From 8de4151dd5a3df28bbc4c7c1a87c1e72649fc70d Mon Sep 17 00:00:00 2001
From: Adam Roach <adam@nostrum.com>
Date: Thu, 29 May 2014 21:13:39 +0100
Subject: [PATCH 001/117] Bug 975548: Import minimal frameworks for client.
 r=nperriault

---
 .../loop/content/libs/backbone-min.js         |   9 ++
 browser/components/loop/content/libs/l10n.js  | 114 ++++++++++++++++++
 .../loop/content/libs/lodash.min.js           |  56 +++++++++
 .../components/loop/content/libs/zepto.min.js |   2 +
 browser/components/loop/content/panel.html    |  24 ++++
 5 files changed, 205 insertions(+)
 create mode 100644 browser/components/loop/content/libs/backbone-min.js
 create mode 100644 browser/components/loop/content/libs/l10n.js
 create mode 100644 browser/components/loop/content/libs/lodash.min.js
 create mode 100644 browser/components/loop/content/libs/zepto.min.js
 create mode 100644 browser/components/loop/content/panel.html

diff --git a/browser/components/loop/content/libs/backbone-min.js b/browser/components/loop/content/libs/backbone-min.js
new file mode 100644
index 000000000000..2c123e771579
--- /dev/null
+++ b/browser/components/loop/content/libs/backbone-min.js
@@ -0,0 +1,9 @@
+//     Backbone.js 1.1.2
+
+//     (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://backbonejs.org
+
+(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r){var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this.id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this.isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChanged(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]=t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","className","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});
+//# sourceMappingURL=backbone-min.map
diff --git a/browser/components/loop/content/libs/l10n.js b/browser/components/loop/content/libs/l10n.js
new file mode 100644
index 000000000000..ff9192ba0f46
--- /dev/null
+++ b/browser/components/loop/content/libs/l10n.js
@@ -0,0 +1,114 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* globals FirefoxCom */
+
+'use strict';
+
+// Small subset of the webL10n API by Fabien Cazenave for pdf.js extension.
+(function(window) {
+  var gLanguage = '';
+
+  // fetch an l10n objects
+  function getL10nData(key) {
+    var response = FirefoxCom.requestSync('getStrings', key);
+    var data = JSON.parse(response);
+    if (!data)
+      console.warn('[l10n] #' + key + ' missing for [' + gLanguage + ']');
+    return data;
+  }
+
+  // replace {{arguments}} with their values
+  function substArguments(text, args) {
+    if (!args)
+      return text;
+
+    return text.replace(/\{\{\s*(\w+)\s*\}\}/g, function(all, name) {
+      return name in args ? args[name] : '{{' + name + '}}';
+    });
+  }
+
+  // translate a string
+  function translateString(key, args, fallback) {
+    var data = getL10nData(key);
+    if (!data && fallback)
+      data = {textContent: fallback};
+    if (!data)
+      return '{{' + key + '}}';
+    return substArguments(data.textContent, args);
+  }
+
+  // translate an HTML element
+  function translateElement(element) {
+    if (!element || !element.dataset)
+      return;
+
+    // get the related l10n object
+    var key = element.dataset.l10nId;
+    var data = getL10nData(key);
+    if (!data)
+      return;
+
+    // get arguments (if any)
+    // TODO: more flexible parser?
+    var args;
+    if (element.dataset.l10nArgs) try {
+      args = JSON.parse(element.dataset.l10nArgs);
+    } catch (e) {
+      console.warn('[l10n] could not parse arguments for #' + key + '');
+    }
+
+    // translate element
+    // TODO: security check?
+    for (var k in data)
+      element[k] = substArguments(data[k], args);
+  }
+
+
+  // translate an HTML subtree
+  function translateFragment(element) {
+    element = element || document.querySelector('html');
+
+    // check all translatable children (= w/ a `data-l10n-id' attribute)
+    var children = element.querySelectorAll('*[data-l10n-id]');
+    var elementCount = children.length;
+    for (var i = 0; i < elementCount; i++)
+      translateElement(children[i]);
+
+    // translate element itself if necessary
+    if (element.dataset.l10nId)
+      translateElement(element);
+  }
+
+  window.addEventListener('DOMContentLoaded', function() {
+    gLanguage = FirefoxCom.requestSync('getLocale', null);
+
+    translateFragment();
+
+    // fire a 'localized' DOM event
+    var evtObject = document.createEvent('Event');
+    evtObject.initEvent('localized', false, false);
+    evtObject.language = gLanguage;
+    window.dispatchEvent(evtObject);
+  });
+
+  // Public API
+  document.mozL10n = {
+    // get a localized string
+    get: translateString,
+
+    // get the document language
+    getLanguage: function() { return gLanguage; },
+
+    // get the direction (ltr|rtl) of the current language
+    getDirection: function() {
+      // http://www.w3.org/International/questions/qa-scripts
+      // Arabic, Hebrew, Farsi, Pashto, Urdu
+      var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
+      return (rtlList.indexOf(gLanguage) >= 0) ? 'rtl' : 'ltr';
+    },
+
+    // translate an element or document fragment
+    translate: translateFragment
+  };
+})(this);
+
diff --git a/browser/components/loop/content/libs/lodash.min.js b/browser/components/loop/content/libs/lodash.min.js
new file mode 100644
index 000000000000..85a9626340c7
--- /dev/null
+++ b/browser/components/loop/content/libs/lodash.min.js
@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Lo-Dash 2.4.1 (Custom Build) lodash.com/license | Underscore.js 1.5.2 underscorejs.org/LICENSE
+ * Build: `lodash modern -o ./dist/lodash.js`
+ */
+;(function(){function n(n,t,e){e=(e||0)-1;for(var r=n?n.length:0;++e<r;)if(n[e]===t)return e;return-1}function t(t,e){var r=typeof e;if(t=t.l,"boolean"==r||null==e)return t[e]?0:-1;"number"!=r&&"string"!=r&&(r="object");var u="number"==r?e:m+e;return t=(t=t[r])&&t[u],"object"==r?t&&-1<n(t,e)?0:-1:t?0:-1}function e(n){var t=this.l,e=typeof n;if("boolean"==e||null==n)t[n]=true;else{"number"!=e&&"string"!=e&&(e="object");var r="number"==e?n:m+n,t=t[e]||(t[e]={});"object"==e?(t[r]||(t[r]=[])).push(n):t[r]=true
+}}function r(n){return n.charCodeAt(0)}function u(n,t){for(var e=n.m,r=t.m,u=-1,o=e.length;++u<o;){var i=e[u],a=r[u];if(i!==a){if(i>a||typeof i=="undefined")return 1;if(i<a||typeof a=="undefined")return-1}}return n.n-t.n}function o(n){var t=-1,r=n.length,u=n[0],o=n[r/2|0],i=n[r-1];if(u&&typeof u=="object"&&o&&typeof o=="object"&&i&&typeof i=="object")return false;for(u=f(),u["false"]=u["null"]=u["true"]=u.undefined=false,o=f(),o.k=n,o.l=u,o.push=e;++t<r;)o.push(n[t]);return o}function i(n){return"\\"+U[n]
+}function a(){return h.pop()||[]}function f(){return g.pop()||{k:null,l:null,m:null,"false":false,n:0,"null":false,number:null,object:null,push:null,string:null,"true":false,undefined:false,o:null}}function l(n){n.length=0,h.length<_&&h.push(n)}function c(n){var t=n.l;t&&c(t),n.k=n.l=n.m=n.object=n.number=n.string=n.o=null,g.length<_&&g.push(n)}function p(n,t,e){t||(t=0),typeof e=="undefined"&&(e=n?n.length:0);var r=-1;e=e-t||0;for(var u=Array(0>e?0:e);++r<e;)u[r]=n[t+r];return u}function s(e){function h(n,t,e){if(!n||!V[typeof n])return n;
+t=t&&typeof e=="undefined"?t:tt(t,e,3);for(var r=-1,u=V[typeof n]&&Fe(n),o=u?u.length:0;++r<o&&(e=u[r],false!==t(n[e],e,n)););return n}function g(n,t,e){var r;if(!n||!V[typeof n])return n;t=t&&typeof e=="undefined"?t:tt(t,e,3);for(r in n)if(false===t(n[r],r,n))break;return n}function _(n,t,e){var r,u=n,o=u;if(!u)return o;for(var i=arguments,a=0,f=typeof e=="number"?2:i.length;++a<f;)if((u=i[a])&&V[typeof u])for(var l=-1,c=V[typeof u]&&Fe(u),p=c?c.length:0;++l<p;)r=c[l],"undefined"==typeof o[r]&&(o[r]=u[r]);
+return o}function U(n,t,e){var r,u=n,o=u;if(!u)return o;var i=arguments,a=0,f=typeof e=="number"?2:i.length;if(3<f&&"function"==typeof i[f-2])var l=tt(i[--f-1],i[f--],2);else 2<f&&"function"==typeof i[f-1]&&(l=i[--f]);for(;++a<f;)if((u=i[a])&&V[typeof u])for(var c=-1,p=V[typeof u]&&Fe(u),s=p?p.length:0;++c<s;)r=p[c],o[r]=l?l(o[r],u[r]):u[r];return o}function H(n){var t,e=[];if(!n||!V[typeof n])return e;for(t in n)me.call(n,t)&&e.push(t);return e}function J(n){return n&&typeof n=="object"&&!Te(n)&&me.call(n,"__wrapped__")?n:new Q(n)
+}function Q(n,t){this.__chain__=!!t,this.__wrapped__=n}function X(n){function t(){if(r){var n=p(r);be.apply(n,arguments)}if(this instanceof t){var o=nt(e.prototype),n=e.apply(o,n||arguments);return wt(n)?n:o}return e.apply(u,n||arguments)}var e=n[0],r=n[2],u=n[4];return $e(t,n),t}function Z(n,t,e,r,u){if(e){var o=e(n);if(typeof o!="undefined")return o}if(!wt(n))return n;var i=ce.call(n);if(!K[i])return n;var f=Ae[i];switch(i){case T:case F:return new f(+n);case W:case P:return new f(n);case z:return o=f(n.source,C.exec(n)),o.lastIndex=n.lastIndex,o
+}if(i=Te(n),t){var c=!r;r||(r=a()),u||(u=a());for(var s=r.length;s--;)if(r[s]==n)return u[s];o=i?f(n.length):{}}else o=i?p(n):U({},n);return i&&(me.call(n,"index")&&(o.index=n.index),me.call(n,"input")&&(o.input=n.input)),t?(r.push(n),u.push(o),(i?St:h)(n,function(n,i){o[i]=Z(n,t,e,r,u)}),c&&(l(r),l(u)),o):o}function nt(n){return wt(n)?ke(n):{}}function tt(n,t,e){if(typeof n!="function")return Ut;if(typeof t=="undefined"||!("prototype"in n))return n;var r=n.__bindData__;if(typeof r=="undefined"&&(De.funcNames&&(r=!n.name),r=r||!De.funcDecomp,!r)){var u=ge.call(n);
+De.funcNames||(r=!O.test(u)),r||(r=E.test(u),$e(n,r))}if(false===r||true!==r&&1&r[1])return n;switch(e){case 1:return function(e){return n.call(t,e)};case 2:return function(e,r){return n.call(t,e,r)};case 3:return function(e,r,u){return n.call(t,e,r,u)};case 4:return function(e,r,u,o){return n.call(t,e,r,u,o)}}return Mt(n,t)}function et(n){function t(){var n=f?i:this;if(u){var h=p(u);be.apply(h,arguments)}return(o||c)&&(h||(h=p(arguments)),o&&be.apply(h,o),c&&h.length<a)?(r|=16,et([e,s?r:-4&r,h,null,i,a])):(h||(h=arguments),l&&(e=n[v]),this instanceof t?(n=nt(e.prototype),h=e.apply(n,h),wt(h)?h:n):e.apply(n,h))
+}var e=n[0],r=n[1],u=n[2],o=n[3],i=n[4],a=n[5],f=1&r,l=2&r,c=4&r,s=8&r,v=e;return $e(t,n),t}function rt(e,r){var u=-1,i=st(),a=e?e.length:0,f=a>=b&&i===n,l=[];if(f){var p=o(r);p?(i=t,r=p):f=false}for(;++u<a;)p=e[u],0>i(r,p)&&l.push(p);return f&&c(r),l}function ut(n,t,e,r){r=(r||0)-1;for(var u=n?n.length:0,o=[];++r<u;){var i=n[r];if(i&&typeof i=="object"&&typeof i.length=="number"&&(Te(i)||yt(i))){t||(i=ut(i,t,e));var a=-1,f=i.length,l=o.length;for(o.length+=f;++a<f;)o[l++]=i[a]}else e||o.push(i)}return o
+}function ot(n,t,e,r,u,o){if(e){var i=e(n,t);if(typeof i!="undefined")return!!i}if(n===t)return 0!==n||1/n==1/t;if(n===n&&!(n&&V[typeof n]||t&&V[typeof t]))return false;if(null==n||null==t)return n===t;var f=ce.call(n),c=ce.call(t);if(f==D&&(f=q),c==D&&(c=q),f!=c)return false;switch(f){case T:case F:return+n==+t;case W:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case z:case P:return n==oe(t)}if(c=f==$,!c){var p=me.call(n,"__wrapped__"),s=me.call(t,"__wrapped__");if(p||s)return ot(p?n.__wrapped__:n,s?t.__wrapped__:t,e,r,u,o);
+if(f!=q)return false;if(f=n.constructor,p=t.constructor,f!=p&&!(dt(f)&&f instanceof f&&dt(p)&&p instanceof p)&&"constructor"in n&&"constructor"in t)return false}for(f=!u,u||(u=a()),o||(o=a()),p=u.length;p--;)if(u[p]==n)return o[p]==t;var v=0,i=true;if(u.push(n),o.push(t),c){if(p=n.length,v=t.length,(i=v==p)||r)for(;v--;)if(c=p,s=t[v],r)for(;c--&&!(i=ot(n[c],s,e,r,u,o)););else if(!(i=ot(n[v],s,e,r,u,o)))break}else g(t,function(t,a,f){return me.call(f,a)?(v++,i=me.call(n,a)&&ot(n[a],t,e,r,u,o)):void 0}),i&&!r&&g(n,function(n,t,e){return me.call(e,t)?i=-1<--v:void 0
+});return u.pop(),o.pop(),f&&(l(u),l(o)),i}function it(n,t,e,r,u){(Te(t)?St:h)(t,function(t,o){var i,a,f=t,l=n[o];if(t&&((a=Te(t))||Pe(t))){for(f=r.length;f--;)if(i=r[f]==t){l=u[f];break}if(!i){var c;e&&(f=e(l,t),c=typeof f!="undefined")&&(l=f),c||(l=a?Te(l)?l:[]:Pe(l)?l:{}),r.push(t),u.push(l),c||it(l,t,e,r,u)}}else e&&(f=e(l,t),typeof f=="undefined"&&(f=t)),typeof f!="undefined"&&(l=f);n[o]=l})}function at(n,t){return n+he(Re()*(t-n+1))}function ft(e,r,u){var i=-1,f=st(),p=e?e.length:0,s=[],v=!r&&p>=b&&f===n,h=u||v?a():s;
+for(v&&(h=o(h),f=t);++i<p;){var g=e[i],y=u?u(g,i,e):g;(r?!i||h[h.length-1]!==y:0>f(h,y))&&((u||v)&&h.push(y),s.push(g))}return v?(l(h.k),c(h)):u&&l(h),s}function lt(n){return function(t,e,r){var u={};e=J.createCallback(e,r,3),r=-1;var o=t?t.length:0;if(typeof o=="number")for(;++r<o;){var i=t[r];n(u,i,e(i,r,t),t)}else h(t,function(t,r,o){n(u,t,e(t,r,o),o)});return u}}function ct(n,t,e,r,u,o){var i=1&t,a=4&t,f=16&t,l=32&t;if(!(2&t||dt(n)))throw new ie;f&&!e.length&&(t&=-17,f=e=false),l&&!r.length&&(t&=-33,l=r=false);
+var c=n&&n.__bindData__;return c&&true!==c?(c=p(c),c[2]&&(c[2]=p(c[2])),c[3]&&(c[3]=p(c[3])),!i||1&c[1]||(c[4]=u),!i&&1&c[1]&&(t|=8),!a||4&c[1]||(c[5]=o),f&&be.apply(c[2]||(c[2]=[]),e),l&&we.apply(c[3]||(c[3]=[]),r),c[1]|=t,ct.apply(null,c)):(1==t||17===t?X:et)([n,t,e,r,u,o])}function pt(n){return Be[n]}function st(){var t=(t=J.indexOf)===Wt?n:t;return t}function vt(n){return typeof n=="function"&&pe.test(n)}function ht(n){var t,e;return n&&ce.call(n)==q&&(t=n.constructor,!dt(t)||t instanceof t)?(g(n,function(n,t){e=t
+}),typeof e=="undefined"||me.call(n,e)):false}function gt(n){return We[n]}function yt(n){return n&&typeof n=="object"&&typeof n.length=="number"&&ce.call(n)==D||false}function mt(n,t,e){var r=Fe(n),u=r.length;for(t=tt(t,e,3);u--&&(e=r[u],false!==t(n[e],e,n)););return n}function bt(n){var t=[];return g(n,function(n,e){dt(n)&&t.push(e)}),t.sort()}function _t(n){for(var t=-1,e=Fe(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function dt(n){return typeof n=="function"}function wt(n){return!(!n||!V[typeof n])
+}function jt(n){return typeof n=="number"||n&&typeof n=="object"&&ce.call(n)==W||false}function kt(n){return typeof n=="string"||n&&typeof n=="object"&&ce.call(n)==P||false}function xt(n){for(var t=-1,e=Fe(n),r=e.length,u=Xt(r);++t<r;)u[t]=n[e[t]];return u}function Ct(n,t,e){var r=-1,u=st(),o=n?n.length:0,i=false;return e=(0>e?Ie(0,o+e):e)||0,Te(n)?i=-1<u(n,t,e):typeof o=="number"?i=-1<(kt(n)?n.indexOf(t,e):u(n,t,e)):h(n,function(n){return++r<e?void 0:!(i=n===t)}),i}function Ot(n,t,e){var r=true;t=J.createCallback(t,e,3),e=-1;
+var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&(r=!!t(n[e],e,n)););else h(n,function(n,e,u){return r=!!t(n,e,u)});return r}function Nt(n,t,e){var r=[];t=J.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u;){var o=n[e];t(o,e,n)&&r.push(o)}else h(n,function(n,e,u){t(n,e,u)&&r.push(n)});return r}function It(n,t,e){t=J.createCallback(t,e,3),e=-1;var r=n?n.length:0;if(typeof r!="number"){var u;return h(n,function(n,e,r){return t(n,e,r)?(u=n,false):void 0}),u}for(;++e<r;){var o=n[e];
+if(t(o,e,n))return o}}function St(n,t,e){var r=-1,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:tt(t,e,3),typeof u=="number")for(;++r<u&&false!==t(n[r],r,n););else h(n,t);return n}function Et(n,t,e){var r=n?n.length:0;if(t=t&&typeof e=="undefined"?t:tt(t,e,3),typeof r=="number")for(;r--&&false!==t(n[r],r,n););else{var u=Fe(n),r=u.length;h(n,function(n,e,o){return e=u?u[--r]:--r,t(o[e],e,o)})}return n}function Rt(n,t,e){var r=-1,u=n?n.length:0;if(t=J.createCallback(t,e,3),typeof u=="number")for(var o=Xt(u);++r<u;)o[r]=t(n[r],r,n);
+else o=[],h(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function At(n,t,e){var u=-1/0,o=u;if(typeof t!="function"&&e&&e[t]===n&&(t=null),null==t&&Te(n)){e=-1;for(var i=n.length;++e<i;){var a=n[e];a>o&&(o=a)}}else t=null==t&&kt(n)?r:J.createCallback(t,e,3),St(n,function(n,e,r){e=t(n,e,r),e>u&&(u=e,o=n)});return o}function Dt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=J.createCallback(t,r,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(e=n[++o]);++o<i;)e=t(e,n[o],o,n);else h(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)
+});return e}function $t(n,t,e,r){var u=3>arguments.length;return t=J.createCallback(t,r,4),Et(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)}),e}function Tt(n){var t=-1,e=n?n.length:0,r=Xt(typeof e=="number"?e:0);return St(n,function(n){var e=at(0,++t);r[t]=r[e],r[e]=n}),r}function Ft(n,t,e){var r;t=J.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&!(r=t(n[e],e,n)););else h(n,function(n,e,u){return!(r=t(n,e,u))});return!!r}function Bt(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=-1;
+for(t=J.createCallback(t,e,3);++o<u&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[0]:v;return p(n,0,Se(Ie(0,r),u))}function Wt(t,e,r){if(typeof r=="number"){var u=t?t.length:0;r=0>r?Ie(0,u+r):r||0}else if(r)return r=zt(t,e),t[r]===e?r:-1;return n(t,e,r)}function qt(n,t,e){if(typeof t!="number"&&null!=t){var r=0,u=-1,o=n?n.length:0;for(t=J.createCallback(t,e,3);++u<o&&t(n[u],u,n);)r++}else r=null==t||e?1:Ie(0,t);return p(n,r)}function zt(n,t,e,r){var u=0,o=n?n.length:u;for(e=e?J.createCallback(e,r,1):Ut,t=e(t);u<o;)r=u+o>>>1,e(n[r])<t?u=r+1:o=r;
+return u}function Pt(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=typeof t!="function"&&r&&r[t]===n?null:t,t=false),null!=e&&(e=J.createCallback(e,r,3)),ft(n,t,e)}function Kt(){for(var n=1<arguments.length?arguments:arguments[0],t=-1,e=n?At(Ve(n,"length")):0,r=Xt(0>e?0:e);++t<e;)r[t]=Ve(n,t);return r}function Lt(n,t){var e=-1,r=n?n.length:0,u={};for(t||!r||Te(n[0])||(t=[]);++e<r;){var o=n[e];t?u[o]=t[e]:o&&(u[o[0]]=o[1])}return u}function Mt(n,t){return 2<arguments.length?ct(n,17,p(arguments,2),null,t):ct(n,1,null,null,t)
+}function Vt(n,t,e){function r(){c&&ve(c),i=c=p=v,(g||h!==t)&&(s=Ue(),a=n.apply(l,o),c||i||(o=l=null))}function u(){var e=t-(Ue()-f);0<e?c=_e(u,e):(i&&ve(i),e=p,i=c=p=v,e&&(s=Ue(),a=n.apply(l,o),c||i||(o=l=null)))}var o,i,a,f,l,c,p,s=0,h=false,g=true;if(!dt(n))throw new ie;if(t=Ie(0,t)||0,true===e)var y=true,g=false;else wt(e)&&(y=e.leading,h="maxWait"in e&&(Ie(t,e.maxWait)||0),g="trailing"in e?e.trailing:g);return function(){if(o=arguments,f=Ue(),l=this,p=g&&(c||!y),false===h)var e=y&&!c;else{i||y||(s=f);var v=h-(f-s),m=0>=v;
+m?(i&&(i=ve(i)),s=f,a=n.apply(l,o)):i||(i=_e(r,v))}return m&&c?c=ve(c):c||t===h||(c=_e(u,t)),e&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a}}function Ut(n){return n}function Gt(n,t,e){var r=true,u=t&&bt(t);t&&(e||u.length)||(null==e&&(e=t),o=Q,t=n,n=J,u=bt(t)),false===e?r=false:wt(e)&&"chain"in e&&(r=e.chain);var o=n,i=dt(o);St(u,function(e){var u=n[e]=t[e];i&&(o.prototype[e]=function(){var t=this.__chain__,e=this.__wrapped__,i=[e];if(be.apply(i,arguments),i=u.apply(n,i),r||t){if(e===i&&wt(i))return this;
+i=new o(i),i.__chain__=t}return i})})}function Ht(){}function Jt(n){return function(t){return t[n]}}function Qt(){return this.__wrapped__}e=e?Y.defaults(G.Object(),e,Y.pick(G,A)):G;var Xt=e.Array,Yt=e.Boolean,Zt=e.Date,ne=e.Function,te=e.Math,ee=e.Number,re=e.Object,ue=e.RegExp,oe=e.String,ie=e.TypeError,ae=[],fe=re.prototype,le=e._,ce=fe.toString,pe=ue("^"+oe(ce).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$"),se=te.ceil,ve=e.clearTimeout,he=te.floor,ge=ne.prototype.toString,ye=vt(ye=re.getPrototypeOf)&&ye,me=fe.hasOwnProperty,be=ae.push,_e=e.setTimeout,de=ae.splice,we=ae.unshift,je=function(){try{var n={},t=vt(t=re.defineProperty)&&t,e=t(n,n,n)&&t
+}catch(r){}return e}(),ke=vt(ke=re.create)&&ke,xe=vt(xe=Xt.isArray)&&xe,Ce=e.isFinite,Oe=e.isNaN,Ne=vt(Ne=re.keys)&&Ne,Ie=te.max,Se=te.min,Ee=e.parseInt,Re=te.random,Ae={};Ae[$]=Xt,Ae[T]=Yt,Ae[F]=Zt,Ae[B]=ne,Ae[q]=re,Ae[W]=ee,Ae[z]=ue,Ae[P]=oe,Q.prototype=J.prototype;var De=J.support={};De.funcDecomp=!vt(e.a)&&E.test(s),De.funcNames=typeof ne.name=="string",J.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:N,variable:"",imports:{_:J}},ke||(nt=function(){function n(){}return function(t){if(wt(t)){n.prototype=t;
+var r=new n;n.prototype=null}return r||e.Object()}}());var $e=je?function(n,t){M.value=t,je(n,"__bindData__",M)}:Ht,Te=xe||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&ce.call(n)==$||false},Fe=Ne?function(n){return wt(n)?Ne(n):[]}:H,Be={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},We=_t(Be),qe=ue("("+Fe(We).join("|")+")","g"),ze=ue("["+Fe(Be).join("")+"]","g"),Pe=ye?function(n){if(!n||ce.call(n)!=q)return false;var t=n.valueOf,e=vt(t)&&(e=ye(t))&&ye(e);return e?n==e||ye(n)==e:ht(n)
+}:ht,Ke=lt(function(n,t,e){me.call(n,e)?n[e]++:n[e]=1}),Le=lt(function(n,t,e){(me.call(n,e)?n[e]:n[e]=[]).push(t)}),Me=lt(function(n,t,e){n[e]=t}),Ve=Rt,Ue=vt(Ue=Zt.now)&&Ue||function(){return(new Zt).getTime()},Ge=8==Ee(d+"08")?Ee:function(n,t){return Ee(kt(n)?n.replace(I,""):n,t||0)};return J.after=function(n,t){if(!dt(t))throw new ie;return function(){return 1>--n?t.apply(this,arguments):void 0}},J.assign=U,J.at=function(n){for(var t=arguments,e=-1,r=ut(t,true,false,1),t=t[2]&&t[2][t[1]]===n?1:r.length,u=Xt(t);++e<t;)u[e]=n[r[e]];
+return u},J.bind=Mt,J.bindAll=function(n){for(var t=1<arguments.length?ut(arguments,true,false,1):bt(n),e=-1,r=t.length;++e<r;){var u=t[e];n[u]=ct(n[u],1,null,null,n)}return n},J.bindKey=function(n,t){return 2<arguments.length?ct(t,19,p(arguments,2),null,n):ct(t,3,null,null,n)},J.chain=function(n){return n=new Q(n),n.__chain__=true,n},J.compact=function(n){for(var t=-1,e=n?n.length:0,r=[];++t<e;){var u=n[t];u&&r.push(u)}return r},J.compose=function(){for(var n=arguments,t=n.length;t--;)if(!dt(n[t]))throw new ie;
+return function(){for(var t=arguments,e=n.length;e--;)t=[n[e].apply(this,t)];return t[0]}},J.constant=function(n){return function(){return n}},J.countBy=Ke,J.create=function(n,t){var e=nt(n);return t?U(e,t):e},J.createCallback=function(n,t,e){var r=typeof n;if(null==n||"function"==r)return tt(n,t,e);if("object"!=r)return Jt(n);var u=Fe(n),o=u[0],i=n[o];return 1!=u.length||i!==i||wt(i)?function(t){for(var e=u.length,r=false;e--&&(r=ot(t[u[e]],n[u[e]],null,true)););return r}:function(n){return n=n[o],i===n&&(0!==i||1/i==1/n)
+}},J.curry=function(n,t){return t=typeof t=="number"?t:+t||n.length,ct(n,4,null,null,null,t)},J.debounce=Vt,J.defaults=_,J.defer=function(n){if(!dt(n))throw new ie;var t=p(arguments,1);return _e(function(){n.apply(v,t)},1)},J.delay=function(n,t){if(!dt(n))throw new ie;var e=p(arguments,2);return _e(function(){n.apply(v,e)},t)},J.difference=function(n){return rt(n,ut(arguments,true,true,1))},J.filter=Nt,J.flatten=function(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=typeof t!="function"&&r&&r[t]===n?null:t,t=false),null!=e&&(n=Rt(n,e,r)),ut(n,t)
+},J.forEach=St,J.forEachRight=Et,J.forIn=g,J.forInRight=function(n,t,e){var r=[];g(n,function(n,t){r.push(t,n)});var u=r.length;for(t=tt(t,e,3);u--&&false!==t(r[u--],r[u],n););return n},J.forOwn=h,J.forOwnRight=mt,J.functions=bt,J.groupBy=Le,J.indexBy=Me,J.initial=function(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=J.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else r=null==t||e?1:t||r;return p(n,0,Se(Ie(0,u-r),u))},J.intersection=function(){for(var e=[],r=-1,u=arguments.length,i=a(),f=st(),p=f===n,s=a();++r<u;){var v=arguments[r];
+(Te(v)||yt(v))&&(e.push(v),i.push(p&&v.length>=b&&o(r?e[r]:s)))}var p=e[0],h=-1,g=p?p.length:0,y=[];n:for(;++h<g;){var m=i[0],v=p[h];if(0>(m?t(m,v):f(s,v))){for(r=u,(m||s).push(v);--r;)if(m=i[r],0>(m?t(m,v):f(e[r],v)))continue n;y.push(v)}}for(;u--;)(m=i[u])&&c(m);return l(i),l(s),y},J.invert=_t,J.invoke=function(n,t){var e=p(arguments,2),r=-1,u=typeof t=="function",o=n?n.length:0,i=Xt(typeof o=="number"?o:0);return St(n,function(n){i[++r]=(u?t:n[t]).apply(n,e)}),i},J.keys=Fe,J.map=Rt,J.mapValues=function(n,t,e){var r={};
+return t=J.createCallback(t,e,3),h(n,function(n,e,u){r[e]=t(n,e,u)}),r},J.max=At,J.memoize=function(n,t){function e(){var r=e.cache,u=t?t.apply(this,arguments):m+arguments[0];return me.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}if(!dt(n))throw new ie;return e.cache={},e},J.merge=function(n){var t=arguments,e=2;if(!wt(n))return n;if("number"!=typeof t[2]&&(e=t.length),3<e&&"function"==typeof t[e-2])var r=tt(t[--e-1],t[e--],2);else 2<e&&"function"==typeof t[e-1]&&(r=t[--e]);for(var t=p(arguments,1,e),u=-1,o=a(),i=a();++u<e;)it(n,t[u],r,o,i);
+return l(o),l(i),n},J.min=function(n,t,e){var u=1/0,o=u;if(typeof t!="function"&&e&&e[t]===n&&(t=null),null==t&&Te(n)){e=-1;for(var i=n.length;++e<i;){var a=n[e];a<o&&(o=a)}}else t=null==t&&kt(n)?r:J.createCallback(t,e,3),St(n,function(n,e,r){e=t(n,e,r),e<u&&(u=e,o=n)});return o},J.omit=function(n,t,e){var r={};if(typeof t!="function"){var u=[];g(n,function(n,t){u.push(t)});for(var u=rt(u,ut(arguments,true,false,1)),o=-1,i=u.length;++o<i;){var a=u[o];r[a]=n[a]}}else t=J.createCallback(t,e,3),g(n,function(n,e,u){t(n,e,u)||(r[e]=n)
+});return r},J.once=function(n){var t,e;if(!dt(n))throw new ie;return function(){return t?e:(t=true,e=n.apply(this,arguments),n=null,e)}},J.pairs=function(n){for(var t=-1,e=Fe(n),r=e.length,u=Xt(r);++t<r;){var o=e[t];u[t]=[o,n[o]]}return u},J.partial=function(n){return ct(n,16,p(arguments,1))},J.partialRight=function(n){return ct(n,32,null,p(arguments,1))},J.pick=function(n,t,e){var r={};if(typeof t!="function")for(var u=-1,o=ut(arguments,true,false,1),i=wt(n)?o.length:0;++u<i;){var a=o[u];a in n&&(r[a]=n[a])
+}else t=J.createCallback(t,e,3),g(n,function(n,e,u){t(n,e,u)&&(r[e]=n)});return r},J.pluck=Ve,J.property=Jt,J.pull=function(n){for(var t=arguments,e=0,r=t.length,u=n?n.length:0;++e<r;)for(var o=-1,i=t[e];++o<u;)n[o]===i&&(de.call(n,o--,1),u--);return n},J.range=function(n,t,e){n=+n||0,e=typeof e=="number"?e:+e||1,null==t&&(t=n,n=0);var r=-1;t=Ie(0,se((t-n)/(e||1)));for(var u=Xt(t);++r<t;)u[r]=n,n+=e;return u},J.reject=function(n,t,e){return t=J.createCallback(t,e,3),Nt(n,function(n,e,r){return!t(n,e,r)
+})},J.remove=function(n,t,e){var r=-1,u=n?n.length:0,o=[];for(t=J.createCallback(t,e,3);++r<u;)e=n[r],t(e,r,n)&&(o.push(e),de.call(n,r--,1),u--);return o},J.rest=qt,J.shuffle=Tt,J.sortBy=function(n,t,e){var r=-1,o=Te(t),i=n?n.length:0,p=Xt(typeof i=="number"?i:0);for(o||(t=J.createCallback(t,e,3)),St(n,function(n,e,u){var i=p[++r]=f();o?i.m=Rt(t,function(t){return n[t]}):(i.m=a())[0]=t(n,e,u),i.n=r,i.o=n}),i=p.length,p.sort(u);i--;)n=p[i],p[i]=n.o,o||l(n.m),c(n);return p},J.tap=function(n,t){return t(n),n
+},J.throttle=function(n,t,e){var r=true,u=true;if(!dt(n))throw new ie;return false===e?r=false:wt(e)&&(r="leading"in e?e.leading:r,u="trailing"in e?e.trailing:u),L.leading=r,L.maxWait=t,L.trailing=u,Vt(n,t,L)},J.times=function(n,t,e){n=-1<(n=+n)?n:0;var r=-1,u=Xt(n);for(t=tt(t,e,1);++r<n;)u[r]=t(r);return u},J.toArray=function(n){return n&&typeof n.length=="number"?p(n):xt(n)},J.transform=function(n,t,e,r){var u=Te(n);if(null==e)if(u)e=[];else{var o=n&&n.constructor;e=nt(o&&o.prototype)}return t&&(t=J.createCallback(t,r,4),(u?St:h)(n,function(n,r,u){return t(e,n,r,u)
+})),e},J.union=function(){return ft(ut(arguments,true,true))},J.uniq=Pt,J.values=xt,J.where=Nt,J.without=function(n){return rt(n,p(arguments,1))},J.wrap=function(n,t){return ct(t,16,[n])},J.xor=function(){for(var n=-1,t=arguments.length;++n<t;){var e=arguments[n];if(Te(e)||yt(e))var r=r?ft(rt(r,e).concat(rt(e,r))):e}return r||[]},J.zip=Kt,J.zipObject=Lt,J.collect=Rt,J.drop=qt,J.each=St,J.eachRight=Et,J.extend=U,J.methods=bt,J.object=Lt,J.select=Nt,J.tail=qt,J.unique=Pt,J.unzip=Kt,Gt(J),J.clone=function(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=t,t=false),Z(n,t,typeof e=="function"&&tt(e,r,1))
+},J.cloneDeep=function(n,t,e){return Z(n,true,typeof t=="function"&&tt(t,e,1))},J.contains=Ct,J.escape=function(n){return null==n?"":oe(n).replace(ze,pt)},J.every=Ot,J.find=It,J.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=J.createCallback(t,e,3);++r<u;)if(t(n[r],r,n))return r;return-1},J.findKey=function(n,t,e){var r;return t=J.createCallback(t,e,3),h(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},J.findLast=function(n,t,e){var r;return t=J.createCallback(t,e,3),Et(n,function(n,e,u){return t(n,e,u)?(r=n,false):void 0
+}),r},J.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=J.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},J.findLastKey=function(n,t,e){var r;return t=J.createCallback(t,e,3),mt(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},J.has=function(n,t){return n?me.call(n,t):false},J.identity=Ut,J.indexOf=Wt,J.isArguments=yt,J.isArray=Te,J.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&ce.call(n)==T||false},J.isDate=function(n){return n&&typeof n=="object"&&ce.call(n)==F||false
+},J.isElement=function(n){return n&&1===n.nodeType||false},J.isEmpty=function(n){var t=true;if(!n)return t;var e=ce.call(n),r=n.length;return e==$||e==P||e==D||e==q&&typeof r=="number"&&dt(n.splice)?!r:(h(n,function(){return t=false}),t)},J.isEqual=function(n,t,e,r){return ot(n,t,typeof e=="function"&&tt(e,r,2))},J.isFinite=function(n){return Ce(n)&&!Oe(parseFloat(n))},J.isFunction=dt,J.isNaN=function(n){return jt(n)&&n!=+n},J.isNull=function(n){return null===n},J.isNumber=jt,J.isObject=wt,J.isPlainObject=Pe,J.isRegExp=function(n){return n&&typeof n=="object"&&ce.call(n)==z||false
+},J.isString=kt,J.isUndefined=function(n){return typeof n=="undefined"},J.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?Ie(0,r+e):Se(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},J.mixin=Gt,J.noConflict=function(){return e._=le,this},J.noop=Ht,J.now=Ue,J.parseInt=Ge,J.random=function(n,t,e){var r=null==n,u=null==t;return null==e&&(typeof n=="boolean"&&u?(e=n,n=1):u||typeof t!="boolean"||(e=t,u=true)),r&&u&&(t=1),n=+n||0,u?(t=n,n=0):t=+t||0,e||n%1||t%1?(e=Re(),Se(n+e*(t-n+parseFloat("1e-"+((e+"").length-1))),t)):at(n,t)
+},J.reduce=Dt,J.reduceRight=$t,J.result=function(n,t){if(n){var e=n[t];return dt(e)?n[t]():e}},J.runInContext=s,J.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Fe(n).length},J.some=Ft,J.sortedIndex=zt,J.template=function(n,t,e){var r=J.templateSettings;n=oe(n||""),e=_({},e,r);var u,o=_({},e.imports,r.imports),r=Fe(o),o=xt(o),a=0,f=e.interpolate||S,l="__p+='",f=ue((e.escape||S).source+"|"+f.source+"|"+(f===N?x:S).source+"|"+(e.evaluate||S).source+"|$","g");n.replace(f,function(t,e,r,o,f,c){return r||(r=o),l+=n.slice(a,c).replace(R,i),e&&(l+="'+__e("+e+")+'"),f&&(u=true,l+="';"+f+";\n__p+='"),r&&(l+="'+((__t=("+r+"))==null?'':__t)+'"),a=c+t.length,t
+}),l+="';",f=e=e.variable,f||(e="obj",l="with("+e+"){"+l+"}"),l=(u?l.replace(w,""):l).replace(j,"$1").replace(k,"$1;"),l="function("+e+"){"+(f?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var c=ne(r,"return "+l).apply(v,o)}catch(p){throw p.source=l,p}return t?c(t):(c.source=l,c)},J.unescape=function(n){return null==n?"":oe(n).replace(qe,gt)},J.uniqueId=function(n){var t=++y;return oe(null==n?"":n)+t
+},J.all=Ot,J.any=Ft,J.detect=It,J.findWhere=It,J.foldl=Dt,J.foldr=$t,J.include=Ct,J.inject=Dt,Gt(function(){var n={};return h(J,function(t,e){J.prototype[e]||(n[e]=t)}),n}(),false),J.first=Bt,J.last=function(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=J.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[u-1]:v;return p(n,Ie(0,u-r))},J.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=xt(n)),null==t||e?n?n[at(0,n.length-1)]:v:(n=Tt(n),n.length=Se(Ie(0,t),n.length),n)
+},J.take=Bt,J.head=Bt,h(J,function(n,t){var e="sample"!==t;J.prototype[t]||(J.prototype[t]=function(t,r){var u=this.__chain__,o=n(this.__wrapped__,t,r);return u||null!=t&&(!r||e&&typeof t=="function")?new Q(o,u):o})}),J.VERSION="2.4.1",J.prototype.chain=function(){return this.__chain__=true,this},J.prototype.toString=function(){return oe(this.__wrapped__)},J.prototype.value=Qt,J.prototype.valueOf=Qt,St(["join","pop","shift"],function(n){var t=ae[n];J.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);
+return n?new Q(e,n):e}}),St(["push","reverse","sort","unshift"],function(n){var t=ae[n];J.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),St(["concat","slice","splice"],function(n){var t=ae[n];J.prototype[n]=function(){return new Q(t.apply(this.__wrapped__,arguments),this.__chain__)}}),J}var v,h=[],g=[],y=0,m=+new Date+"",b=75,_=40,d=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",w=/\b__p\+='';/g,j=/\b(__p\+=)''\+/g,k=/(__e\(.*?\)|\b__t\))\+'';/g,x=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,C=/\w*$/,O=/^\s*function[ \n\r\t]+\w/,N=/<%=([\s\S]+?)%>/g,I=RegExp("^["+d+"]*0+(?=.$)"),S=/($^)/,E=/\bthis\b/,R=/['\n\r\t\u2028\u2029\\]/g,A="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setTimeout".split(" "),D="[object Arguments]",$="[object Array]",T="[object Boolean]",F="[object Date]",B="[object Function]",W="[object Number]",q="[object Object]",z="[object RegExp]",P="[object String]",K={};
+K[B]=false,K[D]=K[$]=K[T]=K[F]=K[W]=K[q]=K[z]=K[P]=true;var L={leading:false,maxWait:0,trailing:false},M={configurable:false,enumerable:false,value:null,writable:false},V={"boolean":false,"function":true,object:true,number:false,string:false,undefined:false},U={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},G=V[typeof window]&&window||this,H=V[typeof exports]&&exports&&!exports.nodeType&&exports,J=V[typeof module]&&module&&!module.nodeType&&module,Q=J&&J.exports===H&&H,X=V[typeof global]&&global;!X||X.global!==X&&X.window!==X||(G=X);
+var Y=s();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(G._=Y, define(function(){return Y})):H&&J?Q?(J.exports=Y)._=Y:H._=Y:G._=Y}).call(this);
\ No newline at end of file
diff --git a/browser/components/loop/content/libs/zepto.min.js b/browser/components/loop/content/libs/zepto.min.js
new file mode 100644
index 000000000000..0b2f97adbb64
--- /dev/null
+++ b/browser/components/loop/content/libs/zepto.min.js
@@ -0,0 +1,2 @@
+/* Zepto v1.1.3 - zepto event ajax form ie - zeptojs.com/license */
+var Zepto=function(){function L(t){return null==t?String(t):j[T.call(t)]||"object"}function Z(t){return"function"==L(t)}function $(t){return null!=t&&t==t.window}function _(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function D(t){return"object"==L(t)}function R(t){return D(t)&&!$(t)&&Object.getPrototypeOf(t)==Object.prototype}function M(t){return"number"==typeof t.length}function k(t){return s.call(t,function(t){return null!=t})}function z(t){return t.length>0?n.fn.concat.apply([],t):t}function F(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function q(t){return t in f?f[t]:f[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function H(t,e){return"number"!=typeof e||c[F(t)]?e:e+"px"}function I(t){var e,n;return u[t]||(e=a.createElement(t),a.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),u[t]=n),u[t]}function V(t){return"children"in t?o.call(t.children):n.map(t.childNodes,function(t){return 1==t.nodeType?t:void 0})}function U(n,i,r){for(e in i)r&&(R(i[e])||A(i[e]))?(R(i[e])&&!R(n[e])&&(n[e]={}),A(i[e])&&!A(n[e])&&(n[e]=[]),U(n[e],i[e],r)):i[e]!==t&&(n[e]=i[e])}function B(t,e){return null==e?n(t):n(t).filter(e)}function J(t,e,n,i){return Z(e)?e.call(t,n,i):e}function X(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function W(e,n){var i=e.className,r=i&&i.baseVal!==t;return n===t?r?i.baseVal:i:void(r?i.baseVal=n:e.className=n)}function Y(t){var e;try{return t?"true"==t||("false"==t?!1:"null"==t?null:/^0/.test(t)||isNaN(e=Number(t))?/^[\[\{]/.test(t)?n.parseJSON(t):t:e):t}catch(i){return t}}function G(t,e){e(t);for(var n in t.childNodes)G(t.childNodes[n],e)}var t,e,n,i,C,N,r=[],o=r.slice,s=r.filter,a=window.document,u={},f={},c={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},l=/^\s*<(\w+|!)[^>]*>/,h=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,p=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,d=/^(?:body|html)$/i,m=/([A-Z])/g,g=["val","css","html","text","data","width","height","offset"],v=["after","prepend","before","append"],y=a.createElement("table"),x=a.createElement("tr"),b={tr:a.createElement("tbody"),tbody:y,thead:y,tfoot:y,td:x,th:x,"*":a.createElement("div")},w=/complete|loaded|interactive/,E=/^[\w-]*$/,j={},T=j.toString,S={},O=a.createElement("div"),P={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},A=Array.isArray||function(t){return t instanceof Array};return S.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var i,r=t.parentNode,o=!r;return o&&(r=O).appendChild(t),i=~S.qsa(r,e).indexOf(t),o&&O.removeChild(t),i},C=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},N=function(t){return s.call(t,function(e,n){return t.indexOf(e)==n})},S.fragment=function(e,i,r){var s,u,f;return h.test(e)&&(s=n(a.createElement(RegExp.$1))),s||(e.replace&&(e=e.replace(p,"<$1></$2>")),i===t&&(i=l.test(e)&&RegExp.$1),i in b||(i="*"),f=b[i],f.innerHTML=""+e,s=n.each(o.call(f.childNodes),function(){f.removeChild(this)})),R(r)&&(u=n(s),n.each(r,function(t,e){g.indexOf(t)>-1?u[t](e):u.attr(t,e)})),s},S.Z=function(t,e){return t=t||[],t.__proto__=n.fn,t.selector=e||"",t},S.isZ=function(t){return t instanceof S.Z},S.init=function(e,i){var r;if(!e)return S.Z();if("string"==typeof e)if(e=e.trim(),"<"==e[0]&&l.test(e))r=S.fragment(e,RegExp.$1,i),e=null;else{if(i!==t)return n(i).find(e);r=S.qsa(a,e)}else{if(Z(e))return n(a).ready(e);if(S.isZ(e))return e;if(A(e))r=k(e);else if(D(e))r=[e],e=null;else if(l.test(e))r=S.fragment(e.trim(),RegExp.$1,i),e=null;else{if(i!==t)return n(i).find(e);r=S.qsa(a,e)}}return S.Z(r,e)},n=function(t,e){return S.init(t,e)},n.extend=function(t){var e,n=o.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){U(t,n,e)}),t},S.qsa=function(t,e){var n,i="#"==e[0],r=!i&&"."==e[0],s=i||r?e.slice(1):e,a=E.test(s);return _(t)&&a&&i?(n=t.getElementById(s))?[n]:[]:1!==t.nodeType&&9!==t.nodeType?[]:o.call(a&&!i?r?t.getElementsByClassName(s):t.getElementsByTagName(e):t.querySelectorAll(e))},n.contains=function(t,e){return t!==e&&t.contains(e)},n.type=L,n.isFunction=Z,n.isWindow=$,n.isArray=A,n.isPlainObject=R,n.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},n.inArray=function(t,e,n){return r.indexOf.call(e,t,n)},n.camelCase=C,n.trim=function(t){return null==t?"":String.prototype.trim.call(t)},n.uuid=0,n.support={},n.expr={},n.map=function(t,e){var n,r,o,i=[];if(M(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&i.push(n);else for(o in t)n=e(t[o],o),null!=n&&i.push(n);return z(i)},n.each=function(t,e){var n,i;if(M(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(i in t)if(e.call(t[i],i,t[i])===!1)return t;return t},n.grep=function(t,e){return s.call(t,e)},window.JSON&&(n.parseJSON=JSON.parse),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){j["[object "+e+"]"]=e.toLowerCase()}),n.fn={forEach:r.forEach,reduce:r.reduce,push:r.push,sort:r.sort,indexOf:r.indexOf,concat:r.concat,map:function(t){return n(n.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return n(o.apply(this,arguments))},ready:function(t){return w.test(a.readyState)&&a.body?t(n):a.addEventListener("DOMContentLoaded",function(){t(n)},!1),this},get:function(e){return e===t?o.call(this):this[e>=0?e:e+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return r.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return Z(t)?this.not(this.not(t)):n(s.call(this,function(e){return S.matches(e,t)}))},add:function(t,e){return n(N(this.concat(n(t,e))))},is:function(t){return this.length>0&&S.matches(this[0],t)},not:function(e){var i=[];if(Z(e)&&e.call!==t)this.each(function(t){e.call(this,t)||i.push(this)});else{var r="string"==typeof e?this.filter(e):M(e)&&Z(e.item)?o.call(e):n(e);this.forEach(function(t){r.indexOf(t)<0&&i.push(t)})}return n(i)},has:function(t){return this.filter(function(){return D(t)?n.contains(this,t):n(this).find(t).size()})},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!D(t)?t:n(t)},last:function(){var t=this[this.length-1];return t&&!D(t)?t:n(t)},find:function(t){var e,i=this;return e="object"==typeof t?n(t).filter(function(){var t=this;return r.some.call(i,function(e){return n.contains(e,t)})}):1==this.length?n(S.qsa(this[0],t)):this.map(function(){return S.qsa(this,t)})},closest:function(t,e){var i=this[0],r=!1;for("object"==typeof t&&(r=n(t));i&&!(r?r.indexOf(i)>=0:S.matches(i,t));)i=i!==e&&!_(i)&&i.parentNode;return n(i)},parents:function(t){for(var e=[],i=this;i.length>0;)i=n.map(i,function(t){return(t=t.parentNode)&&!_(t)&&e.indexOf(t)<0?(e.push(t),t):void 0});return B(e,t)},parent:function(t){return B(N(this.pluck("parentNode")),t)},children:function(t){return B(this.map(function(){return V(this)}),t)},contents:function(){return this.map(function(){return o.call(this.childNodes)})},siblings:function(t){return B(this.map(function(t,e){return s.call(V(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return n.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=I(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var e=Z(t);if(this[0]&&!e)var i=n(t).get(0),r=i.parentNode||this.length>1;return this.each(function(o){n(this).wrapAll(e?t.call(this,o):r?i.cloneNode(!0):i)})},wrapAll:function(t){if(this[0]){n(this[0]).before(t=n(t));for(var e;(e=t.children()).length;)t=e.first();n(t).append(this)}return this},wrapInner:function(t){var e=Z(t);return this.each(function(i){var r=n(this),o=r.contents(),s=e?t.call(this,i):t;o.length?o.wrapAll(s):r.append(s)})},unwrap:function(){return this.parent().each(function(){n(this).replaceWith(n(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(e){return this.each(function(){var i=n(this);(e===t?"none"==i.css("display"):e)?i.show():i.hide()})},prev:function(t){return n(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return n(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0===arguments.length?this.length>0?this[0].innerHTML:null:this.each(function(e){var i=this.innerHTML;n(this).empty().append(J(this,t,e,i))})},text:function(e){return 0===arguments.length?this.length>0?this[0].textContent:null:this.each(function(){this.textContent=e===t?"":""+e})},attr:function(n,i){var r;return"string"==typeof n&&i===t?0==this.length||1!==this[0].nodeType?t:"value"==n&&"INPUT"==this[0].nodeName?this.val():!(r=this[0].getAttribute(n))&&n in this[0]?this[0][n]:r:this.each(function(t){if(1===this.nodeType)if(D(n))for(e in n)X(this,e,n[e]);else X(this,n,J(this,i,t,this.getAttribute(n)))})},removeAttr:function(t){return this.each(function(){1===this.nodeType&&X(this,t)})},prop:function(e,n){return e=P[e]||e,n===t?this[0]&&this[0][e]:this.each(function(t){this[e]=J(this,n,t,this[e])})},data:function(e,n){var i=this.attr("data-"+e.replace(m,"-$1").toLowerCase(),n);return null!==i?Y(i):t},val:function(t){return 0===arguments.length?this[0]&&(this[0].multiple?n(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value):this.each(function(e){this.value=J(this,t,e,this.value)})},offset:function(t){if(t)return this.each(function(e){var i=n(this),r=J(this,t,e,i.offset()),o=i.offsetParent().offset(),s={top:r.top-o.top,left:r.left-o.left};"static"==i.css("position")&&(s.position="relative"),i.css(s)});if(0==this.length)return null;var e=this[0].getBoundingClientRect();return{left:e.left+window.pageXOffset,top:e.top+window.pageYOffset,width:Math.round(e.width),height:Math.round(e.height)}},css:function(t,i){if(arguments.length<2){var r=this[0],o=getComputedStyle(r,"");if(!r)return;if("string"==typeof t)return r.style[C(t)]||o.getPropertyValue(t);if(A(t)){var s={};return n.each(A(t)?t:[t],function(t,e){s[e]=r.style[C(e)]||o.getPropertyValue(e)}),s}}var a="";if("string"==L(t))i||0===i?a=F(t)+":"+H(t,i):this.each(function(){this.style.removeProperty(F(t))});else for(e in t)t[e]||0===t[e]?a+=F(e)+":"+H(e,t[e])+";":this.each(function(){this.style.removeProperty(F(e))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(n(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return t?r.some.call(this,function(t){return this.test(W(t))},q(t)):!1},addClass:function(t){return t?this.each(function(e){i=[];var r=W(this),o=J(this,t,e,r);o.split(/\s+/g).forEach(function(t){n(this).hasClass(t)||i.push(t)},this),i.length&&W(this,r+(r?" ":"")+i.join(" "))}):this},removeClass:function(e){return this.each(function(n){return e===t?W(this,""):(i=W(this),J(this,e,n,i).split(/\s+/g).forEach(function(t){i=i.replace(q(t)," ")}),void W(this,i.trim()))})},toggleClass:function(e,i){return e?this.each(function(r){var o=n(this),s=J(this,e,r,W(this));s.split(/\s+/g).forEach(function(e){(i===t?!o.hasClass(e):i)?o.addClass(e):o.removeClass(e)})}):this},scrollTop:function(e){if(this.length){var n="scrollTop"in this[0];return e===t?n?this[0].scrollTop:this[0].pageYOffset:this.each(n?function(){this.scrollTop=e}:function(){this.scrollTo(this.scrollX,e)})}},scrollLeft:function(e){if(this.length){var n="scrollLeft"in this[0];return e===t?n?this[0].scrollLeft:this[0].pageXOffset:this.each(n?function(){this.scrollLeft=e}:function(){this.scrollTo(e,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),i=this.offset(),r=d.test(e[0].nodeName)?{top:0,left:0}:e.offset();return i.top-=parseFloat(n(t).css("margin-top"))||0,i.left-=parseFloat(n(t).css("margin-left"))||0,r.top+=parseFloat(n(e[0]).css("border-top-width"))||0,r.left+=parseFloat(n(e[0]).css("border-left-width"))||0,{top:i.top-r.top,left:i.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||a.body;t&&!d.test(t.nodeName)&&"static"==n(t).css("position");)t=t.offsetParent;return t})}},n.fn.detach=n.fn.remove,["width","height"].forEach(function(e){var i=e.replace(/./,function(t){return t[0].toUpperCase()});n.fn[e]=function(r){var o,s=this[0];return r===t?$(s)?s["inner"+i]:_(s)?s.documentElement["scroll"+i]:(o=this.offset())&&o[e]:this.each(function(t){s=n(this),s.css(e,J(this,r,t,s[e]()))})}}),v.forEach(function(t,e){var i=e%2;n.fn[t]=function(){var t,o,r=n.map(arguments,function(e){return t=L(e),"object"==t||"array"==t||null==e?e:S.fragment(e)}),s=this.length>1;return r.length<1?this:this.each(function(t,a){o=i?a:a.parentNode,a=0==e?a.nextSibling:1==e?a.firstChild:2==e?a:null,r.forEach(function(t){if(s)t=t.cloneNode(!0);else if(!o)return n(t).remove();G(o.insertBefore(t,a),function(t){null==t.nodeName||"SCRIPT"!==t.nodeName.toUpperCase()||t.type&&"text/javascript"!==t.type||t.src||window.eval.call(window,t.innerHTML)})})})},n.fn[i?t+"To":"insert"+(e?"Before":"After")]=function(e){return n(e)[t](this),this}}),S.Z.prototype=n.fn,S.uniq=N,S.deserializeValue=Y,n.zepto=S,n}();window.Zepto=Zepto,void 0===window.$&&(window.$=Zepto),function(t){function l(t){return t._zid||(t._zid=e++)}function h(t,e,n,i){if(e=p(e),e.ns)var r=d(e.ns);return(s[l(t)]||[]).filter(function(t){return!(!t||e.e&&t.e!=e.e||e.ns&&!r.test(t.ns)||n&&l(t.fn)!==l(n)||i&&t.sel!=i)})}function p(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function d(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function m(t,e){return t.del&&!u&&t.e in f||!!e}function g(t){return c[t]||u&&f[t]||t}function v(e,i,r,o,a,u,f){var h=l(e),d=s[h]||(s[h]=[]);i.split(/\s/).forEach(function(i){if("ready"==i)return t(document).ready(r);var s=p(i);s.fn=r,s.sel=a,s.e in c&&(r=function(e){var n=e.relatedTarget;return!n||n!==this&&!t.contains(this,n)?s.fn.apply(this,arguments):void 0}),s.del=u;var l=u||r;s.proxy=function(t){if(t=j(t),!t.isImmediatePropagationStopped()){t.data=o;var i=l.apply(e,t._args==n?[t]:[t].concat(t._args));return i===!1&&(t.preventDefault(),t.stopPropagation()),i}},s.i=d.length,d.push(s),"addEventListener"in e&&e.addEventListener(g(s.e),s.proxy,m(s,f))})}function y(t,e,n,i,r){var o=l(t);(e||"").split(/\s/).forEach(function(e){h(t,e,n,i).forEach(function(e){delete s[o][e.i],"removeEventListener"in t&&t.removeEventListener(g(e.e),e.proxy,m(e,r))})})}function j(e,i){return(i||!e.isDefaultPrevented)&&(i||(i=e),t.each(E,function(t,n){var r=i[t];e[t]=function(){return this[n]=x,r&&r.apply(i,arguments)},e[n]=b}),(i.defaultPrevented!==n?i.defaultPrevented:"returnValue"in i?i.returnValue===!1:i.getPreventDefault&&i.getPreventDefault())&&(e.isDefaultPrevented=x)),e}function T(t){var e,i={originalEvent:t};for(e in t)w.test(e)||t[e]===n||(i[e]=t[e]);return j(i,t)}var n,e=1,i=Array.prototype.slice,r=t.isFunction,o=function(t){return"string"==typeof t},s={},a={},u="onfocusin"in window,f={focus:"focusin",blur:"focusout"},c={mouseenter:"mouseover",mouseleave:"mouseout"};a.click=a.mousedown=a.mouseup=a.mousemove="MouseEvents",t.event={add:v,remove:y},t.proxy=function(e,n){if(r(e)){var i=function(){return e.apply(n,arguments)};return i._zid=l(e),i}if(o(n))return t.proxy(e[n],e);throw new TypeError("expected function")},t.fn.bind=function(t,e,n){return this.on(t,e,n)},t.fn.unbind=function(t,e){return this.off(t,e)},t.fn.one=function(t,e,n,i){return this.on(t,e,n,i,1)};var x=function(){return!0},b=function(){return!1},w=/^([A-Z]|returnValue$|layer[XY]$)/,E={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};t.fn.delegate=function(t,e,n){return this.on(e,t,n)},t.fn.undelegate=function(t,e,n){return this.off(e,t,n)},t.fn.live=function(e,n){return t(document.body).delegate(this.selector,e,n),this},t.fn.die=function(e,n){return t(document.body).undelegate(this.selector,e,n),this},t.fn.on=function(e,s,a,u,f){var c,l,h=this;return e&&!o(e)?(t.each(e,function(t,e){h.on(t,s,a,e,f)}),h):(o(s)||r(u)||u===!1||(u=a,a=s,s=n),(r(a)||a===!1)&&(u=a,a=n),u===!1&&(u=b),h.each(function(n,r){f&&(c=function(t){return y(r,t.type,u),u.apply(this,arguments)}),s&&(l=function(e){var n,o=t(e.target).closest(s,r).get(0);return o&&o!==r?(n=t.extend(T(e),{currentTarget:o,liveFired:r}),(c||u).apply(o,[n].concat(i.call(arguments,1)))):void 0}),v(r,e,u,a,s,l||c)}))},t.fn.off=function(e,i,s){var a=this;return e&&!o(e)?(t.each(e,function(t,e){a.off(t,i,e)}),a):(o(i)||r(s)||s===!1||(s=i,i=n),s===!1&&(s=b),a.each(function(){y(this,e,s,i)}))},t.fn.trigger=function(e,n){return e=o(e)||t.isPlainObject(e)?t.Event(e):j(e),e._args=n,this.each(function(){"dispatchEvent"in this?this.dispatchEvent(e):t(this).triggerHandler(e,n)})},t.fn.triggerHandler=function(e,n){var i,r;return this.each(function(s,a){i=T(o(e)?t.Event(e):e),i._args=n,i.target=a,t.each(h(a,e.type||e),function(t,e){return r=e.proxy(i),i.isImmediatePropagationStopped()?!1:void 0})}),r},"focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(e){t.fn[e]=function(t){return t?this.bind(e,t):this.trigger(e)}}),["focus","blur"].forEach(function(e){t.fn[e]=function(t){return t?this.bind(e,t):this.each(function(){try{this[e]()}catch(t){}}),this}}),t.Event=function(t,e){o(t)||(e=t,t=e.type);var n=document.createEvent(a[t]||"Events"),i=!0;if(e)for(var r in e)"bubbles"==r?i=!!e[r]:n[r]=e[r];return n.initEvent(t,i,!0),j(n)}}(Zepto),function(t){function l(e,n,i){var r=t.Event(n);return t(e).trigger(r,i),!r.isDefaultPrevented()}function h(t,e,i,r){return t.global?l(e||n,i,r):void 0}function p(e){e.global&&0===t.active++&&h(e,null,"ajaxStart")}function d(e){e.global&&!--t.active&&h(e,null,"ajaxStop")}function m(t,e){var n=e.context;return e.beforeSend.call(n,t,e)===!1||h(e,n,"ajaxBeforeSend",[t,e])===!1?!1:void h(e,n,"ajaxSend",[t,e])}function g(t,e,n,i){var r=n.context,o="success";n.success.call(r,t,o,e),i&&i.resolveWith(r,[t,o,e]),h(n,r,"ajaxSuccess",[e,n,t]),y(o,e,n)}function v(t,e,n,i,r){var o=i.context;i.error.call(o,n,e,t),r&&r.rejectWith(o,[n,e,t]),h(i,o,"ajaxError",[n,i,t||e]),y(e,n,i)}function y(t,e,n){var i=n.context;n.complete.call(i,e,t),h(n,i,"ajaxComplete",[e,n]),d(n)}function x(){}function b(t){return t&&(t=t.split(";",2)[0]),t&&(t==f?"html":t==u?"json":s.test(t)?"script":a.test(t)&&"xml")||"text"}function w(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function E(e){e.processData&&e.data&&"string"!=t.type(e.data)&&(e.data=t.param(e.data,e.traditional)),!e.data||e.type&&"GET"!=e.type.toUpperCase()||(e.url=w(e.url,e.data),e.data=void 0)}function j(e,n,i,r){return t.isFunction(n)&&(r=i,i=n,n=void 0),t.isFunction(i)||(r=i,i=void 0),{url:e,data:n,success:i,dataType:r}}function S(e,n,i,r){var o,s=t.isArray(n),a=t.isPlainObject(n);t.each(n,function(n,u){o=t.type(u),r&&(n=i?r:r+"["+(a||"object"==o||"array"==o?n:"")+"]"),!r&&s?e.add(u.name,u.value):"array"==o||!i&&"object"==o?S(e,u,i,n):e.add(n,u)})}var i,r,e=0,n=window.document,o=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,s=/^(?:text|application)\/javascript/i,a=/^(?:text|application)\/xml/i,u="application/json",f="text/html",c=/^\s*$/;t.active=0,t.ajaxJSONP=function(i,r){if(!("type"in i))return t.ajax(i);var f,h,o=i.jsonpCallback,s=(t.isFunction(o)?o():o)||"jsonp"+ ++e,a=n.createElement("script"),u=window[s],c=function(e){t(a).triggerHandler("error",e||"abort")},l={abort:c};return r&&r.promise(l),t(a).on("load error",function(e,n){clearTimeout(h),t(a).off().remove(),"error"!=e.type&&f?g(f[0],l,i,r):v(null,n||"error",l,i,r),window[s]=u,f&&t.isFunction(u)&&u(f[0]),u=f=void 0}),m(l,i)===!1?(c("abort"),l):(window[s]=function(){f=arguments},a.src=i.url.replace(/\?(.+)=\?/,"?$1="+s),n.head.appendChild(a),i.timeout>0&&(h=setTimeout(function(){c("timeout")},i.timeout)),l)},t.ajaxSettings={type:"GET",beforeSend:x,success:x,error:x,complete:x,context:null,global:!0,xhr:function(){return new window.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:u,xml:"application/xml, text/xml",html:f,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0},t.ajax=function(e){var n=t.extend({},e||{}),o=t.Deferred&&t.Deferred();for(i in t.ajaxSettings)void 0===n[i]&&(n[i]=t.ajaxSettings[i]);p(n),n.crossDomain||(n.crossDomain=/^([\w-]+:)?\/\/([^\/]+)/.test(n.url)&&RegExp.$2!=window.location.host),n.url||(n.url=window.location.toString()),E(n),n.cache===!1&&(n.url=w(n.url,"_="+Date.now()));var s=n.dataType,a=/\?.+=\?/.test(n.url);if("jsonp"==s||a)return a||(n.url=w(n.url,n.jsonp?n.jsonp+"=?":n.jsonp===!1?"":"callback=?")),t.ajaxJSONP(n,o);var j,u=n.accepts[s],f={},l=function(t,e){f[t.toLowerCase()]=[t,e]},h=/^([\w-]+:)\/\//.test(n.url)?RegExp.$1:window.location.protocol,d=n.xhr(),y=d.setRequestHeader;if(o&&o.promise(d),n.crossDomain||l("X-Requested-With","XMLHttpRequest"),l("Accept",u||"*/*"),(u=n.mimeType||u)&&(u.indexOf(",")>-1&&(u=u.split(",",2)[0]),d.overrideMimeType&&d.overrideMimeType(u)),(n.contentType||n.contentType!==!1&&n.data&&"GET"!=n.type.toUpperCase())&&l("Content-Type",n.contentType||"application/x-www-form-urlencoded"),n.headers)for(r in n.headers)l(r,n.headers[r]);if(d.setRequestHeader=l,d.onreadystatechange=function(){if(4==d.readyState){d.onreadystatechange=x,clearTimeout(j);var e,i=!1;if(d.status>=200&&d.status<300||304==d.status||0==d.status&&"file:"==h){s=s||b(n.mimeType||d.getResponseHeader("content-type")),e=d.responseText;try{"script"==s?(1,eval)(e):"xml"==s?e=d.responseXML:"json"==s&&(e=c.test(e)?null:t.parseJSON(e))}catch(r){i=r}i?v(i,"parsererror",d,n,o):g(e,d,n,o)}else v(d.statusText||null,d.status?"error":"abort",d,n,o)}},m(d,n)===!1)return d.abort(),v(null,"abort",d,n,o),d;if(n.xhrFields)for(r in n.xhrFields)d[r]=n.xhrFields[r];var T="async"in n?n.async:!0;d.open(n.type,n.url,T,n.username,n.password);for(r in f)y.apply(d,f[r]);return n.timeout>0&&(j=setTimeout(function(){d.onreadystatechange=x,d.abort(),v(null,"timeout",d,n,o)},n.timeout)),d.send(n.data?n.data:null),d},t.get=function(){return t.ajax(j.apply(null,arguments))},t.post=function(){var e=j.apply(null,arguments);return e.type="POST",t.ajax(e)},t.getJSON=function(){var e=j.apply(null,arguments);return e.dataType="json",t.ajax(e)},t.fn.load=function(e,n,i){if(!this.length)return this;var a,r=this,s=e.split(/\s/),u=j(e,n,i),f=u.success;return s.length>1&&(u.url=s[0],a=s[1]),u.success=function(e){r.html(a?t("<div>").html(e.replace(o,"")).find(a):e),f&&f.apply(r,arguments)},t.ajax(u),this};var T=encodeURIComponent;t.param=function(t,e){var n=[];return n.add=function(t,e){this.push(T(t)+"="+T(e))},S(n,t,e),n.join("&").replace(/%20/g,"+")}}(Zepto),function(t){t.fn.serializeArray=function(){var n,e=[];return t([].slice.call(this.get(0).elements)).each(function(){n=t(this);var i=n.attr("type");"fieldset"!=this.nodeName.toLowerCase()&&!this.disabled&&"submit"!=i&&"reset"!=i&&"button"!=i&&("radio"!=i&&"checkbox"!=i||this.checked)&&e.push({name:n.attr("name"),value:n.val()})}),e},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(e)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(Zepto),function(t){"__proto__"in{}||t.extend(t.zepto,{Z:function(e,n){return e=e||[],t.extend(e,t.fn),e.selector=n||"",e.__Z=!0,e},isZ:function(e){return"array"===t.type(e)&&"__Z"in e}});try{getComputedStyle(void 0)}catch(e){var n=getComputedStyle;window.getComputedStyle=function(t){try{return n(t)}catch(e){return null}}}}(Zepto);
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
new file mode 100644
index 000000000000..9d6b8538c4cc
--- /dev/null
+++ b/browser/components/loop/content/panel.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<html>
+  <head>
+    <title>Loop Panel</title>
+    <!-- XXX (adam): Should we import our own version of Webl10n?
+         What we have here is a copy of the version from pdf.js
+         (which I can't seem to reference directly, so we've copied
+         it here). At the very least, if we're using the same
+         library as pdf.js, we should be referring to the same
+         file. -->
+    <script type="text/javascript" src="libs/l10n.js"></script>
+    <script type="text/javascript" src="libs/zepto.min.js"></script>
+    <script type="text/javascript" src="libs/lodash.min.js"></script>
+    <script type="text/javascript" src="libs/backbone-min.js"></script>
+
+  </head>
+  <body>
+    <!-- Intentionally not localisable as this is a temporary page -->
+    <p>Soon you'll be able to get a url to share with your friends and chat with them</p>
+  </body>
+</html>

From 70abf1ea5730ef188fedffc36c907334255c9a32 Mon Sep 17 00:00:00 2001
From: Adam Roach <adam@nostrum.com>
Date: Thu, 29 May 2014 21:13:40 +0100
Subject: [PATCH 002/117] Bug 976358: Adding chrome URL for Loop panel.
 r=tOkeshu

---
 browser/components/loop/content/panel.html | 1 -
 browser/components/loop/jar.mn             | 6 ++++++
 browser/components/loop/moz.build          | 7 +++++++
 browser/components/moz.build               | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 browser/components/loop/jar.mn
 create mode 100644 browser/components/loop/moz.build

diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index 9d6b8538c4cc..f7daf2582639 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -15,7 +15,6 @@
     <script type="text/javascript" src="libs/zepto.min.js"></script>
     <script type="text/javascript" src="libs/lodash.min.js"></script>
     <script type="text/javascript" src="libs/backbone-min.js"></script>
-
   </head>
   <body>
     <!-- Intentionally not localisable as this is a temporary page -->
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
new file mode 100644
index 000000000000..cc2fc500872a
--- /dev/null
+++ b/browser/components/loop/jar.mn
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+  content/browser/loop/panel.html                          (content/panel.html)
diff --git a/browser/components/loop/moz.build b/browser/components/loop/moz.build
new file mode 100644
index 000000000000..3bbe6729759c
--- /dev/null
+++ b/browser/components/loop/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 7eda6daf01c0..8b760d7f5ef3 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -10,6 +10,7 @@ PARALLEL_DIRS += [
     'dirprovider',
     'downloads',
     'feeds',
+    'loop',
     'places',
     'preferences',
     'privatebrowsing',

From 0a91369aaaaf9951b19493a1236f843f39a4b27f Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:41 +0100
Subject: [PATCH 003/117] Bug 978952 - stand up trivial mocha/chai test; code
 by @n1k0 and @dmose; r=Standard8

---
 .../components/loop/test/mocha-test/README.md |   15 +
 .../loop/test/mocha-test/index.html           |   29 +
 .../loop/test/mocha-test/sample_test.js       |    9 +
 .../components/loop/test/vendor/chai-1.9.0.js | 4696 +++++++++++++
 .../loop/test/vendor/mocha-1.17.1.css         |  270 +
 .../loop/test/vendor/mocha-1.17.1.js          | 5812 +++++++++++++++++
 6 files changed, 10831 insertions(+)
 create mode 100644 browser/components/loop/test/mocha-test/README.md
 create mode 100644 browser/components/loop/test/mocha-test/index.html
 create mode 100644 browser/components/loop/test/mocha-test/sample_test.js
 create mode 100644 browser/components/loop/test/vendor/chai-1.9.0.js
 create mode 100644 browser/components/loop/test/vendor/mocha-1.17.1.css
 create mode 100644 browser/components/loop/test/vendor/mocha-1.17.1.js

diff --git a/browser/components/loop/test/mocha-test/README.md b/browser/components/loop/test/mocha-test/README.md
new file mode 100644
index 000000000000..a306e28646ea
--- /dev/null
+++ b/browser/components/loop/test/mocha-test/README.md
@@ -0,0 +1,15 @@
+== Mocha unit tests ==
+
+These unit tests use the browser build of the [Mocha test framework][1]
+and the Chai Assertion Library's [BDD interface][2].
+
+[1]: http://visionmedia.github.io/mocha/
+[2]: http://chaijs.com/api/bdd/
+
+Aim your browser at the index.html in this directory on your localhost using a file: or HTTP URL to run the tests.
+
+Next steps:
+* hook up to Marionette test suite so that they can be run by Tbpl
+* run via mach command-line
+* run using JS http server so the property security context for DOM elements is used
+
diff --git a/browser/components/loop/test/mocha-test/index.html b/browser/components/loop/test/mocha-test/index.html
new file mode 100644
index 000000000000..d7aab5de9e18
--- /dev/null
+++ b/browser/components/loop/test/mocha-test/index.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Loop mocha tests</title>
+  <link rel="stylesheet" media="all" href="../vendor/mocha-1.17.1.css">
+</head>
+<body>
+  <div id="mocha">
+    <p><a href=".">Index</a></p>
+  </div>
+  <div id="messages"></div>
+  <div id="fixtures"></div>
+  <!-- test dependencies -->
+  <script src="../vendor/mocha-1.17.1.js"></script>
+  <script src="../vendor/chai-1.9.0.js"></script>
+  <script src="../../content/libs/zepto.min.js"></script>
+  <script>
+    chai.Assertion.includeStack = true;
+    mocha.setup('bdd');
+  </script>
+  <script src="sample_test.js"></script>
+  <script>
+    mocha.run(function () {
+      $("#mocha").append("<p id='complete'>complete</p>");
+    });
+</script>
+</body>
+</html>
diff --git a/browser/components/loop/test/mocha-test/sample_test.js b/browser/components/loop/test/mocha-test/sample_test.js
new file mode 100644
index 000000000000..882d85280a78
--- /dev/null
+++ b/browser/components/loop/test/mocha-test/sample_test.js
@@ -0,0 +1,9 @@
+var expect = chai.expect;
+
+describe("test", function() {
+  "use strict";
+
+  it("is true", function() {
+    expect(true).eql(true);
+  });
+});
diff --git a/browser/components/loop/test/vendor/chai-1.9.0.js b/browser/components/loop/test/vendor/chai-1.9.0.js
new file mode 100644
index 000000000000..8a6339a1c734
--- /dev/null
+++ b/browser/components/loop/test/vendor/chai-1.9.0.js
@@ -0,0 +1,4696 @@
+;(function(){
+
+/**
+ * Require the given path.
+ *
+ * @param {String} path
+ * @return {Object} exports
+ * @api public
+ */
+
+function require(path, parent, orig) {
+  var resolved = require.resolve(path);
+
+  // lookup failed
+  if (null == resolved) {
+    orig = orig || path;
+    parent = parent || 'root';
+    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
+    err.path = orig;
+    err.parent = parent;
+    err.require = true;
+    throw err;
+  }
+
+  var module = require.modules[resolved];
+
+  // perform real require()
+  // by invoking the module's
+  // registered function
+  if (!module._resolving && !module.exports) {
+    var mod = {};
+    mod.exports = {};
+    mod.client = mod.component = true;
+    module._resolving = true;
+    module.call(this, mod.exports, require.relative(resolved), mod);
+    delete module._resolving;
+    module.exports = mod.exports;
+  }
+
+  return module.exports;
+}
+
+/**
+ * Registered modules.
+ */
+
+require.modules = {};
+
+/**
+ * Registered aliases.
+ */
+
+require.aliases = {};
+
+/**
+ * Resolve `path`.
+ *
+ * Lookup:
+ *
+ *   - PATH/index.js
+ *   - PATH.js
+ *   - PATH
+ *
+ * @param {String} path
+ * @return {String} path or null
+ * @api private
+ */
+
+require.resolve = function(path) {
+  if (path.charAt(0) === '/') path = path.slice(1);
+
+  var paths = [
+    path,
+    path + '.js',
+    path + '.json',
+    path + '/index.js',
+    path + '/index.json'
+  ];
+
+  for (var i = 0; i < paths.length; i++) {
+    var path = paths[i];
+    if (require.modules.hasOwnProperty(path)) return path;
+    if (require.aliases.hasOwnProperty(path)) return require.aliases[path];
+  }
+};
+
+/**
+ * Normalize `path` relative to the current path.
+ *
+ * @param {String} curr
+ * @param {String} path
+ * @return {String}
+ * @api private
+ */
+
+require.normalize = function(curr, path) {
+  var segs = [];
+
+  if ('.' != path.charAt(0)) return path;
+
+  curr = curr.split('/');
+  path = path.split('/');
+
+  for (var i = 0; i < path.length; ++i) {
+    if ('..' == path[i]) {
+      curr.pop();
+    } else if ('.' != path[i] && '' != path[i]) {
+      segs.push(path[i]);
+    }
+  }
+
+  return curr.concat(segs).join('/');
+};
+
+/**
+ * Register module at `path` with callback `definition`.
+ *
+ * @param {String} path
+ * @param {Function} definition
+ * @api private
+ */
+
+require.register = function(path, definition) {
+  require.modules[path] = definition;
+};
+
+/**
+ * Alias a module definition.
+ *
+ * @param {String} from
+ * @param {String} to
+ * @api private
+ */
+
+require.alias = function(from, to) {
+  if (!require.modules.hasOwnProperty(from)) {
+    throw new Error('Failed to alias "' + from + '", it does not exist');
+  }
+  require.aliases[to] = from;
+};
+
+/**
+ * Return a require function relative to the `parent` path.
+ *
+ * @param {String} parent
+ * @return {Function}
+ * @api private
+ */
+
+require.relative = function(parent) {
+  var p = require.normalize(parent, '..');
+
+  /**
+   * lastIndexOf helper.
+   */
+
+  function lastIndexOf(arr, obj) {
+    var i = arr.length;
+    while (i--) {
+      if (arr[i] === obj) return i;
+    }
+    return -1;
+  }
+
+  /**
+   * The relative require() itself.
+   */
+
+  function localRequire(path) {
+    var resolved = localRequire.resolve(path);
+    return require(resolved, parent, path);
+  }
+
+  /**
+   * Resolve relative to the parent.
+   */
+
+  localRequire.resolve = function(path) {
+    var c = path.charAt(0);
+    if ('/' == c) return path.slice(1);
+    if ('.' == c) return require.normalize(p, path);
+
+    // resolve deps by returning
+    // the dep in the nearest "deps"
+    // directory
+    var segs = parent.split('/');
+    var i = lastIndexOf(segs, 'deps') + 1;
+    if (!i) i = 0;
+    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
+    return path;
+  };
+
+  /**
+   * Check if module is defined at `path`.
+   */
+
+  localRequire.exists = function(path) {
+    return require.modules.hasOwnProperty(localRequire.resolve(path));
+  };
+
+  return localRequire;
+};
+require.register("chaijs-assertion-error/index.js", function(exports, require, module){
+/*!
+ * assertion-error
+ * Copyright(c) 2013 Jake Luer <jake@qualiancy.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Return a function that will copy properties from
+ * one object to another excluding any originally
+ * listed. Returned function will create a new `{}`.
+ *
+ * @param {String} excluded properties ...
+ * @return {Function}
+ */
+
+function exclude () {
+  var excludes = [].slice.call(arguments);
+
+  function excludeProps (res, obj) {
+    Object.keys(obj).forEach(function (key) {
+      if (!~excludes.indexOf(key)) res[key] = obj[key];
+    });
+  }
+
+  return function extendExclude () {
+    var args = [].slice.call(arguments)
+      , i = 0
+      , res = {};
+
+    for (; i < args.length; i++) {
+      excludeProps(res, args[i]);
+    }
+
+    return res;
+  };
+};
+
+/*!
+ * Primary Exports
+ */
+
+module.exports = AssertionError;
+
+/**
+ * ### AssertionError
+ *
+ * An extension of the JavaScript `Error` constructor for
+ * assertion and validation scenarios.
+ *
+ * @param {String} message
+ * @param {Object} properties to include (optional)
+ * @param {callee} start stack function (optional)
+ */
+
+function AssertionError (message, _props, ssf) {
+  var extend = exclude('name', 'message', 'stack', 'constructor', 'toJSON')
+    , props = extend(_props || {});
+
+  // default values
+  this.message = message || 'Unspecified AssertionError';
+  this.showDiff = false;
+
+  // copy from properties
+  for (var key in props) {
+    this[key] = props[key];
+  }
+
+  // capture stack trace
+  ssf = ssf || arguments.callee;
+  if (ssf && Error.captureStackTrace) {
+    Error.captureStackTrace(this, ssf);
+  }
+}
+
+/*!
+ * Inherit from Error.prototype
+ */
+
+AssertionError.prototype = Object.create(Error.prototype);
+
+/*!
+ * Statically set name
+ */
+
+AssertionError.prototype.name = 'AssertionError';
+
+/*!
+ * Ensure correct constructor
+ */
+
+AssertionError.prototype.constructor = AssertionError;
+
+/**
+ * Allow errors to be converted to JSON for static transfer.
+ *
+ * @param {Boolean} include stack (default: `true`)
+ * @return {Object} object that can be `JSON.stringify`
+ */
+
+AssertionError.prototype.toJSON = function (stack) {
+  var extend = exclude('constructor', 'toJSON', 'stack')
+    , props = extend({ name: this.name }, this);
+
+  // include stack if exists and not turned off
+  if (false !== stack && this.stack) {
+    props.stack = this.stack;
+  }
+
+  return props;
+};
+
+});
+require.register("chaijs-type-detect/lib/type.js", function(exports, require, module){
+/*!
+ * type-detect
+ * Copyright(c) 2013 jake luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Primary Exports
+ */
+
+var exports = module.exports = getType;
+
+/*!
+ * Detectable javascript natives
+ */
+
+var natives = {
+    '[object Array]': 'array'
+  , '[object RegExp]': 'regexp'
+  , '[object Function]': 'function'
+  , '[object Arguments]': 'arguments'
+  , '[object Date]': 'date'
+};
+
+/**
+ * ### typeOf (obj)
+ *
+ * Use several different techniques to determine
+ * the type of object being tested.
+ *
+ *
+ * @param {Mixed} object
+ * @return {String} object type
+ * @api public
+ */
+
+function getType (obj) {
+  var str = Object.prototype.toString.call(obj);
+  if (natives[str]) return natives[str];
+  if (obj === null) return 'null';
+  if (obj === undefined) return 'undefined';
+  if (obj === Object(obj)) return 'object';
+  return typeof obj;
+}
+
+exports.Library = Library;
+
+/**
+ * ### Library
+ *
+ * Create a repository for custom type detection.
+ *
+ * ```js
+ * var lib = new type.Library;
+ * ```
+ *
+ */
+
+function Library () {
+  this.tests = {};
+}
+
+/**
+ * #### .of (obj)
+ *
+ * Expose replacement `typeof` detection to the library.
+ *
+ * ```js
+ * if ('string' === lib.of('hello world')) {
+ *   // ...
+ * }
+ * ```
+ *
+ * @param {Mixed} object to test
+ * @return {String} type
+ */
+
+Library.prototype.of = getType;
+
+/**
+ * #### .define (type, test)
+ *
+ * Add a test to for the `.test()` assertion.
+ *
+ * Can be defined as a regular expression:
+ *
+ * ```js
+ * lib.define('int', /^[0-9]+$/);
+ * ```
+ *
+ * ... or as a function:
+ *
+ * ```js
+ * lib.define('bln', function (obj) {
+ *   if ('boolean' === lib.of(obj)) return true;
+ *   var blns = [ 'yes', 'no', 'true', 'false', 1, 0 ];
+ *   if ('string' === lib.of(obj)) obj = obj.toLowerCase();
+ *   return !! ~blns.indexOf(obj);
+ * });
+ * ```
+ *
+ * @param {String} type
+ * @param {RegExp|Function} test
+ * @api public
+ */
+
+Library.prototype.define = function (type, test) {
+  if (arguments.length === 1) return this.tests[type];
+  this.tests[type] = test;
+  return this;
+};
+
+/**
+ * #### .test (obj, test)
+ *
+ * Assert that an object is of type. Will first
+ * check natives, and if that does not pass it will
+ * use the user defined custom tests.
+ *
+ * ```js
+ * assert(lib.test('1', 'int'));
+ * assert(lib.test('yes', 'bln'));
+ * ```
+ *
+ * @param {Mixed} object
+ * @param {String} type
+ * @return {Boolean} result
+ * @api public
+ */
+
+Library.prototype.test = function (obj, type) {
+  if (type === getType(obj)) return true;
+  var test = this.tests[type];
+
+  if (test && 'regexp' === getType(test)) {
+    return test.test(obj);
+  } else if (test && 'function' === getType(test)) {
+    return test(obj);
+  } else {
+    throw new ReferenceError('Type test "' + type + '" not defined or invalid.');
+  }
+};
+
+});
+require.register("chaijs-deep-eql/lib/eql.js", function(exports, require, module){
+/*!
+ * deep-eql
+ * Copyright(c) 2013 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependencies
+ */
+
+var type = require('type-detect');
+
+/*!
+ * Buffer.isBuffer browser shim
+ */
+
+var Buffer;
+try { Buffer = require('buffer').Buffer; }
+catch(ex) {
+  Buffer = {};
+  Buffer.isBuffer = function() { return false; }
+}
+
+/*!
+ * Primary Export
+ */
+
+module.exports = deepEqual;
+
+/**
+ * Assert super-strict (egal) equality between
+ * two objects of any type.
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @param {Array} memoised (optional)
+ * @return {Boolean} equal match
+ */
+
+function deepEqual(a, b, m) {
+  if (sameValue(a, b)) {
+    return true;
+  } else if ('date' === type(a)) {
+    return dateEqual(a, b);
+  } else if ('regexp' === type(a)) {
+    return regexpEqual(a, b);
+  } else if (Buffer.isBuffer(a)) {
+    return bufferEqual(a, b);
+  } else if ('arguments' === type(a)) {
+    return argumentsEqual(a, b, m);
+  } else if (!typeEqual(a, b)) {
+    return false;
+  } else if (('object' !== type(a) && 'object' !== type(b))
+  && ('array' !== type(a) && 'array' !== type(b))) {
+    return sameValue(a, b);
+  } else {
+    return objectEqual(a, b, m);
+  }
+}
+
+/*!
+ * Strict (egal) equality test. Ensures that NaN always
+ * equals NaN and `-0` does not equal `+0`.
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @return {Boolean} equal match
+ */
+
+function sameValue(a, b) {
+  if (a === b) return a !== 0 || 1 / a === 1 / b;
+  return a !== a && b !== b;
+}
+
+/*!
+ * Compare the types of two given objects and
+ * return if they are equal. Note that an Array
+ * has a type of `array` (not `object`) and arguments
+ * have a type of `arguments` (not `array`/`object`).
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @return {Boolean} result
+ */
+
+function typeEqual(a, b) {
+  return type(a) === type(b);
+}
+
+/*!
+ * Compare two Date objects by asserting that
+ * the time values are equal using `saveValue`.
+ *
+ * @param {Date} a
+ * @param {Date} b
+ * @return {Boolean} result
+ */
+
+function dateEqual(a, b) {
+  if ('date' !== type(b)) return false;
+  return sameValue(a.getTime(), b.getTime());
+}
+
+/*!
+ * Compare two regular expressions by converting them
+ * to string and checking for `sameValue`.
+ *
+ * @param {RegExp} a
+ * @param {RegExp} b
+ * @return {Boolean} result
+ */
+
+function regexpEqual(a, b) {
+  if ('regexp' !== type(b)) return false;
+  return sameValue(a.toString(), b.toString());
+}
+
+/*!
+ * Assert deep equality of two `arguments` objects.
+ * Unfortunately, these must be sliced to arrays
+ * prior to test to ensure no bad behavior.
+ *
+ * @param {Arguments} a
+ * @param {Arguments} b
+ * @param {Array} memoize (optional)
+ * @return {Boolean} result
+ */
+
+function argumentsEqual(a, b, m) {
+  if ('arguments' !== type(b)) return false;
+  a = [].slice.call(a);
+  b = [].slice.call(b);
+  return deepEqual(a, b, m);
+}
+
+/*!
+ * Get enumerable properties of a given object.
+ *
+ * @param {Object} a
+ * @return {Array} property names
+ */
+
+function enumerable(a) {
+  var res = [];
+  for (var key in a) res.push(key);
+  return res;
+}
+
+/*!
+ * Simple equality for flat iterable objects
+ * such as Arrays or Node.js buffers.
+ *
+ * @param {Iterable} a
+ * @param {Iterable} b
+ * @return {Boolean} result
+ */
+
+function iterableEqual(a, b) {
+  if (a.length !==  b.length) return false;
+
+  var i = 0;
+  var match = true;
+
+  for (; i < a.length; i++) {
+    if (a[i] !== b[i]) {
+      match = false;
+      break;
+    }
+  }
+
+  return match;
+}
+
+/*!
+ * Extension to `iterableEqual` specifically
+ * for Node.js Buffers.
+ *
+ * @param {Buffer} a
+ * @param {Mixed} b
+ * @return {Boolean} result
+ */
+
+function bufferEqual(a, b) {
+  if (!Buffer.isBuffer(b)) return false;
+  return iterableEqual(a, b);
+}
+
+/*!
+ * Block for `objectEqual` ensuring non-existing
+ * values don't get in.
+ *
+ * @param {Mixed} object
+ * @return {Boolean} result
+ */
+
+function isValue(a) {
+  return a !== null && a !== undefined;
+}
+
+/*!
+ * Recursively check the equality of two objects.
+ * Once basic sameness has been established it will
+ * defer to `deepEqual` for each enumerable key
+ * in the object.
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @return {Boolean} result
+ */
+
+function objectEqual(a, b, m) {
+  if (!isValue(a) || !isValue(b)) {
+    return false;
+  }
+
+  if (a.prototype !== b.prototype) {
+    return false;
+  }
+
+  var i;
+  if (m) {
+    for (i = 0; i < m.length; i++) {
+      if ((m[i][0] === a && m[i][1] === b)
+      ||  (m[i][0] === b && m[i][1] === a)) {
+        return true;
+      }
+    }
+  } else {
+    m = [];
+  }
+
+  try {
+    var ka = enumerable(a);
+    var kb = enumerable(b);
+  } catch (ex) {
+    return false;
+  }
+
+  ka.sort();
+  kb.sort();
+
+  if (!iterableEqual(ka, kb)) {
+    return false;
+  }
+
+  m.push([ a, b ]);
+
+  var key;
+  for (i = ka.length - 1; i >= 0; i--) {
+    key = ka[i];
+    if (!deepEqual(a[key], b[key], m)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+});
+require.register("chai/index.js", function(exports, require, module){
+module.exports = require('./lib/chai');
+
+});
+require.register("chai/lib/chai.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+var used = []
+  , exports = module.exports = {};
+
+/*!
+ * Chai version
+ */
+
+exports.version = '1.8.1';
+
+/*!
+ * Assertion Error
+ */
+
+exports.AssertionError = require('assertion-error');
+
+/*!
+ * Utils for plugins (not exported)
+ */
+
+var util = require('./chai/utils');
+
+/**
+ * # .use(function)
+ *
+ * Provides a way to extend the internals of Chai
+ *
+ * @param {Function}
+ * @returns {this} for chaining
+ * @api public
+ */
+
+exports.use = function (fn) {
+  if (!~used.indexOf(fn)) {
+    fn(this, util);
+    used.push(fn);
+  }
+
+  return this;
+};
+
+/*!
+ * Primary `Assertion` prototype
+ */
+
+var assertion = require('./chai/assertion');
+exports.use(assertion);
+
+/*!
+ * Core Assertions
+ */
+
+var core = require('./chai/core/assertions');
+exports.use(core);
+
+/*!
+ * Expect interface
+ */
+
+var expect = require('./chai/interface/expect');
+exports.use(expect);
+
+/*!
+ * Should interface
+ */
+
+var should = require('./chai/interface/should');
+exports.use(should);
+
+/*!
+ * Assert interface
+ */
+
+var assert = require('./chai/interface/assert');
+exports.use(assert);
+
+});
+require.register("chai/lib/chai/assertion.js", function(exports, require, module){
+/*!
+ * chai
+ * http://chaijs.com
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (_chai, util) {
+  /*!
+   * Module dependencies.
+   */
+
+  var AssertionError = _chai.AssertionError
+    , flag = util.flag;
+
+  /*!
+   * Module export.
+   */
+
+  _chai.Assertion = Assertion;
+
+  /*!
+   * Assertion Constructor
+   *
+   * Creates object for chaining.
+   *
+   * @api private
+   */
+
+  function Assertion (obj, msg, stack) {
+    flag(this, 'ssfi', stack || arguments.callee);
+    flag(this, 'object', obj);
+    flag(this, 'message', msg);
+  }
+
+  /*!
+    * ### Assertion.includeStack
+    *
+    * User configurable property, influences whether stack trace
+    * is included in Assertion error message. Default of false
+    * suppresses stack trace in the error message
+    *
+    *     Assertion.includeStack = true;  // enable stack on error
+    *
+    * @api public
+    */
+
+  Assertion.includeStack = false;
+
+  /*!
+   * ### Assertion.showDiff
+   *
+   * User configurable property, influences whether or not
+   * the `showDiff` flag should be included in the thrown
+   * AssertionErrors. `false` will always be `false`; `true`
+   * will be true when the assertion has requested a diff
+   * be shown.
+   *
+   * @api public
+   */
+
+  Assertion.showDiff = true;
+
+  Assertion.addProperty = function (name, fn) {
+    util.addProperty(this.prototype, name, fn);
+  };
+
+  Assertion.addMethod = function (name, fn) {
+    util.addMethod(this.prototype, name, fn);
+  };
+
+  Assertion.addChainableMethod = function (name, fn, chainingBehavior) {
+    util.addChainableMethod(this.prototype, name, fn, chainingBehavior);
+  };
+
+  Assertion.overwriteProperty = function (name, fn) {
+    util.overwriteProperty(this.prototype, name, fn);
+  };
+
+  Assertion.overwriteMethod = function (name, fn) {
+    util.overwriteMethod(this.prototype, name, fn);
+  };
+
+  Assertion.overwriteChainableMethod = function (name, fn, chainingBehavior) {
+    util.overwriteChainableMethod(this.prototype, name, fn, chainingBehavior);
+  };
+
+  /*!
+   * ### .assert(expression, message, negateMessage, expected, actual)
+   *
+   * Executes an expression and check expectations. Throws AssertionError for reporting if test doesn't pass.
+   *
+   * @name assert
+   * @param {Philosophical} expression to be tested
+   * @param {String} message to display if fails
+   * @param {String} negatedMessage to display if negated expression fails
+   * @param {Mixed} expected value (remember to check for negation)
+   * @param {Mixed} actual (optional) will default to `this.obj`
+   * @api private
+   */
+
+  Assertion.prototype.assert = function (expr, msg, negateMsg, expected, _actual, showDiff) {
+    var ok = util.test(this, arguments);
+    if (true !== showDiff) showDiff = false;
+    if (true !== Assertion.showDiff) showDiff = false;
+
+    if (!ok) {
+      var msg = util.getMessage(this, arguments)
+        , actual = util.getActual(this, arguments);
+      throw new AssertionError(msg, {
+          actual: actual
+        , expected: expected
+        , showDiff: showDiff
+      }, (Assertion.includeStack) ? this.assert : flag(this, 'ssfi'));
+    }
+  };
+
+  /*!
+   * ### ._obj
+   *
+   * Quick reference to stored `actual` value for plugin developers.
+   *
+   * @api private
+   */
+
+  Object.defineProperty(Assertion.prototype, '_obj',
+    { get: function () {
+        return flag(this, 'object');
+      }
+    , set: function (val) {
+        flag(this, 'object', val);
+      }
+  });
+};
+
+});
+require.register("chai/lib/chai/core/assertions.js", function(exports, require, module){
+/*!
+ * chai
+ * http://chaijs.com
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (chai, _) {
+  var Assertion = chai.Assertion
+    , toString = Object.prototype.toString
+    , flag = _.flag;
+
+  /**
+   * ### Language Chains
+   *
+   * The following are provided as chainable getters to
+   * improve the readability of your assertions. They
+   * do not provide an testing capability unless they
+   * have been overwritten by a plugin.
+   *
+   * **Chains**
+   *
+   * - to
+   * - be
+   * - been
+   * - is
+   * - that
+   * - and
+   * - has
+   * - have
+   * - with
+   * - at
+   * - of
+   * - same
+   *
+   * @name language chains
+   * @api public
+   */
+
+  [ 'to', 'be', 'been'
+  , 'is', 'and', 'has', 'have'
+  , 'with', 'that', 'at'
+  , 'of', 'same' ].forEach(function (chain) {
+    Assertion.addProperty(chain, function () {
+      return this;
+    });
+  });
+
+  /**
+   * ### .not
+   *
+   * Negates any of assertions following in the chain.
+   *
+   *     expect(foo).to.not.equal('bar');
+   *     expect(goodFn).to.not.throw(Error);
+   *     expect({ foo: 'baz' }).to.have.property('foo')
+   *       .and.not.equal('bar');
+   *
+   * @name not
+   * @api public
+   */
+
+  Assertion.addProperty('not', function () {
+    flag(this, 'negate', true);
+  });
+
+  /**
+   * ### .deep
+   *
+   * Sets the `deep` flag, later used by the `equal` and
+   * `property` assertions.
+   *
+   *     expect(foo).to.deep.equal({ bar: 'baz' });
+   *     expect({ foo: { bar: { baz: 'quux' } } })
+   *       .to.have.deep.property('foo.bar.baz', 'quux');
+   *
+   * @name deep
+   * @api public
+   */
+
+  Assertion.addProperty('deep', function () {
+    flag(this, 'deep', true);
+  });
+
+  /**
+   * ### .a(type)
+   *
+   * The `a` and `an` assertions are aliases that can be
+   * used either as language chains or to assert a value's
+   * type.
+   *
+   *     // typeof
+   *     expect('test').to.be.a('string');
+   *     expect({ foo: 'bar' }).to.be.an('object');
+   *     expect(null).to.be.a('null');
+   *     expect(undefined).to.be.an('undefined');
+   *
+   *     // language chain
+   *     expect(foo).to.be.an.instanceof(Foo);
+   *
+   * @name a
+   * @alias an
+   * @param {String} type
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function an (type, msg) {
+    if (msg) flag(this, 'message', msg);
+    type = type.toLowerCase();
+    var obj = flag(this, 'object')
+      , article = ~[ 'a', 'e', 'i', 'o', 'u' ].indexOf(type.charAt(0)) ? 'an ' : 'a ';
+
+    this.assert(
+        type === _.type(obj)
+      , 'expected #{this} to be ' + article + type
+      , 'expected #{this} not to be ' + article + type
+    );
+  }
+
+  Assertion.addChainableMethod('an', an);
+  Assertion.addChainableMethod('a', an);
+
+  /**
+   * ### .include(value)
+   *
+   * The `include` and `contain` assertions can be used as either property
+   * based language chains or as methods to assert the inclusion of an object
+   * in an array or a substring in a string. When used as language chains,
+   * they toggle the `contain` flag for the `keys` assertion.
+   *
+   *     expect([1,2,3]).to.include(2);
+   *     expect('foobar').to.contain('foo');
+   *     expect({ foo: 'bar', hello: 'universe' }).to.include.keys('foo');
+   *
+   * @name include
+   * @alias contain
+   * @param {Object|String|Number} obj
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function includeChainingBehavior () {
+    flag(this, 'contains', true);
+  }
+
+  function include (val, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+
+    if (_.type(val) === 'object') {
+      if (!flag(this, 'negate')) {
+        for (var k in val) new Assertion(obj).property(k, val[k]);
+        return;
+      }
+      var subset = {}
+      for (var k in val) subset[k] = obj[k]
+      var expected = _.eql(subset, val);
+    } else {
+      var expected = obj && ~obj.indexOf(val)
+    }
+    this.assert(
+        expected
+      , 'expected #{this} to include ' + _.inspect(val)
+      , 'expected #{this} to not include ' + _.inspect(val));
+  }
+
+  Assertion.addChainableMethod('include', include, includeChainingBehavior);
+  Assertion.addChainableMethod('contain', include, includeChainingBehavior);
+
+  /**
+   * ### .ok
+   *
+   * Asserts that the target is truthy.
+   *
+   *     expect('everthing').to.be.ok;
+   *     expect(1).to.be.ok;
+   *     expect(false).to.not.be.ok;
+   *     expect(undefined).to.not.be.ok;
+   *     expect(null).to.not.be.ok;
+   *
+   * @name ok
+   * @api public
+   */
+
+  Assertion.addProperty('ok', function () {
+    this.assert(
+        flag(this, 'object')
+      , 'expected #{this} to be truthy'
+      , 'expected #{this} to be falsy');
+  });
+
+  /**
+   * ### .true
+   *
+   * Asserts that the target is `true`.
+   *
+   *     expect(true).to.be.true;
+   *     expect(1).to.not.be.true;
+   *
+   * @name true
+   * @api public
+   */
+
+  Assertion.addProperty('true', function () {
+    this.assert(
+        true === flag(this, 'object')
+      , 'expected #{this} to be true'
+      , 'expected #{this} to be false'
+      , this.negate ? false : true
+    );
+  });
+
+  /**
+   * ### .false
+   *
+   * Asserts that the target is `false`.
+   *
+   *     expect(false).to.be.false;
+   *     expect(0).to.not.be.false;
+   *
+   * @name false
+   * @api public
+   */
+
+  Assertion.addProperty('false', function () {
+    this.assert(
+        false === flag(this, 'object')
+      , 'expected #{this} to be false'
+      , 'expected #{this} to be true'
+      , this.negate ? true : false
+    );
+  });
+
+  /**
+   * ### .null
+   *
+   * Asserts that the target is `null`.
+   *
+   *     expect(null).to.be.null;
+   *     expect(undefined).not.to.be.null;
+   *
+   * @name null
+   * @api public
+   */
+
+  Assertion.addProperty('null', function () {
+    this.assert(
+        null === flag(this, 'object')
+      , 'expected #{this} to be null'
+      , 'expected #{this} not to be null'
+    );
+  });
+
+  /**
+   * ### .undefined
+   *
+   * Asserts that the target is `undefined`.
+   *
+   *     expect(undefined).to.be.undefined;
+   *     expect(null).to.not.be.undefined;
+   *
+   * @name undefined
+   * @api public
+   */
+
+  Assertion.addProperty('undefined', function () {
+    this.assert(
+        undefined === flag(this, 'object')
+      , 'expected #{this} to be undefined'
+      , 'expected #{this} not to be undefined'
+    );
+  });
+
+  /**
+   * ### .exist
+   *
+   * Asserts that the target is neither `null` nor `undefined`.
+   *
+   *     var foo = 'hi'
+   *       , bar = null
+   *       , baz;
+   *
+   *     expect(foo).to.exist;
+   *     expect(bar).to.not.exist;
+   *     expect(baz).to.not.exist;
+   *
+   * @name exist
+   * @api public
+   */
+
+  Assertion.addProperty('exist', function () {
+    this.assert(
+        null != flag(this, 'object')
+      , 'expected #{this} to exist'
+      , 'expected #{this} to not exist'
+    );
+  });
+
+
+  /**
+   * ### .empty
+   *
+   * Asserts that the target's length is `0`. For arrays, it checks
+   * the `length` property. For objects, it gets the count of
+   * enumerable keys.
+   *
+   *     expect([]).to.be.empty;
+   *     expect('').to.be.empty;
+   *     expect({}).to.be.empty;
+   *
+   * @name empty
+   * @api public
+   */
+
+  Assertion.addProperty('empty', function () {
+    var obj = flag(this, 'object')
+      , expected = obj;
+
+    if (Array.isArray(obj) || 'string' === typeof object) {
+      expected = obj.length;
+    } else if (typeof obj === 'object') {
+      expected = Object.keys(obj).length;
+    }
+
+    this.assert(
+        !expected
+      , 'expected #{this} to be empty'
+      , 'expected #{this} not to be empty'
+    );
+  });
+
+  /**
+   * ### .arguments
+   *
+   * Asserts that the target is an arguments object.
+   *
+   *     function test () {
+   *       expect(arguments).to.be.arguments;
+   *     }
+   *
+   * @name arguments
+   * @alias Arguments
+   * @api public
+   */
+
+  function checkArguments () {
+    var obj = flag(this, 'object')
+      , type = Object.prototype.toString.call(obj);
+    this.assert(
+        '[object Arguments]' === type
+      , 'expected #{this} to be arguments but got ' + type
+      , 'expected #{this} to not be arguments'
+    );
+  }
+
+  Assertion.addProperty('arguments', checkArguments);
+  Assertion.addProperty('Arguments', checkArguments);
+
+  /**
+   * ### .equal(value)
+   *
+   * Asserts that the target is strictly equal (`===`) to `value`.
+   * Alternately, if the `deep` flag is set, asserts that
+   * the target is deeply equal to `value`.
+   *
+   *     expect('hello').to.equal('hello');
+   *     expect(42).to.equal(42);
+   *     expect(1).to.not.equal(true);
+   *     expect({ foo: 'bar' }).to.not.equal({ foo: 'bar' });
+   *     expect({ foo: 'bar' }).to.deep.equal({ foo: 'bar' });
+   *
+   * @name equal
+   * @alias equals
+   * @alias eq
+   * @alias deep.equal
+   * @param {Mixed} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertEqual (val, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'deep')) {
+      return this.eql(val);
+    } else {
+      this.assert(
+          val === obj
+        , 'expected #{this} to equal #{exp}'
+        , 'expected #{this} to not equal #{exp}'
+        , val
+        , this._obj
+        , true
+      );
+    }
+  }
+
+  Assertion.addMethod('equal', assertEqual);
+  Assertion.addMethod('equals', assertEqual);
+  Assertion.addMethod('eq', assertEqual);
+
+  /**
+   * ### .eql(value)
+   *
+   * Asserts that the target is deeply equal to `value`.
+   *
+   *     expect({ foo: 'bar' }).to.eql({ foo: 'bar' });
+   *     expect([ 1, 2, 3 ]).to.eql([ 1, 2, 3 ]);
+   *
+   * @name eql
+   * @alias eqls
+   * @param {Mixed} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertEql(obj, msg) {
+    if (msg) flag(this, 'message', msg);
+    this.assert(
+        _.eql(obj, flag(this, 'object'))
+      , 'expected #{this} to deeply equal #{exp}'
+      , 'expected #{this} to not deeply equal #{exp}'
+      , obj
+      , this._obj
+      , true
+    );
+  }
+
+  Assertion.addMethod('eql', assertEql);
+  Assertion.addMethod('eqls', assertEql);
+
+  /**
+   * ### .above(value)
+   *
+   * Asserts that the target is greater than `value`.
+   *
+   *     expect(10).to.be.above(5);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a minimum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.above(2);
+   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
+   *
+   * @name above
+   * @alias gt
+   * @alias greaterThan
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertAbove (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len > n
+        , 'expected #{this} to have a length above #{exp} but got #{act}'
+        , 'expected #{this} to not have a length above #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj > n
+        , 'expected #{this} to be above ' + n
+        , 'expected #{this} to be at most ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('above', assertAbove);
+  Assertion.addMethod('gt', assertAbove);
+  Assertion.addMethod('greaterThan', assertAbove);
+
+  /**
+   * ### .least(value)
+   *
+   * Asserts that the target is greater than or equal to `value`.
+   *
+   *     expect(10).to.be.at.least(10);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a minimum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.of.at.least(2);
+   *     expect([ 1, 2, 3 ]).to.have.length.of.at.least(3);
+   *
+   * @name least
+   * @alias gte
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertLeast (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len >= n
+        , 'expected #{this} to have a length at least #{exp} but got #{act}'
+        , 'expected #{this} to have a length below #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj >= n
+        , 'expected #{this} to be at least ' + n
+        , 'expected #{this} to be below ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('least', assertLeast);
+  Assertion.addMethod('gte', assertLeast);
+
+  /**
+   * ### .below(value)
+   *
+   * Asserts that the target is less than `value`.
+   *
+   *     expect(5).to.be.below(10);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a maximum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.below(4);
+   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
+   *
+   * @name below
+   * @alias lt
+   * @alias lessThan
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertBelow (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len < n
+        , 'expected #{this} to have a length below #{exp} but got #{act}'
+        , 'expected #{this} to not have a length below #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj < n
+        , 'expected #{this} to be below ' + n
+        , 'expected #{this} to be at least ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('below', assertBelow);
+  Assertion.addMethod('lt', assertBelow);
+  Assertion.addMethod('lessThan', assertBelow);
+
+  /**
+   * ### .most(value)
+   *
+   * Asserts that the target is less than or equal to `value`.
+   *
+   *     expect(5).to.be.at.most(5);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a maximum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.of.at.most(4);
+   *     expect([ 1, 2, 3 ]).to.have.length.of.at.most(3);
+   *
+   * @name most
+   * @alias lte
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertMost (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len <= n
+        , 'expected #{this} to have a length at most #{exp} but got #{act}'
+        , 'expected #{this} to have a length above #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj <= n
+        , 'expected #{this} to be at most ' + n
+        , 'expected #{this} to be above ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('most', assertMost);
+  Assertion.addMethod('lte', assertMost);
+
+  /**
+   * ### .within(start, finish)
+   *
+   * Asserts that the target is within a range.
+   *
+   *     expect(7).to.be.within(5,10);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a length range. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.within(2,4);
+   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
+   *
+   * @name within
+   * @param {Number} start lowerbound inclusive
+   * @param {Number} finish upperbound inclusive
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('within', function (start, finish, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object')
+      , range = start + '..' + finish;
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len >= start && len <= finish
+        , 'expected #{this} to have a length within ' + range
+        , 'expected #{this} to not have a length within ' + range
+      );
+    } else {
+      this.assert(
+          obj >= start && obj <= finish
+        , 'expected #{this} to be within ' + range
+        , 'expected #{this} to not be within ' + range
+      );
+    }
+  });
+
+  /**
+   * ### .instanceof(constructor)
+   *
+   * Asserts that the target is an instance of `constructor`.
+   *
+   *     var Tea = function (name) { this.name = name; }
+   *       , Chai = new Tea('chai');
+   *
+   *     expect(Chai).to.be.an.instanceof(Tea);
+   *     expect([ 1, 2, 3 ]).to.be.instanceof(Array);
+   *
+   * @name instanceof
+   * @param {Constructor} constructor
+   * @param {String} message _optional_
+   * @alias instanceOf
+   * @api public
+   */
+
+  function assertInstanceOf (constructor, msg) {
+    if (msg) flag(this, 'message', msg);
+    var name = _.getName(constructor);
+    this.assert(
+        flag(this, 'object') instanceof constructor
+      , 'expected #{this} to be an instance of ' + name
+      , 'expected #{this} to not be an instance of ' + name
+    );
+  };
+
+  Assertion.addMethod('instanceof', assertInstanceOf);
+  Assertion.addMethod('instanceOf', assertInstanceOf);
+
+  /**
+   * ### .property(name, [value])
+   *
+   * Asserts that the target has a property `name`, optionally asserting that
+   * the value of that property is strictly equal to  `value`.
+   * If the `deep` flag is set, you can use dot- and bracket-notation for deep
+   * references into objects and arrays.
+   *
+   *     // simple referencing
+   *     var obj = { foo: 'bar' };
+   *     expect(obj).to.have.property('foo');
+   *     expect(obj).to.have.property('foo', 'bar');
+   *
+   *     // deep referencing
+   *     var deepObj = {
+   *         green: { tea: 'matcha' }
+   *       , teas: [ 'chai', 'matcha', { tea: 'konacha' } ]
+   *     };
+
+   *     expect(deepObj).to.have.deep.property('green.tea', 'matcha');
+   *     expect(deepObj).to.have.deep.property('teas[1]', 'matcha');
+   *     expect(deepObj).to.have.deep.property('teas[2].tea', 'konacha');
+   *
+   * You can also use an array as the starting point of a `deep.property`
+   * assertion, or traverse nested arrays.
+   *
+   *     var arr = [
+   *         [ 'chai', 'matcha', 'konacha' ]
+   *       , [ { tea: 'chai' }
+   *         , { tea: 'matcha' }
+   *         , { tea: 'konacha' } ]
+   *     ];
+   *
+   *     expect(arr).to.have.deep.property('[0][1]', 'matcha');
+   *     expect(arr).to.have.deep.property('[1][2].tea', 'konacha');
+   *
+   * Furthermore, `property` changes the subject of the assertion
+   * to be the value of that property from the original object. This
+   * permits for further chainable assertions on that property.
+   *
+   *     expect(obj).to.have.property('foo')
+   *       .that.is.a('string');
+   *     expect(deepObj).to.have.property('green')
+   *       .that.is.an('object')
+   *       .that.deep.equals({ tea: 'matcha' });
+   *     expect(deepObj).to.have.property('teas')
+   *       .that.is.an('array')
+   *       .with.deep.property('[2]')
+   *         .that.deep.equals({ tea: 'konacha' });
+   *
+   * @name property
+   * @alias deep.property
+   * @param {String} name
+   * @param {Mixed} value (optional)
+   * @param {String} message _optional_
+   * @returns value of property for chaining
+   * @api public
+   */
+
+  Assertion.addMethod('property', function (name, val, msg) {
+    if (msg) flag(this, 'message', msg);
+
+    var descriptor = flag(this, 'deep') ? 'deep property ' : 'property '
+      , negate = flag(this, 'negate')
+      , obj = flag(this, 'object')
+      , value = flag(this, 'deep')
+        ? _.getPathValue(name, obj)
+        : obj[name];
+
+    if (negate && undefined !== val) {
+      if (undefined === value) {
+        msg = (msg != null) ? msg + ': ' : '';
+        throw new Error(msg + _.inspect(obj) + ' has no ' + descriptor + _.inspect(name));
+      }
+    } else {
+      this.assert(
+          undefined !== value
+        , 'expected #{this} to have a ' + descriptor + _.inspect(name)
+        , 'expected #{this} to not have ' + descriptor + _.inspect(name));
+    }
+
+    if (undefined !== val) {
+      this.assert(
+          val === value
+        , 'expected #{this} to have a ' + descriptor + _.inspect(name) + ' of #{exp}, but got #{act}'
+        , 'expected #{this} to not have a ' + descriptor + _.inspect(name) + ' of #{act}'
+        , val
+        , value
+      );
+    }
+
+    flag(this, 'object', value);
+  });
+
+
+  /**
+   * ### .ownProperty(name)
+   *
+   * Asserts that the target has an own property `name`.
+   *
+   *     expect('test').to.have.ownProperty('length');
+   *
+   * @name ownProperty
+   * @alias haveOwnProperty
+   * @param {String} name
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertOwnProperty (name, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        obj.hasOwnProperty(name)
+      , 'expected #{this} to have own property ' + _.inspect(name)
+      , 'expected #{this} to not have own property ' + _.inspect(name)
+    );
+  }
+
+  Assertion.addMethod('ownProperty', assertOwnProperty);
+  Assertion.addMethod('haveOwnProperty', assertOwnProperty);
+
+  /**
+   * ### .length(value)
+   *
+   * Asserts that the target's `length` property has
+   * the expected value.
+   *
+   *     expect([ 1, 2, 3]).to.have.length(3);
+   *     expect('foobar').to.have.length(6);
+   *
+   * Can also be used as a chain precursor to a value
+   * comparison for the length property.
+   *
+   *     expect('foo').to.have.length.above(2);
+   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
+   *     expect('foo').to.have.length.below(4);
+   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
+   *     expect('foo').to.have.length.within(2,4);
+   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
+   *
+   * @name length
+   * @alias lengthOf
+   * @param {Number} length
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertLengthChain () {
+    flag(this, 'doLength', true);
+  }
+
+  function assertLength (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    new Assertion(obj, msg).to.have.property('length');
+    var len = obj.length;
+
+    this.assert(
+        len == n
+      , 'expected #{this} to have a length of #{exp} but got #{act}'
+      , 'expected #{this} to not have a length of #{act}'
+      , n
+      , len
+    );
+  }
+
+  Assertion.addChainableMethod('length', assertLength, assertLengthChain);
+  Assertion.addMethod('lengthOf', assertLength, assertLengthChain);
+
+  /**
+   * ### .match(regexp)
+   *
+   * Asserts that the target matches a regular expression.
+   *
+   *     expect('foobar').to.match(/^foo/);
+   *
+   * @name match
+   * @param {RegExp} RegularExpression
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('match', function (re, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        re.exec(obj)
+      , 'expected #{this} to match ' + re
+      , 'expected #{this} not to match ' + re
+    );
+  });
+
+  /**
+   * ### .string(string)
+   *
+   * Asserts that the string target contains another string.
+   *
+   *     expect('foobar').to.have.string('bar');
+   *
+   * @name string
+   * @param {String} string
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('string', function (str, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    new Assertion(obj, msg).is.a('string');
+
+    this.assert(
+        ~obj.indexOf(str)
+      , 'expected #{this} to contain ' + _.inspect(str)
+      , 'expected #{this} to not contain ' + _.inspect(str)
+    );
+  });
+
+
+  /**
+   * ### .keys(key1, [key2], [...])
+   *
+   * Asserts that the target has exactly the given keys, or
+   * asserts the inclusion of some keys when using the
+   * `include` or `contain` modifiers.
+   *
+   *     expect({ foo: 1, bar: 2 }).to.have.keys(['foo', 'bar']);
+   *     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('foo', 'bar');
+   *
+   * @name keys
+   * @alias key
+   * @param {String...|Array} keys
+   * @api public
+   */
+
+  function assertKeys (keys) {
+    var obj = flag(this, 'object')
+      , str
+      , ok = true;
+
+    keys = keys instanceof Array
+      ? keys
+      : Array.prototype.slice.call(arguments);
+
+    if (!keys.length) throw new Error('keys required');
+
+    var actual = Object.keys(obj)
+      , len = keys.length;
+
+    // Inclusion
+    ok = keys.every(function(key){
+      return ~actual.indexOf(key);
+    });
+
+    // Strict
+    if (!flag(this, 'negate') && !flag(this, 'contains')) {
+      ok = ok && keys.length == actual.length;
+    }
+
+    // Key string
+    if (len > 1) {
+      keys = keys.map(function(key){
+        return _.inspect(key);
+      });
+      var last = keys.pop();
+      str = keys.join(', ') + ', and ' + last;
+    } else {
+      str = _.inspect(keys[0]);
+    }
+
+    // Form
+    str = (len > 1 ? 'keys ' : 'key ') + str;
+
+    // Have / include
+    str = (flag(this, 'contains') ? 'contain ' : 'have ') + str;
+
+    // Assertion
+    this.assert(
+        ok
+      , 'expected #{this} to ' + str
+      , 'expected #{this} to not ' + str
+    );
+  }
+
+  Assertion.addMethod('keys', assertKeys);
+  Assertion.addMethod('key', assertKeys);
+
+  /**
+   * ### .throw(constructor)
+   *
+   * Asserts that the function target will throw a specific error, or specific type of error
+   * (as determined using `instanceof`), optionally with a RegExp or string inclusion test
+   * for the error's message.
+   *
+   *     var err = new ReferenceError('This is a bad function.');
+   *     var fn = function () { throw err; }
+   *     expect(fn).to.throw(ReferenceError);
+   *     expect(fn).to.throw(Error);
+   *     expect(fn).to.throw(/bad function/);
+   *     expect(fn).to.not.throw('good function');
+   *     expect(fn).to.throw(ReferenceError, /bad function/);
+   *     expect(fn).to.throw(err);
+   *     expect(fn).to.not.throw(new RangeError('Out of range.'));
+   *
+   * Please note that when a throw expectation is negated, it will check each
+   * parameter independently, starting with error constructor type. The appropriate way
+   * to check for the existence of a type of error but for a message that does not match
+   * is to use `and`.
+   *
+   *     expect(fn).to.throw(ReferenceError)
+   *        .and.not.throw(/good function/);
+   *
+   * @name throw
+   * @alias throws
+   * @alias Throw
+   * @param {ErrorConstructor} constructor
+   * @param {String|RegExp} expected error message
+   * @param {String} message _optional_
+   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+   * @returns error for chaining (null if no error)
+   * @api public
+   */
+
+  function assertThrows (constructor, errMsg, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    new Assertion(obj, msg).is.a('function');
+
+    var thrown = false
+      , desiredError = null
+      , name = null
+      , thrownError = null;
+
+    if (arguments.length === 0) {
+      errMsg = null;
+      constructor = null;
+    } else if (constructor && (constructor instanceof RegExp || 'string' === typeof constructor)) {
+      errMsg = constructor;
+      constructor = null;
+    } else if (constructor && constructor instanceof Error) {
+      desiredError = constructor;
+      constructor = null;
+      errMsg = null;
+    } else if (typeof constructor === 'function') {
+      name = constructor.prototype.name || constructor.name;
+      if (name === 'Error' && constructor !== Error) {
+        name = (new constructor()).name;
+      }
+    } else {
+      constructor = null;
+    }
+
+    try {
+      obj();
+    } catch (err) {
+      // first, check desired error
+      if (desiredError) {
+        this.assert(
+            err === desiredError
+          , 'expected #{this} to throw #{exp} but #{act} was thrown'
+          , 'expected #{this} to not throw #{exp}'
+          , (desiredError instanceof Error ? desiredError.toString() : desiredError)
+          , (err instanceof Error ? err.toString() : err)
+        );
+
+        flag(this, 'object', err);
+        return this;
+      }
+
+      // next, check constructor
+      if (constructor) {
+        this.assert(
+            err instanceof constructor
+          , 'expected #{this} to throw #{exp} but #{act} was thrown'
+          , 'expected #{this} to not throw #{exp} but #{act} was thrown'
+          , name
+          , (err instanceof Error ? err.toString() : err)
+        );
+
+        if (!errMsg) {
+          flag(this, 'object', err);
+          return this;
+        }
+      }
+
+      // next, check message
+      var message = 'object' === _.type(err) && "message" in err
+        ? err.message
+        : '' + err;
+
+      if ((message != null) && errMsg && errMsg instanceof RegExp) {
+        this.assert(
+            errMsg.exec(message)
+          , 'expected #{this} to throw error matching #{exp} but got #{act}'
+          , 'expected #{this} to throw error not matching #{exp}'
+          , errMsg
+          , message
+        );
+
+        flag(this, 'object', err);
+        return this;
+      } else if ((message != null) && errMsg && 'string' === typeof errMsg) {
+        this.assert(
+            ~message.indexOf(errMsg)
+          , 'expected #{this} to throw error including #{exp} but got #{act}'
+          , 'expected #{this} to throw error not including #{act}'
+          , errMsg
+          , message
+        );
+
+        flag(this, 'object', err);
+        return this;
+      } else {
+        thrown = true;
+        thrownError = err;
+      }
+    }
+
+    var actuallyGot = ''
+      , expectedThrown = name !== null
+        ? name
+        : desiredError
+          ? '#{exp}' //_.inspect(desiredError)
+          : 'an error';
+
+    if (thrown) {
+      actuallyGot = ' but #{act} was thrown'
+    }
+
+    this.assert(
+        thrown === true
+      , 'expected #{this} to throw ' + expectedThrown + actuallyGot
+      , 'expected #{this} to not throw ' + expectedThrown + actuallyGot
+      , (desiredError instanceof Error ? desiredError.toString() : desiredError)
+      , (thrownError instanceof Error ? thrownError.toString() : thrownError)
+    );
+
+    flag(this, 'object', thrownError);
+  };
+
+  Assertion.addMethod('throw', assertThrows);
+  Assertion.addMethod('throws', assertThrows);
+  Assertion.addMethod('Throw', assertThrows);
+
+  /**
+   * ### .respondTo(method)
+   *
+   * Asserts that the object or class target will respond to a method.
+   *
+   *     Klass.prototype.bar = function(){};
+   *     expect(Klass).to.respondTo('bar');
+   *     expect(obj).to.respondTo('bar');
+   *
+   * To check if a constructor will respond to a static function,
+   * set the `itself` flag.
+   *
+   *     Klass.baz = function(){};
+   *     expect(Klass).itself.to.respondTo('baz');
+   *
+   * @name respondTo
+   * @param {String} method
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('respondTo', function (method, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object')
+      , itself = flag(this, 'itself')
+      , context = ('function' === _.type(obj) && !itself)
+        ? obj.prototype[method]
+        : obj[method];
+
+    this.assert(
+        'function' === typeof context
+      , 'expected #{this} to respond to ' + _.inspect(method)
+      , 'expected #{this} to not respond to ' + _.inspect(method)
+    );
+  });
+
+  /**
+   * ### .itself
+   *
+   * Sets the `itself` flag, later used by the `respondTo` assertion.
+   *
+   *     function Foo() {}
+   *     Foo.bar = function() {}
+   *     Foo.prototype.baz = function() {}
+   *
+   *     expect(Foo).itself.to.respondTo('bar');
+   *     expect(Foo).itself.not.to.respondTo('baz');
+   *
+   * @name itself
+   * @api public
+   */
+
+  Assertion.addProperty('itself', function () {
+    flag(this, 'itself', true);
+  });
+
+  /**
+   * ### .satisfy(method)
+   *
+   * Asserts that the target passes a given truth test.
+   *
+   *     expect(1).to.satisfy(function(num) { return num > 0; });
+   *
+   * @name satisfy
+   * @param {Function} matcher
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('satisfy', function (matcher, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        matcher(obj)
+      , 'expected #{this} to satisfy ' + _.objDisplay(matcher)
+      , 'expected #{this} to not satisfy' + _.objDisplay(matcher)
+      , this.negate ? false : true
+      , matcher(obj)
+    );
+  });
+
+  /**
+   * ### .closeTo(expected, delta)
+   *
+   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
+   *
+   *     expect(1.5).to.be.closeTo(1, 0.5);
+   *
+   * @name closeTo
+   * @param {Number} expected
+   * @param {Number} delta
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('closeTo', function (expected, delta, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        Math.abs(obj - expected) <= delta
+      , 'expected #{this} to be close to ' + expected + ' +/- ' + delta
+      , 'expected #{this} not to be close to ' + expected + ' +/- ' + delta
+    );
+  });
+
+  function isSubsetOf(subset, superset) {
+    return subset.every(function(elem) {
+      return superset.indexOf(elem) !== -1;
+    })
+  }
+
+  /**
+   * ### .members(set)
+   *
+   * Asserts that the target is a superset of `set`,
+   * or that the target and `set` have the same members.
+   *
+   *     expect([1, 2, 3]).to.include.members([3, 2]);
+   *     expect([1, 2, 3]).to.not.include.members([3, 2, 8]);
+   *
+   *     expect([4, 2]).to.have.members([2, 4]);
+   *     expect([5, 2]).to.not.have.members([5, 2, 1]);
+   *
+   * @name members
+   * @param {Array} set
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('members', function (subset, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+
+    new Assertion(obj).to.be.an('array');
+    new Assertion(subset).to.be.an('array');
+
+    if (flag(this, 'contains')) {
+      return this.assert(
+          isSubsetOf(subset, obj)
+        , 'expected #{this} to be a superset of #{act}'
+        , 'expected #{this} to not be a superset of #{act}'
+        , obj
+        , subset
+      );
+    }
+
+    this.assert(
+        isSubsetOf(obj, subset) && isSubsetOf(subset, obj)
+        , 'expected #{this} to have the same members as #{act}'
+        , 'expected #{this} to not have the same members as #{act}'
+        , obj
+        , subset
+    );
+  });
+};
+
+});
+require.register("chai/lib/chai/interface/assert.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+
+module.exports = function (chai, util) {
+
+  /*!
+   * Chai dependencies.
+   */
+
+  var Assertion = chai.Assertion
+    , flag = util.flag;
+
+  /*!
+   * Module export.
+   */
+
+  /**
+   * ### assert(expression, message)
+   *
+   * Write your own test expressions.
+   *
+   *     assert('foo' !== 'bar', 'foo is not bar');
+   *     assert(Array.isArray([]), 'empty arrays are arrays');
+   *
+   * @param {Mixed} expression to test for truthiness
+   * @param {String} message to display on error
+   * @name assert
+   * @api public
+   */
+
+  var assert = chai.assert = function (express, errmsg) {
+    var test = new Assertion(null);
+    test.assert(
+        express
+      , errmsg
+      , '[ negation message unavailable ]'
+    );
+  };
+
+  /**
+   * ### .fail(actual, expected, [message], [operator])
+   *
+   * Throw a failure. Node.js `assert` module-compatible.
+   *
+   * @name fail
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @param {String} operator
+   * @api public
+   */
+
+  assert.fail = function (actual, expected, message, operator) {
+    message = message || 'assert.fail()';
+    throw new chai.AssertionError(message, {
+        actual: actual
+      , expected: expected
+      , operator: operator
+    }, assert.fail);
+  };
+
+  /**
+   * ### .ok(object, [message])
+   *
+   * Asserts that `object` is truthy.
+   *
+   *     assert.ok('everything', 'everything is ok');
+   *     assert.ok(false, 'this will fail');
+   *
+   * @name ok
+   * @param {Mixed} object to test
+   * @param {String} message
+   * @api public
+   */
+
+  assert.ok = function (val, msg) {
+    new Assertion(val, msg).is.ok;
+  };
+
+  /**
+   * ### .notOk(object, [message])
+   *
+   * Asserts that `object` is falsy.
+   *
+   *     assert.notOk('everything', 'this will fail');
+   *     assert.notOk(false, 'this will pass');
+   *
+   * @name notOk
+   * @param {Mixed} object to test
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notOk = function (val, msg) {
+    new Assertion(val, msg).is.not.ok;
+  };
+
+  /**
+   * ### .equal(actual, expected, [message])
+   *
+   * Asserts non-strict equality (`==`) of `actual` and `expected`.
+   *
+   *     assert.equal(3, '3', '== coerces values to strings');
+   *
+   * @name equal
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.equal = function (act, exp, msg) {
+    var test = new Assertion(act, msg);
+
+    test.assert(
+        exp == flag(test, 'object')
+      , 'expected #{this} to equal #{exp}'
+      , 'expected #{this} to not equal #{act}'
+      , exp
+      , act
+    );
+  };
+
+  /**
+   * ### .notEqual(actual, expected, [message])
+   *
+   * Asserts non-strict inequality (`!=`) of `actual` and `expected`.
+   *
+   *     assert.notEqual(3, 4, 'these numbers are not equal');
+   *
+   * @name notEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notEqual = function (act, exp, msg) {
+    var test = new Assertion(act, msg);
+
+    test.assert(
+        exp != flag(test, 'object')
+      , 'expected #{this} to not equal #{exp}'
+      , 'expected #{this} to equal #{act}'
+      , exp
+      , act
+    );
+  };
+
+  /**
+   * ### .strictEqual(actual, expected, [message])
+   *
+   * Asserts strict equality (`===`) of `actual` and `expected`.
+   *
+   *     assert.strictEqual(true, true, 'these booleans are strictly equal');
+   *
+   * @name strictEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.strictEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.equal(exp);
+  };
+
+  /**
+   * ### .notStrictEqual(actual, expected, [message])
+   *
+   * Asserts strict inequality (`!==`) of `actual` and `expected`.
+   *
+   *     assert.notStrictEqual(3, '3', 'no coercion for strict equality');
+   *
+   * @name notStrictEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notStrictEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.not.equal(exp);
+  };
+
+  /**
+   * ### .deepEqual(actual, expected, [message])
+   *
+   * Asserts that `actual` is deeply equal to `expected`.
+   *
+   *     assert.deepEqual({ tea: 'green' }, { tea: 'green' });
+   *
+   * @name deepEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.eql(exp);
+  };
+
+  /**
+   * ### .notDeepEqual(actual, expected, [message])
+   *
+   * Assert that `actual` is not deeply equal to `expected`.
+   *
+   *     assert.notDeepEqual({ tea: 'green' }, { tea: 'jasmine' });
+   *
+   * @name notDeepEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notDeepEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.not.eql(exp);
+  };
+
+  /**
+   * ### .isTrue(value, [message])
+   *
+   * Asserts that `value` is true.
+   *
+   *     var teaServed = true;
+   *     assert.isTrue(teaServed, 'the tea has been served');
+   *
+   * @name isTrue
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isTrue = function (val, msg) {
+    new Assertion(val, msg).is['true'];
+  };
+
+  /**
+   * ### .isFalse(value, [message])
+   *
+   * Asserts that `value` is false.
+   *
+   *     var teaServed = false;
+   *     assert.isFalse(teaServed, 'no tea yet? hmm...');
+   *
+   * @name isFalse
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isFalse = function (val, msg) {
+    new Assertion(val, msg).is['false'];
+  };
+
+  /**
+   * ### .isNull(value, [message])
+   *
+   * Asserts that `value` is null.
+   *
+   *     assert.isNull(err, 'there was no error');
+   *
+   * @name isNull
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNull = function (val, msg) {
+    new Assertion(val, msg).to.equal(null);
+  };
+
+  /**
+   * ### .isNotNull(value, [message])
+   *
+   * Asserts that `value` is not null.
+   *
+   *     var tea = 'tasty chai';
+   *     assert.isNotNull(tea, 'great, time for tea!');
+   *
+   * @name isNotNull
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotNull = function (val, msg) {
+    new Assertion(val, msg).to.not.equal(null);
+  };
+
+  /**
+   * ### .isUndefined(value, [message])
+   *
+   * Asserts that `value` is `undefined`.
+   *
+   *     var tea;
+   *     assert.isUndefined(tea, 'no tea defined');
+   *
+   * @name isUndefined
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isUndefined = function (val, msg) {
+    new Assertion(val, msg).to.equal(undefined);
+  };
+
+  /**
+   * ### .isDefined(value, [message])
+   *
+   * Asserts that `value` is not `undefined`.
+   *
+   *     var tea = 'cup of chai';
+   *     assert.isDefined(tea, 'tea has been defined');
+   *
+   * @name isDefined
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isDefined = function (val, msg) {
+    new Assertion(val, msg).to.not.equal(undefined);
+  };
+
+  /**
+   * ### .isFunction(value, [message])
+   *
+   * Asserts that `value` is a function.
+   *
+   *     function serveTea() { return 'cup of tea'; };
+   *     assert.isFunction(serveTea, 'great, we can have tea now');
+   *
+   * @name isFunction
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isFunction = function (val, msg) {
+    new Assertion(val, msg).to.be.a('function');
+  };
+
+  /**
+   * ### .isNotFunction(value, [message])
+   *
+   * Asserts that `value` is _not_ a function.
+   *
+   *     var serveTea = [ 'heat', 'pour', 'sip' ];
+   *     assert.isNotFunction(serveTea, 'great, we have listed the steps');
+   *
+   * @name isNotFunction
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotFunction = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('function');
+  };
+
+  /**
+   * ### .isObject(value, [message])
+   *
+   * Asserts that `value` is an object (as revealed by
+   * `Object.prototype.toString`).
+   *
+   *     var selection = { name: 'Chai', serve: 'with spices' };
+   *     assert.isObject(selection, 'tea selection is an object');
+   *
+   * @name isObject
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isObject = function (val, msg) {
+    new Assertion(val, msg).to.be.a('object');
+  };
+
+  /**
+   * ### .isNotObject(value, [message])
+   *
+   * Asserts that `value` is _not_ an object.
+   *
+   *     var selection = 'chai'
+   *     assert.isObject(selection, 'tea selection is not an object');
+   *     assert.isObject(null, 'null is not an object');
+   *
+   * @name isNotObject
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotObject = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('object');
+  };
+
+  /**
+   * ### .isArray(value, [message])
+   *
+   * Asserts that `value` is an array.
+   *
+   *     var menu = [ 'green', 'chai', 'oolong' ];
+   *     assert.isArray(menu, 'what kind of tea do we want?');
+   *
+   * @name isArray
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isArray = function (val, msg) {
+    new Assertion(val, msg).to.be.an('array');
+  };
+
+  /**
+   * ### .isNotArray(value, [message])
+   *
+   * Asserts that `value` is _not_ an array.
+   *
+   *     var menu = 'green|chai|oolong';
+   *     assert.isNotArray(menu, 'what kind of tea do we want?');
+   *
+   * @name isNotArray
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotArray = function (val, msg) {
+    new Assertion(val, msg).to.not.be.an('array');
+  };
+
+  /**
+   * ### .isString(value, [message])
+   *
+   * Asserts that `value` is a string.
+   *
+   *     var teaOrder = 'chai';
+   *     assert.isString(teaOrder, 'order placed');
+   *
+   * @name isString
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isString = function (val, msg) {
+    new Assertion(val, msg).to.be.a('string');
+  };
+
+  /**
+   * ### .isNotString(value, [message])
+   *
+   * Asserts that `value` is _not_ a string.
+   *
+   *     var teaOrder = 4;
+   *     assert.isNotString(teaOrder, 'order placed');
+   *
+   * @name isNotString
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotString = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('string');
+  };
+
+  /**
+   * ### .isNumber(value, [message])
+   *
+   * Asserts that `value` is a number.
+   *
+   *     var cups = 2;
+   *     assert.isNumber(cups, 'how many cups');
+   *
+   * @name isNumber
+   * @param {Number} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNumber = function (val, msg) {
+    new Assertion(val, msg).to.be.a('number');
+  };
+
+  /**
+   * ### .isNotNumber(value, [message])
+   *
+   * Asserts that `value` is _not_ a number.
+   *
+   *     var cups = '2 cups please';
+   *     assert.isNotNumber(cups, 'how many cups');
+   *
+   * @name isNotNumber
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotNumber = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('number');
+  };
+
+  /**
+   * ### .isBoolean(value, [message])
+   *
+   * Asserts that `value` is a boolean.
+   *
+   *     var teaReady = true
+   *       , teaServed = false;
+   *
+   *     assert.isBoolean(teaReady, 'is the tea ready');
+   *     assert.isBoolean(teaServed, 'has tea been served');
+   *
+   * @name isBoolean
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isBoolean = function (val, msg) {
+    new Assertion(val, msg).to.be.a('boolean');
+  };
+
+  /**
+   * ### .isNotBoolean(value, [message])
+   *
+   * Asserts that `value` is _not_ a boolean.
+   *
+   *     var teaReady = 'yep'
+   *       , teaServed = 'nope';
+   *
+   *     assert.isNotBoolean(teaReady, 'is the tea ready');
+   *     assert.isNotBoolean(teaServed, 'has tea been served');
+   *
+   * @name isNotBoolean
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotBoolean = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('boolean');
+  };
+
+  /**
+   * ### .typeOf(value, name, [message])
+   *
+   * Asserts that `value`'s type is `name`, as determined by
+   * `Object.prototype.toString`.
+   *
+   *     assert.typeOf({ tea: 'chai' }, 'object', 'we have an object');
+   *     assert.typeOf(['chai', 'jasmine'], 'array', 'we have an array');
+   *     assert.typeOf('tea', 'string', 'we have a string');
+   *     assert.typeOf(/tea/, 'regexp', 'we have a regular expression');
+   *     assert.typeOf(null, 'null', 'we have a null');
+   *     assert.typeOf(undefined, 'undefined', 'we have an undefined');
+   *
+   * @name typeOf
+   * @param {Mixed} value
+   * @param {String} name
+   * @param {String} message
+   * @api public
+   */
+
+  assert.typeOf = function (val, type, msg) {
+    new Assertion(val, msg).to.be.a(type);
+  };
+
+  /**
+   * ### .notTypeOf(value, name, [message])
+   *
+   * Asserts that `value`'s type is _not_ `name`, as determined by
+   * `Object.prototype.toString`.
+   *
+   *     assert.notTypeOf('tea', 'number', 'strings are not numbers');
+   *
+   * @name notTypeOf
+   * @param {Mixed} value
+   * @param {String} typeof name
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notTypeOf = function (val, type, msg) {
+    new Assertion(val, msg).to.not.be.a(type);
+  };
+
+  /**
+   * ### .instanceOf(object, constructor, [message])
+   *
+   * Asserts that `value` is an instance of `constructor`.
+   *
+   *     var Tea = function (name) { this.name = name; }
+   *       , chai = new Tea('chai');
+   *
+   *     assert.instanceOf(chai, Tea, 'chai is an instance of tea');
+   *
+   * @name instanceOf
+   * @param {Object} object
+   * @param {Constructor} constructor
+   * @param {String} message
+   * @api public
+   */
+
+  assert.instanceOf = function (val, type, msg) {
+    new Assertion(val, msg).to.be.instanceOf(type);
+  };
+
+  /**
+   * ### .notInstanceOf(object, constructor, [message])
+   *
+   * Asserts `value` is not an instance of `constructor`.
+   *
+   *     var Tea = function (name) { this.name = name; }
+   *       , chai = new String('chai');
+   *
+   *     assert.notInstanceOf(chai, Tea, 'chai is not an instance of tea');
+   *
+   * @name notInstanceOf
+   * @param {Object} object
+   * @param {Constructor} constructor
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notInstanceOf = function (val, type, msg) {
+    new Assertion(val, msg).to.not.be.instanceOf(type);
+  };
+
+  /**
+   * ### .include(haystack, needle, [message])
+   *
+   * Asserts that `haystack` includes `needle`. Works
+   * for strings and arrays.
+   *
+   *     assert.include('foobar', 'bar', 'foobar contains string "bar"');
+   *     assert.include([ 1, 2, 3 ], 3, 'array contains value');
+   *
+   * @name include
+   * @param {Array|String} haystack
+   * @param {Mixed} needle
+   * @param {String} message
+   * @api public
+   */
+
+  assert.include = function (exp, inc, msg) {
+    new Assertion(exp, msg).include(inc);
+  };
+
+  /**
+   * ### .notInclude(haystack, needle, [message])
+   *
+   * Asserts that `haystack` does not include `needle`. Works
+   * for strings and arrays.
+   *i
+   *     assert.notInclude('foobar', 'baz', 'string not include substring');
+   *     assert.notInclude([ 1, 2, 3 ], 4, 'array not include contain value');
+   *
+   * @name notInclude
+   * @param {Array|String} haystack
+   * @param {Mixed} needle
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notInclude = function (exp, inc, msg) {
+    new Assertion(exp, msg).not.include(inc);
+  };
+
+  /**
+   * ### .match(value, regexp, [message])
+   *
+   * Asserts that `value` matches the regular expression `regexp`.
+   *
+   *     assert.match('foobar', /^foo/, 'regexp matches');
+   *
+   * @name match
+   * @param {Mixed} value
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @api public
+   */
+
+  assert.match = function (exp, re, msg) {
+    new Assertion(exp, msg).to.match(re);
+  };
+
+  /**
+   * ### .notMatch(value, regexp, [message])
+   *
+   * Asserts that `value` does not match the regular expression `regexp`.
+   *
+   *     assert.notMatch('foobar', /^foo/, 'regexp does not match');
+   *
+   * @name notMatch
+   * @param {Mixed} value
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notMatch = function (exp, re, msg) {
+    new Assertion(exp, msg).to.not.match(re);
+  };
+
+  /**
+   * ### .property(object, property, [message])
+   *
+   * Asserts that `object` has a property named by `property`.
+   *
+   *     assert.property({ tea: { green: 'matcha' }}, 'tea');
+   *
+   * @name property
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.property = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.have.property(prop);
+  };
+
+  /**
+   * ### .notProperty(object, property, [message])
+   *
+   * Asserts that `object` does _not_ have a property named by `property`.
+   *
+   *     assert.notProperty({ tea: { green: 'matcha' }}, 'coffee');
+   *
+   * @name notProperty
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notProperty = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.not.have.property(prop);
+  };
+
+  /**
+   * ### .deepProperty(object, property, [message])
+   *
+   * Asserts that `object` has a property named by `property`, which can be a
+   * string using dot- and bracket-notation for deep reference.
+   *
+   *     assert.deepProperty({ tea: { green: 'matcha' }}, 'tea.green');
+   *
+   * @name deepProperty
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepProperty = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.have.deep.property(prop);
+  };
+
+  /**
+   * ### .notDeepProperty(object, property, [message])
+   *
+   * Asserts that `object` does _not_ have a property named by `property`, which
+   * can be a string using dot- and bracket-notation for deep reference.
+   *
+   *     assert.notDeepProperty({ tea: { green: 'matcha' }}, 'tea.oolong');
+   *
+   * @name notDeepProperty
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notDeepProperty = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.not.have.deep.property(prop);
+  };
+
+  /**
+   * ### .propertyVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property` with value given
+   * by `value`.
+   *
+   *     assert.propertyVal({ tea: 'is good' }, 'tea', 'is good');
+   *
+   * @name propertyVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.propertyVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.have.property(prop, val);
+  };
+
+  /**
+   * ### .propertyNotVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property`, but with a value
+   * different from that given by `value`.
+   *
+   *     assert.propertyNotVal({ tea: 'is good' }, 'tea', 'is bad');
+   *
+   * @name propertyNotVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.propertyNotVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.not.have.property(prop, val);
+  };
+
+  /**
+   * ### .deepPropertyVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property` with value given
+   * by `value`. `property` can use dot- and bracket-notation for deep
+   * reference.
+   *
+   *     assert.deepPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'matcha');
+   *
+   * @name deepPropertyVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepPropertyVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.have.deep.property(prop, val);
+  };
+
+  /**
+   * ### .deepPropertyNotVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property`, but with a value
+   * different from that given by `value`. `property` can use dot- and
+   * bracket-notation for deep reference.
+   *
+   *     assert.deepPropertyNotVal({ tea: { green: 'matcha' }}, 'tea.green', 'konacha');
+   *
+   * @name deepPropertyNotVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepPropertyNotVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.not.have.deep.property(prop, val);
+  };
+
+  /**
+   * ### .lengthOf(object, length, [message])
+   *
+   * Asserts that `object` has a `length` property with the expected value.
+   *
+   *     assert.lengthOf([1,2,3], 3, 'array has length of 3');
+   *     assert.lengthOf('foobar', 5, 'string has length of 6');
+   *
+   * @name lengthOf
+   * @param {Mixed} object
+   * @param {Number} length
+   * @param {String} message
+   * @api public
+   */
+
+  assert.lengthOf = function (exp, len, msg) {
+    new Assertion(exp, msg).to.have.length(len);
+  };
+
+  /**
+   * ### .throws(function, [constructor/string/regexp], [string/regexp], [message])
+   *
+   * Asserts that `function` will throw an error that is an instance of
+   * `constructor`, or alternately that it will throw an error with message
+   * matching `regexp`.
+   *
+   *     assert.throw(fn, 'function throws a reference error');
+   *     assert.throw(fn, /function throws a reference error/);
+   *     assert.throw(fn, ReferenceError);
+   *     assert.throw(fn, ReferenceError, 'function throws a reference error');
+   *     assert.throw(fn, ReferenceError, /function throws a reference error/);
+   *
+   * @name throws
+   * @alias throw
+   * @alias Throw
+   * @param {Function} function
+   * @param {ErrorConstructor} constructor
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+   * @api public
+   */
+
+  assert.Throw = function (fn, errt, errs, msg) {
+    if ('string' === typeof errt || errt instanceof RegExp) {
+      errs = errt;
+      errt = null;
+    }
+
+    var assertErr = new Assertion(fn, msg).to.Throw(errt, errs);
+    return flag(assertErr, 'object');
+  };
+
+  /**
+   * ### .doesNotThrow(function, [constructor/regexp], [message])
+   *
+   * Asserts that `function` will _not_ throw an error that is an instance of
+   * `constructor`, or alternately that it will not throw an error with message
+   * matching `regexp`.
+   *
+   *     assert.doesNotThrow(fn, Error, 'function does not throw');
+   *
+   * @name doesNotThrow
+   * @param {Function} function
+   * @param {ErrorConstructor} constructor
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+   * @api public
+   */
+
+  assert.doesNotThrow = function (fn, type, msg) {
+    if ('string' === typeof type) {
+      msg = type;
+      type = null;
+    }
+
+    new Assertion(fn, msg).to.not.Throw(type);
+  };
+
+  /**
+   * ### .operator(val1, operator, val2, [message])
+   *
+   * Compares two values using `operator`.
+   *
+   *     assert.operator(1, '<', 2, 'everything is ok');
+   *     assert.operator(1, '>', 2, 'this will fail');
+   *
+   * @name operator
+   * @param {Mixed} val1
+   * @param {String} operator
+   * @param {Mixed} val2
+   * @param {String} message
+   * @api public
+   */
+
+  assert.operator = function (val, operator, val2, msg) {
+    if (!~['==', '===', '>', '>=', '<', '<=', '!=', '!=='].indexOf(operator)) {
+      throw new Error('Invalid operator "' + operator + '"');
+    }
+    var test = new Assertion(eval(val + operator + val2), msg);
+    test.assert(
+        true === flag(test, 'object')
+      , 'expected ' + util.inspect(val) + ' to be ' + operator + ' ' + util.inspect(val2)
+      , 'expected ' + util.inspect(val) + ' to not be ' + operator + ' ' + util.inspect(val2) );
+  };
+
+  /**
+   * ### .closeTo(actual, expected, delta, [message])
+   *
+   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
+   *
+   *     assert.closeTo(1.5, 1, 0.5, 'numbers are close');
+   *
+   * @name closeTo
+   * @param {Number} actual
+   * @param {Number} expected
+   * @param {Number} delta
+   * @param {String} message
+   * @api public
+   */
+
+  assert.closeTo = function (act, exp, delta, msg) {
+    new Assertion(act, msg).to.be.closeTo(exp, delta);
+  };
+
+  /**
+   * ### .sameMembers(set1, set2, [message])
+   *
+   * Asserts that `set1` and `set2` have the same members.
+   * Order is not taken into account.
+   *
+   *     assert.sameMembers([ 1, 2, 3 ], [ 2, 1, 3 ], 'same members');
+   *
+   * @name sameMembers
+   * @param {Array} superset
+   * @param {Array} subset
+   * @param {String} message
+   * @api public
+   */
+
+  assert.sameMembers = function (set1, set2, msg) {
+    new Assertion(set1, msg).to.have.same.members(set2);
+  }
+
+  /**
+   * ### .includeMembers(superset, subset, [message])
+   *
+   * Asserts that `subset` is included in `superset`.
+   * Order is not taken into account.
+   *
+   *     assert.includeMembers([ 1, 2, 3 ], [ 2, 1 ], 'include members');
+   *
+   * @name includeMembers
+   * @param {Array} superset
+   * @param {Array} subset
+   * @param {String} message
+   * @api public
+   */
+
+  assert.includeMembers = function (superset, subset, msg) {
+    new Assertion(superset, msg).to.include.members(subset);
+  }
+
+  /*!
+   * Undocumented / untested
+   */
+
+  assert.ifError = function (val, msg) {
+    new Assertion(val, msg).to.not.be.ok;
+  };
+
+  /*!
+   * Aliases.
+   */
+
+  (function alias(name, as){
+    assert[as] = assert[name];
+    return alias;
+  })
+  ('Throw', 'throw')
+  ('Throw', 'throws');
+};
+
+});
+require.register("chai/lib/chai/interface/expect.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (chai, util) {
+  chai.expect = function (val, message) {
+    return new chai.Assertion(val, message);
+  };
+};
+
+
+});
+require.register("chai/lib/chai/interface/should.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (chai, util) {
+  var Assertion = chai.Assertion;
+
+  function loadShould () {
+    // modify Object.prototype to have `should`
+    Object.defineProperty(Object.prototype, 'should',
+      {
+        set: function (value) {
+          // See https://github.com/chaijs/chai/issues/86: this makes
+          // `whatever.should = someValue` actually set `someValue`, which is
+          // especially useful for `global.should = require('chai').should()`.
+          //
+          // Note that we have to use [[DefineProperty]] instead of [[Put]]
+          // since otherwise we would trigger this very setter!
+          Object.defineProperty(this, 'should', {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+          });
+        }
+      , get: function(){
+          if (this instanceof String || this instanceof Number) {
+            return new Assertion(this.constructor(this));
+          } else if (this instanceof Boolean) {
+            return new Assertion(this == true);
+          }
+          return new Assertion(this);
+        }
+      , configurable: true
+    });
+
+    var should = {};
+
+    should.equal = function (val1, val2, msg) {
+      new Assertion(val1, msg).to.equal(val2);
+    };
+
+    should.Throw = function (fn, errt, errs, msg) {
+      new Assertion(fn, msg).to.Throw(errt, errs);
+    };
+
+    should.exist = function (val, msg) {
+      new Assertion(val, msg).to.exist;
+    }
+
+    // negation
+    should.not = {}
+
+    should.not.equal = function (val1, val2, msg) {
+      new Assertion(val1, msg).to.not.equal(val2);
+    };
+
+    should.not.Throw = function (fn, errt, errs, msg) {
+      new Assertion(fn, msg).to.not.Throw(errt, errs);
+    };
+
+    should.not.exist = function (val, msg) {
+      new Assertion(val, msg).to.not.exist;
+    }
+
+    should['throw'] = should['Throw'];
+    should.not['throw'] = should.not['Throw'];
+
+    return should;
+  };
+
+  chai.should = loadShould;
+  chai.Should = loadShould;
+};
+
+});
+require.register("chai/lib/chai/utils/addChainableMethod.js", function(exports, require, module){
+/*!
+ * Chai - addChainingMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependencies
+ */
+
+var transferFlags = require('./transferFlags');
+
+/*!
+ * Module variables
+ */
+
+// Check whether `__proto__` is supported
+var hasProtoSupport = '__proto__' in Object;
+
+// Without `__proto__` support, this module will need to add properties to a function.
+// However, some Function.prototype methods cannot be overwritten,
+// and there seems no easy cross-platform way to detect them (@see chaijs/chai/issues/69).
+var excludeNames = /^(?:length|name|arguments|caller)$/;
+
+// Cache `Function` properties
+var call  = Function.prototype.call,
+    apply = Function.prototype.apply;
+
+/**
+ * ### addChainableMethod (ctx, name, method, chainingBehavior)
+ *
+ * Adds a method to an object, such that the method can also be chained.
+ *
+ *     utils.addChainableMethod(chai.Assertion.prototype, 'foo', function (str) {
+ *       var obj = utils.flag(this, 'object');
+ *       new chai.Assertion(obj).to.be.equal(str);
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.addChainableMethod('foo', fn, chainingBehavior);
+ *
+ * The result can then be used as both a method assertion, executing both `method` and
+ * `chainingBehavior`, or as a language chain, which only executes `chainingBehavior`.
+ *
+ *     expect(fooStr).to.be.foo('bar');
+ *     expect(fooStr).to.be.foo.equal('foo');
+ *
+ * @param {Object} ctx object to which the method is added
+ * @param {String} name of method to add
+ * @param {Function} method function to be used for `name`, when called
+ * @param {Function} chainingBehavior function to be called every time the property is accessed
+ * @name addChainableMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method, chainingBehavior) {
+  if (typeof chainingBehavior !== 'function') {
+    chainingBehavior = function () { };
+  }
+
+  var chainableBehavior = {
+      method: method
+    , chainingBehavior: chainingBehavior
+  };
+
+  // save the methods so we can overwrite them later, if we need to.
+  if (!ctx.__methods) {
+    ctx.__methods = {};
+  }
+  ctx.__methods[name] = chainableBehavior;
+
+  Object.defineProperty(ctx, name,
+    { get: function () {
+        chainableBehavior.chainingBehavior.call(this);
+
+        var assert = function () {
+          var result = chainableBehavior.method.apply(this, arguments);
+          return result === undefined ? this : result;
+        };
+
+        // Use `__proto__` if available
+        if (hasProtoSupport) {
+          // Inherit all properties from the object by replacing the `Function` prototype
+          var prototype = assert.__proto__ = Object.create(this);
+          // Restore the `call` and `apply` methods from `Function`
+          prototype.call = call;
+          prototype.apply = apply;
+        }
+        // Otherwise, redefine all properties (slow!)
+        else {
+          var asserterNames = Object.getOwnPropertyNames(ctx);
+          asserterNames.forEach(function (asserterName) {
+            if (!excludeNames.test(asserterName)) {
+              var pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
+              Object.defineProperty(assert, asserterName, pd);
+            }
+          });
+        }
+
+        transferFlags(this, assert);
+        return assert;
+      }
+    , configurable: true
+  });
+};
+
+});
+require.register("chai/lib/chai/utils/addMethod.js", function(exports, require, module){
+/*!
+ * Chai - addMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### .addMethod (ctx, name, method)
+ *
+ * Adds a method to the prototype of an object.
+ *
+ *     utils.addMethod(chai.Assertion.prototype, 'foo', function (str) {
+ *       var obj = utils.flag(this, 'object');
+ *       new chai.Assertion(obj).to.be.equal(str);
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.addMethod('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(fooStr).to.be.foo('bar');
+ *
+ * @param {Object} ctx object to which the method is added
+ * @param {String} name of method to add
+ * @param {Function} method function to be used for name
+ * @name addMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method) {
+  ctx[name] = function () {
+    var result = method.apply(this, arguments);
+    return result === undefined ? this : result;
+  };
+};
+
+});
+require.register("chai/lib/chai/utils/addProperty.js", function(exports, require, module){
+/*!
+ * Chai - addProperty utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### addProperty (ctx, name, getter)
+ *
+ * Adds a property to the prototype of an object.
+ *
+ *     utils.addProperty(chai.Assertion.prototype, 'foo', function () {
+ *       var obj = utils.flag(this, 'object');
+ *       new chai.Assertion(obj).to.be.instanceof(Foo);
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.addProperty('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.be.foo;
+ *
+ * @param {Object} ctx object to which the property is added
+ * @param {String} name of property to add
+ * @param {Function} getter function to be used for name
+ * @name addProperty
+ * @api public
+ */
+
+module.exports = function (ctx, name, getter) {
+  Object.defineProperty(ctx, name,
+    { get: function () {
+        var result = getter.call(this);
+        return result === undefined ? this : result;
+      }
+    , configurable: true
+  });
+};
+
+});
+require.register("chai/lib/chai/utils/flag.js", function(exports, require, module){
+/*!
+ * Chai - flag utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### flag(object ,key, [value])
+ *
+ * Get or set a flag value on an object. If a
+ * value is provided it will be set, else it will
+ * return the currently set value or `undefined` if
+ * the value is not set.
+ *
+ *     utils.flag(this, 'foo', 'bar'); // setter
+ *     utils.flag(this, 'foo'); // getter, returns `bar`
+ *
+ * @param {Object} object (constructed Assertion
+ * @param {String} key
+ * @param {Mixed} value (optional)
+ * @name flag
+ * @api private
+ */
+
+module.exports = function (obj, key, value) {
+  var flags = obj.__flags || (obj.__flags = Object.create(null));
+  if (arguments.length === 3) {
+    flags[key] = value;
+  } else {
+    return flags[key];
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/getActual.js", function(exports, require, module){
+/*!
+ * Chai - getActual utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * # getActual(object, [actual])
+ *
+ * Returns the `actual` value for an Assertion
+ *
+ * @param {Object} object (constructed Assertion)
+ * @param {Arguments} chai.Assertion.prototype.assert arguments
+ */
+
+module.exports = function (obj, args) {
+  var actual = args[4];
+  return 'undefined' !== typeof actual ? actual : obj._obj;
+};
+
+});
+require.register("chai/lib/chai/utils/getEnumerableProperties.js", function(exports, require, module){
+/*!
+ * Chai - getEnumerableProperties utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### .getEnumerableProperties(object)
+ *
+ * This allows the retrieval of enumerable property names of an object,
+ * inherited or not.
+ *
+ * @param {Object} object
+ * @returns {Array}
+ * @name getEnumerableProperties
+ * @api public
+ */
+
+module.exports = function getEnumerableProperties(object) {
+  var result = [];
+  for (var name in object) {
+    result.push(name);
+  }
+  return result;
+};
+
+});
+require.register("chai/lib/chai/utils/getMessage.js", function(exports, require, module){
+/*!
+ * Chai - message composition utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependancies
+ */
+
+var flag = require('./flag')
+  , getActual = require('./getActual')
+  , inspect = require('./inspect')
+  , objDisplay = require('./objDisplay');
+
+/**
+ * ### .getMessage(object, message, negateMessage)
+ *
+ * Construct the error message based on flags
+ * and template tags. Template tags will return
+ * a stringified inspection of the object referenced.
+ *
+ * Message template tags:
+ * - `#{this}` current asserted object
+ * - `#{act}` actual value
+ * - `#{exp}` expected value
+ *
+ * @param {Object} object (constructed Assertion)
+ * @param {Arguments} chai.Assertion.prototype.assert arguments
+ * @name getMessage
+ * @api public
+ */
+
+module.exports = function (obj, args) {
+  var negate = flag(obj, 'negate')
+    , val = flag(obj, 'object')
+    , expected = args[3]
+    , actual = getActual(obj, args)
+    , msg = negate ? args[2] : args[1]
+    , flagMsg = flag(obj, 'message');
+
+  msg = msg || '';
+  msg = msg
+    .replace(/#{this}/g, objDisplay(val))
+    .replace(/#{act}/g, objDisplay(actual))
+    .replace(/#{exp}/g, objDisplay(expected));
+
+  return flagMsg ? flagMsg + ': ' + msg : msg;
+};
+
+});
+require.register("chai/lib/chai/utils/getName.js", function(exports, require, module){
+/*!
+ * Chai - getName utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * # getName(func)
+ *
+ * Gets the name of a function, in a cross-browser way.
+ *
+ * @param {Function} a function (usually a constructor)
+ */
+
+module.exports = function (func) {
+  if (func.name) return func.name;
+
+  var match = /^\s?function ([^(]*)\(/.exec(func);
+  return match && match[1] ? match[1] : "";
+};
+
+});
+require.register("chai/lib/chai/utils/getPathValue.js", function(exports, require, module){
+/*!
+ * Chai - getPathValue utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * @see https://github.com/logicalparadox/filtr
+ * MIT Licensed
+ */
+
+/**
+ * ### .getPathValue(path, object)
+ *
+ * This allows the retrieval of values in an
+ * object given a string path.
+ *
+ *     var obj = {
+ *         prop1: {
+ *             arr: ['a', 'b', 'c']
+ *           , str: 'Hello'
+ *         }
+ *       , prop2: {
+ *             arr: [ { nested: 'Universe' } ]
+ *           , str: 'Hello again!'
+ *         }
+ *     }
+ *
+ * The following would be the results.
+ *
+ *     getPathValue('prop1.str', obj); // Hello
+ *     getPathValue('prop1.att[2]', obj); // b
+ *     getPathValue('prop2.arr[0].nested', obj); // Universe
+ *
+ * @param {String} path
+ * @param {Object} object
+ * @returns {Object} value or `undefined`
+ * @name getPathValue
+ * @api public
+ */
+
+var getPathValue = module.exports = function (path, obj) {
+  var parsed = parsePath(path);
+  return _getPathValue(parsed, obj);
+};
+
+/*!
+ * ## parsePath(path)
+ *
+ * Helper function used to parse string object
+ * paths. Use in conjunction with `_getPathValue`.
+ *
+ *      var parsed = parsePath('myobject.property.subprop');
+ *
+ * ### Paths:
+ *
+ * * Can be as near infinitely deep and nested
+ * * Arrays are also valid using the formal `myobject.document[3].property`.
+ *
+ * @param {String} path
+ * @returns {Object} parsed
+ * @api private
+ */
+
+function parsePath (path) {
+  var str = path.replace(/\[/g, '.[')
+    , parts = str.match(/(\\\.|[^.]+?)+/g);
+  return parts.map(function (value) {
+    var re = /\[(\d+)\]$/
+      , mArr = re.exec(value)
+    if (mArr) return { i: parseFloat(mArr[1]) };
+    else return { p: value };
+  });
+};
+
+/*!
+ * ## _getPathValue(parsed, obj)
+ *
+ * Helper companion function for `.parsePath` that returns
+ * the value located at the parsed address.
+ *
+ *      var value = getPathValue(parsed, obj);
+ *
+ * @param {Object} parsed definition from `parsePath`.
+ * @param {Object} object to search against
+ * @returns {Object|Undefined} value
+ * @api private
+ */
+
+function _getPathValue (parsed, obj) {
+  var tmp = obj
+    , res;
+  for (var i = 0, l = parsed.length; i < l; i++) {
+    var part = parsed[i];
+    if (tmp) {
+      if ('undefined' !== typeof part.p)
+        tmp = tmp[part.p];
+      else if ('undefined' !== typeof part.i)
+        tmp = tmp[part.i];
+      if (i == (l - 1)) res = tmp;
+    } else {
+      res = undefined;
+    }
+  }
+  return res;
+};
+
+});
+require.register("chai/lib/chai/utils/getProperties.js", function(exports, require, module){
+/*!
+ * Chai - getProperties utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### .getProperties(object)
+ *
+ * This allows the retrieval of property names of an object, enumerable or not,
+ * inherited or not.
+ *
+ * @param {Object} object
+ * @returns {Array}
+ * @name getProperties
+ * @api public
+ */
+
+module.exports = function getProperties(object) {
+  var result = Object.getOwnPropertyNames(subject);
+
+  function addProperty(property) {
+    if (result.indexOf(property) === -1) {
+      result.push(property);
+    }
+  }
+
+  var proto = Object.getPrototypeOf(subject);
+  while (proto !== null) {
+    Object.getOwnPropertyNames(proto).forEach(addProperty);
+    proto = Object.getPrototypeOf(proto);
+  }
+
+  return result;
+};
+
+});
+require.register("chai/lib/chai/utils/index.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Main exports
+ */
+
+var exports = module.exports = {};
+
+/*!
+ * test utility
+ */
+
+exports.test = require('./test');
+
+/*!
+ * type utility
+ */
+
+exports.type = require('./type');
+
+/*!
+ * message utility
+ */
+
+exports.getMessage = require('./getMessage');
+
+/*!
+ * actual utility
+ */
+
+exports.getActual = require('./getActual');
+
+/*!
+ * Inspect util
+ */
+
+exports.inspect = require('./inspect');
+
+/*!
+ * Object Display util
+ */
+
+exports.objDisplay = require('./objDisplay');
+
+/*!
+ * Flag utility
+ */
+
+exports.flag = require('./flag');
+
+/*!
+ * Flag transferring utility
+ */
+
+exports.transferFlags = require('./transferFlags');
+
+/*!
+ * Deep equal utility
+ */
+
+exports.eql = require('deep-eql');
+
+/*!
+ * Deep path value
+ */
+
+exports.getPathValue = require('./getPathValue');
+
+/*!
+ * Function name
+ */
+
+exports.getName = require('./getName');
+
+/*!
+ * add Property
+ */
+
+exports.addProperty = require('./addProperty');
+
+/*!
+ * add Method
+ */
+
+exports.addMethod = require('./addMethod');
+
+/*!
+ * overwrite Property
+ */
+
+exports.overwriteProperty = require('./overwriteProperty');
+
+/*!
+ * overwrite Method
+ */
+
+exports.overwriteMethod = require('./overwriteMethod');
+
+/*!
+ * Add a chainable method
+ */
+
+exports.addChainableMethod = require('./addChainableMethod');
+
+/*!
+ * Overwrite chainable method
+ */
+
+exports.overwriteChainableMethod = require('./overwriteChainableMethod');
+
+
+});
+require.register("chai/lib/chai/utils/inspect.js", function(exports, require, module){
+// This is (almost) directly from Node.js utils
+// https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/util.js
+
+var getName = require('./getName');
+var getProperties = require('./getProperties');
+var getEnumerableProperties = require('./getEnumerableProperties');
+
+module.exports = inspect;
+
+/**
+ * Echos the value of a value. Trys to print the value out
+ * in the best way possible given the different types.
+ *
+ * @param {Object} obj The object to print out.
+ * @param {Boolean} showHidden Flag that shows hidden (not enumerable)
+ *    properties of objects.
+ * @param {Number} depth Depth in which to descend in object. Default is 2.
+ * @param {Boolean} colors Flag to turn on ANSI escape codes to color the
+ *    output. Default is false (no coloring).
+ */
+function inspect(obj, showHidden, depth, colors) {
+  var ctx = {
+    showHidden: showHidden,
+    seen: [],
+    stylize: function (str) { return str; }
+  };
+  return formatValue(ctx, obj, (typeof depth === 'undefined' ? 2 : depth));
+}
+
+// https://gist.github.com/1044128/
+var getOuterHTML = function(element) {
+  if ('outerHTML' in element) return element.outerHTML;
+  var ns = "http://www.w3.org/1999/xhtml";
+  var container = document.createElementNS(ns, '_');
+  var elemProto = (window.HTMLElement || window.Element).prototype;
+  var xmlSerializer = new XMLSerializer();
+  var html;
+  if (document.xmlVersion) {
+    return xmlSerializer.serializeToString(element);
+  } else {
+    container.appendChild(element.cloneNode(false));
+    html = container.innerHTML.replace('><', '>' + element.innerHTML + '<');
+    container.innerHTML = '';
+    return html;
+  }
+};
+
+// Returns true if object is a DOM element.
+var isDOMElement = function (object) {
+  if (typeof HTMLElement === 'object') {
+    return object instanceof HTMLElement;
+  } else {
+    return object &&
+      typeof object === 'object' &&
+      object.nodeType === 1 &&
+      typeof object.nodeName === 'string';
+  }
+};
+
+function formatValue(ctx, value, recurseTimes) {
+  // Provide a hook for user-specified inspect functions.
+  // Check that value is an object with an inspect function on it
+  if (value && typeof value.inspect === 'function' &&
+      // Filter out the util module, it's inspect function is special
+      value.inspect !== exports.inspect &&
+      // Also filter out any prototype objects using the circular check.
+      !(value.constructor && value.constructor.prototype === value)) {
+    var ret = value.inspect(recurseTimes);
+    if (typeof ret !== 'string') {
+      ret = formatValue(ctx, ret, recurseTimes);
+    }
+    return ret;
+  }
+
+  // Primitive types cannot have properties
+  var primitive = formatPrimitive(ctx, value);
+  if (primitive) {
+    return primitive;
+  }
+
+  // If it's DOM elem, get outer HTML.
+  if (isDOMElement(value)) {
+    return getOuterHTML(value);
+  }
+
+  // Look up the keys of the object.
+  var visibleKeys = getEnumerableProperties(value);
+  var keys = ctx.showHidden ? getProperties(value) : visibleKeys;
+
+  // Some type of object without properties can be shortcutted.
+  // In IE, errors have a single `stack` property, or if they are vanilla `Error`,
+  // a `stack` plus `description` property; ignore those for consistency.
+  if (keys.length === 0 || (isError(value) && (
+      (keys.length === 1 && keys[0] === 'stack') ||
+      (keys.length === 2 && keys[0] === 'description' && keys[1] === 'stack')
+     ))) {
+    if (typeof value === 'function') {
+      var name = getName(value);
+      var nameSuffix = name ? ': ' + name : '';
+      return ctx.stylize('[Function' + nameSuffix + ']', 'special');
+    }
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    }
+    if (isDate(value)) {
+      return ctx.stylize(Date.prototype.toUTCString.call(value), 'date');
+    }
+    if (isError(value)) {
+      return formatError(value);
+    }
+  }
+
+  var base = '', array = false, braces = ['{', '}'];
+
+  // Make Array say that they are Array
+  if (isArray(value)) {
+    array = true;
+    braces = ['[', ']'];
+  }
+
+  // Make functions say that they are functions
+  if (typeof value === 'function') {
+    var name = getName(value);
+    var nameSuffix = name ? ': ' + name : '';
+    base = ' [Function' + nameSuffix + ']';
+  }
+
+  // Make RegExps say that they are RegExps
+  if (isRegExp(value)) {
+    base = ' ' + RegExp.prototype.toString.call(value);
+  }
+
+  // Make dates with properties first say the date
+  if (isDate(value)) {
+    base = ' ' + Date.prototype.toUTCString.call(value);
+  }
+
+  // Make error with message first say the error
+  if (isError(value)) {
+    return formatError(value);
+  }
+
+  if (keys.length === 0 && (!array || value.length == 0)) {
+    return braces[0] + base + braces[1];
+  }
+
+  if (recurseTimes < 0) {
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    } else {
+      return ctx.stylize('[Object]', 'special');
+    }
+  }
+
+  ctx.seen.push(value);
+
+  var output;
+  if (array) {
+    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+  } else {
+    output = keys.map(function(key) {
+      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+    });
+  }
+
+  ctx.seen.pop();
+
+  return reduceToSingleString(output, base, braces);
+}
+
+
+function formatPrimitive(ctx, value) {
+  switch (typeof value) {
+    case 'undefined':
+      return ctx.stylize('undefined', 'undefined');
+
+    case 'string':
+      var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+                                               .replace(/'/g, "\\'")
+                                               .replace(/\\"/g, '"') + '\'';
+      return ctx.stylize(simple, 'string');
+
+    case 'number':
+      return ctx.stylize('' + value, 'number');
+
+    case 'boolean':
+      return ctx.stylize('' + value, 'boolean');
+  }
+  // For some reason typeof null is "object", so special case here.
+  if (value === null) {
+    return ctx.stylize('null', 'null');
+  }
+}
+
+
+function formatError(value) {
+  return '[' + Error.prototype.toString.call(value) + ']';
+}
+
+
+function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+  var output = [];
+  for (var i = 0, l = value.length; i < l; ++i) {
+    if (Object.prototype.hasOwnProperty.call(value, String(i))) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          String(i), true));
+    } else {
+      output.push('');
+    }
+  }
+  keys.forEach(function(key) {
+    if (!key.match(/^\d+$/)) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          key, true));
+    }
+  });
+  return output;
+}
+
+
+function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+  var name, str;
+  if (value.__lookupGetter__) {
+    if (value.__lookupGetter__(key)) {
+      if (value.__lookupSetter__(key)) {
+        str = ctx.stylize('[Getter/Setter]', 'special');
+      } else {
+        str = ctx.stylize('[Getter]', 'special');
+      }
+    } else {
+      if (value.__lookupSetter__(key)) {
+        str = ctx.stylize('[Setter]', 'special');
+      }
+    }
+  }
+  if (visibleKeys.indexOf(key) < 0) {
+    name = '[' + key + ']';
+  }
+  if (!str) {
+    if (ctx.seen.indexOf(value[key]) < 0) {
+      if (recurseTimes === null) {
+        str = formatValue(ctx, value[key], null);
+      } else {
+        str = formatValue(ctx, value[key], recurseTimes - 1);
+      }
+      if (str.indexOf('\n') > -1) {
+        if (array) {
+          str = str.split('\n').map(function(line) {
+            return '  ' + line;
+          }).join('\n').substr(2);
+        } else {
+          str = '\n' + str.split('\n').map(function(line) {
+            return '   ' + line;
+          }).join('\n');
+        }
+      }
+    } else {
+      str = ctx.stylize('[Circular]', 'special');
+    }
+  }
+  if (typeof name === 'undefined') {
+    if (array && key.match(/^\d+$/)) {
+      return str;
+    }
+    name = JSON.stringify('' + key);
+    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+      name = name.substr(1, name.length - 2);
+      name = ctx.stylize(name, 'name');
+    } else {
+      name = name.replace(/'/g, "\\'")
+                 .replace(/\\"/g, '"')
+                 .replace(/(^"|"$)/g, "'");
+      name = ctx.stylize(name, 'string');
+    }
+  }
+
+  return name + ': ' + str;
+}
+
+
+function reduceToSingleString(output, base, braces) {
+  var numLinesEst = 0;
+  var length = output.reduce(function(prev, cur) {
+    numLinesEst++;
+    if (cur.indexOf('\n') >= 0) numLinesEst++;
+    return prev + cur.length + 1;
+  }, 0);
+
+  if (length > 60) {
+    return braces[0] +
+           (base === '' ? '' : base + '\n ') +
+           ' ' +
+           output.join(',\n  ') +
+           ' ' +
+           braces[1];
+  }
+
+  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+}
+
+function isArray(ar) {
+  return Array.isArray(ar) ||
+         (typeof ar === 'object' && objectToString(ar) === '[object Array]');
+}
+
+function isRegExp(re) {
+  return typeof re === 'object' && objectToString(re) === '[object RegExp]';
+}
+
+function isDate(d) {
+  return typeof d === 'object' && objectToString(d) === '[object Date]';
+}
+
+function isError(e) {
+  return typeof e === 'object' && objectToString(e) === '[object Error]';
+}
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
+
+});
+require.register("chai/lib/chai/utils/objDisplay.js", function(exports, require, module){
+/*!
+ * Chai - flag utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependancies
+ */
+
+var inspect = require('./inspect');
+
+/**
+ * ### .objDisplay (object)
+ *
+ * Determines if an object or an array matches
+ * criteria to be inspected in-line for error
+ * messages or should be truncated.
+ *
+ * @param {Mixed} javascript object to inspect
+ * @name objDisplay
+ * @api public
+ */
+
+module.exports = function (obj) {
+  var str = inspect(obj)
+    , type = Object.prototype.toString.call(obj);
+
+  if (str.length >= 40) {
+    if (type === '[object Function]') {
+      return !obj.name || obj.name === ''
+        ? '[Function]'
+        : '[Function: ' + obj.name + ']';
+    } else if (type === '[object Array]') {
+      return '[ Array(' + obj.length + ') ]';
+    } else if (type === '[object Object]') {
+      var keys = Object.keys(obj)
+        , kstr = keys.length > 2
+          ? keys.splice(0, 2).join(', ') + ', ...'
+          : keys.join(', ');
+      return '{ Object (' + kstr + ') }';
+    } else {
+      return str;
+    }
+  } else {
+    return str;
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/overwriteMethod.js", function(exports, require, module){
+/*!
+ * Chai - overwriteMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### overwriteMethod (ctx, name, fn)
+ *
+ * Overwites an already existing method and provides
+ * access to previous function. Must return function
+ * to be used for name.
+ *
+ *     utils.overwriteMethod(chai.Assertion.prototype, 'equal', function (_super) {
+ *       return function (str) {
+ *         var obj = utils.flag(this, 'object');
+ *         if (obj instanceof Foo) {
+ *           new chai.Assertion(obj.value).to.equal(str);
+ *         } else {
+ *           _super.apply(this, arguments);
+ *         }
+ *       }
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.overwriteMethod('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.equal('bar');
+ *
+ * @param {Object} ctx object whose method is to be overwritten
+ * @param {String} name of method to overwrite
+ * @param {Function} method function that returns a function to be used for name
+ * @name overwriteMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method) {
+  var _method = ctx[name]
+    , _super = function () { return this; };
+
+  if (_method && 'function' === typeof _method)
+    _super = _method;
+
+  ctx[name] = function () {
+    var result = method(_super).apply(this, arguments);
+    return result === undefined ? this : result;
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/overwriteProperty.js", function(exports, require, module){
+/*!
+ * Chai - overwriteProperty utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### overwriteProperty (ctx, name, fn)
+ *
+ * Overwites an already existing property getter and provides
+ * access to previous value. Must return function to use as getter.
+ *
+ *     utils.overwriteProperty(chai.Assertion.prototype, 'ok', function (_super) {
+ *       return function () {
+ *         var obj = utils.flag(this, 'object');
+ *         if (obj instanceof Foo) {
+ *           new chai.Assertion(obj.name).to.equal('bar');
+ *         } else {
+ *           _super.call(this);
+ *         }
+ *       }
+ *     });
+ *
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.overwriteProperty('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.be.ok;
+ *
+ * @param {Object} ctx object whose property is to be overwritten
+ * @param {String} name of property to overwrite
+ * @param {Function} getter function that returns a getter function to be used for name
+ * @name overwriteProperty
+ * @api public
+ */
+
+module.exports = function (ctx, name, getter) {
+  var _get = Object.getOwnPropertyDescriptor(ctx, name)
+    , _super = function () {};
+
+  if (_get && 'function' === typeof _get.get)
+    _super = _get.get
+
+  Object.defineProperty(ctx, name,
+    { get: function () {
+        var result = getter(_super).call(this);
+        return result === undefined ? this : result;
+      }
+    , configurable: true
+  });
+};
+
+});
+require.register("chai/lib/chai/utils/overwriteChainableMethod.js", function(exports, require, module){
+/*!
+ * Chai - overwriteChainableMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### overwriteChainableMethod (ctx, name, fn)
+ *
+ * Overwites an already existing chainable method
+ * and provides access to the previous function or
+ * property.  Must return functions to be used for
+ * name.
+ *
+ *     utils.overwriteChainableMethod(chai.Assertion.prototype, 'length',
+ *       function (_super) {
+ *       }
+ *     , function (_super) {
+ *       }
+ *     );
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.overwriteChainableMethod('foo', fn, fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.have.length(3);
+ *     expect(myFoo).to.have.length.above(3);
+ *
+ * @param {Object} ctx object whose method / property is to be overwritten
+ * @param {String} name of method / property to overwrite
+ * @param {Function} method function that returns a function to be used for name
+ * @param {Function} chainingBehavior function that returns a function to be used for property
+ * @name overwriteChainableMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method, chainingBehavior) {
+  var chainableBehavior = ctx.__methods[name];
+
+  var _chainingBehavior = chainableBehavior.chainingBehavior;
+  chainableBehavior.chainingBehavior = function () {
+    var result = chainingBehavior(_chainingBehavior).call(this);
+    return result === undefined ? this : result;
+  };
+
+  var _method = chainableBehavior.method;
+  chainableBehavior.method = function () {
+    var result = method(_method).apply(this, arguments);
+    return result === undefined ? this : result;
+  };
+};
+
+});
+require.register("chai/lib/chai/utils/test.js", function(exports, require, module){
+/*!
+ * Chai - test utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependancies
+ */
+
+var flag = require('./flag');
+
+/**
+ * # test(object, expression)
+ *
+ * Test and object for expression.
+ *
+ * @param {Object} object (constructed Assertion)
+ * @param {Arguments} chai.Assertion.prototype.assert arguments
+ */
+
+module.exports = function (obj, args) {
+  var negate = flag(obj, 'negate')
+    , expr = args[0];
+  return negate ? !expr : expr;
+};
+
+});
+require.register("chai/lib/chai/utils/transferFlags.js", function(exports, require, module){
+/*!
+ * Chai - transferFlags utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### transferFlags(assertion, object, includeAll = true)
+ *
+ * Transfer all the flags for `assertion` to `object`. If
+ * `includeAll` is set to `false`, then the base Chai
+ * assertion flags (namely `object`, `ssfi`, and `message`)
+ * will not be transferred.
+ *
+ *
+ *     var newAssertion = new Assertion();
+ *     utils.transferFlags(assertion, newAssertion);
+ *
+ *     var anotherAsseriton = new Assertion(myObj);
+ *     utils.transferFlags(assertion, anotherAssertion, false);
+ *
+ * @param {Assertion} assertion the assertion to transfer the flags from
+ * @param {Object} object the object to transfer the flags too; usually a new assertion
+ * @param {Boolean} includeAll
+ * @name getAllFlags
+ * @api private
+ */
+
+module.exports = function (assertion, object, includeAll) {
+  var flags = assertion.__flags || (assertion.__flags = Object.create(null));
+
+  if (!object.__flags) {
+    object.__flags = Object.create(null);
+  }
+
+  includeAll = arguments.length === 3 ? includeAll : true;
+
+  for (var flag in flags) {
+    if (includeAll ||
+        (flag !== 'object' && flag !== 'ssfi' && flag != 'message')) {
+      object.__flags[flag] = flags[flag];
+    }
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/type.js", function(exports, require, module){
+/*!
+ * Chai - type utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Detectable javascript natives
+ */
+
+var natives = {
+    '[object Arguments]': 'arguments'
+  , '[object Array]': 'array'
+  , '[object Date]': 'date'
+  , '[object Function]': 'function'
+  , '[object Number]': 'number'
+  , '[object RegExp]': 'regexp'
+  , '[object String]': 'string'
+};
+
+/**
+ * ### type(object)
+ *
+ * Better implementation of `typeof` detection that can
+ * be used cross-browser. Handles the inconsistencies of
+ * Array, `null`, and `undefined` detection.
+ *
+ *     utils.type({}) // 'object'
+ *     utils.type(null) // `null'
+ *     utils.type(undefined) // `undefined`
+ *     utils.type([]) // `array`
+ *
+ * @param {Mixed} object to detect type of
+ * @name type
+ * @api private
+ */
+
+module.exports = function (obj) {
+  var str = Object.prototype.toString.call(obj);
+  if (natives[str]) return natives[str];
+  if (obj === null) return 'null';
+  if (obj === undefined) return 'undefined';
+  if (obj === Object(obj)) return 'object';
+  return typeof obj;
+};
+
+});
+
+
+
+
+require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js");
+require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js");
+require.alias("chaijs-assertion-error/index.js", "assertion-error/index.js");
+require.alias("chaijs-assertion-error/index.js", "chaijs-assertion-error/index.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "chai/deps/deep-eql/lib/eql.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "chai/deps/deep-eql/index.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "deep-eql/index.js");
+require.alias("chaijs-type-detect/lib/type.js", "chaijs-deep-eql/deps/type-detect/lib/type.js");
+require.alias("chaijs-type-detect/lib/type.js", "chaijs-deep-eql/deps/type-detect/index.js");
+require.alias("chaijs-type-detect/lib/type.js", "chaijs-type-detect/index.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "chaijs-deep-eql/index.js");
+require.alias("chai/index.js", "chai/index.js");if (typeof exports == "object") {
+  module.exports = require("chai");
+} else if (typeof define == "function" && define.amd) {
+  define([], function(){ return require("chai"); });
+} else {
+  this["chai"] = require("chai");
+}})();
\ No newline at end of file
diff --git a/browser/components/loop/test/vendor/mocha-1.17.1.css b/browser/components/loop/test/vendor/mocha-1.17.1.css
new file mode 100644
index 000000000000..42b9798fa4e3
--- /dev/null
+++ b/browser/components/loop/test/vendor/mocha-1.17.1.css
@@ -0,0 +1,270 @@
+@charset "utf-8";
+
+body {
+  margin:0;
+}
+
+#mocha {
+  font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
+  margin: 60px 50px;
+}
+
+#mocha ul,
+#mocha li {
+  margin: 0;
+  padding: 0;
+}
+
+#mocha ul {
+  list-style: none;
+}
+
+#mocha h1,
+#mocha h2 {
+  margin: 0;
+}
+
+#mocha h1 {
+  margin-top: 15px;
+  font-size: 1em;
+  font-weight: 200;
+}
+
+#mocha h1 a {
+  text-decoration: none;
+  color: inherit;
+}
+
+#mocha h1 a:hover {
+  text-decoration: underline;
+}
+
+#mocha .suite .suite h1 {
+  margin-top: 0;
+  font-size: .8em;
+}
+
+#mocha .hidden {
+  display: none;
+}
+
+#mocha h2 {
+  font-size: 12px;
+  font-weight: normal;
+  cursor: pointer;
+}
+
+#mocha .suite {
+  margin-left: 15px;
+}
+
+#mocha .test {
+  margin-left: 15px;
+  overflow: hidden;
+}
+
+#mocha .test.pending:hover h2::after {
+  content: '(pending)';
+  font-family: arial, sans-serif;
+}
+
+#mocha .test.pass.medium .duration {
+  background: #c09853;
+}
+
+#mocha .test.pass.slow .duration {
+  background: #b94a48;
+}
+
+#mocha .test.pass::before {
+  content: '✓';
+  font-size: 12px;
+  display: block;
+  float: left;
+  margin-right: 5px;
+  color: #00d6b2;
+}
+
+#mocha .test.pass .duration {
+  font-size: 9px;
+  margin-left: 5px;
+  padding: 2px 5px;
+  color: #fff;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
+  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -ms-border-radius: 5px;
+  -o-border-radius: 5px;
+  border-radius: 5px;
+}
+
+#mocha .test.pass.fast .duration {
+  display: none;
+}
+
+#mocha .test.pending {
+  color: #0b97c4;
+}
+
+#mocha .test.pending::before {
+  content: '◦';
+  color: #0b97c4;
+}
+
+#mocha .test.fail {
+  color: #c00;
+}
+
+#mocha .test.fail pre {
+  color: black;
+}
+
+#mocha .test.fail::before {
+  content: '✖';
+  font-size: 12px;
+  display: block;
+  float: left;
+  margin-right: 5px;
+  color: #c00;
+}
+
+#mocha .test pre.error {
+  color: #c00;
+  max-height: 300px;
+  overflow: auto;
+}
+
+/**
+ * (1): approximate for browsers not supporting calc
+ * (2): 42 = 2*15 + 2*10 + 2*1 (padding + margin + border)
+ *      ^^ seriously
+ */
+#mocha .test pre {
+  display: block;
+  float: left;
+  clear: left;
+  font: 12px/1.5 monaco, monospace;
+  margin: 5px;
+  padding: 15px;
+  border: 1px solid #eee;
+  max-width: 85%; /*(1)*/
+  max-width: calc(100% - 42px); /*(2)*/
+  word-wrap: break-word;
+  border-bottom-color: #ddd;
+  -webkit-border-radius: 3px;
+  -webkit-box-shadow: 0 1px 3px #eee;
+  -moz-border-radius: 3px;
+  -moz-box-shadow: 0 1px 3px #eee;
+  border-radius: 3px;
+}
+
+#mocha .test h2 {
+  position: relative;
+}
+
+#mocha .test a.replay {
+  position: absolute;
+  top: 3px;
+  right: 0;
+  text-decoration: none;
+  vertical-align: middle;
+  display: block;
+  width: 15px;
+  height: 15px;
+  line-height: 15px;
+  text-align: center;
+  background: #eee;
+  font-size: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+  -webkit-transition: opacity 200ms;
+  -moz-transition: opacity 200ms;
+  transition: opacity 200ms;
+  opacity: 0.3;
+  color: #888;
+}
+
+#mocha .test:hover a.replay {
+  opacity: 1;
+}
+
+#mocha-report.pass .test.fail {
+  display: none;
+}
+
+#mocha-report.fail .test.pass {
+  display: none;
+}
+
+#mocha-report.pending .test.pass,
+#mocha-report.pending .test.fail {
+  display: none;
+}
+#mocha-report.pending .test.pass.pending {
+  display: block;
+}
+
+#mocha-error {
+  color: #c00;
+  font-size: 1.5em;
+  font-weight: 100;
+  letter-spacing: 1px;
+}
+
+#mocha-stats {
+  position: fixed;
+  top: 15px;
+  right: 10px;
+  font-size: 12px;
+  margin: 0;
+  color: #888;
+  z-index: 1;
+}
+
+#mocha-stats .progress {
+  float: right;
+  padding-top: 0;
+}
+
+#mocha-stats em {
+  color: black;
+}
+
+#mocha-stats a {
+  text-decoration: none;
+  color: inherit;
+}
+
+#mocha-stats a:hover {
+  border-bottom: 1px solid #eee;
+}
+
+#mocha-stats li {
+  display: inline-block;
+  margin: 0 5px;
+  list-style: none;
+  padding-top: 11px;
+}
+
+#mocha-stats canvas {
+  width: 40px;
+  height: 40px;
+}
+
+#mocha code .comment { color: #ddd; }
+#mocha code .init { color: #2f6fad; }
+#mocha code .string { color: #5890ad; }
+#mocha code .keyword { color: #8a6343; }
+#mocha code .number { color: #2f6fad; }
+
+@media screen and (max-device-width: 480px) {
+  #mocha {
+    margin: 60px 0px;
+  }
+
+  #mocha #stats {
+    position: absolute;
+  }
+}
diff --git a/browser/components/loop/test/vendor/mocha-1.17.1.js b/browser/components/loop/test/vendor/mocha-1.17.1.js
new file mode 100644
index 000000000000..3dcdae6c1bdc
--- /dev/null
+++ b/browser/components/loop/test/vendor/mocha-1.17.1.js
@@ -0,0 +1,5812 @@
+;(function(){
+
+// CommonJS require()
+
+function require(p){
+    var path = require.resolve(p)
+      , mod = require.modules[path];
+    if (!mod) throw new Error('failed to require "' + p + '"');
+    if (!mod.exports) {
+      mod.exports = {};
+      mod.call(mod.exports, mod, mod.exports, require.relative(path));
+    }
+    return mod.exports;
+  }
+
+require.modules = {};
+
+require.resolve = function (path){
+    var orig = path
+      , reg = path + '.js'
+      , index = path + '/index.js';
+    return require.modules[reg] && reg
+      || require.modules[index] && index
+      || orig;
+  };
+
+require.register = function (path, fn){
+    require.modules[path] = fn;
+  };
+
+require.relative = function (parent) {
+    return function(p){
+      if ('.' != p.charAt(0)) return require(p);
+
+      var path = parent.split('/')
+        , segs = p.split('/');
+      path.pop();
+
+      for (var i = 0; i < segs.length; i++) {
+        var seg = segs[i];
+        if ('..' == seg) path.pop();
+        else if ('.' != seg) path.push(seg);
+      }
+
+      return require(path.join('/'));
+    };
+  };
+
+
+require.register("browser/debug.js", function(module, exports, require){
+
+module.exports = function(type){
+  return function(){
+  }
+};
+
+}); // module: browser/debug.js
+
+require.register("browser/diff.js", function(module, exports, require){
+/* See LICENSE file for terms of use */
+
+/*
+ * Text diff implementation.
+ *
+ * This library supports the following APIS:
+ * JsDiff.diffChars: Character by character diff
+ * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
+ * JsDiff.diffLines: Line based diff
+ *
+ * JsDiff.diffCss: Diff targeted at CSS content
+ *
+ * These methods are based on the implementation proposed in
+ * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
+ * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
+ */
+var JsDiff = (function() {
+  /*jshint maxparams: 5*/
+  function clonePath(path) {
+    return { newPos: path.newPos, components: path.components.slice(0) };
+  }
+  function removeEmpty(array) {
+    var ret = [];
+    for (var i = 0; i < array.length; i++) {
+      if (array[i]) {
+        ret.push(array[i]);
+      }
+    }
+    return ret;
+  }
+  function escapeHTML(s) {
+    var n = s;
+    n = n.replace(/&/g, '&amp;');
+    n = n.replace(/</g, '&lt;');
+    n = n.replace(/>/g, '&gt;');
+    n = n.replace(/"/g, '&quot;');
+
+    return n;
+  }
+
+  var Diff = function(ignoreWhitespace) {
+    this.ignoreWhitespace = ignoreWhitespace;
+  };
+  Diff.prototype = {
+      diff: function(oldString, newString) {
+        // Handle the identity case (this is due to unrolling editLength == 0
+        if (newString === oldString) {
+          return [{ value: newString }];
+        }
+        if (!newString) {
+          return [{ value: oldString, removed: true }];
+        }
+        if (!oldString) {
+          return [{ value: newString, added: true }];
+        }
+
+        newString = this.tokenize(newString);
+        oldString = this.tokenize(oldString);
+
+        var newLen = newString.length, oldLen = oldString.length;
+        var maxEditLength = newLen + oldLen;
+        var bestPath = [{ newPos: -1, components: [] }];
+
+        // Seed editLength = 0
+        var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
+        if (bestPath[0].newPos+1 >= newLen && oldPos+1 >= oldLen) {
+          return bestPath[0].components;
+        }
+
+        for (var editLength = 1; editLength <= maxEditLength; editLength++) {
+          for (var diagonalPath = -1*editLength; diagonalPath <= editLength; diagonalPath+=2) {
+            var basePath;
+            var addPath = bestPath[diagonalPath-1],
+                removePath = bestPath[diagonalPath+1];
+            oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
+            if (addPath) {
+              // No one else is going to attempt to use this value, clear it
+              bestPath[diagonalPath-1] = undefined;
+            }
+
+            var canAdd = addPath && addPath.newPos+1 < newLen;
+            var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
+            if (!canAdd && !canRemove) {
+              bestPath[diagonalPath] = undefined;
+              continue;
+            }
+
+            // Select the diagonal that we want to branch from. We select the prior
+            // path whose position in the new string is the farthest from the origin
+            // and does not pass the bounds of the diff graph
+            if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
+              basePath = clonePath(removePath);
+              this.pushComponent(basePath.components, oldString[oldPos], undefined, true);
+            } else {
+              basePath = clonePath(addPath);
+              basePath.newPos++;
+              this.pushComponent(basePath.components, newString[basePath.newPos], true, undefined);
+            }
+
+            var oldPos = this.extractCommon(basePath, newString, oldString, diagonalPath);
+
+            if (basePath.newPos+1 >= newLen && oldPos+1 >= oldLen) {
+              return basePath.components;
+            } else {
+              bestPath[diagonalPath] = basePath;
+            }
+          }
+        }
+      },
+
+      pushComponent: function(components, value, added, removed) {
+        var last = components[components.length-1];
+        if (last && last.added === added && last.removed === removed) {
+          // We need to clone here as the component clone operation is just
+          // as shallow array clone
+          components[components.length-1] =
+            {value: this.join(last.value, value), added: added, removed: removed };
+        } else {
+          components.push({value: value, added: added, removed: removed });
+        }
+      },
+      extractCommon: function(basePath, newString, oldString, diagonalPath) {
+        var newLen = newString.length,
+            oldLen = oldString.length,
+            newPos = basePath.newPos,
+            oldPos = newPos - diagonalPath;
+        while (newPos+1 < newLen && oldPos+1 < oldLen && this.equals(newString[newPos+1], oldString[oldPos+1])) {
+          newPos++;
+          oldPos++;
+
+          this.pushComponent(basePath.components, newString[newPos], undefined, undefined);
+        }
+        basePath.newPos = newPos;
+        return oldPos;
+      },
+
+      equals: function(left, right) {
+        var reWhitespace = /\S/;
+        if (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right)) {
+          return true;
+        } else {
+          return left === right;
+        }
+      },
+      join: function(left, right) {
+        return left + right;
+      },
+      tokenize: function(value) {
+        return value;
+      }
+  };
+
+  var CharDiff = new Diff();
+
+  var WordDiff = new Diff(true);
+  var WordWithSpaceDiff = new Diff();
+  WordDiff.tokenize = WordWithSpaceDiff.tokenize = function(value) {
+    return removeEmpty(value.split(/(\s+|\b)/));
+  };
+
+  var CssDiff = new Diff(true);
+  CssDiff.tokenize = function(value) {
+    return removeEmpty(value.split(/([{}:;,]|\s+)/));
+  };
+
+  var LineDiff = new Diff();
+  LineDiff.tokenize = function(value) {
+    return value.split(/^/m);
+  };
+
+  return {
+    Diff: Diff,
+
+    diffChars: function(oldStr, newStr) { return CharDiff.diff(oldStr, newStr); },
+    diffWords: function(oldStr, newStr) { return WordDiff.diff(oldStr, newStr); },
+    diffWordsWithSpace: function(oldStr, newStr) { return WordWithSpaceDiff.diff(oldStr, newStr); },
+    diffLines: function(oldStr, newStr) { return LineDiff.diff(oldStr, newStr); },
+
+    diffCss: function(oldStr, newStr) { return CssDiff.diff(oldStr, newStr); },
+
+    createPatch: function(fileName, oldStr, newStr, oldHeader, newHeader) {
+      var ret = [];
+
+      ret.push('Index: ' + fileName);
+      ret.push('===================================================================');
+      ret.push('--- ' + fileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
+      ret.push('+++ ' + fileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
+
+      var diff = LineDiff.diff(oldStr, newStr);
+      if (!diff[diff.length-1].value) {
+        diff.pop();   // Remove trailing newline add
+      }
+      diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier
+
+      function contextLines(lines) {
+        return lines.map(function(entry) { return ' ' + entry; });
+      }
+      function eofNL(curRange, i, current) {
+        var last = diff[diff.length-2],
+            isLast = i === diff.length-2,
+            isLastOfType = i === diff.length-3 && (current.added !== last.added || current.removed !== last.removed);
+
+        // Figure out if this is the last line for the given file and missing NL
+        if (!/\n$/.test(current.value) && (isLast || isLastOfType)) {
+          curRange.push('\\ No newline at end of file');
+        }
+      }
+
+      var oldRangeStart = 0, newRangeStart = 0, curRange = [],
+          oldLine = 1, newLine = 1;
+      for (var i = 0; i < diff.length; i++) {
+        var current = diff[i],
+            lines = current.lines || current.value.replace(/\n$/, '').split('\n');
+        current.lines = lines;
+
+        if (current.added || current.removed) {
+          if (!oldRangeStart) {
+            var prev = diff[i-1];
+            oldRangeStart = oldLine;
+            newRangeStart = newLine;
+
+            if (prev) {
+              curRange = contextLines(prev.lines.slice(-4));
+              oldRangeStart -= curRange.length;
+              newRangeStart -= curRange.length;
+            }
+          }
+          curRange.push.apply(curRange, lines.map(function(entry) { return (current.added?'+':'-') + entry; }));
+          eofNL(curRange, i, current);
+
+          if (current.added) {
+            newLine += lines.length;
+          } else {
+            oldLine += lines.length;
+          }
+        } else {
+          if (oldRangeStart) {
+            // Close out any changes that have been output (or join overlapping)
+            if (lines.length <= 8 && i < diff.length-2) {
+              // Overlapping
+              curRange.push.apply(curRange, contextLines(lines));
+            } else {
+              // end the range and output
+              var contextSize = Math.min(lines.length, 4);
+              ret.push(
+                  '@@ -' + oldRangeStart + ',' + (oldLine-oldRangeStart+contextSize)
+                  + ' +' + newRangeStart + ',' + (newLine-newRangeStart+contextSize)
+                  + ' @@');
+              ret.push.apply(ret, curRange);
+              ret.push.apply(ret, contextLines(lines.slice(0, contextSize)));
+              if (lines.length <= 4) {
+                eofNL(ret, i, current);
+              }
+
+              oldRangeStart = 0;  newRangeStart = 0; curRange = [];
+            }
+          }
+          oldLine += lines.length;
+          newLine += lines.length;
+        }
+      }
+
+      return ret.join('\n') + '\n';
+    },
+
+    applyPatch: function(oldStr, uniDiff) {
+      var diffstr = uniDiff.split('\n');
+      var diff = [];
+      var remEOFNL = false,
+          addEOFNL = false;
+
+      for (var i = (diffstr[0][0]==='I'?4:0); i < diffstr.length; i++) {
+        if(diffstr[i][0] === '@') {
+          var meh = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+          diff.unshift({
+            start:meh[3],
+            oldlength:meh[2],
+            oldlines:[],
+            newlength:meh[4],
+            newlines:[]
+          });
+        } else if(diffstr[i][0] === '+') {
+          diff[0].newlines.push(diffstr[i].substr(1));
+        } else if(diffstr[i][0] === '-') {
+          diff[0].oldlines.push(diffstr[i].substr(1));
+        } else if(diffstr[i][0] === ' ') {
+          diff[0].newlines.push(diffstr[i].substr(1));
+          diff[0].oldlines.push(diffstr[i].substr(1));
+        } else if(diffstr[i][0] === '\\') {
+          if (diffstr[i-1][0] === '+') {
+            remEOFNL = true;
+          } else if(diffstr[i-1][0] === '-') {
+            addEOFNL = true;
+          }
+        }
+      }
+
+      var str = oldStr.split('\n');
+      for (var i = diff.length - 1; i >= 0; i--) {
+        var d = diff[i];
+        for (var j = 0; j < d.oldlength; j++) {
+          if(str[d.start-1+j] !== d.oldlines[j]) {
+            return false;
+          }
+        }
+        Array.prototype.splice.apply(str,[d.start-1,+d.oldlength].concat(d.newlines));
+      }
+
+      if (remEOFNL) {
+        while (!str[str.length-1]) {
+          str.pop();
+        }
+      } else if (addEOFNL) {
+        str.push('');
+      }
+      return str.join('\n');
+    },
+
+    convertChangesToXML: function(changes){
+      var ret = [];
+      for ( var i = 0; i < changes.length; i++) {
+        var change = changes[i];
+        if (change.added) {
+          ret.push('<ins>');
+        } else if (change.removed) {
+          ret.push('<del>');
+        }
+
+        ret.push(escapeHTML(change.value));
+
+        if (change.added) {
+          ret.push('</ins>');
+        } else if (change.removed) {
+          ret.push('</del>');
+        }
+      }
+      return ret.join('');
+    },
+
+    // See: http://code.google.com/p/google-diff-match-patch/wiki/API
+    convertChangesToDMP: function(changes){
+      var ret = [], change;
+      for ( var i = 0; i < changes.length; i++) {
+        change = changes[i];
+        ret.push([(change.added ? 1 : change.removed ? -1 : 0), change.value]);
+      }
+      return ret;
+    }
+  };
+})();
+
+if (typeof module !== 'undefined') {
+    module.exports = JsDiff;
+}
+
+}); // module: browser/diff.js
+
+require.register("browser/events.js", function(module, exports, require){
+
+/**
+ * Module exports.
+ */
+
+exports.EventEmitter = EventEmitter;
+
+/**
+ * Check if `obj` is an array.
+ */
+
+function isArray(obj) {
+  return '[object Array]' == {}.toString.call(obj);
+}
+
+/**
+ * Event emitter constructor.
+ *
+ * @api public
+ */
+
+function EventEmitter(){};
+
+/**
+ * Adds a listener.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.on = function (name, fn) {
+  if (!this.$events) {
+    this.$events = {};
+  }
+
+  if (!this.$events[name]) {
+    this.$events[name] = fn;
+  } else if (isArray(this.$events[name])) {
+    this.$events[name].push(fn);
+  } else {
+    this.$events[name] = [this.$events[name], fn];
+  }
+
+  return this;
+};
+
+EventEmitter.prototype.addListener = EventEmitter.prototype.on;
+
+/**
+ * Adds a volatile listener.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.once = function (name, fn) {
+  var self = this;
+
+  function on () {
+    self.removeListener(name, on);
+    fn.apply(this, arguments);
+  };
+
+  on.listener = fn;
+  this.on(name, on);
+
+  return this;
+};
+
+/**
+ * Removes a listener.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.removeListener = function (name, fn) {
+  if (this.$events && this.$events[name]) {
+    var list = this.$events[name];
+
+    if (isArray(list)) {
+      var pos = -1;
+
+      for (var i = 0, l = list.length; i < l; i++) {
+        if (list[i] === fn || (list[i].listener && list[i].listener === fn)) {
+          pos = i;
+          break;
+        }
+      }
+
+      if (pos < 0) {
+        return this;
+      }
+
+      list.splice(pos, 1);
+
+      if (!list.length) {
+        delete this.$events[name];
+      }
+    } else if (list === fn || (list.listener && list.listener === fn)) {
+      delete this.$events[name];
+    }
+  }
+
+  return this;
+};
+
+/**
+ * Removes all listeners for an event.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.removeAllListeners = function (name) {
+  if (name === undefined) {
+    this.$events = {};
+    return this;
+  }
+
+  if (this.$events && this.$events[name]) {
+    this.$events[name] = null;
+  }
+
+  return this;
+};
+
+/**
+ * Gets all listeners for a certain event.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.listeners = function (name) {
+  if (!this.$events) {
+    this.$events = {};
+  }
+
+  if (!this.$events[name]) {
+    this.$events[name] = [];
+  }
+
+  if (!isArray(this.$events[name])) {
+    this.$events[name] = [this.$events[name]];
+  }
+
+  return this.$events[name];
+};
+
+/**
+ * Emits an event.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.emit = function (name) {
+  if (!this.$events) {
+    return false;
+  }
+
+  var handler = this.$events[name];
+
+  if (!handler) {
+    return false;
+  }
+
+  var args = [].slice.call(arguments, 1);
+
+  if ('function' == typeof handler) {
+    handler.apply(this, args);
+  } else if (isArray(handler)) {
+    var listeners = handler.slice();
+
+    for (var i = 0, l = listeners.length; i < l; i++) {
+      listeners[i].apply(this, args);
+    }
+  } else {
+    return false;
+  }
+
+  return true;
+};
+}); // module: browser/events.js
+
+require.register("browser/fs.js", function(module, exports, require){
+
+}); // module: browser/fs.js
+
+require.register("browser/path.js", function(module, exports, require){
+
+}); // module: browser/path.js
+
+require.register("browser/progress.js", function(module, exports, require){
+/**
+ * Expose `Progress`.
+ */
+
+module.exports = Progress;
+
+/**
+ * Initialize a new `Progress` indicator.
+ */
+
+function Progress() {
+  this.percent = 0;
+  this.size(0);
+  this.fontSize(11);
+  this.font('helvetica, arial, sans-serif');
+}
+
+/**
+ * Set progress size to `n`.
+ *
+ * @param {Number} n
+ * @return {Progress} for chaining
+ * @api public
+ */
+
+Progress.prototype.size = function(n){
+  this._size = n;
+  return this;
+};
+
+/**
+ * Set text to `str`.
+ *
+ * @param {String} str
+ * @return {Progress} for chaining
+ * @api public
+ */
+
+Progress.prototype.text = function(str){
+  this._text = str;
+  return this;
+};
+
+/**
+ * Set font size to `n`.
+ *
+ * @param {Number} n
+ * @return {Progress} for chaining
+ * @api public
+ */
+
+Progress.prototype.fontSize = function(n){
+  this._fontSize = n;
+  return this;
+};
+
+/**
+ * Set font `family`.
+ *
+ * @param {String} family
+ * @return {Progress} for chaining
+ */
+
+Progress.prototype.font = function(family){
+  this._font = family;
+  return this;
+};
+
+/**
+ * Update percentage to `n`.
+ *
+ * @param {Number} n
+ * @return {Progress} for chaining
+ */
+
+Progress.prototype.update = function(n){
+  this.percent = n;
+  return this;
+};
+
+/**
+ * Draw on `ctx`.
+ *
+ * @param {CanvasRenderingContext2d} ctx
+ * @return {Progress} for chaining
+ */
+
+Progress.prototype.draw = function(ctx){
+  try {
+    var percent = Math.min(this.percent, 100)
+      , size = this._size
+      , half = size / 2
+      , x = half
+      , y = half
+      , rad = half - 1
+      , fontSize = this._fontSize;
+  
+    ctx.font = fontSize + 'px ' + this._font;
+  
+    var angle = Math.PI * 2 * (percent / 100);
+    ctx.clearRect(0, 0, size, size);
+  
+    // outer circle
+    ctx.strokeStyle = '#9f9f9f';
+    ctx.beginPath();
+    ctx.arc(x, y, rad, 0, angle, false);
+    ctx.stroke();
+  
+    // inner circle
+    ctx.strokeStyle = '#eee';
+    ctx.beginPath();
+    ctx.arc(x, y, rad - 1, 0, angle, true);
+    ctx.stroke();
+  
+    // text
+    var text = this._text || (percent | 0) + '%'
+      , w = ctx.measureText(text).width;
+  
+    ctx.fillText(
+        text
+      , x - w / 2 + 1
+      , y + fontSize / 2 - 1);
+  } catch (ex) {} //don't fail if we can't render progress
+  return this;
+};
+
+}); // module: browser/progress.js
+
+require.register("browser/tty.js", function(module, exports, require){
+
+exports.isatty = function(){
+  return true;
+};
+
+exports.getWindowSize = function(){
+  if ('innerHeight' in global) {
+    return [global.innerHeight, global.innerWidth];
+  } else {
+    // In a Web Worker, the DOM Window is not available.
+    return [640, 480];
+  }
+};
+
+}); // module: browser/tty.js
+
+require.register("context.js", function(module, exports, require){
+
+/**
+ * Expose `Context`.
+ */
+
+module.exports = Context;
+
+/**
+ * Initialize a new `Context`.
+ *
+ * @api private
+ */
+
+function Context(){}
+
+/**
+ * Set or get the context `Runnable` to `runnable`.
+ *
+ * @param {Runnable} runnable
+ * @return {Context}
+ * @api private
+ */
+
+Context.prototype.runnable = function(runnable){
+  if (0 == arguments.length) return this._runnable;
+  this.test = this._runnable = runnable;
+  return this;
+};
+
+/**
+ * Set test timeout `ms`.
+ *
+ * @param {Number} ms
+ * @return {Context} self
+ * @api private
+ */
+
+Context.prototype.timeout = function(ms){
+  this.runnable().timeout(ms);
+  return this;
+};
+
+/**
+ * Set test slowness threshold `ms`.
+ *
+ * @param {Number} ms
+ * @return {Context} self
+ * @api private
+ */
+
+Context.prototype.slow = function(ms){
+  this.runnable().slow(ms);
+  return this;
+};
+
+/**
+ * Inspect the context void of `._runnable`.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Context.prototype.inspect = function(){
+  return JSON.stringify(this, function(key, val){
+    if ('_runnable' == key) return;
+    if ('test' == key) return;
+    return val;
+  }, 2);
+};
+
+}); // module: context.js
+
+require.register("hook.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Runnable = require('./runnable');
+
+/**
+ * Expose `Hook`.
+ */
+
+module.exports = Hook;
+
+/**
+ * Initialize a new `Hook` with the given `title` and callback `fn`.
+ *
+ * @param {String} title
+ * @param {Function} fn
+ * @api private
+ */
+
+function Hook(title, fn) {
+  Runnable.call(this, title, fn);
+  this.type = 'hook';
+}
+
+/**
+ * Inherit from `Runnable.prototype`.
+ */
+
+function F(){};
+F.prototype = Runnable.prototype;
+Hook.prototype = new F;
+Hook.prototype.constructor = Hook;
+
+
+/**
+ * Get or set the test `err`.
+ *
+ * @param {Error} err
+ * @return {Error}
+ * @api public
+ */
+
+Hook.prototype.error = function(err){
+  if (0 == arguments.length) {
+    var err = this._error;
+    this._error = null;
+    return err;
+  }
+
+  this._error = err;
+};
+
+}); // module: hook.js
+
+require.register("interfaces/bdd.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test')
+  , utils = require('../utils');
+
+/**
+ * BDD-style interface:
+ *
+ *      describe('Array', function(){
+ *        describe('#indexOf()', function(){
+ *          it('should return -1 when not present', function(){
+ *
+ *          });
+ *
+ *          it('should return the index when present', function(){
+ *
+ *          });
+ *        });
+ *      });
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('pre-require', function(context, file, mocha){
+
+    /**
+     * Execute before running tests.
+     */
+
+    context.before = function(fn){
+      suites[0].beforeAll(fn);
+    };
+
+    /**
+     * Execute after running tests.
+     */
+
+    context.after = function(fn){
+      suites[0].afterAll(fn);
+    };
+
+    /**
+     * Execute before each test case.
+     */
+
+    context.beforeEach = function(fn){
+      suites[0].beforeEach(fn);
+    };
+
+    /**
+     * Execute after each test case.
+     */
+
+    context.afterEach = function(fn){
+      suites[0].afterEach(fn);
+    };
+
+    /**
+     * Describe a "suite" with the given `title`
+     * and callback `fn` containing nested suites
+     * and/or tests.
+     */
+
+    context.describe = context.context = function(title, fn){
+      var suite = Suite.create(suites[0], title);
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+      return suite;
+    };
+
+    /**
+     * Pending describe.
+     */
+
+    context.xdescribe =
+    context.xcontext =
+    context.describe.skip = function(title, fn){
+      var suite = Suite.create(suites[0], title);
+      suite.pending = true;
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+    };
+
+    /**
+     * Exclusive suite.
+     */
+
+    context.describe.only = function(title, fn){
+      var suite = context.describe(title, fn);
+      mocha.grep(suite.fullTitle());
+      return suite;
+    };
+
+    /**
+     * Describe a specification or test-case
+     * with the given `title` and callback `fn`
+     * acting as a thunk.
+     */
+
+    context.it = context.specify = function(title, fn){
+      var suite = suites[0];
+      if (suite.pending) var fn = null;
+      var test = new Test(title, fn);
+      suite.addTest(test);
+      return test;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.it.only = function(title, fn){
+      var test = context.it(title, fn);
+      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      mocha.grep(new RegExp(reString));
+      return test;
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.xit =
+    context.xspecify =
+    context.it.skip = function(title){
+      context.it(title);
+    };
+  });
+};
+
+}); // module: interfaces/bdd.js
+
+require.register("interfaces/exports.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test');
+
+/**
+ * TDD-style interface:
+ *
+ *     exports.Array = {
+ *       '#indexOf()': {
+ *         'should return -1 when the value is not present': function(){
+ *
+ *         },
+ *
+ *         'should return the correct index when the value is present': function(){
+ *
+ *         }
+ *       }
+ *     };
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('require', visit);
+
+  function visit(obj) {
+    var suite;
+    for (var key in obj) {
+      if ('function' == typeof obj[key]) {
+        var fn = obj[key];
+        switch (key) {
+          case 'before':
+            suites[0].beforeAll(fn);
+            break;
+          case 'after':
+            suites[0].afterAll(fn);
+            break;
+          case 'beforeEach':
+            suites[0].beforeEach(fn);
+            break;
+          case 'afterEach':
+            suites[0].afterEach(fn);
+            break;
+          default:
+            suites[0].addTest(new Test(key, fn));
+        }
+      } else {
+        var suite = Suite.create(suites[0], key);
+        suites.unshift(suite);
+        visit(obj[key]);
+        suites.shift();
+      }
+    }
+  }
+};
+
+}); // module: interfaces/exports.js
+
+require.register("interfaces/index.js", function(module, exports, require){
+
+exports.bdd = require('./bdd');
+exports.tdd = require('./tdd');
+exports.qunit = require('./qunit');
+exports.exports = require('./exports');
+
+}); // module: interfaces/index.js
+
+require.register("interfaces/qunit.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test')
+  , utils = require('../utils');
+
+/**
+ * QUnit-style interface:
+ *
+ *     suite('Array');
+ *
+ *     test('#length', function(){
+ *       var arr = [1,2,3];
+ *       ok(arr.length == 3);
+ *     });
+ *
+ *     test('#indexOf()', function(){
+ *       var arr = [1,2,3];
+ *       ok(arr.indexOf(1) == 0);
+ *       ok(arr.indexOf(2) == 1);
+ *       ok(arr.indexOf(3) == 2);
+ *     });
+ *
+ *     suite('String');
+ *
+ *     test('#length', function(){
+ *       ok('foo'.length == 3);
+ *     });
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('pre-require', function(context, file, mocha){
+
+    /**
+     * Execute before running tests.
+     */
+
+    context.before = function(fn){
+      suites[0].beforeAll(fn);
+    };
+
+    /**
+     * Execute after running tests.
+     */
+
+    context.after = function(fn){
+      suites[0].afterAll(fn);
+    };
+
+    /**
+     * Execute before each test case.
+     */
+
+    context.beforeEach = function(fn){
+      suites[0].beforeEach(fn);
+    };
+
+    /**
+     * Execute after each test case.
+     */
+
+    context.afterEach = function(fn){
+      suites[0].afterEach(fn);
+    };
+
+    /**
+     * Describe a "suite" with the given `title`.
+     */
+
+    context.suite = function(title){
+      if (suites.length > 1) suites.shift();
+      var suite = Suite.create(suites[0], title);
+      suites.unshift(suite);
+      return suite;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.suite.only = function(title, fn){
+      var suite = context.suite(title, fn);
+      mocha.grep(suite.fullTitle());
+    };
+
+    /**
+     * Describe a specification or test-case
+     * with the given `title` and callback `fn`
+     * acting as a thunk.
+     */
+
+    context.test = function(title, fn){
+      var test = new Test(title, fn);
+      suites[0].addTest(test);
+      return test;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.test.only = function(title, fn){
+      var test = context.test(title, fn);
+      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      mocha.grep(new RegExp(reString));
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.test.skip = function(title){
+      context.test(title);
+    };
+  });
+};
+
+}); // module: interfaces/qunit.js
+
+require.register("interfaces/tdd.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test')
+  , utils = require('../utils');;
+
+/**
+ * TDD-style interface:
+ *
+ *      suite('Array', function(){
+ *        suite('#indexOf()', function(){
+ *          suiteSetup(function(){
+ *
+ *          });
+ *
+ *          test('should return -1 when not present', function(){
+ *
+ *          });
+ *
+ *          test('should return the index when present', function(){
+ *
+ *          });
+ *
+ *          suiteTeardown(function(){
+ *
+ *          });
+ *        });
+ *      });
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('pre-require', function(context, file, mocha){
+
+    /**
+     * Execute before each test case.
+     */
+
+    context.setup = function(fn){
+      suites[0].beforeEach(fn);
+    };
+
+    /**
+     * Execute after each test case.
+     */
+
+    context.teardown = function(fn){
+      suites[0].afterEach(fn);
+    };
+
+    /**
+     * Execute before the suite.
+     */
+
+    context.suiteSetup = function(fn){
+      suites[0].beforeAll(fn);
+    };
+
+    /**
+     * Execute after the suite.
+     */
+
+    context.suiteTeardown = function(fn){
+      suites[0].afterAll(fn);
+    };
+
+    /**
+     * Describe a "suite" with the given `title`
+     * and callback `fn` containing nested suites
+     * and/or tests.
+     */
+
+    context.suite = function(title, fn){
+      var suite = Suite.create(suites[0], title);
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+      return suite;
+    };
+
+    /**
+     * Pending suite.
+     */
+    context.suite.skip = function(title, fn) {
+      var suite = Suite.create(suites[0], title);
+      suite.pending = true;
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.suite.only = function(title, fn){
+      var suite = context.suite(title, fn);
+      mocha.grep(suite.fullTitle());
+    };
+
+    /**
+     * Describe a specification or test-case
+     * with the given `title` and callback `fn`
+     * acting as a thunk.
+     */
+
+    context.test = function(title, fn){
+      var suite = suites[0];
+      if (suite.pending) var fn = null;
+      var test = new Test(title, fn);
+      suite.addTest(test);
+      return test;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.test.only = function(title, fn){
+      var test = context.test(title, fn);
+      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      mocha.grep(new RegExp(reString));
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.test.skip = function(title){
+      context.test(title);
+    };
+  });
+};
+
+}); // module: interfaces/tdd.js
+
+require.register("mocha.js", function(module, exports, require){
+/*!
+ * mocha
+ * Copyright(c) 2011 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var path = require('browser/path')
+  , utils = require('./utils');
+
+/**
+ * Expose `Mocha`.
+ */
+
+exports = module.exports = Mocha;
+
+/**
+ * Expose internals.
+ */
+
+exports.utils = utils;
+exports.interfaces = require('./interfaces');
+exports.reporters = require('./reporters');
+exports.Runnable = require('./runnable');
+exports.Context = require('./context');
+exports.Runner = require('./runner');
+exports.Suite = require('./suite');
+exports.Hook = require('./hook');
+exports.Test = require('./test');
+
+/**
+ * Return image `name` path.
+ *
+ * @param {String} name
+ * @return {String}
+ * @api private
+ */
+
+function image(name) {
+  return __dirname + '/../images/' + name + '.png';
+}
+
+/**
+ * Setup mocha with `options`.
+ *
+ * Options:
+ *
+ *   - `ui` name "bdd", "tdd", "exports" etc
+ *   - `reporter` reporter instance, defaults to `mocha.reporters.Dot`
+ *   - `globals` array of accepted globals
+ *   - `timeout` timeout in milliseconds
+ *   - `bail` bail on the first test failure
+ *   - `slow` milliseconds to wait before considering a test slow
+ *   - `ignoreLeaks` ignore global leaks
+ *   - `grep` string or regexp to filter tests with
+ *
+ * @param {Object} options
+ * @api public
+ */
+
+function Mocha(options) {
+  options = options || {};
+  this.files = [];
+  this.options = options;
+  this.grep(options.grep);
+  this.suite = new exports.Suite('', new exports.Context);
+  this.ui(options.ui);
+  this.bail(options.bail);
+  this.reporter(options.reporter);
+  if (null != options.timeout) this.timeout(options.timeout);
+  this.useColors(options.useColors)
+  if (options.slow) this.slow(options.slow);
+
+  this.suite.on('pre-require', function (context) {
+    exports.afterEach = context.afterEach || context.teardown;
+    exports.after = context.after || context.suiteTeardown;
+    exports.beforeEach = context.beforeEach || context.setup;
+    exports.before = context.before || context.suiteSetup;
+    exports.describe = context.describe || context.suite;
+    exports.it = context.it || context.test;
+    exports.setup = context.setup || context.beforeEach;
+    exports.suiteSetup = context.suiteSetup || context.before;
+    exports.suiteTeardown = context.suiteTeardown || context.after;
+    exports.suite = context.suite || context.describe;
+    exports.teardown = context.teardown || context.afterEach;
+    exports.test = context.test || context.it;
+  });
+}
+
+/**
+ * Enable or disable bailing on the first failure.
+ *
+ * @param {Boolean} [bail]
+ * @api public
+ */
+
+Mocha.prototype.bail = function(bail){
+  if (0 == arguments.length) bail = true;
+  this.suite.bail(bail);
+  return this;
+};
+
+/**
+ * Add test `file`.
+ *
+ * @param {String} file
+ * @api public
+ */
+
+Mocha.prototype.addFile = function(file){
+  this.files.push(file);
+  return this;
+};
+
+/**
+ * Set reporter to `reporter`, defaults to "dot".
+ *
+ * @param {String|Function} reporter name or constructor
+ * @api public
+ */
+
+Mocha.prototype.reporter = function(reporter){
+  if ('function' == typeof reporter) {
+    this._reporter = reporter;
+  } else {
+    reporter = reporter || 'dot';
+    var _reporter;
+    try { _reporter = require('./reporters/' + reporter); } catch (err) {};
+    if (!_reporter) try { _reporter = require(reporter); } catch (err) {};
+    if (!_reporter && reporter === 'teamcity')
+      console.warn('The Teamcity reporter was moved to a package named ' +
+        'mocha-teamcity-reporter ' +
+        '(https://npmjs.org/package/mocha-teamcity-reporter).');
+    if (!_reporter) throw new Error('invalid reporter "' + reporter + '"');
+    this._reporter = _reporter;
+  }
+  return this;
+};
+
+/**
+ * Set test UI `name`, defaults to "bdd".
+ *
+ * @param {String} bdd
+ * @api public
+ */
+
+Mocha.prototype.ui = function(name){
+  name = name || 'bdd';
+  this._ui = exports.interfaces[name];
+  if (!this._ui) try { this._ui = require(name); } catch (err) {};
+  if (!this._ui) throw new Error('invalid interface "' + name + '"');
+  this._ui = this._ui(this.suite);
+  return this;
+};
+
+/**
+ * Load registered files.
+ *
+ * @api private
+ */
+
+Mocha.prototype.loadFiles = function(fn){
+  var self = this;
+  var suite = this.suite;
+  var pending = this.files.length;
+  this.files.forEach(function(file){
+    file = path.resolve(file);
+    suite.emit('pre-require', global, file, self);
+    suite.emit('require', require(file), file, self);
+    suite.emit('post-require', global, file, self);
+    --pending || (fn && fn());
+  });
+};
+
+/**
+ * Enable growl support.
+ *
+ * @api private
+ */
+
+Mocha.prototype._growl = function(runner, reporter) {
+  var notify = require('growl');
+
+  runner.on('end', function(){
+    var stats = reporter.stats;
+    if (stats.failures) {
+      var msg = stats.failures + ' of ' + runner.total + ' tests failed';
+      notify(msg, { name: 'mocha', title: 'Failed', image: image('error') });
+    } else {
+      notify(stats.passes + ' tests passed in ' + stats.duration + 'ms', {
+          name: 'mocha'
+        , title: 'Passed'
+        , image: image('ok')
+      });
+    }
+  });
+};
+
+/**
+ * Add regexp to grep, if `re` is a string it is escaped.
+ *
+ * @param {RegExp|String} re
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.grep = function(re){
+  this.options.grep = 'string' == typeof re
+    ? new RegExp(utils.escapeRegexp(re))
+    : re;
+  return this;
+};
+
+/**
+ * Invert `.grep()` matches.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.invert = function(){
+  this.options.invert = true;
+  return this;
+};
+
+/**
+ * Ignore global leaks.
+ *
+ * @param {Boolean} ignore
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.ignoreLeaks = function(ignore){
+  this.options.ignoreLeaks = !!ignore;
+  return this;
+};
+
+/**
+ * Enable global leak checking.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.checkLeaks = function(){
+  this.options.ignoreLeaks = false;
+  return this;
+};
+
+/**
+ * Enable growl support.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.growl = function(){
+  this.options.growl = true;
+  return this;
+};
+
+/**
+ * Ignore `globals` array or string.
+ *
+ * @param {Array|String} globals
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.globals = function(globals){
+  this.options.globals = (this.options.globals || []).concat(globals);
+  return this;
+};
+
+/**
+ * Emit color output.
+ *
+ * @param {Boolean} colors
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.useColors = function(colors){
+  this.options.useColors = arguments.length && colors != undefined
+    ? colors
+    : true;
+  return this;
+};
+
+/**
+ * Use inline diffs rather than +/-.
+ *
+ * @param {Boolean} inlineDiffs
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.useInlineDiffs = function(inlineDiffs) {
+  this.options.useInlineDiffs = arguments.length && inlineDiffs != undefined
+  ? inlineDiffs
+  : false;
+  return this;
+};
+
+/**
+ * Set the timeout in milliseconds.
+ *
+ * @param {Number} timeout
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.timeout = function(timeout){
+  this.suite.timeout(timeout);
+  return this;
+};
+
+/**
+ * Set slowness threshold in milliseconds.
+ *
+ * @param {Number} slow
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.slow = function(slow){
+  this.suite.slow(slow);
+  return this;
+};
+
+/**
+ * Makes all tests async (accepting a callback)
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.asyncOnly = function(){
+  this.options.asyncOnly = true;
+  return this;
+};
+
+/**
+ * Run tests and invoke `fn()` when complete.
+ *
+ * @param {Function} fn
+ * @return {Runner}
+ * @api public
+ */
+
+Mocha.prototype.run = function(fn){
+  if (this.files.length) this.loadFiles();
+  var suite = this.suite;
+  var options = this.options;
+  var runner = new exports.Runner(suite);
+  var reporter = new this._reporter(runner);
+  runner.ignoreLeaks = false !== options.ignoreLeaks;
+  runner.asyncOnly = options.asyncOnly;
+  if (options.grep) runner.grep(options.grep, options.invert);
+  if (options.globals) runner.globals(options.globals);
+  if (options.growl) this._growl(runner, reporter);
+  exports.reporters.Base.useColors = options.useColors;
+  exports.reporters.Base.inlineDiffs = options.useInlineDiffs;
+  return runner.run(fn);
+};
+
+}); // module: mocha.js
+
+require.register("ms.js", function(module, exports, require){
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} options
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options){
+  options = options || {};
+  if ('string' == typeof val) return parse(val);
+  return options.long ? longFormat(val) : shortFormat(val);
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  var match = /^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)?$/i.exec(str);
+  if (!match) return;
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 's':
+      return n * s;
+    case 'ms':
+      return n;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function shortFormat(ms) {
+  if (ms >= d) return Math.round(ms / d) + 'd';
+  if (ms >= h) return Math.round(ms / h) + 'h';
+  if (ms >= m) return Math.round(ms / m) + 'm';
+  if (ms >= s) return Math.round(ms / s) + 's';
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function longFormat(ms) {
+  return plural(ms, d, 'day')
+    || plural(ms, h, 'hour')
+    || plural(ms, m, 'minute')
+    || plural(ms, s, 'second')
+    || ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) return;
+  if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
+
+}); // module: ms.js
+
+require.register("reporters/base.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var tty = require('browser/tty')
+  , diff = require('browser/diff')
+  , ms = require('../ms')
+  , utils = require('../utils');
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Check if both stdio streams are associated with a tty.
+ */
+
+var isatty = tty.isatty(1) && tty.isatty(2);
+
+/**
+ * Expose `Base`.
+ */
+
+exports = module.exports = Base;
+
+/**
+ * Enable coloring by default.
+ */
+
+exports.useColors = isatty || (process.env.MOCHA_COLORS !== undefined);
+
+/**
+ * Inline diffs instead of +/-
+ */
+
+exports.inlineDiffs = false;
+
+/**
+ * Default color map.
+ */
+
+exports.colors = {
+    'pass': 90
+  , 'fail': 31
+  , 'bright pass': 92
+  , 'bright fail': 91
+  , 'bright yellow': 93
+  , 'pending': 36
+  , 'suite': 0
+  , 'error title': 0
+  , 'error message': 31
+  , 'error stack': 90
+  , 'checkmark': 32
+  , 'fast': 90
+  , 'medium': 33
+  , 'slow': 31
+  , 'green': 32
+  , 'light': 90
+  , 'diff gutter': 90
+  , 'diff added': 42
+  , 'diff removed': 41
+};
+
+/**
+ * Default symbol map.
+ */
+
+exports.symbols = {
+  ok: '✓',
+  err: '✖',
+  dot: '․'
+};
+
+// With node.js on Windows: use symbols available in terminal default fonts
+if ('win32' == process.platform) {
+  exports.symbols.ok = '\u221A';
+  exports.symbols.err = '\u00D7';
+  exports.symbols.dot = '.';
+}
+
+/**
+ * Color `str` with the given `type`,
+ * allowing colors to be disabled,
+ * as well as user-defined color
+ * schemes.
+ *
+ * @param {String} type
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+var color = exports.color = function(type, str) {
+  if (!exports.useColors) return str;
+  return '\u001b[' + exports.colors[type] + 'm' + str + '\u001b[0m';
+};
+
+/**
+ * Expose term window size, with some
+ * defaults for when stderr is not a tty.
+ */
+
+exports.window = {
+  width: isatty
+    ? process.stdout.getWindowSize
+      ? process.stdout.getWindowSize(1)[0]
+      : tty.getWindowSize()[1]
+    : 75
+};
+
+/**
+ * Expose some basic cursor interactions
+ * that are common among reporters.
+ */
+
+exports.cursor = {
+  hide: function(){
+    isatty && process.stdout.write('\u001b[?25l');
+  },
+
+  show: function(){
+    isatty && process.stdout.write('\u001b[?25h');
+  },
+
+  deleteLine: function(){
+    isatty && process.stdout.write('\u001b[2K');
+  },
+
+  beginningOfLine: function(){
+    isatty && process.stdout.write('\u001b[0G');
+  },
+
+  CR: function(){
+    if (isatty) {
+      exports.cursor.deleteLine();
+      exports.cursor.beginningOfLine();
+    } else {
+      process.stdout.write('\r');
+    }
+  }
+};
+
+/**
+ * Outut the given `failures` as a list.
+ *
+ * @param {Array} failures
+ * @api public
+ */
+
+exports.list = function(failures){
+  console.error();
+  failures.forEach(function(test, i){
+    // format
+    var fmt = color('error title', '  %s) %s:\n')
+      + color('error message', '     %s')
+      + color('error stack', '\n%s\n');
+
+    // msg
+    var err = test.err
+      , message = err.message || ''
+      , stack = err.stack || message
+      , index = stack.indexOf(message) + message.length
+      , msg = stack.slice(0, index)
+      , actual = err.actual
+      , expected = err.expected
+      , escape = true;
+
+    // uncaught
+    if (err.uncaught) {
+      msg = 'Uncaught ' + msg;
+    }
+
+    // explicitly show diff
+    if (err.showDiff && sameType(actual, expected)) {
+      escape = false;
+      err.actual = actual = stringify(canonicalize(actual));
+      err.expected = expected = stringify(canonicalize(expected));
+    }
+
+    // actual / expected diff
+    if ('string' == typeof actual && 'string' == typeof expected) {
+      fmt = color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
+      var match = message.match(/^([^:]+): expected/);
+      msg = '\n      ' + color('error message', match ? match[1] : msg);
+
+      if (exports.inlineDiffs) {
+        msg += inlineDiff(err, escape);
+      } else {
+        msg += unifiedDiff(err, escape);
+      }
+    }
+
+    // indent stack trace without msg
+    stack = stack.slice(index ? index + 1 : index)
+      .replace(/^/gm, '  ');
+
+    console.error(fmt, (i + 1), test.fullTitle(), msg, stack);
+  });
+};
+
+/**
+ * Initialize a new `Base` reporter.
+ *
+ * All other reporters generally
+ * inherit from this reporter, providing
+ * stats such as test duration, number
+ * of tests passed / failed etc.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Base(runner) {
+  var self = this
+    , stats = this.stats = { suites: 0, tests: 0, passes: 0, pending: 0, failures: 0 }
+    , failures = this.failures = [];
+
+  if (!runner) return;
+  this.runner = runner;
+
+  runner.stats = stats;
+
+  runner.on('start', function(){
+    stats.start = new Date;
+  });
+
+  runner.on('suite', function(suite){
+    stats.suites = stats.suites || 0;
+    suite.root || stats.suites++;
+  });
+
+  runner.on('test end', function(test){
+    stats.tests = stats.tests || 0;
+    stats.tests++;
+  });
+
+  runner.on('pass', function(test){
+    stats.passes = stats.passes || 0;
+
+    var medium = test.slow() / 2;
+    test.speed = test.duration > test.slow()
+      ? 'slow'
+      : test.duration > medium
+        ? 'medium'
+        : 'fast';
+
+    stats.passes++;
+  });
+
+  runner.on('fail', function(test, err){
+    stats.failures = stats.failures || 0;
+    stats.failures++;
+    test.err = err;
+    failures.push(test);
+  });
+
+  runner.on('end', function(){
+    stats.end = new Date;
+    stats.duration = new Date - stats.start;
+  });
+
+  runner.on('pending', function(){
+    stats.pending++;
+  });
+}
+
+/**
+ * Output common epilogue used by many of
+ * the bundled reporters.
+ *
+ * @api public
+ */
+
+Base.prototype.epilogue = function(){
+  var stats = this.stats;
+  var tests;
+  var fmt;
+
+  console.log();
+
+  // passes
+  fmt = color('bright pass', ' ')
+    + color('green', ' %d passing')
+    + color('light', ' (%s)');
+
+  console.log(fmt,
+    stats.passes || 0,
+    ms(stats.duration));
+
+  // pending
+  if (stats.pending) {
+    fmt = color('pending', ' ')
+      + color('pending', ' %d pending');
+
+    console.log(fmt, stats.pending);
+  }
+
+  // failures
+  if (stats.failures) {
+    fmt = color('fail', '  %d failing');
+
+    console.error(fmt,
+      stats.failures);
+
+    Base.list(this.failures);
+    console.error();
+  }
+
+  console.log();
+};
+
+/**
+ * Pad the given `str` to `len`.
+ *
+ * @param {String} str
+ * @param {String} len
+ * @return {String}
+ * @api private
+ */
+
+function pad(str, len) {
+  str = String(str);
+  return Array(len - str.length + 1).join(' ') + str;
+}
+
+
+/**
+ * Returns an inline diff between 2 strings with coloured ANSI output
+ *
+ * @param {Error} Error with actual/expected
+ * @return {String} Diff
+ * @api private
+ */
+
+function inlineDiff(err, escape) {
+  var msg = errorDiff(err, 'WordsWithSpace', escape);
+
+  // linenos
+  var lines = msg.split('\n');
+  if (lines.length > 4) {
+    var width = String(lines.length).length;
+    msg = lines.map(function(str, i){
+      return pad(++i, width) + ' |' + ' ' + str;
+    }).join('\n');
+  }
+
+  // legend
+  msg = '\n'
+    + color('diff removed', 'actual')
+    + ' '
+    + color('diff added', 'expected')
+    + '\n\n'
+    + msg
+    + '\n';
+
+  // indent
+  msg = msg.replace(/^/gm, '      ');
+  return msg;
+}
+
+/**
+ * Returns a unified diff between 2 strings
+ *
+ * @param {Error} Error with actual/expected
+ * @return {String} Diff
+ * @api private
+ */
+
+function unifiedDiff(err, escape) {
+  var indent = '      ';
+  function cleanUp(line) {
+    if (escape) {
+      line = escapeInvisibles(line);
+    }
+    if (line[0] === '+') return indent + colorLines('diff added', line);
+    if (line[0] === '-') return indent + colorLines('diff removed', line);
+    if (line.match(/\@\@/)) return null;
+    if (line.match(/\\ No newline/)) return null;
+    else return indent + line;
+  }
+  function notBlank(line) {
+    return line != null;
+  }
+  msg = diff.createPatch('string', err.actual, err.expected);
+  var lines = msg.split('\n').splice(4);
+  return '\n      '
+         + colorLines('diff added',   '+ expected') + ' '
+         + colorLines('diff removed', '- actual')
+         + '\n\n'
+         + lines.map(cleanUp).filter(notBlank).join('\n');
+}
+
+/**
+ * Return a character diff for `err`.
+ *
+ * @param {Error} err
+ * @return {String}
+ * @api private
+ */
+
+function errorDiff(err, type, escape) {
+  var actual   = escape ? escapeInvisibles(err.actual)   : err.actual;
+  var expected = escape ? escapeInvisibles(err.expected) : err.expected;
+  return diff['diff' + type](actual, expected).map(function(str){
+    if (str.added) return colorLines('diff added', str.value);
+    if (str.removed) return colorLines('diff removed', str.value);
+    return str.value;
+  }).join('');
+}
+
+/**
+ * Returns a string with all invisible characters in plain text
+ *
+ * @param {String} line
+ * @return {String}
+ * @api private
+ */
+function escapeInvisibles(line) {
+    return line.replace(/\t/g, '<tab>')
+               .replace(/\r/g, '<CR>')
+               .replace(/\n/g, '<LF>\n');
+}
+
+/**
+ * Color lines for `str`, using the color `name`.
+ *
+ * @param {String} name
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+function colorLines(name, str) {
+  return str.split('\n').map(function(str){
+    return color(name, str);
+  }).join('\n');
+}
+
+/**
+ * Stringify `obj`.
+ *
+ * @param {Object} obj
+ * @return {String}
+ * @api private
+ */
+
+function stringify(obj) {
+  if (obj instanceof RegExp) return obj.toString();
+  return JSON.stringify(obj, null, 2);
+}
+
+/**
+ * Return a new object that has the keys in sorted order.
+ * @param {Object} obj
+ * @return {Object}
+ * @api private
+ */
+
+ function canonicalize(obj, stack) {
+   stack = stack || [];
+
+   if (utils.indexOf(stack, obj) !== -1) return obj;
+
+   var canonicalizedObj;
+
+   if ('[object Array]' == {}.toString.call(obj)) {
+     stack.push(obj);
+     canonicalizedObj = utils.map(obj, function(item) {
+       return canonicalize(item, stack);
+     });
+     stack.pop();
+   } else if (typeof obj === 'object' && obj !== null) {
+     stack.push(obj);
+     canonicalizedObj = {};
+     utils.forEach(utils.keys(obj).sort(), function(key) {
+       canonicalizedObj[key] = canonicalize(obj[key], stack);
+     });
+     stack.pop();
+   } else {
+     canonicalizedObj = obj;
+   }
+
+   return canonicalizedObj;
+ }
+
+/**
+ * Check that a / b have the same type.
+ *
+ * @param {Object} a
+ * @param {Object} b
+ * @return {Boolean}
+ * @api private
+ */
+
+function sameType(a, b) {
+  a = Object.prototype.toString.call(a);
+  b = Object.prototype.toString.call(b);
+  return a == b;
+}
+
+
+}); // module: reporters/base.js
+
+require.register("reporters/doc.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils');
+
+/**
+ * Expose `Doc`.
+ */
+
+exports = module.exports = Doc;
+
+/**
+ * Initialize a new `Doc` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Doc(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , total = runner.total
+    , indents = 2;
+
+  function indent() {
+    return Array(indents).join('  ');
+  }
+
+  runner.on('suite', function(suite){
+    if (suite.root) return;
+    ++indents;
+    console.log('%s<section class="suite">', indent());
+    ++indents;
+    console.log('%s<h1>%s</h1>', indent(), utils.escape(suite.title));
+    console.log('%s<dl>', indent());
+  });
+
+  runner.on('suite end', function(suite){
+    if (suite.root) return;
+    console.log('%s</dl>', indent());
+    --indents;
+    console.log('%s</section>', indent());
+    --indents;
+  });
+
+  runner.on('pass', function(test){
+    console.log('%s  <dt>%s</dt>', indent(), utils.escape(test.title));
+    var code = utils.escape(utils.clean(test.fn.toString()));
+    console.log('%s  <dd><pre><code>%s</code></pre></dd>', indent(), code);
+  });
+}
+
+}); // module: reporters/doc.js
+
+require.register("reporters/dot.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , color = Base.color;
+
+/**
+ * Expose `Dot`.
+ */
+
+exports = module.exports = Dot;
+
+/**
+ * Initialize a new `Dot` matrix test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Dot(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , width = Base.window.width * .75 | 0
+    , n = 0;
+
+  runner.on('start', function(){
+    process.stdout.write('\n  ');
+  });
+
+  runner.on('pending', function(test){
+    process.stdout.write(color('pending', Base.symbols.dot));
+  });
+
+  runner.on('pass', function(test){
+    if (++n % width == 0) process.stdout.write('\n  ');
+    if ('slow' == test.speed) {
+      process.stdout.write(color('bright yellow', Base.symbols.dot));
+    } else {
+      process.stdout.write(color(test.speed, Base.symbols.dot));
+    }
+  });
+
+  runner.on('fail', function(test, err){
+    if (++n % width == 0) process.stdout.write('\n  ');
+    process.stdout.write(color('fail', Base.symbols.dot));
+  });
+
+  runner.on('end', function(){
+    console.log();
+    self.epilogue();
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Dot.prototype = new F;
+Dot.prototype.constructor = Dot;
+
+}); // module: reporters/dot.js
+
+require.register("reporters/html-cov.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var JSONCov = require('./json-cov')
+  , fs = require('browser/fs');
+
+/**
+ * Expose `HTMLCov`.
+ */
+
+exports = module.exports = HTMLCov;
+
+/**
+ * Initialize a new `JsCoverage` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function HTMLCov(runner) {
+  var jade = require('jade')
+    , file = __dirname + '/templates/coverage.jade'
+    , str = fs.readFileSync(file, 'utf8')
+    , fn = jade.compile(str, { filename: file })
+    , self = this;
+
+  JSONCov.call(this, runner, false);
+
+  runner.on('end', function(){
+    process.stdout.write(fn({
+        cov: self.cov
+      , coverageClass: coverageClass
+    }));
+  });
+}
+
+/**
+ * Return coverage class for `n`.
+ *
+ * @return {String}
+ * @api private
+ */
+
+function coverageClass(n) {
+  if (n >= 75) return 'high';
+  if (n >= 50) return 'medium';
+  if (n >= 25) return 'low';
+  return 'terrible';
+}
+}); // module: reporters/html-cov.js
+
+require.register("reporters/html.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils')
+  , Progress = require('../browser/progress')
+  , escape = utils.escape;
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Expose `HTML`.
+ */
+
+exports = module.exports = HTML;
+
+/**
+ * Stats template.
+ */
+
+var statsTemplate = '<ul id="mocha-stats">'
+  + '<li class="progress"><canvas width="40" height="40"></canvas></li>'
+  + '<li class="passes"><a href="#">passes:</a> <em>0</em></li>'
+  + '<li class="failures"><a href="#">failures:</a> <em>0</em></li>'
+  + '<li class="duration">duration: <em>0</em>s</li>'
+  + '</ul>';
+
+/**
+ * Initialize a new `HTML` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function HTML(runner, root) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , total = runner.total
+    , stat = fragment(statsTemplate)
+    , items = stat.getElementsByTagName('li')
+    , passes = items[1].getElementsByTagName('em')[0]
+    , passesLink = items[1].getElementsByTagName('a')[0]
+    , failures = items[2].getElementsByTagName('em')[0]
+    , failuresLink = items[2].getElementsByTagName('a')[0]
+    , duration = items[3].getElementsByTagName('em')[0]
+    , canvas = stat.getElementsByTagName('canvas')[0]
+    , report = fragment('<ul id="mocha-report"></ul>')
+    , stack = [report]
+    , progress
+    , ctx
+
+  root = root || document.getElementById('mocha');
+
+  if (canvas.getContext) {
+    var ratio = window.devicePixelRatio || 1;
+    canvas.style.width = canvas.width;
+    canvas.style.height = canvas.height;
+    canvas.width *= ratio;
+    canvas.height *= ratio;
+    ctx = canvas.getContext('2d');
+    ctx.scale(ratio, ratio);
+    progress = new Progress;
+  }
+
+  if (!root) return error('#mocha div missing, add it to your document');
+
+  // pass toggle
+  on(passesLink, 'click', function(){
+    unhide();
+    var name = /pass/.test(report.className) ? '' : ' pass';
+    report.className = report.className.replace(/fail|pass/g, '') + name;
+    if (report.className.trim()) hideSuitesWithout('test pass');
+  });
+
+  // failure toggle
+  on(failuresLink, 'click', function(){
+    unhide();
+    var name = /fail/.test(report.className) ? '' : ' fail';
+    report.className = report.className.replace(/fail|pass/g, '') + name;
+    if (report.className.trim()) hideSuitesWithout('test fail');
+  });
+
+  root.appendChild(stat);
+  root.appendChild(report);
+
+  if (progress) progress.size(40);
+
+  runner.on('suite', function(suite){
+    if (suite.root) return;
+
+    // suite
+    var url = self.suiteURL(suite);
+    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
+
+    // container
+    stack[0].appendChild(el);
+    stack.unshift(document.createElement('ul'));
+    el.appendChild(stack[0]);
+  });
+
+  runner.on('suite end', function(suite){
+    if (suite.root) return;
+    stack.shift();
+  });
+
+  runner.on('fail', function(test, err){
+    if ('hook' == test.type) runner.emit('test end', test);
+  });
+
+  runner.on('test end', function(test){
+    // TODO: add to stats
+    var percent = stats.tests / this.total * 100 | 0;
+    if (progress) progress.update(percent).draw(ctx);
+
+    // update stats
+    var ms = new Date - stats.start;
+    text(passes, stats.passes);
+    text(failures, stats.failures);
+    text(duration, (ms / 1000).toFixed(2));
+
+    // test
+    if ('passed' == test.state) {
+      var url = self.testURL(test);
+      var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span> <a href="%s" class="replay">‣</a></h2></li>', test.speed, test.title, test.duration, url);
+    } else if (test.pending) {
+      var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);
+    } else {
+      var el = fragment('<li class="test fail"><h2>%e <a href="?grep=%e" class="replay">‣</a></h2></li>', test.title, encodeURIComponent(test.fullTitle()));
+      var str = test.err.stack || test.err.toString();
+
+      // FF / Opera do not add the message
+      if (!~str.indexOf(test.err.message)) {
+        str = test.err.message + '\n' + str;
+      }
+
+      // <=IE7 stringifies to [Object Error]. Since it can be overloaded, we
+      // check for the result of the stringifying.
+      if ('[object Error]' == str) str = test.err.message;
+
+      // Safari doesn't give you a stack. Let's at least provide a source line.
+      if (!test.err.stack && test.err.sourceURL && test.err.line !== undefined) {
+        str += "\n(" + test.err.sourceURL + ":" + test.err.line + ")";
+      }
+
+      el.appendChild(fragment('<pre class="error">%e</pre>', str));
+    }
+
+    // toggle code
+    // TODO: defer
+    if (!test.pending) {
+      var h2 = el.getElementsByTagName('h2')[0];
+
+      on(h2, 'click', function(){
+        pre.style.display = 'none' == pre.style.display
+          ? 'block'
+          : 'none';
+      });
+
+      var pre = fragment('<pre><code>%e</code></pre>', utils.clean(test.fn.toString()));
+      el.appendChild(pre);
+      pre.style.display = 'none';
+    }
+
+    // Don't call .appendChild if #mocha-report was already .shift()'ed off the stack.
+    if (stack[0]) stack[0].appendChild(el);
+  });
+}
+
+/**
+ * Provide suite URL
+ *
+ * @param {Object} [suite]
+ */
+
+HTML.prototype.suiteURL = function(suite){
+  return '?grep=' + encodeURIComponent(suite.fullTitle());
+};
+
+/**
+ * Provide test URL
+ *
+ * @param {Object} [test]
+ */
+
+HTML.prototype.testURL = function(test){
+  return '?grep=' + encodeURIComponent(test.fullTitle());
+};
+
+/**
+ * Display error `msg`.
+ */
+
+function error(msg) {
+  document.body.appendChild(fragment('<div id="mocha-error">%s</div>', msg));
+}
+
+/**
+ * Return a DOM fragment from `html`.
+ */
+
+function fragment(html) {
+  var args = arguments
+    , div = document.createElement('div')
+    , i = 1;
+
+  div.innerHTML = html.replace(/%([se])/g, function(_, type){
+    switch (type) {
+      case 's': return String(args[i++]);
+      case 'e': return escape(args[i++]);
+    }
+  });
+
+  return div.firstChild;
+}
+
+/**
+ * Check for suites that do not have elements
+ * with `classname`, and hide them.
+ */
+
+function hideSuitesWithout(classname) {
+  var suites = document.getElementsByClassName('suite');
+  for (var i = 0; i < suites.length; i++) {
+    var els = suites[i].getElementsByClassName(classname);
+    if (0 == els.length) suites[i].className += ' hidden';
+  }
+}
+
+/**
+ * Unhide .hidden suites.
+ */
+
+function unhide() {
+  var els = document.getElementsByClassName('suite hidden');
+  for (var i = 0; i < els.length; ++i) {
+    els[i].className = els[i].className.replace('suite hidden', 'suite');
+  }
+}
+
+/**
+ * Set `el` text to `str`.
+ */
+
+function text(el, str) {
+  if (el.textContent) {
+    el.textContent = str;
+  } else {
+    el.innerText = str;
+  }
+}
+
+/**
+ * Listen on `event` with callback `fn`.
+ */
+
+function on(el, event, fn) {
+  if (el.addEventListener) {
+    el.addEventListener(event, fn, false);
+  } else {
+    el.attachEvent('on' + event, fn);
+  }
+}
+
+}); // module: reporters/html.js
+
+require.register("reporters/index.js", function(module, exports, require){
+
+exports.Base = require('./base');
+exports.Dot = require('./dot');
+exports.Doc = require('./doc');
+exports.TAP = require('./tap');
+exports.JSON = require('./json');
+exports.HTML = require('./html');
+exports.List = require('./list');
+exports.Min = require('./min');
+exports.Spec = require('./spec');
+exports.Nyan = require('./nyan');
+exports.XUnit = require('./xunit');
+exports.Markdown = require('./markdown');
+exports.Progress = require('./progress');
+exports.Landing = require('./landing');
+exports.JSONCov = require('./json-cov');
+exports.HTMLCov = require('./html-cov');
+exports.JSONStream = require('./json-stream');
+
+}); // module: reporters/index.js
+
+require.register("reporters/json-cov.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base');
+
+/**
+ * Expose `JSONCov`.
+ */
+
+exports = module.exports = JSONCov;
+
+/**
+ * Initialize a new `JsCoverage` reporter.
+ *
+ * @param {Runner} runner
+ * @param {Boolean} output
+ * @api public
+ */
+
+function JSONCov(runner, output) {
+  var self = this
+    , output = 1 == arguments.length ? true : output;
+
+  Base.call(this, runner);
+
+  var tests = []
+    , failures = []
+    , passes = [];
+
+  runner.on('test end', function(test){
+    tests.push(test);
+  });
+
+  runner.on('pass', function(test){
+    passes.push(test);
+  });
+
+  runner.on('fail', function(test){
+    failures.push(test);
+  });
+
+  runner.on('end', function(){
+    var cov = global._$jscoverage || {};
+    var result = self.cov = map(cov);
+    result.stats = self.stats;
+    result.tests = tests.map(clean);
+    result.failures = failures.map(clean);
+    result.passes = passes.map(clean);
+    if (!output) return;
+    process.stdout.write(JSON.stringify(result, null, 2 ));
+  });
+}
+
+/**
+ * Map jscoverage data to a JSON structure
+ * suitable for reporting.
+ *
+ * @param {Object} cov
+ * @return {Object}
+ * @api private
+ */
+
+function map(cov) {
+  var ret = {
+      instrumentation: 'node-jscoverage'
+    , sloc: 0
+    , hits: 0
+    , misses: 0
+    , coverage: 0
+    , files: []
+  };
+
+  for (var filename in cov) {
+    var data = coverage(filename, cov[filename]);
+    ret.files.push(data);
+    ret.hits += data.hits;
+    ret.misses += data.misses;
+    ret.sloc += data.sloc;
+  }
+
+  ret.files.sort(function(a, b) {
+    return a.filename.localeCompare(b.filename);
+  });
+
+  if (ret.sloc > 0) {
+    ret.coverage = (ret.hits / ret.sloc) * 100;
+  }
+
+  return ret;
+};
+
+/**
+ * Map jscoverage data for a single source file
+ * to a JSON structure suitable for reporting.
+ *
+ * @param {String} filename name of the source file
+ * @param {Object} data jscoverage coverage data
+ * @return {Object}
+ * @api private
+ */
+
+function coverage(filename, data) {
+  var ret = {
+    filename: filename,
+    coverage: 0,
+    hits: 0,
+    misses: 0,
+    sloc: 0,
+    source: {}
+  };
+
+  data.source.forEach(function(line, num){
+    num++;
+
+    if (data[num] === 0) {
+      ret.misses++;
+      ret.sloc++;
+    } else if (data[num] !== undefined) {
+      ret.hits++;
+      ret.sloc++;
+    }
+
+    ret.source[num] = {
+        source: line
+      , coverage: data[num] === undefined
+        ? ''
+        : data[num]
+    };
+  });
+
+  ret.coverage = ret.hits / ret.sloc * 100;
+
+  return ret;
+}
+
+/**
+ * Return a plain-object representation of `test`
+ * free of cyclic properties etc.
+ *
+ * @param {Object} test
+ * @return {Object}
+ * @api private
+ */
+
+function clean(test) {
+  return {
+      title: test.title
+    , fullTitle: test.fullTitle()
+    , duration: test.duration
+  }
+}
+
+}); // module: reporters/json-cov.js
+
+require.register("reporters/json-stream.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , color = Base.color;
+
+/**
+ * Expose `List`.
+ */
+
+exports = module.exports = List;
+
+/**
+ * Initialize a new `List` test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function List(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , total = runner.total;
+
+  runner.on('start', function(){
+    console.log(JSON.stringify(['start', { total: total }]));
+  });
+
+  runner.on('pass', function(test){
+    console.log(JSON.stringify(['pass', clean(test)]));
+  });
+
+  runner.on('fail', function(test, err){
+    console.log(JSON.stringify(['fail', clean(test)]));
+  });
+
+  runner.on('end', function(){
+    process.stdout.write(JSON.stringify(['end', self.stats]));
+  });
+}
+
+/**
+ * Return a plain-object representation of `test`
+ * free of cyclic properties etc.
+ *
+ * @param {Object} test
+ * @return {Object}
+ * @api private
+ */
+
+function clean(test) {
+  return {
+      title: test.title
+    , fullTitle: test.fullTitle()
+    , duration: test.duration
+  }
+}
+}); // module: reporters/json-stream.js
+
+require.register("reporters/json.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `JSON`.
+ */
+
+exports = module.exports = JSONReporter;
+
+/**
+ * Initialize a new `JSON` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function JSONReporter(runner) {
+  var self = this;
+  Base.call(this, runner);
+
+  var tests = []
+    , failures = []
+    , passes = [];
+
+  runner.on('test end', function(test){
+    tests.push(test);
+  });
+
+  runner.on('pass', function(test){
+    passes.push(test);
+  });
+
+  runner.on('fail', function(test){
+    failures.push(test);
+  });
+
+  runner.on('end', function(){
+    var obj = {
+        stats: self.stats
+      , tests: tests.map(clean)
+      , failures: failures.map(clean)
+      , passes: passes.map(clean)
+    };
+
+    process.stdout.write(JSON.stringify(obj, null, 2));
+  });
+}
+
+/**
+ * Return a plain-object representation of `test`
+ * free of cyclic properties etc.
+ *
+ * @param {Object} test
+ * @return {Object}
+ * @api private
+ */
+
+function clean(test) {
+  return {
+      title: test.title
+    , fullTitle: test.fullTitle()
+    , duration: test.duration
+  }
+}
+}); // module: reporters/json.js
+
+require.register("reporters/landing.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `Landing`.
+ */
+
+exports = module.exports = Landing;
+
+/**
+ * Airplane color.
+ */
+
+Base.colors.plane = 0;
+
+/**
+ * Airplane crash color.
+ */
+
+Base.colors['plane crash'] = 31;
+
+/**
+ * Runway color.
+ */
+
+Base.colors.runway = 90;
+
+/**
+ * Initialize a new `Landing` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Landing(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , width = Base.window.width * .75 | 0
+    , total = runner.total
+    , stream = process.stdout
+    , plane = color('plane', '✈')
+    , crashed = -1
+    , n = 0;
+
+  function runway() {
+    var buf = Array(width).join('-');
+    return '  ' + color('runway', buf);
+  }
+
+  runner.on('start', function(){
+    stream.write('\n  ');
+    cursor.hide();
+  });
+
+  runner.on('test end', function(test){
+    // check if the plane crashed
+    var col = -1 == crashed
+      ? width * ++n / total | 0
+      : crashed;
+
+    // show the crash
+    if ('failed' == test.state) {
+      plane = color('plane crash', '✈');
+      crashed = col;
+    }
+
+    // render landing strip
+    stream.write('\u001b[4F\n\n');
+    stream.write(runway());
+    stream.write('\n  ');
+    stream.write(color('runway', Array(col).join('⋅')));
+    stream.write(plane)
+    stream.write(color('runway', Array(width - col).join('⋅') + '\n'));
+    stream.write(runway());
+    stream.write('\u001b[0m');
+  });
+
+  runner.on('end', function(){
+    cursor.show();
+    console.log();
+    self.epilogue();
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Landing.prototype = new F;
+Landing.prototype.constructor = Landing;
+
+}); // module: reporters/landing.js
+
+require.register("reporters/list.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `List`.
+ */
+
+exports = module.exports = List;
+
+/**
+ * Initialize a new `List` test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function List(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , n = 0;
+
+  runner.on('start', function(){
+    console.log();
+  });
+
+  runner.on('test', function(test){
+    process.stdout.write(color('pass', '    ' + test.fullTitle() + ': '));
+  });
+
+  runner.on('pending', function(test){
+    var fmt = color('checkmark', '  -')
+      + color('pending', ' %s');
+    console.log(fmt, test.fullTitle());
+  });
+
+  runner.on('pass', function(test){
+    var fmt = color('checkmark', '  '+Base.symbols.dot)
+      + color('pass', ' %s: ')
+      + color(test.speed, '%dms');
+    cursor.CR();
+    console.log(fmt, test.fullTitle(), test.duration);
+  });
+
+  runner.on('fail', function(test, err){
+    cursor.CR();
+    console.log(color('fail', '  %d) %s'), ++n, test.fullTitle());
+  });
+
+  runner.on('end', self.epilogue.bind(self));
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+List.prototype = new F;
+List.prototype.constructor = List;
+
+
+}); // module: reporters/list.js
+
+require.register("reporters/markdown.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils');
+
+/**
+ * Expose `Markdown`.
+ */
+
+exports = module.exports = Markdown;
+
+/**
+ * Initialize a new `Markdown` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Markdown(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , level = 0
+    , buf = '';
+
+  function title(str) {
+    return Array(level).join('#') + ' ' + str;
+  }
+
+  function indent() {
+    return Array(level).join('  ');
+  }
+
+  function mapTOC(suite, obj) {
+    var ret = obj;
+    obj = obj[suite.title] = obj[suite.title] || { suite: suite };
+    suite.suites.forEach(function(suite){
+      mapTOC(suite, obj);
+    });
+    return ret;
+  }
+
+  function stringifyTOC(obj, level) {
+    ++level;
+    var buf = '';
+    var link;
+    for (var key in obj) {
+      if ('suite' == key) continue;
+      if (key) link = ' - [' + key + '](#' + utils.slug(obj[key].suite.fullTitle()) + ')\n';
+      if (key) buf += Array(level).join('  ') + link;
+      buf += stringifyTOC(obj[key], level);
+    }
+    --level;
+    return buf;
+  }
+
+  function generateTOC(suite) {
+    var obj = mapTOC(suite, {});
+    return stringifyTOC(obj, 0);
+  }
+
+  generateTOC(runner.suite);
+
+  runner.on('suite', function(suite){
+    ++level;
+    var slug = utils.slug(suite.fullTitle());
+    buf += '<a name="' + slug + '"></a>' + '\n';
+    buf += title(suite.title) + '\n';
+  });
+
+  runner.on('suite end', function(suite){
+    --level;
+  });
+
+  runner.on('pass', function(test){
+    var code = utils.clean(test.fn.toString());
+    buf += test.title + '.\n';
+    buf += '\n```js\n';
+    buf += code + '\n';
+    buf += '```\n\n';
+  });
+
+  runner.on('end', function(){
+    process.stdout.write('# TOC\n');
+    process.stdout.write(generateTOC(runner.suite));
+    process.stdout.write(buf);
+  });
+}
+}); // module: reporters/markdown.js
+
+require.register("reporters/min.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base');
+
+/**
+ * Expose `Min`.
+ */
+
+exports = module.exports = Min;
+
+/**
+ * Initialize a new `Min` minimal test reporter (best used with --watch).
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Min(runner) {
+  Base.call(this, runner);
+
+  runner.on('start', function(){
+    // clear screen
+    process.stdout.write('\u001b[2J');
+    // set cursor position
+    process.stdout.write('\u001b[1;3H');
+  });
+
+  runner.on('end', this.epilogue.bind(this));
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Min.prototype = new F;
+Min.prototype.constructor = Min;
+
+
+}); // module: reporters/min.js
+
+require.register("reporters/nyan.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , color = Base.color;
+
+/**
+ * Expose `Dot`.
+ */
+
+exports = module.exports = NyanCat;
+
+/**
+ * Initialize a new `Dot` matrix test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function NyanCat(runner) {
+  Base.call(this, runner);
+  var self = this
+    , stats = this.stats
+    , width = Base.window.width * .75 | 0
+    , rainbowColors = this.rainbowColors = self.generateColors()
+    , colorIndex = this.colorIndex = 0
+    , numerOfLines = this.numberOfLines = 4
+    , trajectories = this.trajectories = [[], [], [], []]
+    , nyanCatWidth = this.nyanCatWidth = 11
+    , trajectoryWidthMax = this.trajectoryWidthMax = (width - nyanCatWidth)
+    , scoreboardWidth = this.scoreboardWidth = 5
+    , tick = this.tick = 0
+    , n = 0;
+
+  runner.on('start', function(){
+    Base.cursor.hide();
+    self.draw();
+  });
+
+  runner.on('pending', function(test){
+    self.draw();
+  });
+
+  runner.on('pass', function(test){
+    self.draw();
+  });
+
+  runner.on('fail', function(test, err){
+    self.draw();
+  });
+
+  runner.on('end', function(){
+    Base.cursor.show();
+    for (var i = 0; i < self.numberOfLines; i++) write('\n');
+    self.epilogue();
+  });
+}
+
+/**
+ * Draw the nyan cat
+ *
+ * @api private
+ */
+
+NyanCat.prototype.draw = function(){
+  this.appendRainbow();
+  this.drawScoreboard();
+  this.drawRainbow();
+  this.drawNyanCat();
+  this.tick = !this.tick;
+};
+
+/**
+ * Draw the "scoreboard" showing the number
+ * of passes, failures and pending tests.
+ *
+ * @api private
+ */
+
+NyanCat.prototype.drawScoreboard = function(){
+  var stats = this.stats;
+  var colors = Base.colors;
+
+  function draw(color, n) {
+    write(' ');
+    write('\u001b[' + color + 'm' + n + '\u001b[0m');
+    write('\n');
+  }
+
+  draw(colors.green, stats.passes);
+  draw(colors.fail, stats.failures);
+  draw(colors.pending, stats.pending);
+  write('\n');
+
+  this.cursorUp(this.numberOfLines);
+};
+
+/**
+ * Append the rainbow.
+ *
+ * @api private
+ */
+
+NyanCat.prototype.appendRainbow = function(){
+  var segment = this.tick ? '_' : '-';
+  var rainbowified = this.rainbowify(segment);
+
+  for (var index = 0; index < this.numberOfLines; index++) {
+    var trajectory = this.trajectories[index];
+    if (trajectory.length >= this.trajectoryWidthMax) trajectory.shift();
+    trajectory.push(rainbowified);
+  }
+};
+
+/**
+ * Draw the rainbow.
+ *
+ * @api private
+ */
+
+NyanCat.prototype.drawRainbow = function(){
+  var self = this;
+
+  this.trajectories.forEach(function(line, index) {
+    write('\u001b[' + self.scoreboardWidth + 'C');
+    write(line.join(''));
+    write('\n');
+  });
+
+  this.cursorUp(this.numberOfLines);
+};
+
+/**
+ * Draw the nyan cat
+ *
+ * @api private
+ */
+
+NyanCat.prototype.drawNyanCat = function() {
+  var self = this;
+  var startWidth = this.scoreboardWidth + this.trajectories[0].length;
+  var color = '\u001b[' + startWidth + 'C';
+  var padding = '';
+
+  write(color);
+  write('_,------,');
+  write('\n');
+
+  write(color);
+  padding = self.tick ? '  ' : '   ';
+  write('_|' + padding + '/\\_/\\ ');
+  write('\n');
+
+  write(color);
+  padding = self.tick ? '_' : '__';
+  var tail = self.tick ? '~' : '^';
+  var face;
+  write(tail + '|' + padding + this.face() + ' ');
+  write('\n');
+
+  write(color);
+  padding = self.tick ? ' ' : '  ';
+  write(padding + '""  "" ');
+  write('\n');
+
+  this.cursorUp(this.numberOfLines);
+};
+
+/**
+ * Draw nyan cat face.
+ *
+ * @return {String}
+ * @api private
+ */
+
+NyanCat.prototype.face = function() {
+  var stats = this.stats;
+  if (stats.failures) {
+    return '( x .x)';
+  } else if (stats.pending) {
+    return '( o .o)';
+  } else if(stats.passes) {
+    return '( ^ .^)';
+  } else {
+    return '( - .-)';
+  }
+}
+
+/**
+ * Move cursor up `n`.
+ *
+ * @param {Number} n
+ * @api private
+ */
+
+NyanCat.prototype.cursorUp = function(n) {
+  write('\u001b[' + n + 'A');
+};
+
+/**
+ * Move cursor down `n`.
+ *
+ * @param {Number} n
+ * @api private
+ */
+
+NyanCat.prototype.cursorDown = function(n) {
+  write('\u001b[' + n + 'B');
+};
+
+/**
+ * Generate rainbow colors.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+NyanCat.prototype.generateColors = function(){
+  var colors = [];
+
+  for (var i = 0; i < (6 * 7); i++) {
+    var pi3 = Math.floor(Math.PI / 3);
+    var n = (i * (1.0 / 6));
+    var r = Math.floor(3 * Math.sin(n) + 3);
+    var g = Math.floor(3 * Math.sin(n + 2 * pi3) + 3);
+    var b = Math.floor(3 * Math.sin(n + 4 * pi3) + 3);
+    colors.push(36 * r + 6 * g + b + 16);
+  }
+
+  return colors;
+};
+
+/**
+ * Apply rainbow to the given `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+NyanCat.prototype.rainbowify = function(str){
+  var color = this.rainbowColors[this.colorIndex % this.rainbowColors.length];
+  this.colorIndex += 1;
+  return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m';
+};
+
+/**
+ * Stdout helper.
+ */
+
+function write(string) {
+  process.stdout.write(string);
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+NyanCat.prototype = new F;
+NyanCat.prototype.constructor = NyanCat;
+
+
+}); // module: reporters/nyan.js
+
+require.register("reporters/progress.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `Progress`.
+ */
+
+exports = module.exports = Progress;
+
+/**
+ * General progress bar color.
+ */
+
+Base.colors.progress = 90;
+
+/**
+ * Initialize a new `Progress` bar test reporter.
+ *
+ * @param {Runner} runner
+ * @param {Object} options
+ * @api public
+ */
+
+function Progress(runner, options) {
+  Base.call(this, runner);
+
+  var self = this
+    , options = options || {}
+    , stats = this.stats
+    , width = Base.window.width * .50 | 0
+    , total = runner.total
+    , complete = 0
+    , max = Math.max;
+
+  // default chars
+  options.open = options.open || '[';
+  options.complete = options.complete || '▬';
+  options.incomplete = options.incomplete || Base.symbols.dot;
+  options.close = options.close || ']';
+  options.verbose = false;
+
+  // tests started
+  runner.on('start', function(){
+    console.log();
+    cursor.hide();
+  });
+
+  // tests complete
+  runner.on('test end', function(){
+    complete++;
+    var incomplete = total - complete
+      , percent = complete / total
+      , n = width * percent | 0
+      , i = width - n;
+
+    cursor.CR();
+    process.stdout.write('\u001b[J');
+    process.stdout.write(color('progress', '  ' + options.open));
+    process.stdout.write(Array(n).join(options.complete));
+    process.stdout.write(Array(i).join(options.incomplete));
+    process.stdout.write(color('progress', options.close));
+    if (options.verbose) {
+      process.stdout.write(color('progress', ' ' + complete + ' of ' + total));
+    }
+  });
+
+  // tests are complete, output some stats
+  // and the failures if any
+  runner.on('end', function(){
+    cursor.show();
+    console.log();
+    self.epilogue();
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Progress.prototype = new F;
+Progress.prototype.constructor = Progress;
+
+
+}); // module: reporters/progress.js
+
+require.register("reporters/spec.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `Spec`.
+ */
+
+exports = module.exports = Spec;
+
+/**
+ * Initialize a new `Spec` test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Spec(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , indents = 0
+    , n = 0;
+
+  function indent() {
+    return Array(indents).join('  ')
+  }
+
+  runner.on('start', function(){
+    console.log();
+  });
+
+  runner.on('suite', function(suite){
+    ++indents;
+    console.log(color('suite', '%s%s'), indent(), suite.title);
+  });
+
+  runner.on('suite end', function(suite){
+    --indents;
+    if (1 == indents) console.log();
+  });
+
+  runner.on('pending', function(test){
+    var fmt = indent() + color('pending', '  - %s');
+    console.log(fmt, test.title);
+  });
+
+  runner.on('pass', function(test){
+    if ('fast' == test.speed) {
+      var fmt = indent()
+        + color('checkmark', '  ' + Base.symbols.ok)
+        + color('pass', ' %s ');
+      cursor.CR();
+      console.log(fmt, test.title);
+    } else {
+      var fmt = indent()
+        + color('checkmark', '  ' + Base.symbols.ok)
+        + color('pass', ' %s ')
+        + color(test.speed, '(%dms)');
+      cursor.CR();
+      console.log(fmt, test.title, test.duration);
+    }
+  });
+
+  runner.on('fail', function(test, err){
+    cursor.CR();
+    console.log(indent() + color('fail', '  %d) %s'), ++n, test.title);
+  });
+
+  runner.on('end', self.epilogue.bind(self));
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Spec.prototype = new F;
+Spec.prototype.constructor = Spec;
+
+
+}); // module: reporters/spec.js
+
+require.register("reporters/tap.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `TAP`.
+ */
+
+exports = module.exports = TAP;
+
+/**
+ * Initialize a new `TAP` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function TAP(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , n = 1
+    , passes = 0
+    , failures = 0;
+
+  runner.on('start', function(){
+    var total = runner.grepTotal(runner.suite);
+    console.log('%d..%d', 1, total);
+  });
+
+  runner.on('test end', function(){
+    ++n;
+  });
+
+  runner.on('pending', function(test){
+    console.log('ok %d %s # SKIP -', n, title(test));
+  });
+
+  runner.on('pass', function(test){
+    passes++;
+    console.log('ok %d %s', n, title(test));
+  });
+
+  runner.on('fail', function(test, err){
+    failures++;
+    console.log('not ok %d %s', n, title(test));
+    if (err.stack) console.log(err.stack.replace(/^/gm, '  '));
+  });
+
+  runner.on('end', function(){
+    console.log('# tests ' + (passes + failures));
+    console.log('# pass ' + passes);
+    console.log('# fail ' + failures);
+  });
+}
+
+/**
+ * Return a TAP-safe title of `test`
+ *
+ * @param {Object} test
+ * @return {String}
+ * @api private
+ */
+
+function title(test) {
+  return test.fullTitle().replace(/#/g, '');
+}
+
+}); // module: reporters/tap.js
+
+require.register("reporters/xunit.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils')
+  , escape = utils.escape;
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Expose `XUnit`.
+ */
+
+exports = module.exports = XUnit;
+
+/**
+ * Initialize a new `XUnit` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function XUnit(runner) {
+  Base.call(this, runner);
+  var stats = this.stats
+    , tests = []
+    , self = this;
+
+  runner.on('pending', function(test){
+    tests.push(test);
+  });
+
+  runner.on('pass', function(test){
+    tests.push(test);
+  });
+
+  runner.on('fail', function(test){
+    tests.push(test);
+  });
+
+  runner.on('end', function(){
+    console.log(tag('testsuite', {
+        name: 'Mocha Tests'
+      , tests: stats.tests
+      , failures: stats.failures
+      , errors: stats.failures
+      , skipped: stats.tests - stats.failures - stats.passes
+      , timestamp: (new Date).toUTCString()
+      , time: (stats.duration / 1000) || 0
+    }, false));
+
+    tests.forEach(test);
+    console.log('</testsuite>');
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+XUnit.prototype = new F;
+XUnit.prototype.constructor = XUnit;
+
+
+/**
+ * Output tag for the given `test.`
+ */
+
+function test(test) {
+  var attrs = {
+      classname: test.parent.fullTitle()
+    , name: test.title
+    , time: (test.duration / 1000) || 0
+  };
+
+  if ('failed' == test.state) {
+    var err = test.err;
+    attrs.message = escape(err.message);
+    console.log(tag('testcase', attrs, false, tag('failure', attrs, false, cdata(err.stack))));
+  } else if (test.pending) {
+    console.log(tag('testcase', attrs, false, tag('skipped', {}, true)));
+  } else {
+    console.log(tag('testcase', attrs, true) );
+  }
+}
+
+/**
+ * HTML tag helper.
+ */
+
+function tag(name, attrs, close, content) {
+  var end = close ? '/>' : '>'
+    , pairs = []
+    , tag;
+
+  for (var key in attrs) {
+    pairs.push(key + '="' + escape(attrs[key]) + '"');
+  }
+
+  tag = '<' + name + (pairs.length ? ' ' + pairs.join(' ') : '') + end;
+  if (content) tag += content + '</' + name + end;
+  return tag;
+}
+
+/**
+ * Return cdata escaped CDATA `str`.
+ */
+
+function cdata(str) {
+  return '<![CDATA[' + escape(str) + ']]>';
+}
+
+}); // module: reporters/xunit.js
+
+require.register("runnable.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = require('browser/events').EventEmitter
+  , debug = require('browser/debug')('mocha:runnable')
+  , milliseconds = require('./ms');
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Object#toString().
+ */
+
+var toString = Object.prototype.toString;
+
+/**
+ * Expose `Runnable`.
+ */
+
+module.exports = Runnable;
+
+/**
+ * Initialize a new `Runnable` with the given `title` and callback `fn`.
+ *
+ * @param {String} title
+ * @param {Function} fn
+ * @api private
+ */
+
+function Runnable(title, fn) {
+  this.title = title;
+  this.fn = fn;
+  this.async = fn && fn.length;
+  this.sync = ! this.async;
+  this._timeout = 2000;
+  this._slow = 75;
+  this.timedOut = false;
+}
+
+/**
+ * Inherit from `EventEmitter.prototype`.
+ */
+
+function F(){};
+F.prototype = EventEmitter.prototype;
+Runnable.prototype = new F;
+Runnable.prototype.constructor = Runnable;
+
+
+/**
+ * Set & get timeout `ms`.
+ *
+ * @param {Number|String} ms
+ * @return {Runnable|Number} ms or self
+ * @api private
+ */
+
+Runnable.prototype.timeout = function(ms){
+  if (0 == arguments.length) return this._timeout;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('timeout %d', ms);
+  this._timeout = ms;
+  if (this.timer) this.resetTimeout();
+  return this;
+};
+
+/**
+ * Set & get slow `ms`.
+ *
+ * @param {Number|String} ms
+ * @return {Runnable|Number} ms or self
+ * @api private
+ */
+
+Runnable.prototype.slow = function(ms){
+  if (0 === arguments.length) return this._slow;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('timeout %d', ms);
+  this._slow = ms;
+  return this;
+};
+
+/**
+ * Return the full title generated by recursively
+ * concatenating the parent's full title.
+ *
+ * @return {String}
+ * @api public
+ */
+
+Runnable.prototype.fullTitle = function(){
+  return this.parent.fullTitle() + ' ' + this.title;
+};
+
+/**
+ * Clear the timeout.
+ *
+ * @api private
+ */
+
+Runnable.prototype.clearTimeout = function(){
+  clearTimeout(this.timer);
+};
+
+/**
+ * Inspect the runnable void of private properties.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Runnable.prototype.inspect = function(){
+  return JSON.stringify(this, function(key, val){
+    if ('_' == key[0]) return;
+    if ('parent' == key) return '#<Suite>';
+    if ('ctx' == key) return '#<Context>';
+    return val;
+  }, 2);
+};
+
+/**
+ * Reset the timeout.
+ *
+ * @api private
+ */
+
+Runnable.prototype.resetTimeout = function(){
+  var self = this;
+  var ms = this.timeout() || 1e9;
+
+  this.clearTimeout();
+  this.timer = setTimeout(function(){
+    self.callback(new Error('timeout of ' + ms + 'ms exceeded'));
+    self.timedOut = true;
+  }, ms);
+};
+
+/**
+ * Whitelist these globals for this test run
+ *
+ * @api private
+ */
+Runnable.prototype.globals = function(arr){
+  var self = this;
+  this._allowedGlobals = arr;
+};
+
+/**
+ * Run the test and invoke `fn(err)`.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+
+Runnable.prototype.run = function(fn){
+  var self = this
+    , ms = this.timeout()
+    , start = new Date
+    , ctx = this.ctx
+    , finished
+    , emitted;
+
+  if (ctx) ctx.runnable(this);
+
+  // timeout
+  if (this.async) {
+    if (ms) {
+      this.timer = setTimeout(function(){
+        done(new Error('timeout of ' + ms + 'ms exceeded'));
+        self.timedOut = true;
+      }, ms);
+    }
+  }
+
+  // called multiple times
+  function multiple(err) {
+    if (emitted) return;
+    emitted = true;
+    self.emit('error', err || new Error('done() called multiple times'));
+  }
+
+  // finished
+  function done(err) {
+    if (self.timedOut) return;
+    if (finished) return multiple(err);
+    self.clearTimeout();
+    self.duration = new Date - start;
+    finished = true;
+    fn(err);
+  }
+
+  // for .resetTimeout()
+  this.callback = done;
+
+  // async
+  if (this.async) {
+    try {
+      this.fn.call(ctx, function(err){
+        if (err instanceof Error || toString.call(err) === "[object Error]") return done(err);
+        if (null != err) return done(new Error('done() invoked with non-Error: ' + err));
+        done();
+      });
+    } catch (err) {
+      done(err);
+    }
+    return;
+  }
+
+  if (this.asyncOnly) {
+    return done(new Error('--async-only option in use without declaring `done()`'));
+  }
+
+  // sync
+  try {
+    if (!this.pending) this.fn.call(ctx);
+    this.duration = new Date - start;
+    fn();
+  } catch (err) {
+    fn(err);
+  }
+};
+
+}); // module: runnable.js
+
+require.register("runner.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = require('browser/events').EventEmitter
+  , debug = require('browser/debug')('mocha:runner')
+  , Test = require('./test')
+  , utils = require('./utils')
+  , filter = utils.filter
+  , keys = utils.keys;
+
+/**
+ * Non-enumerable globals.
+ */
+
+var globals = [
+  'setTimeout',
+  'clearTimeout',
+  'setInterval',
+  'clearInterval',
+  'XMLHttpRequest',
+  'Date'
+];
+
+/**
+ * Expose `Runner`.
+ */
+
+module.exports = Runner;
+
+/**
+ * Initialize a `Runner` for the given `suite`.
+ *
+ * Events:
+ *
+ *   - `start`  execution started
+ *   - `end`  execution complete
+ *   - `suite`  (suite) test suite execution started
+ *   - `suite end`  (suite) all tests (and sub-suites) have finished
+ *   - `test`  (test) test execution started
+ *   - `test end`  (test) test completed
+ *   - `hook`  (hook) hook execution started
+ *   - `hook end`  (hook) hook complete
+ *   - `pass`  (test) test passed
+ *   - `fail`  (test, err) test failed
+ *   - `pending`  (test) test pending
+ *
+ * @api public
+ */
+
+function Runner(suite) {
+  var self = this;
+  this._globals = [];
+  this._abort = false;
+  this.suite = suite;
+  this.total = suite.total();
+  this.failures = 0;
+  this.on('test end', function(test){ self.checkGlobals(test); });
+  this.on('hook end', function(hook){ self.checkGlobals(hook); });
+  this.grep(/.*/);
+  this.globals(this.globalProps().concat(extraGlobals()));
+}
+
+/**
+ * Wrapper for setImmediate, process.nextTick, or browser polyfill.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.immediately = global.setImmediate || process.nextTick;
+
+/**
+ * Inherit from `EventEmitter.prototype`.
+ */
+
+function F(){};
+F.prototype = EventEmitter.prototype;
+Runner.prototype = new F;
+Runner.prototype.constructor = Runner;
+
+
+/**
+ * Run tests with full titles matching `re`. Updates runner.total
+ * with number of tests matched.
+ *
+ * @param {RegExp} re
+ * @param {Boolean} invert
+ * @return {Runner} for chaining
+ * @api public
+ */
+
+Runner.prototype.grep = function(re, invert){
+  debug('grep %s', re);
+  this._grep = re;
+  this._invert = invert;
+  this.total = this.grepTotal(this.suite);
+  return this;
+};
+
+/**
+ * Returns the number of tests matching the grep search for the
+ * given suite.
+ *
+ * @param {Suite} suite
+ * @return {Number}
+ * @api public
+ */
+
+Runner.prototype.grepTotal = function(suite) {
+  var self = this;
+  var total = 0;
+
+  suite.eachTest(function(test){
+    var match = self._grep.test(test.fullTitle());
+    if (self._invert) match = !match;
+    if (match) total++;
+  });
+
+  return total;
+};
+
+/**
+ * Return a list of global properties.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+Runner.prototype.globalProps = function() {
+  var props = utils.keys(global);
+
+  // non-enumerables
+  for (var i = 0; i < globals.length; ++i) {
+    if (~utils.indexOf(props, globals[i])) continue;
+    props.push(globals[i]);
+  }
+
+  return props;
+};
+
+/**
+ * Allow the given `arr` of globals.
+ *
+ * @param {Array} arr
+ * @return {Runner} for chaining
+ * @api public
+ */
+
+Runner.prototype.globals = function(arr){
+  if (0 == arguments.length) return this._globals;
+  debug('globals %j', arr);
+  this._globals = this._globals.concat(arr);
+  return this;
+};
+
+/**
+ * Check for global variable leaks.
+ *
+ * @api private
+ */
+
+Runner.prototype.checkGlobals = function(test){
+  if (this.ignoreLeaks) return;
+  var ok = this._globals;
+
+  var globals = this.globalProps();
+  var isNode = process.kill;
+  var leaks;
+
+  if (test) {
+    ok = ok.concat(test._allowedGlobals || []);
+  }
+
+  if(this.prevGlobalsLength == globals.length) return;
+  this.prevGlobalsLength = globals.length;
+
+  leaks = filterLeaks(ok, globals);
+  this._globals = this._globals.concat(leaks);
+
+  if (leaks.length > 1) {
+    this.fail(test, new Error('global leaks detected: ' + leaks.join(', ') + ''));
+  } else if (leaks.length) {
+    this.fail(test, new Error('global leak detected: ' + leaks[0]));
+  }
+};
+
+/**
+ * Fail the given `test`.
+ *
+ * @param {Test} test
+ * @param {Error} err
+ * @api private
+ */
+
+Runner.prototype.fail = function(test, err){
+  ++this.failures;
+  test.state = 'failed';
+
+  if ('string' == typeof err) {
+    err = new Error('the string "' + err + '" was thrown, throw an Error :)');
+  }
+
+  this.emit('fail', test, err);
+};
+
+/**
+ * Fail the given `hook` with `err`.
+ *
+ * Hook failures work in the following pattern:
+ * - If bail, then exit
+ * - Failed `before` hook skips all tests in a suite and subsuites,
+ *   but jumps to corresponding `after` hook
+ * - Failed `before each` hook skips remaining tests in a
+ *   suite and jumps to corresponding `after each` hook,
+ *   which is run only once
+ * - Failed `after` hook does not alter
+ *   execution order
+ * - Failed `after each` hook skips remaining tests in a
+ *   suite and subsuites, but executes other `after each`
+ *   hooks
+ *
+ * @param {Hook} hook
+ * @param {Error} err
+ * @api private
+ */
+
+Runner.prototype.failHook = function(hook, err){
+  this.fail(hook, err);
+  if (this.suite.bail()) {
+    this.emit('end');
+  }
+};
+
+/**
+ * Run hook `name` callbacks and then invoke `fn()`.
+ *
+ * @param {String} name
+ * @param {Function} function
+ * @api private
+ */
+
+Runner.prototype.hook = function(name, fn){
+  var suite = this.suite
+    , hooks = suite['_' + name]
+    , self = this
+    , timer;
+
+  function next(i) {
+    var hook = hooks[i];
+    if (!hook) return fn();
+    if (self.failures && suite.bail()) return fn();
+    self.currentRunnable = hook;
+
+    hook.ctx.currentTest = self.test;
+
+    self.emit('hook', hook);
+
+    hook.on('error', function(err){
+      self.failHook(hook, err);
+    });
+
+    hook.run(function(err){
+      hook.removeAllListeners('error');
+      var testError = hook.error();
+      if (testError) self.fail(self.test, testError);
+      if (err) {
+        self.failHook(hook, err);
+
+        // stop executing hooks, notify callee of hook err
+        return fn(err);
+      }
+      self.emit('hook end', hook);
+      delete hook.ctx.currentTest;
+      next(++i);
+    });
+  }
+
+  Runner.immediately(function(){
+    next(0);
+  });
+};
+
+/**
+ * Run hook `name` for the given array of `suites`
+ * in order, and callback `fn(err, errSuite)`.
+ *
+ * @param {String} name
+ * @param {Array} suites
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.hooks = function(name, suites, fn){
+  var self = this
+    , orig = this.suite;
+
+  function next(suite) {
+    self.suite = suite;
+
+    if (!suite) {
+      self.suite = orig;
+      return fn();
+    }
+
+    self.hook(name, function(err){
+      if (err) {
+        var errSuite = self.suite;
+        self.suite = orig;
+        return fn(err, errSuite);
+      }
+
+      next(suites.pop());
+    });
+  }
+
+  next(suites.pop());
+};
+
+/**
+ * Run hooks from the top level down.
+ *
+ * @param {String} name
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.hookUp = function(name, fn){
+  var suites = [this.suite].concat(this.parents()).reverse();
+  this.hooks(name, suites, fn);
+};
+
+/**
+ * Run hooks from the bottom up.
+ *
+ * @param {String} name
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.hookDown = function(name, fn){
+  var suites = [this.suite].concat(this.parents());
+  this.hooks(name, suites, fn);
+};
+
+/**
+ * Return an array of parent Suites from
+ * closest to furthest.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+Runner.prototype.parents = function(){
+  var suite = this.suite
+    , suites = [];
+  while (suite = suite.parent) suites.push(suite);
+  return suites;
+};
+
+/**
+ * Run the current test and callback `fn(err)`.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.runTest = function(fn){
+  var test = this.test
+    , self = this;
+
+  if (this.asyncOnly) test.asyncOnly = true;
+
+  try {
+    test.on('error', function(err){
+      self.fail(test, err);
+    });
+    test.run(fn);
+  } catch (err) {
+    fn(err);
+  }
+};
+
+/**
+ * Run tests in the given `suite` and invoke
+ * the callback `fn()` when complete.
+ *
+ * @param {Suite} suite
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.runTests = function(suite, fn){
+  var self = this
+    , tests = suite.tests.slice()
+    , test;
+
+
+  function hookErr(err, errSuite, after) {
+    // before/after Each hook for errSuite failed:
+    var orig = self.suite;
+
+    // for failed 'after each' hook start from errSuite parent,
+    // otherwise start from errSuite itself
+    self.suite = after ? errSuite.parent : errSuite;
+
+    if (self.suite) {
+      // call hookUp afterEach
+      self.hookUp('afterEach', function(err2, errSuite2) {
+        self.suite = orig;
+        // some hooks may fail even now
+        if (err2) return hookErr(err2, errSuite2, true);
+        // report error suite
+        fn(errSuite);
+      });
+    } else {
+      // there is no need calling other 'after each' hooks
+      self.suite = orig;
+      fn(errSuite);
+    }
+  }
+
+  function next(err, errSuite) {
+    // if we bail after first err
+    if (self.failures && suite._bail) return fn();
+
+    if (self._abort) return fn();
+
+    if (err) return hookErr(err, errSuite, true);
+
+    // next test
+    test = tests.shift();
+
+    // all done
+    if (!test) return fn();
+
+    // grep
+    var match = self._grep.test(test.fullTitle());
+    if (self._invert) match = !match;
+    if (!match) return next();
+
+    // pending
+    if (test.pending) {
+      self.emit('pending', test);
+      self.emit('test end', test);
+      return next();
+    }
+
+    // execute test and hook(s)
+    self.emit('test', self.test = test);
+    self.hookDown('beforeEach', function(err, errSuite){
+
+      if (err) return hookErr(err, errSuite, false);
+
+      self.currentRunnable = self.test;
+      self.runTest(function(err){
+        test = self.test;
+
+        if (err) {
+          self.fail(test, err);
+          self.emit('test end', test);
+          return self.hookUp('afterEach', next);
+        }
+
+        test.state = 'passed';
+        self.emit('pass', test);
+        self.emit('test end', test);
+        self.hookUp('afterEach', next);
+      });
+    });
+  }
+
+  this.next = next;
+  next();
+};
+
+/**
+ * Run the given `suite` and invoke the
+ * callback `fn()` when complete.
+ *
+ * @param {Suite} suite
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.runSuite = function(suite, fn){
+  var total = this.grepTotal(suite)
+    , self = this
+    , i = 0;
+
+  debug('run suite %s', suite.fullTitle());
+
+  if (!total) return fn();
+
+  this.emit('suite', this.suite = suite);
+
+  function next(errSuite) {
+    if (errSuite) {
+      // current suite failed on a hook from errSuite
+      if (errSuite == suite) {
+        // if errSuite is current suite
+        // continue to the next sibling suite
+        return done();
+      } else {
+        // errSuite is among the parents of current suite
+        // stop execution of errSuite and all sub-suites
+        return done(errSuite);
+      }
+    }
+
+    if (self._abort) return done();
+
+    var curr = suite.suites[i++];
+    if (!curr) return done();
+    self.runSuite(curr, next);
+  }
+
+  function done(errSuite) {
+    self.suite = suite;
+    self.hook('afterAll', function(){
+      self.emit('suite end', suite);
+      fn(errSuite);
+    });
+  }
+
+  this.hook('beforeAll', function(err){
+    if (err) return done();
+    self.runTests(suite, next);
+  });
+};
+
+/**
+ * Handle uncaught exceptions.
+ *
+ * @param {Error} err
+ * @api private
+ */
+
+Runner.prototype.uncaught = function(err){
+  debug('uncaught exception %s', err.message);
+  var runnable = this.currentRunnable;
+  if (!runnable || 'failed' == runnable.state) return;
+  runnable.clearTimeout();
+  err.uncaught = true;
+  this.fail(runnable, err);
+
+  // recover from test
+  if ('test' == runnable.type) {
+    this.emit('test end', runnable);
+    this.hookUp('afterEach', this.next);
+    return;
+  }
+
+  // bail on hooks
+  this.emit('end');
+};
+
+/**
+ * Run the root suite and invoke `fn(failures)`
+ * on completion.
+ *
+ * @param {Function} fn
+ * @return {Runner} for chaining
+ * @api public
+ */
+
+Runner.prototype.run = function(fn){
+  var self = this
+    , fn = fn || function(){};
+
+  function uncaught(err){
+    self.uncaught(err);
+  }
+
+  debug('start');
+
+  // callback
+  this.on('end', function(){
+    debug('end');
+    process.removeListener('uncaughtException', uncaught);
+    fn(self.failures);
+  });
+
+  // run suites
+  this.emit('start');
+  this.runSuite(this.suite, function(){
+    debug('finished running');
+    self.emit('end');
+  });
+
+  // uncaught exception
+  process.on('uncaughtException', uncaught);
+
+  return this;
+};
+
+/**
+ * Cleanly abort execution
+ *
+ * @return {Runner} for chaining
+ * @api public
+ */
+Runner.prototype.abort = function(){
+  debug('aborting');
+  this._abort = true;
+}
+
+/**
+ * Filter leaks with the given globals flagged as `ok`.
+ *
+ * @param {Array} ok
+ * @param {Array} globals
+ * @return {Array}
+ * @api private
+ */
+
+function filterLeaks(ok, globals) {
+  return filter(globals, function(key){
+    // Firefox and Chrome exposes iframes as index inside the window object
+    if (/^d+/.test(key)) return false;
+
+    // in firefox
+    // if runner runs in an iframe, this iframe's window.getInterface method not init at first
+    // it is assigned in some seconds
+    if (global.navigator && /^getInterface/.test(key)) return false;
+
+    // an iframe could be approached by window[iframeIndex]
+    // in ie6,7,8 and opera, iframeIndex is enumerable, this could cause leak
+    if (global.navigator && /^\d+/.test(key)) return false;
+
+    // Opera and IE expose global variables for HTML element IDs (issue #243)
+    if (/^mocha-/.test(key)) return false;
+
+    var matched = filter(ok, function(ok){
+      if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]);
+      return key == ok;
+    });
+    return matched.length == 0 && (!global.navigator || 'onerror' !== key);
+  });
+}
+
+/**
+ * Array of globals dependent on the environment.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+ function extraGlobals() {
+  if (typeof(process) === 'object' &&
+      typeof(process.version) === 'string') {
+
+    var nodeVersion = process.version.split('.').reduce(function(a, v) {
+      return a << 8 | v;
+    });
+
+    // 'errno' was renamed to process._errno in v0.9.11.
+
+    if (nodeVersion < 0x00090B) {
+      return ['errno'];
+    }
+  }
+
+  return [];
+ }
+
+}); // module: runner.js
+
+require.register("suite.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = require('browser/events').EventEmitter
+  , debug = require('browser/debug')('mocha:suite')
+  , milliseconds = require('./ms')
+  , utils = require('./utils')
+  , Hook = require('./hook');
+
+/**
+ * Expose `Suite`.
+ */
+
+exports = module.exports = Suite;
+
+/**
+ * Create a new `Suite` with the given `title`
+ * and parent `Suite`. When a suite with the
+ * same title is already present, that suite
+ * is returned to provide nicer reporter
+ * and more flexible meta-testing.
+ *
+ * @param {Suite} parent
+ * @param {String} title
+ * @return {Suite}
+ * @api public
+ */
+
+exports.create = function(parent, title){
+  var suite = new Suite(title, parent.ctx);
+  suite.parent = parent;
+  if (parent.pending) suite.pending = true;
+  title = suite.fullTitle();
+  parent.addSuite(suite);
+  return suite;
+};
+
+/**
+ * Initialize a new `Suite` with the given
+ * `title` and `ctx`.
+ *
+ * @param {String} title
+ * @param {Context} ctx
+ * @api private
+ */
+
+function Suite(title, ctx) {
+  this.title = title;
+  this.ctx = ctx;
+  this.suites = [];
+  this.tests = [];
+  this.pending = false;
+  this._beforeEach = [];
+  this._beforeAll = [];
+  this._afterEach = [];
+  this._afterAll = [];
+  this.root = !title;
+  this._timeout = 2000;
+  this._slow = 75;
+  this._bail = false;
+}
+
+/**
+ * Inherit from `EventEmitter.prototype`.
+ */
+
+function F(){};
+F.prototype = EventEmitter.prototype;
+Suite.prototype = new F;
+Suite.prototype.constructor = Suite;
+
+
+/**
+ * Return a clone of this `Suite`.
+ *
+ * @return {Suite}
+ * @api private
+ */
+
+Suite.prototype.clone = function(){
+  var suite = new Suite(this.title);
+  debug('clone');
+  suite.ctx = this.ctx;
+  suite.timeout(this.timeout());
+  suite.slow(this.slow());
+  suite.bail(this.bail());
+  return suite;
+};
+
+/**
+ * Set timeout `ms` or short-hand such as "2s".
+ *
+ * @param {Number|String} ms
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.timeout = function(ms){
+  if (0 == arguments.length) return this._timeout;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('timeout %d', ms);
+  this._timeout = parseInt(ms, 10);
+  return this;
+};
+
+/**
+ * Set slow `ms` or short-hand such as "2s".
+ *
+ * @param {Number|String} ms
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.slow = function(ms){
+  if (0 === arguments.length) return this._slow;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('slow %d', ms);
+  this._slow = ms;
+  return this;
+};
+
+/**
+ * Sets whether to bail after first error.
+ *
+ * @parma {Boolean} bail
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.bail = function(bail){
+  if (0 == arguments.length) return this._bail;
+  debug('bail %s', bail);
+  this._bail = bail;
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` before running tests.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.beforeAll = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"before all" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._beforeAll.push(hook);
+  this.emit('beforeAll', hook);
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` after running tests.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.afterAll = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"after all" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._afterAll.push(hook);
+  this.emit('afterAll', hook);
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` before each test case.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.beforeEach = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"before each" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._beforeEach.push(hook);
+  this.emit('beforeEach', hook);
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` after each test case.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.afterEach = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"after each" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._afterEach.push(hook);
+  this.emit('afterEach', hook);
+  return this;
+};
+
+/**
+ * Add a test `suite`.
+ *
+ * @param {Suite} suite
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.addSuite = function(suite){
+  suite.parent = this;
+  suite.timeout(this.timeout());
+  suite.slow(this.slow());
+  suite.bail(this.bail());
+  this.suites.push(suite);
+  this.emit('suite', suite);
+  return this;
+};
+
+/**
+ * Add a `test` to this suite.
+ *
+ * @param {Test} test
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.addTest = function(test){
+  test.parent = this;
+  test.timeout(this.timeout());
+  test.slow(this.slow());
+  test.ctx = this.ctx;
+  this.tests.push(test);
+  this.emit('test', test);
+  return this;
+};
+
+/**
+ * Return the full title generated by recursively
+ * concatenating the parent's full title.
+ *
+ * @return {String}
+ * @api public
+ */
+
+Suite.prototype.fullTitle = function(){
+  if (this.parent) {
+    var full = this.parent.fullTitle();
+    if (full) return full + ' ' + this.title;
+  }
+  return this.title;
+};
+
+/**
+ * Return the total number of tests.
+ *
+ * @return {Number}
+ * @api public
+ */
+
+Suite.prototype.total = function(){
+  return utils.reduce(this.suites, function(sum, suite){
+    return sum + suite.total();
+  }, 0) + this.tests.length;
+};
+
+/**
+ * Iterates through each suite recursively to find
+ * all tests. Applies a function in the format
+ * `fn(test)`.
+ *
+ * @param {Function} fn
+ * @return {Suite}
+ * @api private
+ */
+
+Suite.prototype.eachTest = function(fn){
+  utils.forEach(this.tests, fn);
+  utils.forEach(this.suites, function(suite){
+    suite.eachTest(fn);
+  });
+  return this;
+};
+
+}); // module: suite.js
+
+require.register("test.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Runnable = require('./runnable');
+
+/**
+ * Expose `Test`.
+ */
+
+module.exports = Test;
+
+/**
+ * Initialize a new `Test` with the given `title` and callback `fn`.
+ *
+ * @param {String} title
+ * @param {Function} fn
+ * @api private
+ */
+
+function Test(title, fn) {
+  Runnable.call(this, title, fn);
+  this.pending = !fn;
+  this.type = 'test';
+}
+
+/**
+ * Inherit from `Runnable.prototype`.
+ */
+
+function F(){};
+F.prototype = Runnable.prototype;
+Test.prototype = new F;
+Test.prototype.constructor = Test;
+
+
+}); // module: test.js
+
+require.register("utils.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var fs = require('browser/fs')
+  , path = require('browser/path')
+  , join = path.join
+  , debug = require('browser/debug')('mocha:watch');
+
+/**
+ * Ignored directories.
+ */
+
+var ignore = ['node_modules', '.git'];
+
+/**
+ * Escape special characters in the given string of html.
+ *
+ * @param  {String} html
+ * @return {String}
+ * @api private
+ */
+
+exports.escape = function(html){
+  return String(html)
+    .replace(/&/g, '&amp;')
+    .replace(/"/g, '&quot;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
+};
+
+/**
+ * Array#forEach (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} scope
+ * @api private
+ */
+
+exports.forEach = function(arr, fn, scope){
+  for (var i = 0, l = arr.length; i < l; i++)
+    fn.call(scope, arr[i], i);
+};
+
+/**
+ * Array#map (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} scope
+ * @api private
+ */
+
+exports.map = function(arr, fn, scope){
+  var result = [];
+  for (var i = 0, l = arr.length; i < l; i++)
+    result.push(fn.call(scope, arr[i], i));
+  return result;
+};
+
+/**
+ * Array#indexOf (<=IE8)
+ *
+ * @parma {Array} arr
+ * @param {Object} obj to find index of
+ * @param {Number} start
+ * @api private
+ */
+
+exports.indexOf = function(arr, obj, start){
+  for (var i = start || 0, l = arr.length; i < l; i++) {
+    if (arr[i] === obj)
+      return i;
+  }
+  return -1;
+};
+
+/**
+ * Array#reduce (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} initial value
+ * @api private
+ */
+
+exports.reduce = function(arr, fn, val){
+  var rval = val;
+
+  for (var i = 0, l = arr.length; i < l; i++) {
+    rval = fn(rval, arr[i], i, arr);
+  }
+
+  return rval;
+};
+
+/**
+ * Array#filter (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @api private
+ */
+
+exports.filter = function(arr, fn){
+  var ret = [];
+
+  for (var i = 0, l = arr.length; i < l; i++) {
+    var val = arr[i];
+    if (fn(val, i, arr)) ret.push(val);
+  }
+
+  return ret;
+};
+
+/**
+ * Object.keys (<=IE8)
+ *
+ * @param {Object} obj
+ * @return {Array} keys
+ * @api private
+ */
+
+exports.keys = Object.keys || function(obj) {
+  var keys = []
+    , has = Object.prototype.hasOwnProperty // for `window` on <=IE8
+
+  for (var key in obj) {
+    if (has.call(obj, key)) {
+      keys.push(key);
+    }
+  }
+
+  return keys;
+};
+
+/**
+ * Watch the given `files` for changes
+ * and invoke `fn(file)` on modification.
+ *
+ * @param {Array} files
+ * @param {Function} fn
+ * @api private
+ */
+
+exports.watch = function(files, fn){
+  var options = { interval: 100 };
+  files.forEach(function(file){
+    debug('file %s', file);
+    fs.watchFile(file, options, function(curr, prev){
+      if (prev.mtime < curr.mtime) fn(file);
+    });
+  });
+};
+
+/**
+ * Ignored files.
+ */
+
+function ignored(path){
+  return !~ignore.indexOf(path);
+}
+
+/**
+ * Lookup files in the given `dir`.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+exports.files = function(dir, ret){
+  ret = ret || [];
+
+  fs.readdirSync(dir)
+  .filter(ignored)
+  .forEach(function(path){
+    path = join(dir, path);
+    if (fs.statSync(path).isDirectory()) {
+      exports.files(path, ret);
+    } else if (path.match(/\.(js|coffee|litcoffee|coffee.md)$/)) {
+      ret.push(path);
+    }
+  });
+
+  return ret;
+};
+
+/**
+ * Compute a slug from the given `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+exports.slug = function(str){
+  return str
+    .toLowerCase()
+    .replace(/ +/g, '-')
+    .replace(/[^-\w]/g, '');
+};
+
+/**
+ * Strip the function definition from `str`,
+ * and re-indent for pre whitespace.
+ */
+
+exports.clean = function(str) {
+  str = str
+    .replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, '')
+    .replace(/^function *\(.*\) *{/, '')
+    .replace(/\s+\}$/, '');
+
+  var spaces = str.match(/^\n?( *)/)[1].length
+    , tabs = str.match(/^\n?(\t*)/)[1].length
+    , re = new RegExp('^\n?' + (tabs ? '\t' : ' ') + '{' + (tabs ? tabs : spaces) + '}', 'gm');
+
+  str = str.replace(re, '');
+
+  return exports.trim(str);
+};
+
+/**
+ * Escape regular expression characters in `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+exports.escapeRegexp = function(str){
+  return str.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&");
+};
+
+/**
+ * Trim the given `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+exports.trim = function(str){
+  return str.replace(/^\s+|\s+$/g, '');
+};
+
+/**
+ * Parse the given `qs`.
+ *
+ * @param {String} qs
+ * @return {Object}
+ * @api private
+ */
+
+exports.parseQuery = function(qs){
+  return exports.reduce(qs.replace('?', '').split('&'), function(obj, pair){
+    var i = pair.indexOf('=')
+      , key = pair.slice(0, i)
+      , val = pair.slice(++i);
+
+    obj[key] = decodeURIComponent(val);
+    return obj;
+  }, {});
+};
+
+/**
+ * Highlight the given string of `js`.
+ *
+ * @param {String} js
+ * @return {String}
+ * @api private
+ */
+
+function highlight(js) {
+  return js
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/\/\/(.*)/gm, '<span class="comment">//$1</span>')
+    .replace(/('.*?')/gm, '<span class="string">$1</span>')
+    .replace(/(\d+\.\d+)/gm, '<span class="number">$1</span>')
+    .replace(/(\d+)/gm, '<span class="number">$1</span>')
+    .replace(/\bnew *(\w+)/gm, '<span class="keyword">new</span> <span class="init">$1</span>')
+    .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '<span class="keyword">$1</span>')
+}
+
+/**
+ * Highlight the contents of tag `name`.
+ *
+ * @param {String} name
+ * @api private
+ */
+
+exports.highlightTags = function(name) {
+  var code = document.getElementsByTagName(name);
+  for (var i = 0, len = code.length; i < len; ++i) {
+    code[i].innerHTML = highlight(code[i].innerHTML);
+  }
+};
+
+}); // module: utils.js
+// The global object is "self" in Web Workers.
+global = (function() { return this; })();
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date;
+var setTimeout = global.setTimeout;
+var setInterval = global.setInterval;
+var clearTimeout = global.clearTimeout;
+var clearInterval = global.clearInterval;
+
+/**
+ * Node shims.
+ *
+ * These are meant only to allow
+ * mocha.js to run untouched, not
+ * to allow running node code in
+ * the browser.
+ */
+
+var process = {};
+process.exit = function(status){};
+process.stdout = {};
+
+var uncaughtExceptionHandlers = [];
+
+/**
+ * Remove uncaughtException listener.
+ */
+
+process.removeListener = function(e, fn){
+  if ('uncaughtException' == e) {
+    global.onerror = function() {};
+    var i = Mocha.utils.indexOf(uncaughtExceptionHandlers, fn);
+    if (i != -1) { uncaughtExceptionHandlers.splice(i, 1); }
+  }
+};
+
+/**
+ * Implements uncaughtException listener.
+ */
+
+process.on = function(e, fn){
+  if ('uncaughtException' == e) {
+    global.onerror = function(err, url, line){
+      fn(new Error(err + ' (' + url + ':' + line + ')'));
+      return true;
+    };
+    uncaughtExceptionHandlers.push(fn);
+  }
+};
+
+/**
+ * Expose mocha.
+ */
+
+var Mocha = global.Mocha = require('mocha'),
+    mocha = global.mocha = new Mocha({ reporter: 'html' });
+
+// The BDD UI is registered by default, but no UI will be functional in the
+// browser without an explicit call to the overridden `mocha.ui` (see below).
+// Ensure that this default UI does not expose its methods to the global scope.
+mocha.suite.removeAllListeners('pre-require');
+
+var immediateQueue = []
+  , immediateTimeout;
+
+function timeslice() {
+  var immediateStart = new Date().getTime();
+  while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
+    immediateQueue.shift()();
+  }
+  if (immediateQueue.length) {
+    immediateTimeout = setTimeout(timeslice, 0);
+  } else {
+    immediateTimeout = null;
+  }
+}
+
+/**
+ * High-performance override of Runner.immediately.
+ */
+
+Mocha.Runner.immediately = function(callback) {
+  immediateQueue.push(callback);
+  if (!immediateTimeout) {
+    immediateTimeout = setTimeout(timeslice, 0);
+  }
+};
+
+/**
+ * Function to allow assertion libraries to throw errors directly into mocha.
+ * This is useful when running tests in a browser because window.onerror will
+ * only receive the 'message' attribute of the Error.
+ */
+mocha.throwError = function(err) {
+  Mocha.utils.forEach(uncaughtExceptionHandlers, function (fn) {
+    fn(err);
+  });
+  throw err;
+};
+
+/**
+ * Override ui to ensure that the ui functions are initialized.
+ * Normally this would happen in Mocha.prototype.loadFiles.
+ */
+
+mocha.ui = function(ui){
+  Mocha.prototype.ui.call(this, ui);
+  this.suite.emit('pre-require', global, null, this);
+  return this;
+};
+
+/**
+ * Setup mocha with the given setting options.
+ */
+
+mocha.setup = function(opts){
+  if ('string' == typeof opts) opts = { ui: opts };
+  for (var opt in opts) this[opt](opts[opt]);
+  return this;
+};
+
+/**
+ * Run mocha, returning the Runner.
+ */
+
+mocha.run = function(fn){
+  var options = mocha.options;
+  mocha.globals('location');
+
+  var query = Mocha.utils.parseQuery(global.location.search || '');
+  if (query.grep) mocha.grep(query.grep);
+  if (query.invert) mocha.invert();
+
+  return Mocha.prototype.run.call(mocha, function(){
+    // The DOM Document is not available in Web Workers.
+    if (global.document) {
+      Mocha.utils.highlightTags('code');
+    }
+    if (fn) fn();
+  });
+};
+
+/**
+ * Expose the process shim.
+ */
+
+Mocha.process = process;
+})();
\ No newline at end of file

From 0990db56f0600654b174d31219e45bea08d0db3c Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:41 +0100
Subject: [PATCH 004/117] Bug 972020 - Loop basic UI. r=Standard8

--HG--
rename : browser/components/loop/content/libs/backbone-min.js => browser/components/loop/content/shared/libs/backbone-1.1.2.js
rename : browser/components/loop/content/libs/lodash.min.js => browser/components/loop/content/shared/libs/lodash-2.4.1.js
---
 browser/components/loop/content/js/client.js  |   65 +
 browser/components/loop/content/js/fxcom.js   |   70 +
 browser/components/loop/content/js/panel.js   |  146 +
 .../components/loop/content/libs/zepto.min.js |    2 -
 browser/components/loop/content/panel.html    |   38 +-
 .../components/loop/content/shared/README.md  |   12 +
 .../loop/content/shared/css/common.css        |  138 +
 .../loop/content/shared/css/conversation.css  |   43 +
 .../loop/content/shared/css/panel.css         |   60 +
 .../loop/content/shared/css/readme.html       |  173 +
 .../loop/content/shared/img/icon_32.png       |  Bin 0 -> 2351 bytes
 .../loop/content/shared/img/icon_64.png       |  Bin 0 -> 4081 bytes
 .../libs/backbone-1.1.2.js}                   |    0
 .../loop/content/shared/libs/jquery-2.1.0.js  |    4 +
 .../libs/lodash-2.4.1.js}                     |    0
 .../content/shared/libs/webl10n-20130617.js   | 1157 ++++
 browser/components/loop/jar.mn                |   15 +-
 .../loop/test/mocha-test/client_test.js       |   69 +
 .../loop/test/mocha-test/index.html           |   37 +-
 .../loop/test/mocha-test/panel_test.js        |  128 +
 .../loop/test/mocha-test/sample_test.js       |    9 -
 .../loop/test/vendor/sinon-1.9.0.js           | 4794 +++++++++++++++++
 .../en-US/chrome/browser/loop/loop.properties |    5 +
 browser/locales/jar.mn                        |    1 +
 24 files changed, 6944 insertions(+), 22 deletions(-)
 create mode 100644 browser/components/loop/content/js/client.js
 create mode 100644 browser/components/loop/content/js/fxcom.js
 create mode 100644 browser/components/loop/content/js/panel.js
 delete mode 100644 browser/components/loop/content/libs/zepto.min.js
 create mode 100644 browser/components/loop/content/shared/README.md
 create mode 100644 browser/components/loop/content/shared/css/common.css
 create mode 100644 browser/components/loop/content/shared/css/conversation.css
 create mode 100644 browser/components/loop/content/shared/css/panel.css
 create mode 100644 browser/components/loop/content/shared/css/readme.html
 create mode 100644 browser/components/loop/content/shared/img/icon_32.png
 create mode 100644 browser/components/loop/content/shared/img/icon_64.png
 rename browser/components/loop/content/{libs/backbone-min.js => shared/libs/backbone-1.1.2.js} (100%)
 create mode 100644 browser/components/loop/content/shared/libs/jquery-2.1.0.js
 rename browser/components/loop/content/{libs/lodash.min.js => shared/libs/lodash-2.4.1.js} (100%)
 create mode 100644 browser/components/loop/content/shared/libs/webl10n-20130617.js
 create mode 100644 browser/components/loop/test/mocha-test/client_test.js
 create mode 100644 browser/components/loop/test/mocha-test/panel_test.js
 delete mode 100644 browser/components/loop/test/mocha-test/sample_test.js
 create mode 100644 browser/components/loop/test/vendor/sinon-1.9.0.js
 create mode 100644 browser/locales/en-US/chrome/browser/loop/loop.properties

diff --git a/browser/components/loop/content/js/client.js b/browser/components/loop/content/js/client.js
new file mode 100644
index 000000000000..30493de7bc46
--- /dev/null
+++ b/browser/components/loop/content/js/client.js
@@ -0,0 +1,65 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*global loop*/
+
+var loop = loop || {};
+loop.Client = (function($) {
+  "use strict";
+
+  /**
+   * Loop server client.
+   *
+   * @param {Object} settings Settings object.
+   */
+  function Client(settings) {
+    settings = settings || {};
+    if (!settings.hasOwnProperty("baseApiUrl")) {
+      throw new Error("missing required baseApiUrl");
+    }
+    this.settings = settings;
+  }
+
+  Client.prototype = {
+    /**
+     * Requests a call URL to the Loop server.
+     *
+     * @param  {Function} cb Callback(err, callUrl)
+     */
+    requestCallUrl: function(simplepushUrl, cb) {
+      var endpoint = this.settings.baseApiUrl + "/call-url/",
+          reqData = {simplepushUrl: simplepushUrl};
+
+      function validate(callUrlData) {
+        if (typeof callUrlData !== "object" ||
+            !callUrlData.hasOwnProperty("call_url")) {
+          var message = "Invalid call url data received";
+          console.error(message, callUrlData);
+          throw new Error(message);
+        }
+        return callUrlData.call_url;
+      }
+
+      var req = $.post(endpoint, reqData, function(callUrlData) {
+        try {
+          cb(null, validate(callUrlData));
+        } catch (err) {
+          cb(err);
+        }
+      }, "json");
+
+      req.fail(function(xhr, type, err) {
+        var error = "Unknown error.";
+        if (xhr && xhr.responseJSON && xhr.responseJSON.error) {
+          error = xhr.responseJSON.error;
+        }
+        var message = "HTTP error " + xhr.status + ": " + err + "; " + error;
+        console.error(message);
+        cb(new Error(message));
+      });
+    }
+  };
+
+  return Client;
+})(jQuery);
diff --git a/browser/components/loop/content/js/fxcom.js b/browser/components/loop/content/js/fxcom.js
new file mode 100644
index 000000000000..0d70b4c706b5
--- /dev/null
+++ b/browser/components/loop/content/js/fxcom.js
@@ -0,0 +1,70 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+Components.utils.import("resource://gre/modules/Services.jsm");
+const Ci = Components.interfaces;
+
+/**
+ * Data accessor for chrome resources. This is used to provide an
+ * interface for l10n.js to use.
+ *
+ * XXX currently this file accesses chrome direct, and hence is a big
+ * simplification on what it could be. When we implement
+ * bug 976109 we'll likely need to do a proxy to the chrome space.
+ */
+var FirefoxCom = (function FirefoxComClosure() {
+  return {
+    /**
+     * Handles requests for data synchronously.
+     */
+    requestSync: function(action, data) {
+      if (action === 'getLocale')
+        return this.getLocale();
+
+      if (action === 'getStrings')
+        return this.getStrings(data);
+
+      console.error('[fxcom] Action' + action + ' is unknown');
+      return null;
+    },
+
+    getLocale: function() {
+      try {
+        return Services.prefs.getCharPref('general.useragent.locale');
+      } catch (x) {
+        return 'en-US';
+      }
+    },
+
+    getStrings: function(data) {
+      try {
+        return JSON.stringify(this.localizedStrings[data] || null);
+      } catch (e) {
+        console.error('[fxcom] Unable to retrive localized strings: ' + e);
+      }
+    },
+
+    get localizedStrings() {
+      var stringBundle =
+        Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
+
+      var map = {};
+      var enumerator = stringBundle.getSimpleEnumeration();
+      while (enumerator.hasMoreElements()) {
+        var string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
+        var key = string.key, property = 'textContent';
+        var i = key.lastIndexOf('.');
+        if (i >= 0) {
+          property = key.substring(i + 1);
+          key = key.substring(0, i);
+        }
+        if (!(key in map))
+          map[key] = {};
+        map[key][property] = string.value;
+      }
+      delete this.localizedStrings;
+      return this.localizedStrings = map;
+    }
+  };
+})();
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
new file mode 100644
index 000000000000..6b76eddbd0bb
--- /dev/null
+++ b/browser/components/loop/content/js/panel.js
@@ -0,0 +1,146 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*global loop*/
+
+var loop = loop || {};
+loop.panel = (function(_, __) {
+  "use strict";
+
+  // XXX: baseApiUrl should be configurable (browser pref)
+  var baseApiUrl = "http://localhost:5000",
+      panelView;
+
+  /**
+   * Panel initialisation.
+   */
+  function init() {
+    panelView = new PanelView();
+    panelView.render();
+  }
+
+  /**
+   * Notification model.
+   */
+  var NotificationModel = Backbone.Model.extend({
+    defaults: {
+      level: "info",
+      message: ""
+    }
+  });
+
+  /**
+   * Notification collection
+   */
+  var NotificationCollection = Backbone.Collection.extend({
+    model: NotificationModel
+  });
+
+  /**
+   * Notification view.
+   */
+  var NotificationView = Backbone.View.extend({
+    template: _.template([
+      '<div class="alert alert-<%- level %>">',
+      '  <button class="close"></button>',
+      '  <p class="message"><%- message %></p>',
+      '</div>'
+    ].join("")),
+
+    events: {
+      "click .close": "dismiss"
+    },
+
+    dismiss: function() {
+      this.$el.addClass("fade-out");
+      setTimeout(function() {
+        this.collection.remove(this.model);
+        this.remove();
+      }.bind(this), 500);
+    },
+
+    render: function() {
+      this.$el.html(this.template(this.model.toJSON()));
+      return this;
+    }
+  });
+
+  /**
+   * Notification list view.
+   */
+  var NotificationListView = Backbone.View.extend({
+    initialize: function() {
+      this.listenTo(this.collection, "reset add remove", this.render);
+    },
+
+    render: function() {
+      this.$el.html(this.collection.map(function(notification) {
+        return new NotificationView({
+          model: notification,
+          collection: this.collection
+        }).render().$el;
+      }.bind(this)));
+      return this;
+    }
+  });
+
+  /**
+   * Panel view.
+   */
+  var PanelView = Backbone.View.extend({
+    el: "#default-view",
+
+    events: {
+      "click a.get-url": "getCallUrl"
+    },
+
+    initialize: function() {
+      this.client = new loop.Client({
+        baseApiUrl: baseApiUrl
+      });
+      this.notificationCollection = new NotificationCollection();
+      this.notificationListView = new NotificationListView({
+        el: this.$(".messages"),
+        collection: this.notificationCollection
+      });
+      this.notificationListView.render();
+    },
+
+    notify: function(message, level) {
+      this.notificationCollection.add({
+        level: level || "info",
+        message: message
+      });
+    },
+
+    getCallUrl: function(event) {
+      event.preventDefault();
+      var simplepushUrl = "http://fake.url/"; // XXX: send a real simplepush url
+      this.client.requestCallUrl(simplepushUrl, function(err, callUrl) {
+        if (err) {
+          this.notify(__("unable_retrieve_url"), "error");
+          return;
+        }
+        this.onCallUrlReceived(callUrl);
+      }.bind(this));
+    },
+
+    onCallUrlReceived: function(callUrl) {
+      this.notificationCollection.reset();
+      this.$(".action .invite").hide();
+      this.$(".action .result input").val(callUrl);
+      this.$(".action .result").show();
+      this.$(".description p").text(__("share_link_url"));
+    }
+  });
+
+  return {
+    init: init,
+    NotificationModel: NotificationModel,
+    NotificationCollection: NotificationCollection,
+    NotificationView: NotificationView,
+    NotificationListView: NotificationListView,
+    PanelView: PanelView
+  };
+})(_, document.mozL10n.get);
diff --git a/browser/components/loop/content/libs/zepto.min.js b/browser/components/loop/content/libs/zepto.min.js
deleted file mode 100644
index 0b2f97adbb64..000000000000
--- a/browser/components/loop/content/libs/zepto.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Zepto v1.1.3 - zepto event ajax form ie - zeptojs.com/license */
-var Zepto=function(){function L(t){return null==t?String(t):j[T.call(t)]||"object"}function Z(t){return"function"==L(t)}function $(t){return null!=t&&t==t.window}function _(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function D(t){return"object"==L(t)}function R(t){return D(t)&&!$(t)&&Object.getPrototypeOf(t)==Object.prototype}function M(t){return"number"==typeof t.length}function k(t){return s.call(t,function(t){return null!=t})}function z(t){return t.length>0?n.fn.concat.apply([],t):t}function F(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function q(t){return t in f?f[t]:f[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function H(t,e){return"number"!=typeof e||c[F(t)]?e:e+"px"}function I(t){var e,n;return u[t]||(e=a.createElement(t),a.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),u[t]=n),u[t]}function V(t){return"children"in t?o.call(t.children):n.map(t.childNodes,function(t){return 1==t.nodeType?t:void 0})}function U(n,i,r){for(e in i)r&&(R(i[e])||A(i[e]))?(R(i[e])&&!R(n[e])&&(n[e]={}),A(i[e])&&!A(n[e])&&(n[e]=[]),U(n[e],i[e],r)):i[e]!==t&&(n[e]=i[e])}function B(t,e){return null==e?n(t):n(t).filter(e)}function J(t,e,n,i){return Z(e)?e.call(t,n,i):e}function X(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function W(e,n){var i=e.className,r=i&&i.baseVal!==t;return n===t?r?i.baseVal:i:void(r?i.baseVal=n:e.className=n)}function Y(t){var e;try{return t?"true"==t||("false"==t?!1:"null"==t?null:/^0/.test(t)||isNaN(e=Number(t))?/^[\[\{]/.test(t)?n.parseJSON(t):t:e):t}catch(i){return t}}function G(t,e){e(t);for(var n in t.childNodes)G(t.childNodes[n],e)}var t,e,n,i,C,N,r=[],o=r.slice,s=r.filter,a=window.document,u={},f={},c={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},l=/^\s*<(\w+|!)[^>]*>/,h=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,p=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,d=/^(?:body|html)$/i,m=/([A-Z])/g,g=["val","css","html","text","data","width","height","offset"],v=["after","prepend","before","append"],y=a.createElement("table"),x=a.createElement("tr"),b={tr:a.createElement("tbody"),tbody:y,thead:y,tfoot:y,td:x,th:x,"*":a.createElement("div")},w=/complete|loaded|interactive/,E=/^[\w-]*$/,j={},T=j.toString,S={},O=a.createElement("div"),P={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},A=Array.isArray||function(t){return t instanceof Array};return S.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var i,r=t.parentNode,o=!r;return o&&(r=O).appendChild(t),i=~S.qsa(r,e).indexOf(t),o&&O.removeChild(t),i},C=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},N=function(t){return s.call(t,function(e,n){return t.indexOf(e)==n})},S.fragment=function(e,i,r){var s,u,f;return h.test(e)&&(s=n(a.createElement(RegExp.$1))),s||(e.replace&&(e=e.replace(p,"<$1></$2>")),i===t&&(i=l.test(e)&&RegExp.$1),i in b||(i="*"),f=b[i],f.innerHTML=""+e,s=n.each(o.call(f.childNodes),function(){f.removeChild(this)})),R(r)&&(u=n(s),n.each(r,function(t,e){g.indexOf(t)>-1?u[t](e):u.attr(t,e)})),s},S.Z=function(t,e){return t=t||[],t.__proto__=n.fn,t.selector=e||"",t},S.isZ=function(t){return t instanceof S.Z},S.init=function(e,i){var r;if(!e)return S.Z();if("string"==typeof e)if(e=e.trim(),"<"==e[0]&&l.test(e))r=S.fragment(e,RegExp.$1,i),e=null;else{if(i!==t)return n(i).find(e);r=S.qsa(a,e)}else{if(Z(e))return n(a).ready(e);if(S.isZ(e))return e;if(A(e))r=k(e);else if(D(e))r=[e],e=null;else if(l.test(e))r=S.fragment(e.trim(),RegExp.$1,i),e=null;else{if(i!==t)return n(i).find(e);r=S.qsa(a,e)}}return S.Z(r,e)},n=function(t,e){return S.init(t,e)},n.extend=function(t){var e,n=o.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){U(t,n,e)}),t},S.qsa=function(t,e){var n,i="#"==e[0],r=!i&&"."==e[0],s=i||r?e.slice(1):e,a=E.test(s);return _(t)&&a&&i?(n=t.getElementById(s))?[n]:[]:1!==t.nodeType&&9!==t.nodeType?[]:o.call(a&&!i?r?t.getElementsByClassName(s):t.getElementsByTagName(e):t.querySelectorAll(e))},n.contains=function(t,e){return t!==e&&t.contains(e)},n.type=L,n.isFunction=Z,n.isWindow=$,n.isArray=A,n.isPlainObject=R,n.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},n.inArray=function(t,e,n){return r.indexOf.call(e,t,n)},n.camelCase=C,n.trim=function(t){return null==t?"":String.prototype.trim.call(t)},n.uuid=0,n.support={},n.expr={},n.map=function(t,e){var n,r,o,i=[];if(M(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&i.push(n);else for(o in t)n=e(t[o],o),null!=n&&i.push(n);return z(i)},n.each=function(t,e){var n,i;if(M(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(i in t)if(e.call(t[i],i,t[i])===!1)return t;return t},n.grep=function(t,e){return s.call(t,e)},window.JSON&&(n.parseJSON=JSON.parse),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){j["[object "+e+"]"]=e.toLowerCase()}),n.fn={forEach:r.forEach,reduce:r.reduce,push:r.push,sort:r.sort,indexOf:r.indexOf,concat:r.concat,map:function(t){return n(n.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return n(o.apply(this,arguments))},ready:function(t){return w.test(a.readyState)&&a.body?t(n):a.addEventListener("DOMContentLoaded",function(){t(n)},!1),this},get:function(e){return e===t?o.call(this):this[e>=0?e:e+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return r.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return Z(t)?this.not(this.not(t)):n(s.call(this,function(e){return S.matches(e,t)}))},add:function(t,e){return n(N(this.concat(n(t,e))))},is:function(t){return this.length>0&&S.matches(this[0],t)},not:function(e){var i=[];if(Z(e)&&e.call!==t)this.each(function(t){e.call(this,t)||i.push(this)});else{var r="string"==typeof e?this.filter(e):M(e)&&Z(e.item)?o.call(e):n(e);this.forEach(function(t){r.indexOf(t)<0&&i.push(t)})}return n(i)},has:function(t){return this.filter(function(){return D(t)?n.contains(this,t):n(this).find(t).size()})},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!D(t)?t:n(t)},last:function(){var t=this[this.length-1];return t&&!D(t)?t:n(t)},find:function(t){var e,i=this;return e="object"==typeof t?n(t).filter(function(){var t=this;return r.some.call(i,function(e){return n.contains(e,t)})}):1==this.length?n(S.qsa(this[0],t)):this.map(function(){return S.qsa(this,t)})},closest:function(t,e){var i=this[0],r=!1;for("object"==typeof t&&(r=n(t));i&&!(r?r.indexOf(i)>=0:S.matches(i,t));)i=i!==e&&!_(i)&&i.parentNode;return n(i)},parents:function(t){for(var e=[],i=this;i.length>0;)i=n.map(i,function(t){return(t=t.parentNode)&&!_(t)&&e.indexOf(t)<0?(e.push(t),t):void 0});return B(e,t)},parent:function(t){return B(N(this.pluck("parentNode")),t)},children:function(t){return B(this.map(function(){return V(this)}),t)},contents:function(){return this.map(function(){return o.call(this.childNodes)})},siblings:function(t){return B(this.map(function(t,e){return s.call(V(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return n.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=I(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var e=Z(t);if(this[0]&&!e)var i=n(t).get(0),r=i.parentNode||this.length>1;return this.each(function(o){n(this).wrapAll(e?t.call(this,o):r?i.cloneNode(!0):i)})},wrapAll:function(t){if(this[0]){n(this[0]).before(t=n(t));for(var e;(e=t.children()).length;)t=e.first();n(t).append(this)}return this},wrapInner:function(t){var e=Z(t);return this.each(function(i){var r=n(this),o=r.contents(),s=e?t.call(this,i):t;o.length?o.wrapAll(s):r.append(s)})},unwrap:function(){return this.parent().each(function(){n(this).replaceWith(n(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(e){return this.each(function(){var i=n(this);(e===t?"none"==i.css("display"):e)?i.show():i.hide()})},prev:function(t){return n(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return n(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0===arguments.length?this.length>0?this[0].innerHTML:null:this.each(function(e){var i=this.innerHTML;n(this).empty().append(J(this,t,e,i))})},text:function(e){return 0===arguments.length?this.length>0?this[0].textContent:null:this.each(function(){this.textContent=e===t?"":""+e})},attr:function(n,i){var r;return"string"==typeof n&&i===t?0==this.length||1!==this[0].nodeType?t:"value"==n&&"INPUT"==this[0].nodeName?this.val():!(r=this[0].getAttribute(n))&&n in this[0]?this[0][n]:r:this.each(function(t){if(1===this.nodeType)if(D(n))for(e in n)X(this,e,n[e]);else X(this,n,J(this,i,t,this.getAttribute(n)))})},removeAttr:function(t){return this.each(function(){1===this.nodeType&&X(this,t)})},prop:function(e,n){return e=P[e]||e,n===t?this[0]&&this[0][e]:this.each(function(t){this[e]=J(this,n,t,this[e])})},data:function(e,n){var i=this.attr("data-"+e.replace(m,"-$1").toLowerCase(),n);return null!==i?Y(i):t},val:function(t){return 0===arguments.length?this[0]&&(this[0].multiple?n(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value):this.each(function(e){this.value=J(this,t,e,this.value)})},offset:function(t){if(t)return this.each(function(e){var i=n(this),r=J(this,t,e,i.offset()),o=i.offsetParent().offset(),s={top:r.top-o.top,left:r.left-o.left};"static"==i.css("position")&&(s.position="relative"),i.css(s)});if(0==this.length)return null;var e=this[0].getBoundingClientRect();return{left:e.left+window.pageXOffset,top:e.top+window.pageYOffset,width:Math.round(e.width),height:Math.round(e.height)}},css:function(t,i){if(arguments.length<2){var r=this[0],o=getComputedStyle(r,"");if(!r)return;if("string"==typeof t)return r.style[C(t)]||o.getPropertyValue(t);if(A(t)){var s={};return n.each(A(t)?t:[t],function(t,e){s[e]=r.style[C(e)]||o.getPropertyValue(e)}),s}}var a="";if("string"==L(t))i||0===i?a=F(t)+":"+H(t,i):this.each(function(){this.style.removeProperty(F(t))});else for(e in t)t[e]||0===t[e]?a+=F(e)+":"+H(e,t[e])+";":this.each(function(){this.style.removeProperty(F(e))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(n(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return t?r.some.call(this,function(t){return this.test(W(t))},q(t)):!1},addClass:function(t){return t?this.each(function(e){i=[];var r=W(this),o=J(this,t,e,r);o.split(/\s+/g).forEach(function(t){n(this).hasClass(t)||i.push(t)},this),i.length&&W(this,r+(r?" ":"")+i.join(" "))}):this},removeClass:function(e){return this.each(function(n){return e===t?W(this,""):(i=W(this),J(this,e,n,i).split(/\s+/g).forEach(function(t){i=i.replace(q(t)," ")}),void W(this,i.trim()))})},toggleClass:function(e,i){return e?this.each(function(r){var o=n(this),s=J(this,e,r,W(this));s.split(/\s+/g).forEach(function(e){(i===t?!o.hasClass(e):i)?o.addClass(e):o.removeClass(e)})}):this},scrollTop:function(e){if(this.length){var n="scrollTop"in this[0];return e===t?n?this[0].scrollTop:this[0].pageYOffset:this.each(n?function(){this.scrollTop=e}:function(){this.scrollTo(this.scrollX,e)})}},scrollLeft:function(e){if(this.length){var n="scrollLeft"in this[0];return e===t?n?this[0].scrollLeft:this[0].pageXOffset:this.each(n?function(){this.scrollLeft=e}:function(){this.scrollTo(e,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),i=this.offset(),r=d.test(e[0].nodeName)?{top:0,left:0}:e.offset();return i.top-=parseFloat(n(t).css("margin-top"))||0,i.left-=parseFloat(n(t).css("margin-left"))||0,r.top+=parseFloat(n(e[0]).css("border-top-width"))||0,r.left+=parseFloat(n(e[0]).css("border-left-width"))||0,{top:i.top-r.top,left:i.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||a.body;t&&!d.test(t.nodeName)&&"static"==n(t).css("position");)t=t.offsetParent;return t})}},n.fn.detach=n.fn.remove,["width","height"].forEach(function(e){var i=e.replace(/./,function(t){return t[0].toUpperCase()});n.fn[e]=function(r){var o,s=this[0];return r===t?$(s)?s["inner"+i]:_(s)?s.documentElement["scroll"+i]:(o=this.offset())&&o[e]:this.each(function(t){s=n(this),s.css(e,J(this,r,t,s[e]()))})}}),v.forEach(function(t,e){var i=e%2;n.fn[t]=function(){var t,o,r=n.map(arguments,function(e){return t=L(e),"object"==t||"array"==t||null==e?e:S.fragment(e)}),s=this.length>1;return r.length<1?this:this.each(function(t,a){o=i?a:a.parentNode,a=0==e?a.nextSibling:1==e?a.firstChild:2==e?a:null,r.forEach(function(t){if(s)t=t.cloneNode(!0);else if(!o)return n(t).remove();G(o.insertBefore(t,a),function(t){null==t.nodeName||"SCRIPT"!==t.nodeName.toUpperCase()||t.type&&"text/javascript"!==t.type||t.src||window.eval.call(window,t.innerHTML)})})})},n.fn[i?t+"To":"insert"+(e?"Before":"After")]=function(e){return n(e)[t](this),this}}),S.Z.prototype=n.fn,S.uniq=N,S.deserializeValue=Y,n.zepto=S,n}();window.Zepto=Zepto,void 0===window.$&&(window.$=Zepto),function(t){function l(t){return t._zid||(t._zid=e++)}function h(t,e,n,i){if(e=p(e),e.ns)var r=d(e.ns);return(s[l(t)]||[]).filter(function(t){return!(!t||e.e&&t.e!=e.e||e.ns&&!r.test(t.ns)||n&&l(t.fn)!==l(n)||i&&t.sel!=i)})}function p(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function d(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function m(t,e){return t.del&&!u&&t.e in f||!!e}function g(t){return c[t]||u&&f[t]||t}function v(e,i,r,o,a,u,f){var h=l(e),d=s[h]||(s[h]=[]);i.split(/\s/).forEach(function(i){if("ready"==i)return t(document).ready(r);var s=p(i);s.fn=r,s.sel=a,s.e in c&&(r=function(e){var n=e.relatedTarget;return!n||n!==this&&!t.contains(this,n)?s.fn.apply(this,arguments):void 0}),s.del=u;var l=u||r;s.proxy=function(t){if(t=j(t),!t.isImmediatePropagationStopped()){t.data=o;var i=l.apply(e,t._args==n?[t]:[t].concat(t._args));return i===!1&&(t.preventDefault(),t.stopPropagation()),i}},s.i=d.length,d.push(s),"addEventListener"in e&&e.addEventListener(g(s.e),s.proxy,m(s,f))})}function y(t,e,n,i,r){var o=l(t);(e||"").split(/\s/).forEach(function(e){h(t,e,n,i).forEach(function(e){delete s[o][e.i],"removeEventListener"in t&&t.removeEventListener(g(e.e),e.proxy,m(e,r))})})}function j(e,i){return(i||!e.isDefaultPrevented)&&(i||(i=e),t.each(E,function(t,n){var r=i[t];e[t]=function(){return this[n]=x,r&&r.apply(i,arguments)},e[n]=b}),(i.defaultPrevented!==n?i.defaultPrevented:"returnValue"in i?i.returnValue===!1:i.getPreventDefault&&i.getPreventDefault())&&(e.isDefaultPrevented=x)),e}function T(t){var e,i={originalEvent:t};for(e in t)w.test(e)||t[e]===n||(i[e]=t[e]);return j(i,t)}var n,e=1,i=Array.prototype.slice,r=t.isFunction,o=function(t){return"string"==typeof t},s={},a={},u="onfocusin"in window,f={focus:"focusin",blur:"focusout"},c={mouseenter:"mouseover",mouseleave:"mouseout"};a.click=a.mousedown=a.mouseup=a.mousemove="MouseEvents",t.event={add:v,remove:y},t.proxy=function(e,n){if(r(e)){var i=function(){return e.apply(n,arguments)};return i._zid=l(e),i}if(o(n))return t.proxy(e[n],e);throw new TypeError("expected function")},t.fn.bind=function(t,e,n){return this.on(t,e,n)},t.fn.unbind=function(t,e){return this.off(t,e)},t.fn.one=function(t,e,n,i){return this.on(t,e,n,i,1)};var x=function(){return!0},b=function(){return!1},w=/^([A-Z]|returnValue$|layer[XY]$)/,E={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};t.fn.delegate=function(t,e,n){return this.on(e,t,n)},t.fn.undelegate=function(t,e,n){return this.off(e,t,n)},t.fn.live=function(e,n){return t(document.body).delegate(this.selector,e,n),this},t.fn.die=function(e,n){return t(document.body).undelegate(this.selector,e,n),this},t.fn.on=function(e,s,a,u,f){var c,l,h=this;return e&&!o(e)?(t.each(e,function(t,e){h.on(t,s,a,e,f)}),h):(o(s)||r(u)||u===!1||(u=a,a=s,s=n),(r(a)||a===!1)&&(u=a,a=n),u===!1&&(u=b),h.each(function(n,r){f&&(c=function(t){return y(r,t.type,u),u.apply(this,arguments)}),s&&(l=function(e){var n,o=t(e.target).closest(s,r).get(0);return o&&o!==r?(n=t.extend(T(e),{currentTarget:o,liveFired:r}),(c||u).apply(o,[n].concat(i.call(arguments,1)))):void 0}),v(r,e,u,a,s,l||c)}))},t.fn.off=function(e,i,s){var a=this;return e&&!o(e)?(t.each(e,function(t,e){a.off(t,i,e)}),a):(o(i)||r(s)||s===!1||(s=i,i=n),s===!1&&(s=b),a.each(function(){y(this,e,s,i)}))},t.fn.trigger=function(e,n){return e=o(e)||t.isPlainObject(e)?t.Event(e):j(e),e._args=n,this.each(function(){"dispatchEvent"in this?this.dispatchEvent(e):t(this).triggerHandler(e,n)})},t.fn.triggerHandler=function(e,n){var i,r;return this.each(function(s,a){i=T(o(e)?t.Event(e):e),i._args=n,i.target=a,t.each(h(a,e.type||e),function(t,e){return r=e.proxy(i),i.isImmediatePropagationStopped()?!1:void 0})}),r},"focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(e){t.fn[e]=function(t){return t?this.bind(e,t):this.trigger(e)}}),["focus","blur"].forEach(function(e){t.fn[e]=function(t){return t?this.bind(e,t):this.each(function(){try{this[e]()}catch(t){}}),this}}),t.Event=function(t,e){o(t)||(e=t,t=e.type);var n=document.createEvent(a[t]||"Events"),i=!0;if(e)for(var r in e)"bubbles"==r?i=!!e[r]:n[r]=e[r];return n.initEvent(t,i,!0),j(n)}}(Zepto),function(t){function l(e,n,i){var r=t.Event(n);return t(e).trigger(r,i),!r.isDefaultPrevented()}function h(t,e,i,r){return t.global?l(e||n,i,r):void 0}function p(e){e.global&&0===t.active++&&h(e,null,"ajaxStart")}function d(e){e.global&&!--t.active&&h(e,null,"ajaxStop")}function m(t,e){var n=e.context;return e.beforeSend.call(n,t,e)===!1||h(e,n,"ajaxBeforeSend",[t,e])===!1?!1:void h(e,n,"ajaxSend",[t,e])}function g(t,e,n,i){var r=n.context,o="success";n.success.call(r,t,o,e),i&&i.resolveWith(r,[t,o,e]),h(n,r,"ajaxSuccess",[e,n,t]),y(o,e,n)}function v(t,e,n,i,r){var o=i.context;i.error.call(o,n,e,t),r&&r.rejectWith(o,[n,e,t]),h(i,o,"ajaxError",[n,i,t||e]),y(e,n,i)}function y(t,e,n){var i=n.context;n.complete.call(i,e,t),h(n,i,"ajaxComplete",[e,n]),d(n)}function x(){}function b(t){return t&&(t=t.split(";",2)[0]),t&&(t==f?"html":t==u?"json":s.test(t)?"script":a.test(t)&&"xml")||"text"}function w(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function E(e){e.processData&&e.data&&"string"!=t.type(e.data)&&(e.data=t.param(e.data,e.traditional)),!e.data||e.type&&"GET"!=e.type.toUpperCase()||(e.url=w(e.url,e.data),e.data=void 0)}function j(e,n,i,r){return t.isFunction(n)&&(r=i,i=n,n=void 0),t.isFunction(i)||(r=i,i=void 0),{url:e,data:n,success:i,dataType:r}}function S(e,n,i,r){var o,s=t.isArray(n),a=t.isPlainObject(n);t.each(n,function(n,u){o=t.type(u),r&&(n=i?r:r+"["+(a||"object"==o||"array"==o?n:"")+"]"),!r&&s?e.add(u.name,u.value):"array"==o||!i&&"object"==o?S(e,u,i,n):e.add(n,u)})}var i,r,e=0,n=window.document,o=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,s=/^(?:text|application)\/javascript/i,a=/^(?:text|application)\/xml/i,u="application/json",f="text/html",c=/^\s*$/;t.active=0,t.ajaxJSONP=function(i,r){if(!("type"in i))return t.ajax(i);var f,h,o=i.jsonpCallback,s=(t.isFunction(o)?o():o)||"jsonp"+ ++e,a=n.createElement("script"),u=window[s],c=function(e){t(a).triggerHandler("error",e||"abort")},l={abort:c};return r&&r.promise(l),t(a).on("load error",function(e,n){clearTimeout(h),t(a).off().remove(),"error"!=e.type&&f?g(f[0],l,i,r):v(null,n||"error",l,i,r),window[s]=u,f&&t.isFunction(u)&&u(f[0]),u=f=void 0}),m(l,i)===!1?(c("abort"),l):(window[s]=function(){f=arguments},a.src=i.url.replace(/\?(.+)=\?/,"?$1="+s),n.head.appendChild(a),i.timeout>0&&(h=setTimeout(function(){c("timeout")},i.timeout)),l)},t.ajaxSettings={type:"GET",beforeSend:x,success:x,error:x,complete:x,context:null,global:!0,xhr:function(){return new window.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:u,xml:"application/xml, text/xml",html:f,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0},t.ajax=function(e){var n=t.extend({},e||{}),o=t.Deferred&&t.Deferred();for(i in t.ajaxSettings)void 0===n[i]&&(n[i]=t.ajaxSettings[i]);p(n),n.crossDomain||(n.crossDomain=/^([\w-]+:)?\/\/([^\/]+)/.test(n.url)&&RegExp.$2!=window.location.host),n.url||(n.url=window.location.toString()),E(n),n.cache===!1&&(n.url=w(n.url,"_="+Date.now()));var s=n.dataType,a=/\?.+=\?/.test(n.url);if("jsonp"==s||a)return a||(n.url=w(n.url,n.jsonp?n.jsonp+"=?":n.jsonp===!1?"":"callback=?")),t.ajaxJSONP(n,o);var j,u=n.accepts[s],f={},l=function(t,e){f[t.toLowerCase()]=[t,e]},h=/^([\w-]+:)\/\//.test(n.url)?RegExp.$1:window.location.protocol,d=n.xhr(),y=d.setRequestHeader;if(o&&o.promise(d),n.crossDomain||l("X-Requested-With","XMLHttpRequest"),l("Accept",u||"*/*"),(u=n.mimeType||u)&&(u.indexOf(",")>-1&&(u=u.split(",",2)[0]),d.overrideMimeType&&d.overrideMimeType(u)),(n.contentType||n.contentType!==!1&&n.data&&"GET"!=n.type.toUpperCase())&&l("Content-Type",n.contentType||"application/x-www-form-urlencoded"),n.headers)for(r in n.headers)l(r,n.headers[r]);if(d.setRequestHeader=l,d.onreadystatechange=function(){if(4==d.readyState){d.onreadystatechange=x,clearTimeout(j);var e,i=!1;if(d.status>=200&&d.status<300||304==d.status||0==d.status&&"file:"==h){s=s||b(n.mimeType||d.getResponseHeader("content-type")),e=d.responseText;try{"script"==s?(1,eval)(e):"xml"==s?e=d.responseXML:"json"==s&&(e=c.test(e)?null:t.parseJSON(e))}catch(r){i=r}i?v(i,"parsererror",d,n,o):g(e,d,n,o)}else v(d.statusText||null,d.status?"error":"abort",d,n,o)}},m(d,n)===!1)return d.abort(),v(null,"abort",d,n,o),d;if(n.xhrFields)for(r in n.xhrFields)d[r]=n.xhrFields[r];var T="async"in n?n.async:!0;d.open(n.type,n.url,T,n.username,n.password);for(r in f)y.apply(d,f[r]);return n.timeout>0&&(j=setTimeout(function(){d.onreadystatechange=x,d.abort(),v(null,"timeout",d,n,o)},n.timeout)),d.send(n.data?n.data:null),d},t.get=function(){return t.ajax(j.apply(null,arguments))},t.post=function(){var e=j.apply(null,arguments);return e.type="POST",t.ajax(e)},t.getJSON=function(){var e=j.apply(null,arguments);return e.dataType="json",t.ajax(e)},t.fn.load=function(e,n,i){if(!this.length)return this;var a,r=this,s=e.split(/\s/),u=j(e,n,i),f=u.success;return s.length>1&&(u.url=s[0],a=s[1]),u.success=function(e){r.html(a?t("<div>").html(e.replace(o,"")).find(a):e),f&&f.apply(r,arguments)},t.ajax(u),this};var T=encodeURIComponent;t.param=function(t,e){var n=[];return n.add=function(t,e){this.push(T(t)+"="+T(e))},S(n,t,e),n.join("&").replace(/%20/g,"+")}}(Zepto),function(t){t.fn.serializeArray=function(){var n,e=[];return t([].slice.call(this.get(0).elements)).each(function(){n=t(this);var i=n.attr("type");"fieldset"!=this.nodeName.toLowerCase()&&!this.disabled&&"submit"!=i&&"reset"!=i&&"button"!=i&&("radio"!=i&&"checkbox"!=i||this.checked)&&e.push({name:n.attr("name"),value:n.val()})}),e},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(e)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(Zepto),function(t){"__proto__"in{}||t.extend(t.zepto,{Z:function(e,n){return e=e||[],t.extend(e,t.fn),e.selector=n||"",e.__Z=!0,e},isZ:function(e){return"array"===t.type(e)&&"__Z"in e}});try{getComputedStyle(void 0)}catch(e){var n=getComputedStyle;window.getComputedStyle=function(t){try{return n(t)}catch(e){return null}}}}(Zepto);
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index f7daf2582639..8d2922a5aa81 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -4,20 +4,44 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Loop Panel</title>
+    <link rel="stylesheet" type="text/css" href="shared/css/common.css">
+    <link rel="stylesheet" type="text/css" href="shared/css/panel.css">
+  </head>
+  <body onload="loop.panel.init();">
+    <!-- XXX (n1k0): i10n tbd later as these are temporary texts. -->
+    <div id="default-view" class="share generate-url">
+      <div class="description">
+        <p data-l10n-id="get_link_to_share">
+          Get a link to share with a friend to Video Chat.
+        </p>
+      </div>
+      <div class="action">
+        <div class="messages"></div>
+        <p class="invite">
+          <a class="get-url btn btn-success" href=""
+             data-l10n-id="get_a_call_url">Get a call url</a>
+        </p>
+        <p class="result hide">
+          <input id="call-url" type="url" readonly>
+          <a class="get-url btn btn-info" href="" data-l10n-id="renew">Renew</a>
+        </p>
+      </div>
+    </div>
+
     <!-- XXX (adam): Should we import our own version of Webl10n?
          What we have here is a copy of the version from pdf.js
          (which I can't seem to reference directly, so we've copied
          it here). At the very least, if we're using the same
          library as pdf.js, we should be referring to the same
          file. -->
+    <script type="text/javascript" src="js/fxcom.js"></script>
     <script type="text/javascript" src="libs/l10n.js"></script>
-    <script type="text/javascript" src="libs/zepto.min.js"></script>
-    <script type="text/javascript" src="libs/lodash.min.js"></script>
-    <script type="text/javascript" src="libs/backbone-min.js"></script>
-  </head>
-  <body>
-    <!-- Intentionally not localisable as this is a temporary page -->
-    <p>Soon you'll be able to get a url to share with your friends and chat with them</p>
+    <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
+    <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
+    <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
+    <script type="text/javascript" src="js/client.js"></script>
+    <script type="text/javascript" src="js/panel.js"></script>
   </body>
 </html>
diff --git a/browser/components/loop/content/shared/README.md b/browser/components/loop/content/shared/README.md
new file mode 100644
index 000000000000..8773432f4e32
--- /dev/null
+++ b/browser/components/loop/content/shared/README.md
@@ -0,0 +1,12 @@
+Loop Shared Web Assets
+======================
+
+This directory contains web assets shared across the Loop client webapp and the
+Loop Firefox Component.
+
+Warning
+-------
+
+Any modification in these files will have possible side effects on both the
+Firefox component and the webapp. The `css/readme.html` file uses all the shared
+styles, you should use it as a way of checking for visual regressions.
diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
new file mode 100644
index 000000000000..c4b969ec4f46
--- /dev/null
+++ b/browser/components/loop/content/shared/css/common.css
@@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Generic rules */
+
+/**
+ * "Fixes" the Box Model.
+ * @see http://www.paulirish.com/2012/box-sizing-border-box-ftw/
+ */
+*, *:before, *:after {
+  box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  padding: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans;
+  font-size: 14px;
+  background: #f2f2f2;
+}
+
+button {
+  font-size: .9em; /* for some reason, text is larger within <button> */
+}
+
+img {
+  border: none;
+}
+
+/* Helpers */
+
+/**
+ * Clearfix impl. for modern browsers
+ * 1. The space content is one way to avoid an Opera bug when the
+ *    contenteditable attribute is included anywhere else in the document.
+ *    Otherwise it causes space to appear at the top and bottom of elements
+ *    that are clearfixed.
+ * 2. The use of `table` rather than `block` is only necessary if using
+ *    `:before` to contain the top-margins of child elements.
+ */
+.cf:before,
+.cf:after {
+  content: " ";   /* 1 */
+  display: table; /* 2 */
+}
+
+.cf:after {
+  clear: both;
+}
+
+.hide {
+  display: none;
+}
+
+.tc {
+  text-align: center;
+}
+
+/* Buttons */
+
+.btn {
+  display: inline-block;
+  background: #aaa;
+  border: none;
+  color: #fff;
+  text-decoration: none;
+  padding: .25em .5em .3em;
+  border-radius: .2em;
+}
+
+.btn-info {
+  background: #428BCA;
+}
+
+.btn-success {
+  background: #5cb85c;
+}
+
+.btn-warning {
+  background: #f0ad4e;
+}
+
+.btn-error {
+  background: #d9534f;
+}
+
+/* Alerts */
+.alert {
+  background: #eee;
+  padding: .2em 1em;
+  margin-bottom: 1em;
+}
+
+.alert p.message {
+  padding: 0;
+  margin: 0;
+}
+
+.alert.alert-error {
+  background: #f99;
+  border: 1px solid #f77;
+}
+
+.alert .close {
+  position: relative;
+  top: 0;
+  right: -.8em;
+}
+
+/* Misc */
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 1em;
+  color: #000;
+  opacity: .2;
+}
+
+.close:before {
+  /* \2716 is unicode representation of the close button icon */
+  content: '\2716';
+}
+
+button.close {
+  background: none;
+  border: none;
+  padding: none;
+  cursor: pointer;
+}
+
+/* Transitions */
+.fade-out {
+  transition: opacity 0.5s ease-in;
+  opacity: 0;
+}
diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
new file mode 100644
index 000000000000..d65bdced5a03
--- /dev/null
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Conversation window styles */
+
+.conversation .controls {
+  background: #f2f2f2;
+  padding: .5em;
+}
+
+.conversation .media video {
+  background: #eee;
+}
+
+/* Nested video elements */
+
+.conversation .media.nested {
+  position: relative;
+}
+
+.conversation .media.nested .remote {
+  width: 100%;
+}
+
+.conversation .media.nested .local {
+  position: absolute;
+  bottom: .8em;
+  right: .8em;
+  width: 30%;
+  max-width: 140px;
+}
+
+/* Side by side video elements */
+
+.conversation .media.side-by-side .remote {
+  width: 50%;
+  float: left;
+}
+
+.conversation .media.side-by-side .local {
+  width: 50%;
+}
diff --git a/browser/components/loop/content/shared/css/panel.css b/browser/components/loop/content/shared/css/panel.css
new file mode 100644
index 000000000000..d75b141b979f
--- /dev/null
+++ b/browser/components/loop/content/shared/css/panel.css
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Panel styles */
+
+.spacer {
+  margin-bottom: 1em;
+}
+
+.share {
+  background: #f2f2f2;
+}
+
+.share .description {
+  background: #f7f7f7 url("../img/icon_32.png") no-repeat 1em 1.5em;
+  border-bottom: 1px solid #c3c3c3;
+  padding: 1em 1em 0 4em;
+}
+
+.share .description .field {
+  padding-bottom: 1em;
+  border-bottom: 1px dotted #ddd;
+}
+
+.share .description select {
+  float: right;
+}
+
+.share .description .preview video {
+  background: #ccc;
+  float: right;
+  width: 180px;
+}
+
+.share .action {
+  clear: right;
+  padding: 1em;
+  border-top: 1px solid #fafafa;
+}
+
+.share .action p {
+  margin: 0 0 1em 0;
+}
+
+.share .action input {
+  font-size: .9em;
+  width: 60%;
+  padding: .4em;
+}
+
+/* Specific cases */
+
+.share.generate-url .action {
+  text-align: center;
+}
+
+.share .action .messages p {
+  margin: 0;
+}
diff --git a/browser/components/loop/content/shared/css/readme.html b/browser/components/loop/content/shared/css/readme.html
new file mode 100644
index 000000000000..0a714552c79d
--- /dev/null
+++ b/browser/components/loop/content/shared/css/readme.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<!-- This file is intended to help frontend developers to easily identify what
+     are the available styles for the Loop UI components. -->
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Loop UI shared CSS information/demo</title>
+  <link type="text/css" rel="stylesheet" href="common.css">
+  <link type="text/css" rel="stylesheet" href="panel.css">
+  <link type="text/css" rel="stylesheet" href="conversation.css">
+  <style>
+    body {
+      width: 600px;
+      margin: 1em auto;
+      background: #fff;
+      font-family: Helvetica, Arial, sans;
+    }
+  </style>
+</head>
+<body>
+  <h1>Loop UI toolkit</h1>
+
+  <h2>Logo icons</h2>
+
+  <p>
+    <img src="../img/icon_32.png"> 32x32 transparent PNG
+    <img src="../img/icon_64.png"> 64x64 transparent PNG
+  </p>
+
+  <p><em><strong>Note:</strong> these are temporary.</em></p>
+
+  <h2>Share panel</h2>
+
+  <h3>Simple</h3>
+
+  <div class="share">
+    <form class="description">
+      <p>This is a simple message.</p>
+    </form>
+    <div class="action">
+      <p><input type="url" value="http://loop.im/plop75"></p>
+      <p>Your name will appear as <a href="">Unnamed</a>.</p>
+    </div>
+  </div>
+
+  <h3>Featuring options</h3>
+
+  <div class="share">
+    <form class="description">
+      <p class="field">
+        <label>Share this link with a friend to
+          <select>
+            <option>browse together</option>
+            <option selected="selected">video chat</option>
+            <option>audio chat</option>
+            <option>text chat</option>
+          </select>
+        </label>
+      </p>
+      <p class="field">
+        <label>
+          Use webcam <select><option>Foo</option></select>
+        </label>
+      </p>
+      <p class="field">
+        <label>Use whatever
+          <select><option>Long foo is long indeed</option></select>
+        </label>
+      </p>
+      <p class="preview cf">
+        Preview <video></video>
+      </p>
+    </form>
+    <div class="action">
+      <p><input type="url" value="http://loop.im/plop75"></p>
+      <p>Your name will appear as <a href="">Unnamed</a>.</p>
+    </div>
+  </div>
+
+  <h2>Conversation window</h2>
+
+  <p><em>The conversation component adapts automatically to its container to
+    occupy all the available space.</em></p>
+
+  <h3>Large</h3>
+
+  <div class="conversation">
+    <div class="media nested">
+      <video class="remote"></video>
+      <video class="local"></video>
+    </div>
+  </div>
+
+  <h3>Large with controls</h3>
+
+  <div class="conversation">
+    <nav class="controls">
+      <button class="btn">Start</button>
+      <button class="btn">Stop</button>
+    </nav>
+    <div class="media nested">
+      <video class="remote"></video>
+      <video class="local"></video>
+    </div>
+  </div>
+
+  <h3>Small (think chat window)</h3>
+
+  <div style="width: 204px">
+    <div class="conversation">
+      <div class="media nested">
+        <video class="remote"></video>
+        <video class="local"></video>
+      </div>
+    </div>
+  </div>
+
+  <h3>Side by side</h3>
+
+  <div class="conversation">
+    <div class="media side-by-side">
+      <video class="remote"></video>
+      <video class="local"></video>
+    </div>
+  </div>
+
+  <h2>Buttons</h2>
+
+  <h3>Using <code>&lt;a&gt;</code></h3>
+
+  <p>
+    <a href="" class="btn">default</a>
+    <a href="" class="btn btn-info">info</a>
+    <a href="" class="btn btn-success">success</a>
+    <a href="" class="btn btn-warning">warning</a>
+    <a href="" class="btn btn-error">error</a>
+  </p>
+
+  <h3>Inline</h3>
+
+  <p>Click <a href="" class="btn btn-info">here</a>.</p>
+
+  <h3>Using <code>&lt;button&gt;</code></h3>
+
+  <p>
+    <button class="btn">default</button>
+    <button class="btn btn-info">info</button>
+    <button class="btn btn-success">success</button>
+    <button class="btn btn-warning">warning</button>
+    <button class="btn btn-error">error</button>
+  </p>
+
+  <h2>Alerts</h2>
+
+  <div class="alert alert-error">
+    <button class="close"
+            onclick="var el=this.parentNode;el.classList.add('fade-out');setTimeout(el.remove.bind(el), 500);"></button>
+    <p class="message">Oops! Something went really wrong.</p>
+  </div>
+
+  <script>
+  window.onload = function() {
+    [].forEach.call(document.querySelectorAll("video"), function(video) {
+      video.setAttribute("src", "http://v2v.cc/~j/theora_testsuite/320x240.ogg");
+    });
+  }
+  </script>
+</body>
+</html>
diff --git a/browser/components/loop/content/shared/img/icon_32.png b/browser/components/loop/content/shared/img/icon_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..03cc4d461f83d29d4c842d9cc2172f2c310197f7
GIT binary patch
literal 2351
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
IrAB4^2kB(P6951J

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/img/icon_64.png b/browser/components/loop/content/shared/img/icon_64.png
new file mode 100644
index 0000000000000000000000000000000000000000..8368d7c5cd9818703ad4293c2e2f13441f452b4d
GIT binary patch
literal 4081
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/libs/backbone-min.js b/browser/components/loop/content/shared/libs/backbone-1.1.2.js
similarity index 100%
rename from browser/components/loop/content/libs/backbone-min.js
rename to browser/components/loop/content/shared/libs/backbone-1.1.2.js
diff --git a/browser/components/loop/content/shared/libs/jquery-2.1.0.js b/browser/components/loop/content/shared/libs/jquery-2.1.0.js
new file mode 100644
index 000000000000..cbe6abe59a81
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/jquery-2.1.0.js
@@ -0,0 +1,4 @@
+/*! jQuery v2.1.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m=a.document,n="2.1.0",o=function(a,b){return new o.fn.init(a,b)},p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};o.fn=o.prototype={jquery:n,constructor:o,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=o.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return o.each(this,a,b)},map:function(a){return this.pushStack(o.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},o.extend=o.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||o.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(o.isPlainObject(d)||(e=o.isArray(d)))?(e?(e=!1,f=c&&o.isArray(c)?c:[]):f=c&&o.isPlainObject(c)?c:{},g[b]=o.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},o.extend({expando:"jQuery"+(n+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===o.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isPlainObject:function(a){if("object"!==o.type(a)||a.nodeType||o.isWindow(a))return!1;try{if(a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(b){return!1}return!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=o.trim(a),a&&(1===a.indexOf("use strict")?(b=m.createElement("script"),b.text=a,m.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":k.call(a)},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?o.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),o.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||o.guid++,f):void 0},now:Date.now,support:l}),o.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=o.type(a);return"function"===c||o.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);o.find=t,o.expr=t.selectors,o.expr[":"]=o.expr.pseudos,o.unique=t.uniqueSort,o.text=t.getText,o.isXMLDoc=t.isXML,o.contains=t.contains;var u=o.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(o.isFunction(b))return o.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return o.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return o.filter(b,a,c);b=o.filter(b,a)}return o.grep(a,function(a){return g.call(b,a)>=0!==c})}o.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?o.find.matchesSelector(d,a)?[d]:[]:o.find.matches(a,o.grep(b,function(a){return 1===a.nodeType}))},o.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(o(a).filter(function(){for(b=0;c>b;b++)if(o.contains(e[b],this))return!0}));for(b=0;c>b;b++)o.find(a,e[b],d);return d=this.pushStack(c>1?o.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?o(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=o.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof o?b[0]:b,o.merge(this,o.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:m,!0)),v.test(c[1])&&o.isPlainObject(b))for(c in b)o.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=m.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=m,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):o.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(o):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),o.makeArray(a,this))};A.prototype=o.fn,y=o(m);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};o.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&o(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),o.fn.extend({has:function(a){var b=o(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(o.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?o(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&o.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?o.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(o(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(o.unique(o.merge(this.get(),o(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}o.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return o.dir(a,"parentNode")},parentsUntil:function(a,b,c){return o.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return o.dir(a,"nextSibling")},prevAll:function(a){return o.dir(a,"previousSibling")},nextUntil:function(a,b,c){return o.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return o.dir(a,"previousSibling",c)},siblings:function(a){return o.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return o.sibling(a.firstChild)},contents:function(a){return a.contentDocument||o.merge([],a.childNodes)}},function(a,b){o.fn[a]=function(c,d){var e=o.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=o.filter(d,e)),this.length>1&&(C[a]||o.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return o.each(a.match(E)||[],function(a,c){b[c]=!0}),b}o.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):o.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){o.each(b,function(b,c){var d=o.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&o.each(arguments,function(a,b){var c;while((c=o.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?o.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},o.extend({Deferred:function(a){var b=[["resolve","done",o.Callbacks("once memory"),"resolved"],["reject","fail",o.Callbacks("once memory"),"rejected"],["notify","progress",o.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return o.Deferred(function(c){o.each(b,function(b,f){var g=o.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&o.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?o.extend(a,d):d}},e={};return d.pipe=d.then,o.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&o.isFunction(a.promise)?e:0,g=1===f?a:o.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&o.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;o.fn.ready=function(a){return o.ready.promise().done(a),this},o.extend({isReady:!1,readyWait:1,holdReady:function(a){a?o.readyWait++:o.ready(!0)},ready:function(a){(a===!0?--o.readyWait:o.isReady)||(o.isReady=!0,a!==!0&&--o.readyWait>0||(H.resolveWith(m,[o]),o.fn.trigger&&o(m).trigger("ready").off("ready")))}});function I(){m.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),o.ready()}o.ready.promise=function(b){return H||(H=o.Deferred(),"complete"===m.readyState?setTimeout(o.ready):(m.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},o.ready.promise();var J=o.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===o.type(c)){e=!0;for(h in c)o.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,o.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(o(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};o.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=o.expando+Math.random()}K.uid=1,K.accepts=o.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,o.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(o.isEmptyObject(f))o.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,o.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{o.isArray(b)?d=b.concat(b.map(o.camelCase)):(e=o.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!o.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?o.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}o.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),o.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;
+while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=o.camelCase(d.slice(5)),P(f,d,e[d]));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=o.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),o.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||o.isArray(c)?d=L.access(a,b,o.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=o.queue(a,b),d=c.length,e=c.shift(),f=o._queueHooks(a,b),g=function(){o.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:o.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),o.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?o.queue(this[0],a):void 0===b?this:this.each(function(){var c=o.queue(this,a,b);o._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&o.dequeue(this,a)})},dequeue:function(a){return this.each(function(){o.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=o.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===o.css(a,"display")||!o.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=m.createDocumentFragment(),b=a.appendChild(m.createElement("div"));b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";l.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return m.activeElement}catch(a){}}o.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=o.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof o!==U&&o.event.triggered!==b.type?o.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],n=q=h[1],p=(h[2]||"").split(".").sort(),n&&(l=o.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=o.event.special[n]||{},k=o.extend({type:n,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&o.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(n,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),o.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],n=q=h[1],p=(h[2]||"").split(".").sort(),n){l=o.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||o.removeEvent(a,n,r.handle),delete i[n])}else for(n in i)o.event.remove(a,n+b[j],c,d,!0);o.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,p=[d||m],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||m,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+o.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[o.expando]?b:new o.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:o.makeArray(c,[b]),n=o.event.special[q]||{},e||!n.trigger||n.trigger.apply(d,c)!==!1)){if(!e&&!n.noBubble&&!o.isWindow(d)){for(i=n.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||m)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:n.bindType||q,l=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),l&&l.apply(g,c),l=k&&g[k],l&&l.apply&&o.acceptData(g)&&(b.result=l.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||n._default&&n._default.apply(p.pop(),c)!==!1||!o.acceptData(d)||k&&o.isFunction(d[q])&&!o.isWindow(d)&&(h=d[k],h&&(d[k]=null),o.event.triggered=q,d[q](),o.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=o.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=o.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=o.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((o.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?o(e,this).index(i)>=0:o.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||m,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[o.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new o.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=m),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&o.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return o.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=o.extend(new o.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?o.event.trigger(e,null,b):o.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},o.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},o.Event=function(a,b){return this instanceof o.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.getPreventDefault&&a.getPreventDefault()?Z:$):this.type=a,b&&o.extend(this,b),this.timeStamp=a&&a.timeStamp||o.now(),void(this[o.expando]=!0)):new o.Event(a,b)},o.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z,this.stopPropagation()}},o.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){o.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!o.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.focusinBubbles||o.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){o.event.simulate(b,a.target,o.event.fix(a),!0)};o.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),o.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return o().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=o.guid++)),this.each(function(){o.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,o(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){o.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){o.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?o.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return o.nodeName(a,"table")&&o.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)o.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=o.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&o.nodeName(a,b)?o.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}o.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=o.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||o.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,n=a.length;n>m;m++)if(e=a[m],e||0===e)if("object"===o.type(e))o.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;o.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===o.inArray(e,d))&&(i=o.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f,g,h=o.event.special,i=0;void 0!==(c=a[i]);i++){if(o.acceptData(c)&&(f=c[L.expando],f&&(b=L.cache[f]))){if(d=Object.keys(b.events||{}),d.length)for(g=0;void 0!==(e=d[g]);g++)h[e]?o.event.remove(c,e):o.removeEvent(c,e,b.handle);L.cache[f]&&delete L.cache[f]}delete M.cache[c[M.expando]]}}}),o.fn.extend({text:function(a){return J(this,function(a){return void 0===a?o.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?o.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||o.cleanData(ob(c)),c.parentNode&&(b&&o.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(o.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return o.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(o.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,o.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,n=k-1,p=a[0],q=o.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(c=o.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=o.map(ob(c,"script"),kb),g=f.length;k>j;j++)h=c,j!==n&&(h=o.clone(h,!0,!0),g&&o.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,o.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&o.contains(i,h)&&(h.src?o._evalUrl&&o._evalUrl(h.src):o.globalEval(h.textContent.replace(hb,"")))}return this}}),o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){o.fn[a]=function(a){for(var c,d=[],e=o(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),o(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d=o(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:o.css(d[0],"display");return d.detach(),e}function tb(a){var b=m,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||o("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||o.contains(a.ownerDocument,a)||(g=o.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",e=m.documentElement,f=m.createElement("div"),g=m.createElement("div");g.style.backgroundClip="content-box",g.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===g.style.backgroundClip,f.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",f.appendChild(g);function h(){g.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",e.appendChild(f);var d=a.getComputedStyle(g,null);b="1%"!==d.top,c="4px"===d.width,e.removeChild(f)}a.getComputedStyle&&o.extend(l,{pixelPosition:function(){return h(),b},boxSizingReliable:function(){return null==c&&h(),c},reliableMarginRight:function(){var b,c=g.appendChild(m.createElement("div"));return c.style.cssText=g.style.cssText=d,c.style.marginRight=c.style.width="0",g.style.width="1px",e.appendChild(f),b=!parseFloat(a.getComputedStyle(c,null).marginRight),e.removeChild(f),g.innerHTML="",b}})}(),o.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:0,fontWeight:400},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=o.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=o.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=o.css(a,"border"+R[f]+"Width",!0,e))):(g+=o.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=o.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===o.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):f[g]||(e=S(d),(c&&"none"!==c||!e)&&L.set(d,"olddisplay",e?c:o.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}o.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=o.camelCase(b),i=a.style;return b=o.cssProps[h]||(o.cssProps[h]=Fb(i,h)),g=o.cssHooks[b]||o.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(o.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||o.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]="",i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=o.camelCase(b);return b=o.cssProps[h]||(o.cssProps[h]=Fb(a.style,h)),g=o.cssHooks[b]||o.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||o.isNumeric(f)?f||0:e):e}}),o.each(["height","width"],function(a,b){o.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&zb.test(o.css(a,"display"))?o.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===o.css(a,"boxSizing",!1,e),e):0)}}}),o.cssHooks.marginRight=yb(l.reliableMarginRight,function(a,b){return b?o.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),o.each({margin:"",padding:"",border:"Width"},function(a,b){o.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(o.cssHooks[a+b].set=Gb)}),o.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(o.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=o.css(a,b[g],!1,d);return f}return void 0!==c?o.style(a,b,c):o.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?o(this).show():o(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}o.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(o.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?o.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=o.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){o.fx.step[a.prop]?o.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[o.cssProps[a.prop]]||o.cssHooks[a.prop])?o.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},o.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},o.fx=Kb.prototype.init,o.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(o.cssNumber[a]?"":"px"),g=(o.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(o.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,o.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=o.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k=this,l={},m=a.style,n=a.nodeType&&S(a),p=L.get(a,"fxshow");c.queue||(h=o._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,k.always(function(){k.always(function(){h.unqueued--,o.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],j=o.css(a,"display"),"none"===j&&(j=tb(a.nodeName)),"inline"===j&&"none"===o.css(a,"float")&&(m.display="inline-block")),c.overflow&&(m.overflow="hidden",k.always(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(n?"hide":"show")){if("show"!==e||!p||void 0===p[d])continue;n=!0}l[d]=p&&p[d]||o.style(a,d)}if(!o.isEmptyObject(l)){p?"hidden"in p&&(n=p.hidden):p=L.access(a,"fxshow",{}),f&&(p.hidden=!n),n?o(a).show():k.done(function(){o(a).hide()}),k.done(function(){var b;L.remove(a,"fxshow");for(b in l)o.style(a,b,l[b])});for(d in l)g=Ub(n?p[d]:0,d,k),d in p||(p[d]=g.start,n&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=o.camelCase(c),e=b[d],f=a[c],o.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=o.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=o.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:o.extend({},b),opts:o.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=o.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return o.map(k,Ub,j),o.isFunction(j.opts.start)&&j.opts.start.call(a,j),o.fx.timer(o.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}o.Animation=o.extend(Xb,{tweener:function(a,b){o.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),o.speed=function(a,b,c){var d=a&&"object"==typeof a?o.extend({},a):{complete:c||!c&&b||o.isFunction(a)&&a,duration:a,easing:c&&b||b&&!o.isFunction(b)&&b};return d.duration=o.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in o.fx.speeds?o.fx.speeds[d.duration]:o.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){o.isFunction(d.old)&&d.old.call(this),d.queue&&o.dequeue(this,d.queue)},d},o.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=o.isEmptyObject(a),f=o.speed(b,c,d),g=function(){var b=Xb(this,o.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=o.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&o.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=o.timers,g=d?d.length:0;for(c.finish=!0,o.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),o.each(["toggle","show","hide"],function(a,b){var c=o.fn[b];o.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),o.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){o.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),o.timers=[],o.fx.tick=function(){var a,b=0,c=o.timers;for(Lb=o.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||o.fx.stop(),Lb=void 0},o.fx.timer=function(a){o.timers.push(a),a()?o.fx.start():o.timers.pop()},o.fx.interval=13,o.fx.start=function(){Mb||(Mb=setInterval(o.fx.tick,o.fx.interval))},o.fx.stop=function(){clearInterval(Mb),Mb=null},o.fx.speeds={slow:600,fast:200,_default:400},o.fn.delay=function(a,b){return a=o.fx?o.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=m.createElement("input"),b=m.createElement("select"),c=b.appendChild(m.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=m.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var Yb,Zb,$b=o.expr.attrHandle;o.fn.extend({attr:function(a,b){return J(this,o.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){o.removeAttr(this,a)})}}),o.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?o.prop(a,b,c):(1===f&&o.isXMLDoc(a)||(b=b.toLowerCase(),d=o.attrHooks[b]||(o.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=o.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void o.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=o.propFix[c]||c,o.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&o.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?o.removeAttr(a,c):a.setAttribute(c,c),c}},o.each(o.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||o.find.attr;$b[b]=function(a,b,d){var e,f;
+return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;o.fn.extend({prop:function(a,b){return J(this,o.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[o.propFix[a]||a]})}}),o.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!o.isXMLDoc(a),f&&(b=o.propFix[b]||b,e=o.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),l.optSelected||(o.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),o.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){o.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;o.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(o.isFunction(a))return this.each(function(b){o(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=o.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(o.isFunction(a))return this.each(function(b){o(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?o.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(o.isFunction(a)?function(c){o(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=o(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;o.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=o.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,o(this).val()):a,null==e?e="":"number"==typeof e?e+="":o.isArray(e)&&(e=o.map(e,function(a){return null==a?"":a+""})),b=o.valHooks[this.type]||o.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=o.valHooks[e.type]||o.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),o.extend({valHooks:{select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&o.nodeName(c.parentNode,"optgroup"))){if(b=o(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=o.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=o.inArray(o(d).val(),f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),o.each(["radio","checkbox"],function(){o.valHooks[this]={set:function(a,b){return o.isArray(b)?a.checked=o.inArray(o(a).val(),b)>=0:void 0}},l.checkOn||(o.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),o.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){o.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),o.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=o.now(),dc=/\?/;o.parseJSON=function(a){return JSON.parse(a+"")},o.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&o.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=m.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(o.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,o.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=o.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&o.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}o.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":o.parseJSON,"text xml":o.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,o.ajaxSettings),b):tc(o.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=o.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?o(l):o.event,n=o.Deferred(),p=o.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(n.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=o.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=o.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===o.active++&&o.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(o.lastModified[d]&&v.setRequestHeader("If-Modified-Since",o.lastModified[d]),o.etag[d]&&v.setRequestHeader("If-None-Match",o.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(o.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(o.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?n.resolveWith(l,[r,x,v]):n.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--o.active||o.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return o.get(a,b,c,"json")},getScript:function(a,b){return o.get(a,void 0,b,"script")}}),o.each(["get","post"],function(a,b){o[b]=function(a,c,d,e){return o.isFunction(c)&&(e=e||d,d=c,c=void 0),o.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),o.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){o.fn[b]=function(a){return this.on(b,a)}}),o._evalUrl=function(a){return o.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},o.fn.extend({wrapAll:function(a){var b;return o.isFunction(a)?this.each(function(b){o(this).wrapAll(a.call(this,b))}):(this[0]&&(b=o(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(o.isFunction(a)?function(b){o(this).wrapInner(a.call(this,b))}:function(){var b=o(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=o.isFunction(a);return this.each(function(c){o(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){o.nodeName(this,"body")||o(this).replaceWith(this.childNodes)}).end()}}),o.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},o.expr.filters.visible=function(a){return!o.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(o.isArray(b))o.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==o.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}o.param=function(a,b){var c,d=[],e=function(a,b){b=o.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=o.ajaxSettings&&o.ajaxSettings.traditional),o.isArray(a)||a.jquery&&!o.isPlainObject(a))o.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},o.fn.extend({serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=o.prop(this,"elements");return a?o.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!o(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=o(this).val();return null==c?null:o.isArray(c)?o.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),o.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=o.ajaxSettings.xhr();a.ActiveXObject&&o(a).on("unload",function(){for(var a in Dc)Dc[a]()}),l.cors=!!Fc&&"withCredentials"in Fc,l.ajax=Fc=!!Fc,o.ajaxTransport(function(a){var b;return l.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort"),f.send(a.hasContent&&a.data||null)},abort:function(){b&&b()}}:void 0}),o.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return o.globalEval(a),a}}}),o.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),o.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=o("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),m.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;o.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||o.expando+"_"+cc++;return this[a]=!0,a}}),o.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=o.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||o.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&o.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),o.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||m;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=o.buildFragment([a],b,e),e&&e.length&&o(e).remove(),o.merge([],d.childNodes))};var Ic=o.fn.load;o.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h),a=a.slice(0,h)),o.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&o.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?o("<div>").append(o.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},o.expr.filters.animated=function(a){return o.grep(o.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return o.isWindow(a)?a:9===a.nodeType&&a.defaultView}o.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=o.css(a,"position"),l=o(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=o.css(a,"top"),i=o.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),o.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},o.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){o.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,o.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===o.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),o.nodeName(a[0],"html")||(d=a.offset()),d.top+=o.css(a[0],"borderTopWidth",!0),d.left+=o.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-o.css(c,"marginTop",!0),left:b.left-d.left-o.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!o.nodeName(a,"html")&&"static"===o.css(a,"position"))a=a.offsetParent;return a||Jc})}}),o.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;o.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),o.each(["top","left"],function(a,b){o.cssHooks[b]=yb(l.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?o(a).position()[b]+"px":c):void 0})}),o.each({Height:"height",Width:"width"},function(a,b){o.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){o.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return o.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?o.css(b,c,g):o.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),o.fn.size=function(){return this.length},o.fn.andSelf=o.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return o});var Lc=a.jQuery,Mc=a.$;return o.noConflict=function(b){return a.$===o&&(a.$=Mc),b&&a.jQuery===o&&(a.jQuery=Lc),o},typeof b===U&&(a.jQuery=a.$=o),o});
diff --git a/browser/components/loop/content/libs/lodash.min.js b/browser/components/loop/content/shared/libs/lodash-2.4.1.js
similarity index 100%
rename from browser/components/loop/content/libs/lodash.min.js
rename to browser/components/loop/content/shared/libs/lodash-2.4.1.js
diff --git a/browser/components/loop/content/shared/libs/webl10n-20130617.js b/browser/components/loop/content/shared/libs/webl10n-20130617.js
new file mode 100644
index 000000000000..9d99c6889150
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/webl10n-20130617.js
@@ -0,0 +1,1157 @@
+/**
+ * Copyright (c) 2011-2013 Fabien Cazenave, Mozilla.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/*jshint browser: true, devel: true, es5: true, globalstrict: true */
+'use strict';
+
+document.webL10n = (function(window, document, undefined) {
+  var gL10nData = {};
+  var gTextData = '';
+  var gTextProp = 'textContent';
+  var gLanguage = '';
+  var gMacros = {};
+  var gReadyState = 'loading';
+
+
+  /**
+   * Synchronously loading l10n resources significantly minimizes flickering
+   * from displaying the app with non-localized strings and then updating the
+   * strings. Although this will block all script execution on this page, we
+   * expect that the l10n resources are available locally on flash-storage.
+   *
+   * As synchronous XHR is generally considered as a bad idea, we're still
+   * loading l10n resources asynchronously -- but we keep this in a setting,
+   * just in case... and applications using this library should hide their
+   * content until the `localized' event happens.
+   */
+
+  var gAsyncResourceLoading = true; // read-only
+
+
+  /**
+   * Debug helpers
+   *
+   *   gDEBUG == 0: don't display any console message
+   *   gDEBUG == 1: display only warnings, not logs
+   *   gDEBUG == 2: display all console messages
+   */
+
+  var gDEBUG = 1;
+
+  function consoleLog(message) {
+    if (gDEBUG >= 2) {
+      console.log('[l10n] ' + message);
+    }
+  };
+
+  function consoleWarn(message) {
+    if (gDEBUG) {
+      console.warn('[l10n] ' + message);
+    }
+  };
+
+
+  /**
+   * DOM helpers for the so-called "HTML API".
+   *
+   * These functions are written for modern browsers. For old versions of IE,
+   * they're overridden in the 'startup' section at the end of this file.
+   */
+
+  function getL10nResourceLinks() {
+    return document.querySelectorAll('link[type="application/l10n"]');
+  }
+
+  function getL10nDictionary() {
+    var script = document.querySelector('script[type="application/l10n"]');
+    // TODO: support multiple and external JSON dictionaries
+    return script ? JSON.parse(script.innerHTML) : null;
+  }
+
+  function getTranslatableChildren(element) {
+    return element ? element.querySelectorAll('*[data-l10n-id]') : [];
+  }
+
+  function getL10nAttributes(element) {
+    if (!element)
+      return {};
+
+    var l10nId = element.getAttribute('data-l10n-id');
+    var l10nArgs = element.getAttribute('data-l10n-args');
+    var args = {};
+    if (l10nArgs) {
+      try {
+        args = JSON.parse(l10nArgs);
+      } catch (e) {
+        consoleWarn('could not parse arguments for #' + l10nId);
+      }
+    }
+    return { id: l10nId, args: args };
+  }
+
+  function fireL10nReadyEvent(lang) {
+    var evtObject = document.createEvent('Event');
+    evtObject.initEvent('localized', true, false);
+    evtObject.language = lang;
+    document.dispatchEvent(evtObject);
+  }
+
+  function xhrLoadText(url, onSuccess, onFailure, asynchronous) {
+    onSuccess = onSuccess || function _onSuccess(data) {};
+    onFailure = onFailure || function _onFailure() {
+      consoleWarn(url + ' not found.');
+    };
+
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, asynchronous);
+    if (xhr.overrideMimeType) {
+      xhr.overrideMimeType('text/plain; charset=utf-8');
+    }
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState == 4) {
+        if (xhr.status == 200 || xhr.status === 0) {
+          onSuccess(xhr.responseText);
+        } else {
+          onFailure();
+        }
+      }
+    };
+    xhr.onerror = onFailure;
+    xhr.ontimeout = onFailure;
+
+    // in Firefox OS with the app:// protocol, trying to XHR a non-existing
+    // URL will raise an exception here -- hence this ugly try...catch.
+    try {
+      xhr.send(null);
+    } catch (e) {
+      onFailure();
+    }
+  }
+
+
+  /**
+   * l10n resource parser:
+   *  - reads (async XHR) the l10n resource matching `lang';
+   *  - imports linked resources (synchronously) when specified;
+   *  - parses the text data (fills `gL10nData' and `gTextData');
+   *  - triggers success/failure callbacks when done.
+   *
+   * @param {string} href
+   *    URL of the l10n resource to parse.
+   *
+   * @param {string} lang
+   *    locale (language) to parse.
+   *
+   * @param {Function} successCallback
+   *    triggered when the l10n resource has been successully parsed.
+   *
+   * @param {Function} failureCallback
+   *    triggered when the an error has occured.
+   *
+   * @return {void}
+   *    uses the following global variables: gL10nData, gTextData, gTextProp.
+   */
+
+  function parseResource(href, lang, successCallback, failureCallback) {
+    var baseURL = href.replace(/[^\/]*$/, '') || './';
+
+    // handle escaped characters (backslashes) in a string
+    function evalString(text) {
+      if (text.lastIndexOf('\\') < 0)
+        return text;
+      return text.replace(/\\\\/g, '\\')
+                 .replace(/\\n/g, '\n')
+                 .replace(/\\r/g, '\r')
+                 .replace(/\\t/g, '\t')
+                 .replace(/\\b/g, '\b')
+                 .replace(/\\f/g, '\f')
+                 .replace(/\\{/g, '{')
+                 .replace(/\\}/g, '}')
+                 .replace(/\\"/g, '"')
+                 .replace(/\\'/g, "'");
+    }
+
+    // parse *.properties text data into an l10n dictionary
+    function parseProperties(text) {
+      var dictionary = [];
+
+      // token expressions
+      var reBlank = /^\s*|\s*$/;
+      var reComment = /^\s*#|^\s*$/;
+      var reSection = /^\s*\[(.*)\]\s*$/;
+      var reImport = /^\s*@import\s+url\((.*)\)\s*$/i;
+      var reSplit = /^([^=\s]*)\s*=\s*(.+)$/; // TODO: escape EOLs with '\'
+
+      // parse the *.properties file into an associative array
+      function parseRawLines(rawText, extendedSyntax) {
+        var entries = rawText.replace(reBlank, '').split(/[\r\n]+/);
+        var currentLang = '*';
+        var genericLang = lang.replace(/-[a-z]+$/i, '');
+        var skipLang = false;
+        var match = '';
+
+        for (var i = 0; i < entries.length; i++) {
+          var line = entries[i];
+
+          // comment or blank line?
+          if (reComment.test(line))
+            continue;
+
+          // the extended syntax supports [lang] sections and @import rules
+          if (extendedSyntax) {
+            if (reSection.test(line)) { // section start?
+              match = reSection.exec(line);
+              currentLang = match[1];
+              skipLang = (currentLang !== '*') &&
+                  (currentLang !== lang) && (currentLang !== genericLang);
+              continue;
+            } else if (skipLang) {
+              continue;
+            }
+            if (reImport.test(line)) { // @import rule?
+              match = reImport.exec(line);
+              loadImport(baseURL + match[1]); // load the resource synchronously
+            }
+          }
+
+          // key-value pair
+          var tmp = line.match(reSplit);
+          if (tmp && tmp.length == 3) {
+            dictionary[tmp[1]] = evalString(tmp[2]);
+          }
+        }
+      }
+
+      // import another *.properties file
+      function loadImport(url) {
+        xhrLoadText(url, function(content) {
+          parseRawLines(content, false); // don't allow recursive imports
+        }, null, false); // load synchronously
+      }
+
+      // fill the dictionary
+      parseRawLines(text, true);
+      return dictionary;
+    }
+
+    // load and parse l10n data (warning: global variables are used here)
+    xhrLoadText(href, function(response) {
+      gTextData += response; // mostly for debug
+
+      // parse *.properties text data into an l10n dictionary
+      var data = parseProperties(response);
+
+      // find attribute descriptions, if any
+      for (var key in data) {
+        var id, prop, index = key.lastIndexOf('.');
+        if (index > 0) { // an attribute has been specified
+          id = key.substring(0, index);
+          prop = key.substr(index + 1);
+        } else { // no attribute: assuming text content by default
+          id = key;
+          prop = gTextProp;
+        }
+        if (!gL10nData[id]) {
+          gL10nData[id] = {};
+        }
+        gL10nData[id][prop] = data[key];
+      }
+
+      // trigger callback
+      if (successCallback) {
+        successCallback();
+      }
+    }, failureCallback, gAsyncResourceLoading);
+  };
+
+  // load and parse all resources for the specified locale
+  function loadLocale(lang, callback) {
+    callback = callback || function _callback() {};
+
+    clear();
+    gLanguage = lang;
+
+    // check all <link type="application/l10n" href="..." /> nodes
+    // and load the resource files
+    var langLinks = getL10nResourceLinks();
+    var langCount = langLinks.length;
+    if (langCount == 0) {
+      // we might have a pre-compiled dictionary instead
+      var dict = getL10nDictionary();
+      if (dict && dict.locales && dict.default_locale) {
+        consoleLog('using the embedded JSON directory, early way out');
+        gL10nData = dict.locales[lang] || dict.locales[dict.default_locale];
+        callback();
+      } else {
+        consoleLog('no resource to load, early way out');
+      }
+      // early way out
+      fireL10nReadyEvent(lang);
+      gReadyState = 'complete';
+      return;
+    }
+
+    // start the callback when all resources are loaded
+    var onResourceLoaded = null;
+    var gResourceCount = 0;
+    onResourceLoaded = function() {
+      gResourceCount++;
+      if (gResourceCount >= langCount) {
+        callback();
+        fireL10nReadyEvent(lang);
+        gReadyState = 'complete';
+      }
+    };
+
+    // load all resource files
+    function l10nResourceLink(link) {
+      var href = link.href;
+      var type = link.type;
+      this.load = function(lang, callback) {
+        var applied = lang;
+        parseResource(href, lang, callback, function() {
+          consoleWarn(href + ' not found.');
+          applied = '';
+        });
+        return applied; // return lang if found, an empty string if not found
+      };
+    }
+
+    for (var i = 0; i < langCount; i++) {
+      var resource = new l10nResourceLink(langLinks[i]);
+      var rv = resource.load(lang, onResourceLoaded);
+      if (rv != lang) { // lang not found, used default resource instead
+        consoleWarn('"' + lang + '" resource not found');
+        gLanguage = '';
+      }
+    }
+  }
+
+  // clear all l10n data
+  function clear() {
+    gL10nData = {};
+    gTextData = '';
+    gLanguage = '';
+    // TODO: clear all non predefined macros.
+    // There's no such macro /yet/ but we're planning to have some...
+  }
+
+
+  /**
+   * Get rules for plural forms (shared with JetPack), see:
+   * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+   * https://github.com/mozilla/addon-sdk/blob/master/python-lib/plural-rules-generator.p
+   *
+   * @param {string} lang
+   *    locale (language) used.
+   *
+   * @return {Function}
+   *    returns a function that gives the plural form name for a given integer:
+   *       var fun = getPluralRules('en');
+   *       fun(1)    -> 'one'
+   *       fun(0)    -> 'other'
+   *       fun(1000) -> 'other'.
+   */
+
+  function getPluralRules(lang) {
+    var locales2rules = {
+      'af': 3,
+      'ak': 4,
+      'am': 4,
+      'ar': 1,
+      'asa': 3,
+      'az': 0,
+      'be': 11,
+      'bem': 3,
+      'bez': 3,
+      'bg': 3,
+      'bh': 4,
+      'bm': 0,
+      'bn': 3,
+      'bo': 0,
+      'br': 20,
+      'brx': 3,
+      'bs': 11,
+      'ca': 3,
+      'cgg': 3,
+      'chr': 3,
+      'cs': 12,
+      'cy': 17,
+      'da': 3,
+      'de': 3,
+      'dv': 3,
+      'dz': 0,
+      'ee': 3,
+      'el': 3,
+      'en': 3,
+      'eo': 3,
+      'es': 3,
+      'et': 3,
+      'eu': 3,
+      'fa': 0,
+      'ff': 5,
+      'fi': 3,
+      'fil': 4,
+      'fo': 3,
+      'fr': 5,
+      'fur': 3,
+      'fy': 3,
+      'ga': 8,
+      'gd': 24,
+      'gl': 3,
+      'gsw': 3,
+      'gu': 3,
+      'guw': 4,
+      'gv': 23,
+      'ha': 3,
+      'haw': 3,
+      'he': 2,
+      'hi': 4,
+      'hr': 11,
+      'hu': 0,
+      'id': 0,
+      'ig': 0,
+      'ii': 0,
+      'is': 3,
+      'it': 3,
+      'iu': 7,
+      'ja': 0,
+      'jmc': 3,
+      'jv': 0,
+      'ka': 0,
+      'kab': 5,
+      'kaj': 3,
+      'kcg': 3,
+      'kde': 0,
+      'kea': 0,
+      'kk': 3,
+      'kl': 3,
+      'km': 0,
+      'kn': 0,
+      'ko': 0,
+      'ksb': 3,
+      'ksh': 21,
+      'ku': 3,
+      'kw': 7,
+      'lag': 18,
+      'lb': 3,
+      'lg': 3,
+      'ln': 4,
+      'lo': 0,
+      'lt': 10,
+      'lv': 6,
+      'mas': 3,
+      'mg': 4,
+      'mk': 16,
+      'ml': 3,
+      'mn': 3,
+      'mo': 9,
+      'mr': 3,
+      'ms': 0,
+      'mt': 15,
+      'my': 0,
+      'nah': 3,
+      'naq': 7,
+      'nb': 3,
+      'nd': 3,
+      'ne': 3,
+      'nl': 3,
+      'nn': 3,
+      'no': 3,
+      'nr': 3,
+      'nso': 4,
+      'ny': 3,
+      'nyn': 3,
+      'om': 3,
+      'or': 3,
+      'pa': 3,
+      'pap': 3,
+      'pl': 13,
+      'ps': 3,
+      'pt': 3,
+      'rm': 3,
+      'ro': 9,
+      'rof': 3,
+      'ru': 11,
+      'rwk': 3,
+      'sah': 0,
+      'saq': 3,
+      'se': 7,
+      'seh': 3,
+      'ses': 0,
+      'sg': 0,
+      'sh': 11,
+      'shi': 19,
+      'sk': 12,
+      'sl': 14,
+      'sma': 7,
+      'smi': 7,
+      'smj': 7,
+      'smn': 7,
+      'sms': 7,
+      'sn': 3,
+      'so': 3,
+      'sq': 3,
+      'sr': 11,
+      'ss': 3,
+      'ssy': 3,
+      'st': 3,
+      'sv': 3,
+      'sw': 3,
+      'syr': 3,
+      'ta': 3,
+      'te': 3,
+      'teo': 3,
+      'th': 0,
+      'ti': 4,
+      'tig': 3,
+      'tk': 3,
+      'tl': 4,
+      'tn': 3,
+      'to': 0,
+      'tr': 0,
+      'ts': 3,
+      'tzm': 22,
+      'uk': 11,
+      'ur': 3,
+      've': 3,
+      'vi': 0,
+      'vun': 3,
+      'wa': 4,
+      'wae': 3,
+      'wo': 0,
+      'xh': 3,
+      'xog': 3,
+      'yo': 0,
+      'zh': 0,
+      'zu': 3
+    };
+
+    // utility functions for plural rules methods
+    function isIn(n, list) {
+      return list.indexOf(n) !== -1;
+    }
+    function isBetween(n, start, end) {
+      return start <= n && n <= end;
+    }
+
+    // list of all plural rules methods:
+    // map an integer to the plural form name to use
+    var pluralRules = {
+      '0': function(n) {
+        return 'other';
+      },
+      '1': function(n) {
+        if ((isBetween((n % 100), 3, 10)))
+          return 'few';
+        if (n === 0)
+          return 'zero';
+        if ((isBetween((n % 100), 11, 99)))
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '2': function(n) {
+        if (n !== 0 && (n % 10) === 0)
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '3': function(n) {
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '4': function(n) {
+        if ((isBetween(n, 0, 1)))
+          return 'one';
+        return 'other';
+      },
+      '5': function(n) {
+        if ((isBetween(n, 0, 2)) && n != 2)
+          return 'one';
+        return 'other';
+      },
+      '6': function(n) {
+        if (n === 0)
+          return 'zero';
+        if ((n % 10) == 1 && (n % 100) != 11)
+          return 'one';
+        return 'other';
+      },
+      '7': function(n) {
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '8': function(n) {
+        if ((isBetween(n, 3, 6)))
+          return 'few';
+        if ((isBetween(n, 7, 10)))
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '9': function(n) {
+        if (n === 0 || n != 1 && (isBetween((n % 100), 1, 19)))
+          return 'few';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '10': function(n) {
+        if ((isBetween((n % 10), 2, 9)) && !(isBetween((n % 100), 11, 19)))
+          return 'few';
+        if ((n % 10) == 1 && !(isBetween((n % 100), 11, 19)))
+          return 'one';
+        return 'other';
+      },
+      '11': function(n) {
+        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+          return 'few';
+        if ((n % 10) === 0 ||
+            (isBetween((n % 10), 5, 9)) ||
+            (isBetween((n % 100), 11, 14)))
+          return 'many';
+        if ((n % 10) == 1 && (n % 100) != 11)
+          return 'one';
+        return 'other';
+      },
+      '12': function(n) {
+        if ((isBetween(n, 2, 4)))
+          return 'few';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '13': function(n) {
+        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+          return 'few';
+        if (n != 1 && (isBetween((n % 10), 0, 1)) ||
+            (isBetween((n % 10), 5, 9)) ||
+            (isBetween((n % 100), 12, 14)))
+          return 'many';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '14': function(n) {
+        if ((isBetween((n % 100), 3, 4)))
+          return 'few';
+        if ((n % 100) == 2)
+          return 'two';
+        if ((n % 100) == 1)
+          return 'one';
+        return 'other';
+      },
+      '15': function(n) {
+        if (n === 0 || (isBetween((n % 100), 2, 10)))
+          return 'few';
+        if ((isBetween((n % 100), 11, 19)))
+          return 'many';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '16': function(n) {
+        if ((n % 10) == 1 && n != 11)
+          return 'one';
+        return 'other';
+      },
+      '17': function(n) {
+        if (n == 3)
+          return 'few';
+        if (n === 0)
+          return 'zero';
+        if (n == 6)
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '18': function(n) {
+        if (n === 0)
+          return 'zero';
+        if ((isBetween(n, 0, 2)) && n !== 0 && n != 2)
+          return 'one';
+        return 'other';
+      },
+      '19': function(n) {
+        if ((isBetween(n, 2, 10)))
+          return 'few';
+        if ((isBetween(n, 0, 1)))
+          return 'one';
+        return 'other';
+      },
+      '20': function(n) {
+        if ((isBetween((n % 10), 3, 4) || ((n % 10) == 9)) && !(
+            isBetween((n % 100), 10, 19) ||
+            isBetween((n % 100), 70, 79) ||
+            isBetween((n % 100), 90, 99)
+            ))
+          return 'few';
+        if ((n % 1000000) === 0 && n !== 0)
+          return 'many';
+        if ((n % 10) == 2 && !isIn((n % 100), [12, 72, 92]))
+          return 'two';
+        if ((n % 10) == 1 && !isIn((n % 100), [11, 71, 91]))
+          return 'one';
+        return 'other';
+      },
+      '21': function(n) {
+        if (n === 0)
+          return 'zero';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '22': function(n) {
+        if ((isBetween(n, 0, 1)) || (isBetween(n, 11, 99)))
+          return 'one';
+        return 'other';
+      },
+      '23': function(n) {
+        if ((isBetween((n % 10), 1, 2)) || (n % 20) === 0)
+          return 'one';
+        return 'other';
+      },
+      '24': function(n) {
+        if ((isBetween(n, 3, 10) || isBetween(n, 13, 19)))
+          return 'few';
+        if (isIn(n, [2, 12]))
+          return 'two';
+        if (isIn(n, [1, 11]))
+          return 'one';
+        return 'other';
+      }
+    };
+
+    // return a function that gives the plural form name for a given integer
+    var index = locales2rules[lang.replace(/-.*$/, '')];
+    if (!(index in pluralRules)) {
+      consoleWarn('plural form unknown for [' + lang + ']');
+      return function() { return 'other'; };
+    }
+    return pluralRules[index];
+  }
+
+  // pre-defined 'plural' macro
+  gMacros.plural = function(str, param, key, prop) {
+    var n = parseFloat(param);
+    if (isNaN(n))
+      return str;
+
+    // TODO: support other properties (l20n still doesn't...)
+    if (prop != gTextProp)
+      return str;
+
+    // initialize _pluralRules
+    if (!gMacros._pluralRules) {
+      gMacros._pluralRules = getPluralRules(gLanguage);
+    }
+    var index = '[' + gMacros._pluralRules(n) + ']';
+
+    // try to find a [zero|one|two] key if it's defined
+    if (n === 0 && (key + '[zero]') in gL10nData) {
+      str = gL10nData[key + '[zero]'][prop];
+    } else if (n == 1 && (key + '[one]') in gL10nData) {
+      str = gL10nData[key + '[one]'][prop];
+    } else if (n == 2 && (key + '[two]') in gL10nData) {
+      str = gL10nData[key + '[two]'][prop];
+    } else if ((key + index) in gL10nData) {
+      str = gL10nData[key + index][prop];
+    } else if ((key + '[other]') in gL10nData) {
+      str = gL10nData[key + '[other]'][prop];
+    }
+
+    return str;
+  };
+
+
+  /**
+   * l10n dictionary functions
+   */
+
+  // fetch an l10n object, warn if not found, apply `args' if possible
+  function getL10nData(key, args) {
+    var data = gL10nData[key];
+    if (!data) {
+      consoleWarn('#' + key + ' is undefined.');
+    }
+
+    /** This is where l10n expressions should be processed.
+      * The plan is to support C-style expressions from the l20n project;
+      * until then, only two kinds of simple expressions are supported:
+      *   {[ index ]} and {{ arguments }}.
+      */
+    var rv = {};
+    for (var prop in data) {
+      var str = data[prop];
+      str = substIndexes(str, args, key, prop);
+      str = substArguments(str, args, key);
+      rv[prop] = str;
+    }
+    return rv;
+  }
+
+  // replace {[macros]} with their values
+  function substIndexes(str, args, key, prop) {
+    var reIndex = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)\s*\]\}/;
+    var reMatch = reIndex.exec(str);
+    if (!reMatch || !reMatch.length)
+      return str;
+
+    // an index/macro has been found
+    // Note: at the moment, only one parameter is supported
+    var macroName = reMatch[1];
+    var paramName = reMatch[2];
+    var param;
+    if (args && paramName in args) {
+      param = args[paramName];
+    } else if (paramName in gL10nData) {
+      param = gL10nData[paramName];
+    }
+
+    // there's no macro parser yet: it has to be defined in gMacros
+    if (macroName in gMacros) {
+      var macro = gMacros[macroName];
+      str = macro(str, param, key, prop);
+    }
+    return str;
+  }
+
+  // replace {{arguments}} with their values
+  function substArguments(str, args, key) {
+    var reArgs = /\{\{\s*(.+?)\s*\}\}/;
+    var match = reArgs.exec(str);
+    while (match) {
+      if (!match || match.length < 2)
+        return str; // argument key not found
+
+      var arg = match[1];
+      var sub = '';
+      if (args && arg in args) {
+        sub = args[arg];
+      } else if (arg in gL10nData) {
+        sub = gL10nData[arg][gTextProp];
+      } else {
+        consoleLog('argument {{' + arg + '}} for #' + key + ' is undefined.');
+        return str;
+      }
+
+      str = str.substring(0, match.index) + sub +
+            str.substr(match.index + match[0].length);
+      match = reArgs.exec(str);
+    }
+    return str;
+  }
+
+  // translate an HTML element
+  function translateElement(element) {
+    var l10n = getL10nAttributes(element);
+    if (!l10n.id)
+      return;
+
+    // get the related l10n object
+    var data = getL10nData(l10n.id, l10n.args);
+    if (!data) {
+      consoleWarn('#' + l10n.id + ' is undefined.');
+      return;
+    }
+
+    // translate element (TODO: security checks?)
+    if (data[gTextProp]) { // XXX
+      if (getChildElementCount(element) === 0) {
+        element[gTextProp] = data[gTextProp];
+      } else {
+        // this element has element children: replace the content of the first
+        // (non-empty) child textNode and clear other child textNodes
+        var children = element.childNodes;
+        var found = false;
+        for (var i = 0, l = children.length; i < l; i++) {
+          if (children[i].nodeType === 3 && /\S/.test(children[i].nodeValue)) {
+            if (found) {
+              children[i].nodeValue = '';
+            } else {
+              children[i].nodeValue = data[gTextProp];
+              found = true;
+            }
+          }
+        }
+        // if no (non-empty) textNode is found, insert a textNode before the
+        // first element child.
+        if (!found) {
+          var textNode = document.createTextNode(data[gTextProp]);
+          element.insertBefore(textNode, element.firstChild);
+        }
+      }
+      delete data[gTextProp];
+    }
+
+    for (var k in data) {
+      element[k] = data[k];
+    }
+  }
+
+  // webkit browsers don't currently support 'children' on SVG elements...
+  function getChildElementCount(element) {
+    if (element.children) {
+      return element.children.length;
+    }
+    if (typeof element.childElementCount !== 'undefined') {
+      return element.childElementCount;
+    }
+    var count = 0;
+    for (var i = 0; i < element.childNodes.length; i++) {
+      count += element.nodeType === 1 ? 1 : 0;
+    }
+    return count;
+  }
+
+  // translate an HTML subtree
+  function translateFragment(element) {
+    element = element || document.documentElement;
+
+    // check all translatable children (= w/ a `data-l10n-id' attribute)
+    var children = getTranslatableChildren(element);
+    var elementCount = children.length;
+    for (var i = 0; i < elementCount; i++) {
+      translateElement(children[i]);
+    }
+
+    // translate element itself if necessary
+    translateElement(element);
+  }
+
+
+  /**
+   * Startup & Public API
+   *
+   * Warning: this part of the code contains browser-specific chunks --
+   * that's where obsolete browsers, namely IE8 and earlier, are handled.
+   *
+   * Unlike the rest of the lib, this section is not shared with FirefoxOS/Gaia.
+   */
+
+  // load the default locale on startup
+  function l10nStartup() {
+    gReadyState = 'interactive';
+
+    // most browsers expose the UI language as `navigator.language'
+    // but IE uses `navigator.userLanguage' instead
+    var userLocale = navigator.language || navigator.userLanguage;
+    consoleLog('loading [' + userLocale + '] resources, ' +
+        (gAsyncResourceLoading ? 'asynchronously.' : 'synchronously.'));
+
+    // load the default locale and translate the document if required
+    if (document.documentElement.lang === userLocale) {
+      loadLocale(userLocale);
+    } else {
+      loadLocale(userLocale, translateFragment);
+    }
+  }
+
+  // browser-specific startup
+  if (document.addEventListener) { // modern browsers and IE9+
+    if (document.readyState === 'loading') {
+      // the document is not fully loaded yet: wait for DOMContentLoaded.
+      document.addEventListener('DOMContentLoaded', l10nStartup);
+    } else {
+      // l10n.js is being loaded with <script defer> or <script async>,
+      // the DOM is ready for parsing.
+      window.setTimeout(l10nStartup);
+    }
+  } else if (window.attachEvent) { // IE8 and before (= oldIE)
+    // TODO: check if jQuery is loaded (CSS selector + JSON + events)
+
+    // dummy `console.log' and `console.warn' functions
+    if (!window.console) {
+      consoleLog = function(message) {}; // just ignore console.log calls
+      consoleWarn = function(message) {
+        if (gDEBUG) {
+          alert('[l10n] ' + message); // vintage debugging, baby!
+        }
+      };
+    }
+
+    // XMLHttpRequest for IE6
+    if (!window.XMLHttpRequest) {
+      xhrLoadText = function(url, onSuccess, onFailure, asynchronous) {
+        onSuccess = onSuccess || function _onSuccess(data) {};
+        onFailure = onFailure || function _onFailure() {
+          consoleWarn(url + ' not found.');
+        };
+        var xhr = new ActiveXObject('Microsoft.XMLHTTP');
+        xhr.open('GET', url, asynchronous);
+        xhr.onreadystatechange = function() {
+          if (xhr.readyState == 4) {
+            if (xhr.status == 200) {
+              onSuccess(xhr.responseText);
+            } else {
+              onFailure();
+            }
+          }
+        };
+        xhr.send(null);
+      }
+    }
+
+    // worst hack ever for IE6 and IE7
+    if (!window.JSON) {
+      getL10nAttributes = function(element) {
+        if (!element)
+          return {};
+        var l10nId = element.getAttribute('data-l10n-id'),
+            l10nArgs = element.getAttribute('data-l10n-args'),
+            args = {};
+        if (l10nArgs) try {
+          args = eval(l10nArgs); // XXX yeah, I know...
+        } catch (e) {
+          consoleWarn('could not parse arguments for #' + l10nId);
+        }
+        return { id: l10nId, args: args };
+      };
+    }
+
+    // override `getTranslatableChildren' and `getL10nResourceLinks'
+    if (!document.querySelectorAll) {
+      getTranslatableChildren = function(element) {
+        if (!element)
+          return [];
+        var nodes = element.getElementsByTagName('*'),
+            l10nElements = [],
+            n = nodes.length;
+        for (var i = 0; i < n; i++) {
+          if (nodes[i].getAttribute('data-l10n-id'))
+            l10nElements.push(nodes[i]);
+        }
+        return l10nElements;
+      };
+      getL10nResourceLinks = function() {
+        var links = document.getElementsByTagName('link'),
+            l10nLinks = [],
+            n = links.length;
+        for (var i = 0; i < n; i++) {
+          if (links[i].type == 'application/l10n')
+            l10nLinks.push(links[i]);
+        }
+        return l10nLinks;
+      };
+    }
+
+    // override `getL10nDictionary'
+    if (!window.JSON || !document.querySelectorAll) {
+      getL10nDictionary = function() {
+        var scripts = document.getElementsByName('script');
+        for (var i = 0; i < scripts.length; i++) {
+          if (scripts[i].type == 'application/l10n') {
+            return eval(scripts[i].innerHTML);
+          }
+        }
+        return null;
+      };
+    }
+
+    // fire non-standard `localized' DOM events
+    if (document.createEventObject && !document.createEvent) {
+      fireL10nReadyEvent = function(lang) {
+        // hack to simulate a custom event in IE:
+        // to catch this event, add an event handler to `onpropertychange'
+        document.documentElement.localized = 1;
+      };
+    }
+
+    // startup for IE<9
+    window.attachEvent('onload', function() {
+      gTextProp = document.body.textContent ? 'textContent' : 'innerText';
+      l10nStartup();
+    });
+  }
+
+  // cross-browser API (sorry, oldIE doesn't support getters & setters)
+  return {
+    // get a localized string
+    get: function(key, args, fallback) {
+      var data = getL10nData(key, args) || fallback;
+      if (data) { // XXX double-check this
+        return gTextProp in data ? data[gTextProp] : '';
+      }
+      return '{{' + key + '}}';
+    },
+
+    // debug
+    getData: function() { return gL10nData; },
+    getText: function() { return gTextData; },
+
+    // get|set the document language
+    getLanguage: function() { return gLanguage; },
+    setLanguage: function(lang) { loadLocale(lang, translateFragment); },
+
+    // get the direction (ltr|rtl) of the current language
+    getDirection: function() {
+      // http://www.w3.org/International/questions/qa-scripts
+      // Arabic, Hebrew, Farsi, Pashto, Urdu
+      var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
+      return (rtlList.indexOf(gLanguage) >= 0) ? 'rtl' : 'ltr';
+    },
+
+    // translate an element or document fragment
+    translate: translateFragment,
+
+    // this can be used to prevent race conditions
+    getReadyState: function() { return gReadyState; },
+    ready: function(callback) {
+      if (!callback) {
+        return;
+      } else if (gReadyState == 'complete' || gReadyState == 'interactive') {
+        window.setTimeout(callback);
+      } else if (document.addEventListener) {
+        document.addEventListener('localized', callback);
+      } else if (document.attachEvent) {
+        document.documentElement.attachEvent('onpropertychange', function(e) {
+          if (e.propertyName === 'localized') {
+            callback();
+          }
+        });
+      }
+    }
+  };
+}) (window, document);
+
+// gettext-like shortcut for document.webL10n.get
+if (window._ === undefined) {
+  var _ = document.webL10n.get;
+}
+
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index cc2fc500872a..4007a0191e09 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -3,4 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-  content/browser/loop/panel.html                          (content/panel.html)
+  content/browser/loop/panel.html                    (content/panel.html)
+  content/browser/loop/shared/css/common.css         (content/shared/css/common.css)
+  content/browser/loop/shared/css/panel.css          (content/shared/css/panel.css)
+  content/browser/loop/shared/css/conversation.css   (content/shared/css/conversation.css)
+  content/browser/loop/shared/img/icon_32.png        (content/shared/img/icon_32.png)
+  content/browser/loop/shared/img/icon_64.png        (content/shared/img/icon_64.png)
+  content/browser/loop/shared/libs/lodash-2.4.1.js   (content/shared/libs/lodash-2.4.1.js)
+  content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
+  content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
+  content/browser/loop/libs/l10n.js                  (content/libs/l10n.js)
+  content/browser/loop/js/fxcom.js                   (content/js/fxcom.js)
+  content/browser/loop/js/client.js                  (content/js/client.js)
+  content/browser/loop/js/panel.js                   (content/js/panel.js)
+
diff --git a/browser/components/loop/test/mocha-test/client_test.js b/browser/components/loop/test/mocha-test/client_test.js
new file mode 100644
index 000000000000..ac9b4c0e836d
--- /dev/null
+++ b/browser/components/loop/test/mocha-test/client_test.js
@@ -0,0 +1,69 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop, sinon */
+
+var expect = chai.expect;
+
+describe("loop.Client", function() {
+  "use strict";
+
+  var sandbox, fakeXHR, requests = [];
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    fakeXHR = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+    // https://github.com/cjohansen/Sinon.JS/issues/393
+    fakeXHR.xhr.onCreate = function (xhr) {
+      requests.push(xhr);
+    };
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("loop.Client", function() {
+    describe("#constructor", function() {
+      it("should require a baseApiUrl setting", function() {
+        expect(function() {
+          new loop.Client();
+        }).to.Throw(Error, /required/);
+      });
+    });
+
+    describe("#requestCallUrl", function() {
+      var client;
+
+      beforeEach(function() {
+        client = new loop.Client({baseApiUrl: "http://fake.api"});
+      });
+
+      it("should request for a call url", function() {
+        var callback = sinon.spy();
+        client.requestCallUrl("fakeSimplepushUrl", callback);
+
+        expect(requests).to.have.length.of(1);
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                                 '{"call_url": "fakeCallUrl"}');
+        sinon.assert.calledWithExactly(callback, null, "fakeCallUrl");
+      });
+
+      it("should send an error when the request fails", function() {
+        var callback = sinon.spy();
+        client.requestCallUrl("fakeSimplepushUrl", callback);
+
+        expect(requests).to.have.length.of(1);
+
+        requests[0].respond(400, {"Content-Type": "application/json"},
+                                 '{"error": "my error"}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /HTTP error 400: Bad Request; my error/.test(err.message);
+        }));
+      });
+    });
+  });
+});
diff --git a/browser/components/loop/test/mocha-test/index.html b/browser/components/loop/test/mocha-test/index.html
index d7aab5de9e18..f7c280249b86 100644
--- a/browser/components/loop/test/mocha-test/index.html
+++ b/browser/components/loop/test/mocha-test/index.html
@@ -1,4 +1,7 @@
 <!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <html>
 <head>
   <meta charset="utf-8">
@@ -11,18 +14,46 @@
   </div>
   <div id="messages"></div>
   <div id="fixtures"></div>
+  <!-- libs -->
+  <script>
+  // Components won't load in unprivileged space, faking this one.
+  var FirefoxCom = {
+    requestSync: function(action) {
+      if (action === 'getLocale')
+        return "en-US";
+
+      if (action === 'getStrings')
+        return '{}';
+    },
+    getLocale: function() {
+      return "en-US";
+    },
+    getStrings: function() {
+      return [];
+    },
+  };
+  </script>
+  <script src="../../content/libs/l10n.js"></script>
+  <script type="text/javascript" src="../../content/shared/libs/jquery-2.1.0.js"></script>
+  <script type="text/javascript" src="../../content/shared/libs/lodash-2.4.1.js"></script>
+  <script type="text/javascript" src="../../content/shared/libs/backbone-1.1.2.js"></script>
   <!-- test dependencies -->
   <script src="../vendor/mocha-1.17.1.js"></script>
   <script src="../vendor/chai-1.9.0.js"></script>
-  <script src="../../content/libs/zepto.min.js"></script>
+  <script src="../vendor/sinon-1.9.0.js"></script>
   <script>
     chai.Assertion.includeStack = true;
     mocha.setup('bdd');
   </script>
-  <script src="sample_test.js"></script>
+  <!-- App scripts -->
+  <script src="../../content/js/client.js"></script>
+  <script src="../../content/js/panel.js"></script>
+  <!-- Test scripts -->
+  <script src="panel_test.js"></script>
+  <script src="client_test.js"></script>
   <script>
     mocha.run(function () {
-      $("#mocha").append("<p id='complete'>complete</p>");
+      $("#mocha").append("<p>Complete.</p>");
     });
 </script>
 </body>
diff --git a/browser/components/loop/test/mocha-test/panel_test.js b/browser/components/loop/test/mocha-test/panel_test.js
new file mode 100644
index 000000000000..7a1dfe66c338
--- /dev/null
+++ b/browser/components/loop/test/mocha-test/panel_test.js
@@ -0,0 +1,128 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop, sinon */
+
+var expect = chai.expect;
+
+describe("loop.panel", function() {
+  "use strict";
+
+  var sandbox, fakeXHR, requests = [];
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    fakeXHR = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+    // https://github.com/cjohansen/Sinon.JS/issues/393
+    fakeXHR.xhr.onCreate = function (xhr) {
+      requests.push(xhr);
+    };
+  });
+
+  afterEach(function() {
+    $("#fixtures").empty();
+    sandbox.restore();
+  });
+
+  describe("loop.panel.NotificationView", function() {
+    describe("#render", function() {
+      it("should render template with model attribute values", function() {
+        var view = new loop.panel.NotificationView({
+          el: $("#fixtures"),
+          model: new loop.panel.NotificationModel({
+            level: "error",
+            message: "plop"
+          })
+        });
+
+        view.render();
+
+        expect(view.$(".message").text()).eql("plop");
+      });
+    });
+  });
+
+  describe("loop.panel.NotificationListView", function() {
+    describe("Collection events", function() {
+      var coll, testNotif, view;
+
+      beforeEach(function() {
+        sandbox.stub(loop.panel.NotificationListView.prototype, "render");
+        testNotif = new loop.panel.NotificationModel({
+          level: "error",
+          message: "plop"
+        });
+        coll = new loop.panel.NotificationCollection();
+        view = new loop.panel.NotificationListView({collection: coll});
+      });
+
+      it("should render on notification added to the collection", function() {
+        coll.add(testNotif);
+
+        sinon.assert.calledOnce(view.render);
+      });
+
+      it("should render on notification removed from the collection",
+        function() {
+          coll.add(testNotif);
+          coll.remove(testNotif);
+
+          sinon.assert.calledTwice(view.render);
+        });
+
+      it("should render on collection reset",
+        function() {
+          coll.reset();
+
+          sinon.assert.calledOnce(view.render);
+        });
+    });
+  });
+
+  describe("loop.panel.PanelView", function() {
+    beforeEach(function() {
+      $("#fixtures").append([
+        '<div id="default-view" class="share generate-url">',
+        '  <div class="description">',
+        '    <p>Get a link to share with a friend to Video Chat.</p>',
+        '  </div>',
+        '  <div class="action">',
+        '    <div class="messages"></div>',
+        '    <p class="invite">',
+        '      <a class="get-url" href="">Get a call url</a>',
+        '    </p>',
+        '    <p class="result hide">',
+        '      <input id="call-url" type="url" readonly>',
+        '      <a class="get-url" href="">Renew</a>',
+        '    </p>',
+        '  </div>',
+        '</div>'
+      ].join(""));
+    });
+
+    describe("#getCallurl", function() {
+      it("should request a call url to the server", function() {
+        var requestCallUrl = sandbox.stub(loop.Client.prototype,
+                                          "requestCallUrl");
+        var view = new loop.panel.PanelView();
+
+        view.getCallUrl({preventDefault: sandbox.spy()});
+
+        sinon.assert.calledOnce(requestCallUrl);
+      });
+    });
+
+    describe("#onCallUrlReceived", function() {
+      it("should update the text field with the call url", function() {
+        var view = new loop.panel.PanelView();
+        view.render();
+
+        view.onCallUrlReceived("http://call.me/");
+
+        expect(view.$("input").val()).eql("http://call.me/");
+      });
+    });
+  });
+});
diff --git a/browser/components/loop/test/mocha-test/sample_test.js b/browser/components/loop/test/mocha-test/sample_test.js
deleted file mode 100644
index 882d85280a78..000000000000
--- a/browser/components/loop/test/mocha-test/sample_test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var expect = chai.expect;
-
-describe("test", function() {
-  "use strict";
-
-  it("is true", function() {
-    expect(true).eql(true);
-  });
-});
diff --git a/browser/components/loop/test/vendor/sinon-1.9.0.js b/browser/components/loop/test/vendor/sinon-1.9.0.js
new file mode 100644
index 000000000000..428b729b649b
--- /dev/null
+++ b/browser/components/loop/test/vendor/sinon-1.9.0.js
@@ -0,0 +1,4794 @@
+/**
+ * Sinon.JS 1.9.0, 2014/03/05
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
+ *
+ * (The BSD License)
+ * 
+ * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of Christian Johansen nor the names of his contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+this.sinon = (function () {
+var samsam, formatio;
+function define(mod, deps, fn) { if (mod == "samsam") { samsam = deps(); } else { formatio = fn(samsam); } }
+define.amd = true;
+((typeof define === "function" && define.amd && function (m) { define("samsam", m); }) ||
+ (typeof module === "object" &&
+      function (m) { module.exports = m(); }) || // Node
+ function (m) { this.samsam = m(); } // Browser globals
+)(function () {
+    var o = Object.prototype;
+    var div = typeof document !== "undefined" && document.createElement("div");
+
+    function isNaN(value) {
+        // Unlike global isNaN, this avoids type coercion
+        // typeof check avoids IE host object issues, hat tip to
+        // lodash
+        var val = value; // JsLint thinks value !== value is "weird"
+        return typeof value === "number" && value !== val;
+    }
+
+    function getClass(value) {
+        // Returns the internal [[Class]] by calling Object.prototype.toString
+        // with the provided value as this. Return value is a string, naming the
+        // internal class, e.g. "Array"
+        return o.toString.call(value).split(/[ \]]/)[1];
+    }
+
+    /**
+     * @name samsam.isArguments
+     * @param Object object
+     *
+     * Returns ``true`` if ``object`` is an ``arguments`` object,
+     * ``false`` otherwise.
+     */
+    function isArguments(object) {
+        if (typeof object !== "object" || typeof object.length !== "number" ||
+                getClass(object) === "Array") {
+            return false;
+        }
+        if (typeof object.callee == "function") { return true; }
+        try {
+            object[object.length] = 6;
+            delete object[object.length];
+        } catch (e) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @name samsam.isElement
+     * @param Object object
+     *
+     * Returns ``true`` if ``object`` is a DOM element node. Unlike
+     * Underscore.js/lodash, this function will return ``false`` if ``object``
+     * is an *element-like* object, i.e. a regular object with a ``nodeType``
+     * property that holds the value ``1``.
+     */
+    function isElement(object) {
+        if (!object || object.nodeType !== 1 || !div) { return false; }
+        try {
+            object.appendChild(div);
+            object.removeChild(div);
+        } catch (e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @name samsam.keys
+     * @param Object object
+     *
+     * Return an array of own property names.
+     */
+    function keys(object) {
+        var ks = [], prop;
+        for (prop in object) {
+            if (o.hasOwnProperty.call(object, prop)) { ks.push(prop); }
+        }
+        return ks;
+    }
+
+    /**
+     * @name samsam.isDate
+     * @param Object value
+     *
+     * Returns true if the object is a ``Date``, or *date-like*. Duck typing
+     * of date objects work by checking that the object has a ``getTime``
+     * function whose return value equals the return value from the object's
+     * ``valueOf``.
+     */
+    function isDate(value) {
+        return typeof value.getTime == "function" &&
+            value.getTime() == value.valueOf();
+    }
+
+    /**
+     * @name samsam.isNegZero
+     * @param Object value
+     *
+     * Returns ``true`` if ``value`` is ``-0``.
+     */
+    function isNegZero(value) {
+        return value === 0 && 1 / value === -Infinity;
+    }
+
+    /**
+     * @name samsam.equal
+     * @param Object obj1
+     * @param Object obj2
+     *
+     * Returns ``true`` if two objects are strictly equal. Compared to
+     * ``===`` there are two exceptions:
+     *
+     *   - NaN is considered equal to NaN
+     *   - -0 and +0 are not considered equal
+     */
+    function identical(obj1, obj2) {
+        if (obj1 === obj2 || (isNaN(obj1) && isNaN(obj2))) {
+            return obj1 !== 0 || isNegZero(obj1) === isNegZero(obj2);
+        }
+    }
+
+
+    /**
+     * @name samsam.deepEqual
+     * @param Object obj1
+     * @param Object obj2
+     *
+     * Deep equal comparison. Two values are "deep equal" if:
+     *
+     *   - They are equal, according to samsam.identical
+     *   - They are both date objects representing the same time
+     *   - They are both arrays containing elements that are all deepEqual
+     *   - They are objects with the same set of properties, and each property
+     *     in ``obj1`` is deepEqual to the corresponding property in ``obj2``
+     *
+     * Supports cyclic objects.
+     */
+    function deepEqualCyclic(obj1, obj2) {
+
+        // used for cyclic comparison
+        // contain already visited objects
+        var objects1 = [],
+            objects2 = [],
+        // contain pathes (position in the object structure)
+        // of the already visited objects
+        // indexes same as in objects arrays
+            paths1 = [],
+            paths2 = [],
+        // contains combinations of already compared objects
+        // in the manner: { "$1['ref']$2['ref']": true }
+            compared = {};
+
+        /**
+         * used to check, if the value of a property is an object
+         * (cyclic logic is only needed for objects)
+         * only needed for cyclic logic
+         */
+        function isObject(value) {
+
+            if (typeof value === 'object' && value !== null &&
+                    !(value instanceof Boolean) &&
+                    !(value instanceof Date)    &&
+                    !(value instanceof Number)  &&
+                    !(value instanceof RegExp)  &&
+                    !(value instanceof String)) {
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * returns the index of the given object in the
+         * given objects array, -1 if not contained
+         * only needed for cyclic logic
+         */
+        function getIndex(objects, obj) {
+
+            var i;
+            for (i = 0; i < objects.length; i++) {
+                if (objects[i] === obj) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        // does the recursion for the deep equal check
+        return (function deepEqual(obj1, obj2, path1, path2) {
+            var type1 = typeof obj1;
+            var type2 = typeof obj2;
+
+            // == null also matches undefined
+            if (obj1 === obj2 ||
+                    isNaN(obj1) || isNaN(obj2) ||
+                    obj1 == null || obj2 == null ||
+                    type1 !== "object" || type2 !== "object") {
+
+                return identical(obj1, obj2);
+            }
+
+            // Elements are only equal if identical(expected, actual)
+            if (isElement(obj1) || isElement(obj2)) { return false; }
+
+            var isDate1 = isDate(obj1), isDate2 = isDate(obj2);
+            if (isDate1 || isDate2) {
+                if (!isDate1 || !isDate2 || obj1.getTime() !== obj2.getTime()) {
+                    return false;
+                }
+            }
+
+            if (obj1 instanceof RegExp && obj2 instanceof RegExp) {
+                if (obj1.toString() !== obj2.toString()) { return false; }
+            }
+
+            var class1 = getClass(obj1);
+            var class2 = getClass(obj2);
+            var keys1 = keys(obj1);
+            var keys2 = keys(obj2);
+
+            if (isArguments(obj1) || isArguments(obj2)) {
+                if (obj1.length !== obj2.length) { return false; }
+            } else {
+                if (type1 !== type2 || class1 !== class2 ||
+                        keys1.length !== keys2.length) {
+                    return false;
+                }
+            }
+
+            var key, i, l,
+                // following vars are used for the cyclic logic
+                value1, value2,
+                isObject1, isObject2,
+                index1, index2,
+                newPath1, newPath2;
+
+            for (i = 0, l = keys1.length; i < l; i++) {
+                key = keys1[i];
+                if (!o.hasOwnProperty.call(obj2, key)) {
+                    return false;
+                }
+
+                // Start of the cyclic logic
+
+                value1 = obj1[key];
+                value2 = obj2[key];
+
+                isObject1 = isObject(value1);
+                isObject2 = isObject(value2);
+
+                // determine, if the objects were already visited
+                // (it's faster to check for isObject first, than to
+                // get -1 from getIndex for non objects)
+                index1 = isObject1 ? getIndex(objects1, value1) : -1;
+                index2 = isObject2 ? getIndex(objects2, value2) : -1;
+
+                // determine the new pathes of the objects
+                // - for non cyclic objects the current path will be extended
+                //   by current property name
+                // - for cyclic objects the stored path is taken
+                newPath1 = index1 !== -1
+                    ? paths1[index1]
+                    : path1 + '[' + JSON.stringify(key) + ']';
+                newPath2 = index2 !== -1
+                    ? paths2[index2]
+                    : path2 + '[' + JSON.stringify(key) + ']';
+
+                // stop recursion if current objects are already compared
+                if (compared[newPath1 + newPath2]) {
+                    return true;
+                }
+
+                // remember the current objects and their pathes
+                if (index1 === -1 && isObject1) {
+                    objects1.push(value1);
+                    paths1.push(newPath1);
+                }
+                if (index2 === -1 && isObject2) {
+                    objects2.push(value2);
+                    paths2.push(newPath2);
+                }
+
+                // remember that the current objects are already compared
+                if (isObject1 && isObject2) {
+                    compared[newPath1 + newPath2] = true;
+                }
+
+                // End of cyclic logic
+
+                // neither value1 nor value2 is a cycle
+                // continue with next level
+                if (!deepEqual(value1, value2, newPath1, newPath2)) {
+                    return false;
+                }
+            }
+
+            return true;
+
+        }(obj1, obj2, '$1', '$2'));
+    }
+
+    var match;
+
+    function arrayContains(array, subset) {
+        if (subset.length === 0) { return true; }
+        var i, l, j, k;
+        for (i = 0, l = array.length; i < l; ++i) {
+            if (match(array[i], subset[0])) {
+                for (j = 0, k = subset.length; j < k; ++j) {
+                    if (!match(array[i + j], subset[j])) { return false; }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @name samsam.match
+     * @param Object object
+     * @param Object matcher
+     *
+     * Compare arbitrary value ``object`` with matcher.
+     */
+    match = function match(object, matcher) {
+        if (matcher && typeof matcher.test === "function") {
+            return matcher.test(object);
+        }
+
+        if (typeof matcher === "function") {
+            return matcher(object) === true;
+        }
+
+        if (typeof matcher === "string") {
+            matcher = matcher.toLowerCase();
+            var notNull = typeof object === "string" || !!object;
+            return notNull &&
+                (String(object)).toLowerCase().indexOf(matcher) >= 0;
+        }
+
+        if (typeof matcher === "number") {
+            return matcher === object;
+        }
+
+        if (typeof matcher === "boolean") {
+            return matcher === object;
+        }
+
+        if (getClass(object) === "Array" && getClass(matcher) === "Array") {
+            return arrayContains(object, matcher);
+        }
+
+        if (matcher && typeof matcher === "object") {
+            var prop;
+            for (prop in matcher) {
+                if (!match(object[prop], matcher[prop])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        throw new Error("Matcher was not a string, a number, a " +
+                        "function, a boolean or an object");
+    };
+
+    return {
+        isArguments: isArguments,
+        isElement: isElement,
+        isDate: isDate,
+        isNegZero: isNegZero,
+        identical: identical,
+        deepEqual: deepEqualCyclic,
+        match: match,
+        keys: keys
+    };
+});
+((typeof define === "function" && define.amd && function (m) {
+    define("formatio", ["samsam"], m);
+}) || (typeof module === "object" && function (m) {
+    module.exports = m(require("samsam"));
+}) || function (m) { this.formatio = m(this.samsam); }
+)(function (samsam) {
+    
+    var formatio = {
+        excludeConstructors: ["Object", /^.$/],
+        quoteStrings: true
+    };
+
+    var hasOwn = Object.prototype.hasOwnProperty;
+
+    var specialObjects = [];
+    if (typeof global !== "undefined") {
+        specialObjects.push({ object: global, value: "[object global]" });
+    }
+    if (typeof document !== "undefined") {
+        specialObjects.push({
+            object: document,
+            value: "[object HTMLDocument]"
+        });
+    }
+    if (typeof window !== "undefined") {
+        specialObjects.push({ object: window, value: "[object Window]" });
+    }
+
+    function functionName(func) {
+        if (!func) { return ""; }
+        if (func.displayName) { return func.displayName; }
+        if (func.name) { return func.name; }
+        var matches = func.toString().match(/function\s+([^\(]+)/m);
+        return (matches && matches[1]) || "";
+    }
+
+    function constructorName(f, object) {
+        var name = functionName(object && object.constructor);
+        var excludes = f.excludeConstructors ||
+                formatio.excludeConstructors || [];
+
+        var i, l;
+        for (i = 0, l = excludes.length; i < l; ++i) {
+            if (typeof excludes[i] === "string" && excludes[i] === name) {
+                return "";
+            } else if (excludes[i].test && excludes[i].test(name)) {
+                return "";
+            }
+        }
+
+        return name;
+    }
+
+    function isCircular(object, objects) {
+        if (typeof object !== "object") { return false; }
+        var i, l;
+        for (i = 0, l = objects.length; i < l; ++i) {
+            if (objects[i] === object) { return true; }
+        }
+        return false;
+    }
+
+    function ascii(f, object, processed, indent) {
+        if (typeof object === "string") {
+            var qs = f.quoteStrings;
+            var quote = typeof qs !== "boolean" || qs;
+            return processed || quote ? '"' + object + '"' : object;
+        }
+
+        if (typeof object === "function" && !(object instanceof RegExp)) {
+            return ascii.func(object);
+        }
+
+        processed = processed || [];
+
+        if (isCircular(object, processed)) { return "[Circular]"; }
+
+        if (Object.prototype.toString.call(object) === "[object Array]") {
+            return ascii.array.call(f, object, processed);
+        }
+
+        if (!object) { return String((1/object) === -Infinity ? "-0" : object); }
+        if (samsam.isElement(object)) { return ascii.element(object); }
+
+        if (typeof object.toString === "function" &&
+                object.toString !== Object.prototype.toString) {
+            return object.toString();
+        }
+
+        var i, l;
+        for (i = 0, l = specialObjects.length; i < l; i++) {
+            if (object === specialObjects[i].object) {
+                return specialObjects[i].value;
+            }
+        }
+
+        return ascii.object.call(f, object, processed, indent);
+    }
+
+    ascii.func = function (func) {
+        return "function " + functionName(func) + "() {}";
+    };
+
+    ascii.array = function (array, processed) {
+        processed = processed || [];
+        processed.push(array);
+        var i, l, pieces = [];
+        for (i = 0, l = array.length; i < l; ++i) {
+            pieces.push(ascii(this, array[i], processed));
+        }
+        return "[" + pieces.join(", ") + "]";
+    };
+
+    ascii.object = function (object, processed, indent) {
+        processed = processed || [];
+        processed.push(object);
+        indent = indent || 0;
+        var pieces = [], properties = samsam.keys(object).sort();
+        var length = 3;
+        var prop, str, obj, i, l;
+
+        for (i = 0, l = properties.length; i < l; ++i) {
+            prop = properties[i];
+            obj = object[prop];
+
+            if (isCircular(obj, processed)) {
+                str = "[Circular]";
+            } else {
+                str = ascii(this, obj, processed, indent + 2);
+            }
+
+            str = (/\s/.test(prop) ? '"' + prop + '"' : prop) + ": " + str;
+            length += str.length;
+            pieces.push(str);
+        }
+
+        var cons = constructorName(this, object);
+        var prefix = cons ? "[" + cons + "] " : "";
+        var is = "";
+        for (i = 0, l = indent; i < l; ++i) { is += " "; }
+
+        if (length + indent > 80) {
+            return prefix + "{\n  " + is + pieces.join(",\n  " + is) + "\n" +
+                is + "}";
+        }
+        return prefix + "{ " + pieces.join(", ") + " }";
+    };
+
+    ascii.element = function (element) {
+        var tagName = element.tagName.toLowerCase();
+        var attrs = element.attributes, attr, pairs = [], attrName, i, l, val;
+
+        for (i = 0, l = attrs.length; i < l; ++i) {
+            attr = attrs.item(i);
+            attrName = attr.nodeName.toLowerCase().replace("html:", "");
+            val = attr.nodeValue;
+            if (attrName !== "contenteditable" || val !== "inherit") {
+                if (!!val) { pairs.push(attrName + "=\"" + val + "\""); }
+            }
+        }
+
+        var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
+        var content = element.innerHTML;
+
+        if (content.length > 20) {
+            content = content.substr(0, 20) + "[...]";
+        }
+
+        var res = formatted + pairs.join(" ") + ">" + content +
+                "</" + tagName + ">";
+
+        return res.replace(/ contentEditable="inherit"/, "");
+    };
+
+    function Formatio(options) {
+        for (var opt in options) {
+            this[opt] = options[opt];
+        }
+    }
+
+    Formatio.prototype = {
+        functionName: functionName,
+
+        configure: function (options) {
+            return new Formatio(options);
+        },
+
+        constructorName: function (object) {
+            return constructorName(this, object);
+        },
+
+        ascii: function (object, processed, indent) {
+            return ascii(this, object, processed, indent);
+        }
+    };
+
+    return Formatio.prototype;
+});
+/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
+/*global module, require, __dirname, document*/
+/**
+ * Sinon core utilities. For internal use only.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+var sinon = (function (formatio) {
+    var div = typeof document != "undefined" && document.createElement("div");
+    var hasOwn = Object.prototype.hasOwnProperty;
+
+    function isDOMNode(obj) {
+        var success = false;
+
+        try {
+            obj.appendChild(div);
+            success = div.parentNode == obj;
+        } catch (e) {
+            return false;
+        } finally {
+            try {
+                obj.removeChild(div);
+            } catch (e) {
+                // Remove failed, not much we can do about that
+            }
+        }
+
+        return success;
+    }
+
+    function isElement(obj) {
+        return div && obj && obj.nodeType === 1 && isDOMNode(obj);
+    }
+
+    function isFunction(obj) {
+        return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
+    }
+
+    function mirrorProperties(target, source) {
+        for (var prop in source) {
+            if (!hasOwn.call(target, prop)) {
+                target[prop] = source[prop];
+            }
+        }
+    }
+
+    function isRestorable (obj) {
+        return typeof obj === "function" && typeof obj.restore === "function" && obj.restore.sinon;
+    }
+
+    var sinon = {
+        wrapMethod: function wrapMethod(object, property, method) {
+            if (!object) {
+                throw new TypeError("Should wrap property of object");
+            }
+
+            if (typeof method != "function") {
+                throw new TypeError("Method wrapper should be function");
+            }
+
+            var wrappedMethod = object[property],
+                error;
+
+            if (!isFunction(wrappedMethod)) {
+                error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
+                                    property + " as function");
+            }
+
+            if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
+                error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
+            }
+
+            if (wrappedMethod.calledBefore) {
+                var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
+                error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
+            }
+
+            if (error) {
+                if (wrappedMethod._stack) {
+                    error.stack += '\n--------------\n' + wrappedMethod._stack;
+                }
+                throw error;
+            }
+
+            // IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
+            // when using hasOwn.call on objects from other frames.
+            var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
+            object[property] = method;
+            method.displayName = property;
+            // Set up a stack trace which can be used later to find what line of
+            // code the original method was created on.
+            method._stack = (new Error('Stack Trace for original')).stack;
+
+            method.restore = function () {
+                // For prototype properties try to reset by delete first.
+                // If this fails (ex: localStorage on mobile safari) then force a reset
+                // via direct assignment.
+                if (!owned) {
+                    delete object[property];
+                }
+                if (object[property] === method) {
+                    object[property] = wrappedMethod;
+                }
+            };
+
+            method.restore.sinon = true;
+            mirrorProperties(method, wrappedMethod);
+
+            return method;
+        },
+
+        extend: function extend(target) {
+            for (var i = 1, l = arguments.length; i < l; i += 1) {
+                for (var prop in arguments[i]) {
+                    if (arguments[i].hasOwnProperty(prop)) {
+                        target[prop] = arguments[i][prop];
+                    }
+
+                    // DONT ENUM bug, only care about toString
+                    if (arguments[i].hasOwnProperty("toString") &&
+                        arguments[i].toString != target.toString) {
+                        target.toString = arguments[i].toString;
+                    }
+                }
+            }
+
+            return target;
+        },
+
+        create: function create(proto) {
+            var F = function () {};
+            F.prototype = proto;
+            return new F();
+        },
+
+        deepEqual: function deepEqual(a, b) {
+            if (sinon.match && sinon.match.isMatcher(a)) {
+                return a.test(b);
+            }
+            if (typeof a != "object" || typeof b != "object") {
+                return a === b;
+            }
+
+            if (isElement(a) || isElement(b)) {
+                return a === b;
+            }
+
+            if (a === b) {
+                return true;
+            }
+
+            if ((a === null && b !== null) || (a !== null && b === null)) {
+                return false;
+            }
+
+            if (a instanceof RegExp && b instanceof RegExp) {
+              return (a.source === b.source) && (a.global === b.global) && 
+                (a.ignoreCase === b.ignoreCase) && (a.multiline === b.multiline);
+            }
+
+            var aString = Object.prototype.toString.call(a);
+            if (aString != Object.prototype.toString.call(b)) {
+                return false;
+            }
+
+            if (aString == "[object Date]") {
+                return a.valueOf() === b.valueOf();
+            }
+
+            var prop, aLength = 0, bLength = 0;
+
+            if (aString == "[object Array]" && a.length !== b.length) {
+                return false;
+            }
+
+            for (prop in a) {
+                aLength += 1;
+
+                if (!deepEqual(a[prop], b[prop])) {
+                    return false;
+                }
+            }
+
+            for (prop in b) {
+                bLength += 1;
+            }
+
+            return aLength == bLength;
+        },
+
+        functionName: function functionName(func) {
+            var name = func.displayName || func.name;
+
+            // Use function decomposition as a last resort to get function
+            // name. Does not rely on function decomposition to work - if it
+            // doesn't debugging will be slightly less informative
+            // (i.e. toString will say 'spy' rather than 'myFunc').
+            if (!name) {
+                var matches = func.toString().match(/function ([^\s\(]+)/);
+                name = matches && matches[1];
+            }
+
+            return name;
+        },
+
+        functionToString: function toString() {
+            if (this.getCall && this.callCount) {
+                var thisValue, prop, i = this.callCount;
+
+                while (i--) {
+                    thisValue = this.getCall(i).thisValue;
+
+                    for (prop in thisValue) {
+                        if (thisValue[prop] === this) {
+                            return prop;
+                        }
+                    }
+                }
+            }
+
+            return this.displayName || "sinon fake";
+        },
+
+        getConfig: function (custom) {
+            var config = {};
+            custom = custom || {};
+            var defaults = sinon.defaultConfig;
+
+            for (var prop in defaults) {
+                if (defaults.hasOwnProperty(prop)) {
+                    config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
+                }
+            }
+
+            return config;
+        },
+
+        format: function (val) {
+            return "" + val;
+        },
+
+        defaultConfig: {
+            injectIntoThis: true,
+            injectInto: null,
+            properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+            useFakeTimers: true,
+            useFakeServer: true
+        },
+
+        timesInWords: function timesInWords(count) {
+            return count == 1 && "once" ||
+                count == 2 && "twice" ||
+                count == 3 && "thrice" ||
+                (count || 0) + " times";
+        },
+
+        calledInOrder: function (spies) {
+            for (var i = 1, l = spies.length; i < l; i++) {
+                if (!spies[i - 1].calledBefore(spies[i]) || !spies[i].called) {
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        orderByFirstCall: function (spies) {
+            return spies.sort(function (a, b) {
+                // uuid, won't ever be equal
+                var aCall = a.getCall(0);
+                var bCall = b.getCall(0);
+                var aId = aCall && aCall.callId || -1;
+                var bId = bCall && bCall.callId || -1;
+
+                return aId < bId ? -1 : 1;
+            });
+        },
+
+        log: function () {},
+
+        logError: function (label, err) {
+            var msg = label + " threw exception: ";
+            sinon.log(msg + "[" + err.name + "] " + err.message);
+            if (err.stack) { sinon.log(err.stack); }
+
+            setTimeout(function () {
+                err.message = msg + err.message;
+                throw err;
+            }, 0);
+        },
+
+        typeOf: function (value) {
+            if (value === null) {
+                return "null";
+            }
+            else if (value === undefined) {
+                return "undefined";
+            }
+            var string = Object.prototype.toString.call(value);
+            return string.substring(8, string.length - 1).toLowerCase();
+        },
+
+        createStubInstance: function (constructor) {
+            if (typeof constructor !== "function") {
+                throw new TypeError("The constructor should be a function.");
+            }
+            return sinon.stub(sinon.create(constructor.prototype));
+        },
+
+        restore: function (object) {
+            if (object !== null && typeof object === "object") {
+                for (var prop in object) {
+                    if (isRestorable(object[prop])) {
+                        object[prop].restore();
+                    }
+                }
+            }
+            else if (isRestorable(object)) {
+                object.restore();
+            }
+        }
+    };
+
+    var isNode = typeof module !== "undefined" && module.exports;
+    var isAMD = typeof define === 'function' && typeof define.amd === 'object' && define.amd;
+
+    if (isAMD) {
+        define(function(){
+            return sinon;
+        });
+    } else if (isNode) {
+        try {
+            formatio = require("formatio");
+        } catch (e) {}
+        module.exports = sinon;
+        module.exports.spy = require("./sinon/spy");
+        module.exports.spyCall = require("./sinon/call");
+        module.exports.behavior = require("./sinon/behavior");
+        module.exports.stub = require("./sinon/stub");
+        module.exports.mock = require("./sinon/mock");
+        module.exports.collection = require("./sinon/collection");
+        module.exports.assert = require("./sinon/assert");
+        module.exports.sandbox = require("./sinon/sandbox");
+        module.exports.test = require("./sinon/test");
+        module.exports.testCase = require("./sinon/test_case");
+        module.exports.assert = require("./sinon/assert");
+        module.exports.match = require("./sinon/match");
+    }
+
+    if (formatio) {
+        var formatter = formatio.configure({ quoteStrings: false });
+        sinon.format = function () {
+            return formatter.ascii.apply(formatter, arguments);
+        };
+    } else if (isNode) {
+        try {
+            var util = require("util");
+            sinon.format = function (value) {
+                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
+            };
+        } catch (e) {
+            /* Node, but no util module - would be very old, but better safe than
+             sorry */
+        }
+    }
+
+    return sinon;
+}(typeof formatio == "object" && formatio));
+
+/* @depend ../sinon.js */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Match functions
+ *
+ * @author Maximilian Antoni (mail@maxantoni.de)
+ * @license BSD
+ *
+ * Copyright (c) 2012 Maximilian Antoni
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function assertType(value, type, name) {
+        var actual = sinon.typeOf(value);
+        if (actual !== type) {
+            throw new TypeError("Expected type of " + name + " to be " +
+                type + ", but was " + actual);
+        }
+    }
+
+    var matcher = {
+        toString: function () {
+            return this.message;
+        }
+    };
+
+    function isMatcher(object) {
+        return matcher.isPrototypeOf(object);
+    }
+
+    function matchObject(expectation, actual) {
+        if (actual === null || actual === undefined) {
+            return false;
+        }
+        for (var key in expectation) {
+            if (expectation.hasOwnProperty(key)) {
+                var exp = expectation[key];
+                var act = actual[key];
+                if (match.isMatcher(exp)) {
+                    if (!exp.test(act)) {
+                        return false;
+                    }
+                } else if (sinon.typeOf(exp) === "object") {
+                    if (!matchObject(exp, act)) {
+                        return false;
+                    }
+                } else if (!sinon.deepEqual(exp, act)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    matcher.or = function (m2) {
+        if (!arguments.length) {
+            throw new TypeError("Matcher expected");
+        } else if (!isMatcher(m2)) {
+            m2 = match(m2);
+        }
+        var m1 = this;
+        var or = sinon.create(matcher);
+        or.test = function (actual) {
+            return m1.test(actual) || m2.test(actual);
+        };
+        or.message = m1.message + ".or(" + m2.message + ")";
+        return or;
+    };
+
+    matcher.and = function (m2) {
+        if (!arguments.length) {
+            throw new TypeError("Matcher expected");
+        } else if (!isMatcher(m2)) {
+            m2 = match(m2);
+        }
+        var m1 = this;
+        var and = sinon.create(matcher);
+        and.test = function (actual) {
+            return m1.test(actual) && m2.test(actual);
+        };
+        and.message = m1.message + ".and(" + m2.message + ")";
+        return and;
+    };
+
+    var match = function (expectation, message) {
+        var m = sinon.create(matcher);
+        var type = sinon.typeOf(expectation);
+        switch (type) {
+        case "object":
+            if (typeof expectation.test === "function") {
+                m.test = function (actual) {
+                    return expectation.test(actual) === true;
+                };
+                m.message = "match(" + sinon.functionName(expectation.test) + ")";
+                return m;
+            }
+            var str = [];
+            for (var key in expectation) {
+                if (expectation.hasOwnProperty(key)) {
+                    str.push(key + ": " + expectation[key]);
+                }
+            }
+            m.test = function (actual) {
+                return matchObject(expectation, actual);
+            };
+            m.message = "match(" + str.join(", ") + ")";
+            break;
+        case "number":
+            m.test = function (actual) {
+                return expectation == actual;
+            };
+            break;
+        case "string":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return actual.indexOf(expectation) !== -1;
+            };
+            m.message = "match(\"" + expectation + "\")";
+            break;
+        case "regexp":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return expectation.test(actual);
+            };
+            break;
+        case "function":
+            m.test = expectation;
+            if (message) {
+                m.message = message;
+            } else {
+                m.message = "match(" + sinon.functionName(expectation) + ")";
+            }
+            break;
+        default:
+            m.test = function (actual) {
+              return sinon.deepEqual(expectation, actual);
+            };
+        }
+        if (!m.message) {
+            m.message = "match(" + expectation + ")";
+        }
+        return m;
+    };
+
+    match.isMatcher = isMatcher;
+
+    match.any = match(function () {
+        return true;
+    }, "any");
+
+    match.defined = match(function (actual) {
+        return actual !== null && actual !== undefined;
+    }, "defined");
+
+    match.truthy = match(function (actual) {
+        return !!actual;
+    }, "truthy");
+
+    match.falsy = match(function (actual) {
+        return !actual;
+    }, "falsy");
+
+    match.same = function (expectation) {
+        return match(function (actual) {
+            return expectation === actual;
+        }, "same(" + expectation + ")");
+    };
+
+    match.typeOf = function (type) {
+        assertType(type, "string", "type");
+        return match(function (actual) {
+            return sinon.typeOf(actual) === type;
+        }, "typeOf(\"" + type + "\")");
+    };
+
+    match.instanceOf = function (type) {
+        assertType(type, "function", "type");
+        return match(function (actual) {
+            return actual instanceof type;
+        }, "instanceOf(" + sinon.functionName(type) + ")");
+    };
+
+    function createPropertyMatcher(propertyTest, messagePrefix) {
+        return function (property, value) {
+            assertType(property, "string", "property");
+            var onlyProperty = arguments.length === 1;
+            var message = messagePrefix + "(\"" + property + "\"";
+            if (!onlyProperty) {
+                message += ", " + value;
+            }
+            message += ")";
+            return match(function (actual) {
+                if (actual === undefined || actual === null ||
+                        !propertyTest(actual, property)) {
+                    return false;
+                }
+                return onlyProperty || sinon.deepEqual(value, actual[property]);
+            }, message);
+        };
+    }
+
+    match.has = createPropertyMatcher(function (actual, property) {
+        if (typeof actual === "object") {
+            return property in actual;
+        }
+        return actual[property] !== undefined;
+    }, "has");
+
+    match.hasOwn = createPropertyMatcher(function (actual, property) {
+        return actual.hasOwnProperty(property);
+    }, "hasOwn");
+
+    match.bool = match.typeOf("boolean");
+    match.number = match.typeOf("number");
+    match.string = match.typeOf("string");
+    match.object = match.typeOf("object");
+    match.func = match.typeOf("function");
+    match.array = match.typeOf("array");
+    match.regexp = match.typeOf("regexp");
+    match.date = match.typeOf("date");
+
+    if (commonJSModule) {
+        module.exports = match;
+    } else {
+        sinon.match = match;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+  * @depend ../sinon.js
+  * @depend match.js
+  */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+  * Spy calls
+  *
+  * @author Christian Johansen (christian@cjohansen.no)
+  * @author Maximilian Antoni (mail@maxantoni.de)
+  * @license BSD
+  *
+  * Copyright (c) 2010-2013 Christian Johansen
+  * Copyright (c) 2013 Maximilian Antoni
+  */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function throwYieldError(proxy, text, args) {
+        var msg = sinon.functionName(proxy) + text;
+        if (args.length) {
+            msg += " Received [" + slice.call(args).join(", ") + "]";
+        }
+        throw new Error(msg);
+    }
+
+    var slice = Array.prototype.slice;
+
+    var callProto = {
+        calledOn: function calledOn(thisValue) {
+            if (sinon.match && sinon.match.isMatcher(thisValue)) {
+                return thisValue.test(this.thisValue);
+            }
+            return this.thisValue === thisValue;
+        },
+
+        calledWith: function calledWith() {
+            for (var i = 0, l = arguments.length; i < l; i += 1) {
+                if (!sinon.deepEqual(arguments[i], this.args[i])) {
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        calledWithMatch: function calledWithMatch() {
+            for (var i = 0, l = arguments.length; i < l; i += 1) {
+                var actual = this.args[i];
+                var expectation = arguments[i];
+                if (!sinon.match || !sinon.match(expectation).test(actual)) {
+                    return false;
+                }
+            }
+            return true;
+        },
+
+        calledWithExactly: function calledWithExactly() {
+            return arguments.length == this.args.length &&
+                this.calledWith.apply(this, arguments);
+        },
+
+        notCalledWith: function notCalledWith() {
+            return !this.calledWith.apply(this, arguments);
+        },
+
+        notCalledWithMatch: function notCalledWithMatch() {
+            return !this.calledWithMatch.apply(this, arguments);
+        },
+
+        returned: function returned(value) {
+            return sinon.deepEqual(value, this.returnValue);
+        },
+
+        threw: function threw(error) {
+            if (typeof error === "undefined" || !this.exception) {
+                return !!this.exception;
+            }
+
+            return this.exception === error || this.exception.name === error;
+        },
+
+        calledWithNew: function calledWithNew() {
+            return this.proxy.prototype && this.thisValue instanceof this.proxy;
+        },
+
+        calledBefore: function (other) {
+            return this.callId < other.callId;
+        },
+
+        calledAfter: function (other) {
+            return this.callId > other.callId;
+        },
+
+        callArg: function (pos) {
+            this.args[pos]();
+        },
+
+        callArgOn: function (pos, thisValue) {
+            this.args[pos].apply(thisValue);
+        },
+
+        callArgWith: function (pos) {
+            this.callArgOnWith.apply(this, [pos, null].concat(slice.call(arguments, 1)));
+        },
+
+        callArgOnWith: function (pos, thisValue) {
+            var args = slice.call(arguments, 2);
+            this.args[pos].apply(thisValue, args);
+        },
+
+        "yield": function () {
+            this.yieldOn.apply(this, [null].concat(slice.call(arguments, 0)));
+        },
+
+        yieldOn: function (thisValue) {
+            var args = this.args;
+            for (var i = 0, l = args.length; i < l; ++i) {
+                if (typeof args[i] === "function") {
+                    args[i].apply(thisValue, slice.call(arguments, 1));
+                    return;
+                }
+            }
+            throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
+        },
+
+        yieldTo: function (prop) {
+            this.yieldToOn.apply(this, [prop, null].concat(slice.call(arguments, 1)));
+        },
+
+        yieldToOn: function (prop, thisValue) {
+            var args = this.args;
+            for (var i = 0, l = args.length; i < l; ++i) {
+                if (args[i] && typeof args[i][prop] === "function") {
+                    args[i][prop].apply(thisValue, slice.call(arguments, 2));
+                    return;
+                }
+            }
+            throwYieldError(this.proxy, " cannot yield to '" + prop +
+                "' since no callback was passed.", args);
+        },
+
+        toString: function () {
+            var callStr = this.proxy.toString() + "(";
+            var args = [];
+
+            for (var i = 0, l = this.args.length; i < l; ++i) {
+                args.push(sinon.format(this.args[i]));
+            }
+
+            callStr = callStr + args.join(", ") + ")";
+
+            if (typeof this.returnValue != "undefined") {
+                callStr += " => " + sinon.format(this.returnValue);
+            }
+
+            if (this.exception) {
+                callStr += " !" + this.exception.name;
+
+                if (this.exception.message) {
+                    callStr += "(" + this.exception.message + ")";
+                }
+            }
+
+            return callStr;
+        }
+    };
+
+    callProto.invokeCallback = callProto.yield;
+
+    function createSpyCall(spy, thisValue, args, returnValue, exception, id) {
+        if (typeof id !== "number") {
+            throw new TypeError("Call id is not a number");
+        }
+        var proxyCall = sinon.create(callProto);
+        proxyCall.proxy = spy;
+        proxyCall.thisValue = thisValue;
+        proxyCall.args = args;
+        proxyCall.returnValue = returnValue;
+        proxyCall.exception = exception;
+        proxyCall.callId = id;
+
+        return proxyCall;
+    }
+    createSpyCall.toString = callProto.toString; // used by mocks
+
+    if (commonJSModule) {
+        module.exports = createSpyCall;
+    } else {
+        sinon.spyCall = createSpyCall;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+
+/**
+  * @depend ../sinon.js
+  * @depend call.js
+  */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+  * Spy functions
+  *
+  * @author Christian Johansen (christian@cjohansen.no)
+  * @license BSD
+  *
+  * Copyright (c) 2010-2013 Christian Johansen
+  */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    var push = Array.prototype.push;
+    var slice = Array.prototype.slice;
+    var callId = 0;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function spy(object, property) {
+        if (!property && typeof object == "function") {
+            return spy.create(object);
+        }
+
+        if (!object && !property) {
+            return spy.create(function () { });
+        }
+
+        var method = object[property];
+        return sinon.wrapMethod(object, property, spy.create(method));
+    }
+
+    function matchingFake(fakes, args, strict) {
+        if (!fakes) {
+            return;
+        }
+
+        for (var i = 0, l = fakes.length; i < l; i++) {
+            if (fakes[i].matches(args, strict)) {
+                return fakes[i];
+            }
+        }
+    }
+
+    function incrementCallCount() {
+        this.called = true;
+        this.callCount += 1;
+        this.notCalled = false;
+        this.calledOnce = this.callCount == 1;
+        this.calledTwice = this.callCount == 2;
+        this.calledThrice = this.callCount == 3;
+    }
+
+    function createCallProperties() {
+        this.firstCall = this.getCall(0);
+        this.secondCall = this.getCall(1);
+        this.thirdCall = this.getCall(2);
+        this.lastCall = this.getCall(this.callCount - 1);
+    }
+
+    var vars = "a,b,c,d,e,f,g,h,i,j,k,l";
+    function createProxy(func) {
+        // Retain the function length:
+        var p;
+        if (func.length) {
+            eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
+                ") { return p.invoke(func, this, slice.call(arguments)); });");
+        }
+        else {
+            p = function proxy() {
+                return p.invoke(func, this, slice.call(arguments));
+            };
+        }
+        return p;
+    }
+
+    var uuid = 0;
+
+    // Public API
+    var spyApi = {
+        reset: function () {
+            this.called = false;
+            this.notCalled = true;
+            this.calledOnce = false;
+            this.calledTwice = false;
+            this.calledThrice = false;
+            this.callCount = 0;
+            this.firstCall = null;
+            this.secondCall = null;
+            this.thirdCall = null;
+            this.lastCall = null;
+            this.args = [];
+            this.returnValues = [];
+            this.thisValues = [];
+            this.exceptions = [];
+            this.callIds = [];
+            if (this.fakes) {
+                for (var i = 0; i < this.fakes.length; i++) {
+                    this.fakes[i].reset();
+                }
+            }
+        },
+
+        create: function create(func) {
+            var name;
+
+            if (typeof func != "function") {
+                func = function () { };
+            } else {
+                name = sinon.functionName(func);
+            }
+
+            var proxy = createProxy(func);
+
+            sinon.extend(proxy, spy);
+            delete proxy.create;
+            sinon.extend(proxy, func);
+
+            proxy.reset();
+            proxy.prototype = func.prototype;
+            proxy.displayName = name || "spy";
+            proxy.toString = sinon.functionToString;
+            proxy._create = sinon.spy.create;
+            proxy.id = "spy#" + uuid++;
+
+            return proxy;
+        },
+
+        invoke: function invoke(func, thisValue, args) {
+            var matching = matchingFake(this.fakes, args);
+            var exception, returnValue;
+
+            incrementCallCount.call(this);
+            push.call(this.thisValues, thisValue);
+            push.call(this.args, args);
+            push.call(this.callIds, callId++);
+
+            try {
+                if (matching) {
+                    returnValue = matching.invoke(func, thisValue, args);
+                } else {
+                    returnValue = (this.func || func).apply(thisValue, args);
+                }
+
+                var thisCall = this.getCall(this.callCount - 1);
+                if (thisCall.calledWithNew() && typeof returnValue !== 'object') {
+                    returnValue = thisValue;
+                }
+            } catch (e) {
+                exception = e;
+            }
+
+            push.call(this.exceptions, exception);
+            push.call(this.returnValues, returnValue);
+
+            createCallProperties.call(this);
+
+            if (exception !== undefined) {
+                throw exception;
+            }
+
+            return returnValue;
+        },
+
+        getCall: function getCall(i) {
+            if (i < 0 || i >= this.callCount) {
+                return null;
+            }
+
+            return sinon.spyCall(this, this.thisValues[i], this.args[i],
+                                    this.returnValues[i], this.exceptions[i],
+                                    this.callIds[i]);
+        },
+
+        getCalls: function () {
+            var calls = [];
+            var i;
+
+            for (i = 0; i < this.callCount; i++) {
+                calls.push(this.getCall(i));
+            }
+
+            return calls;
+        },
+
+        calledBefore: function calledBefore(spyFn) {
+            if (!this.called) {
+                return false;
+            }
+
+            if (!spyFn.called) {
+                return true;
+            }
+
+            return this.callIds[0] < spyFn.callIds[spyFn.callIds.length - 1];
+        },
+
+        calledAfter: function calledAfter(spyFn) {
+            if (!this.called || !spyFn.called) {
+                return false;
+            }
+
+            return this.callIds[this.callCount - 1] > spyFn.callIds[spyFn.callCount - 1];
+        },
+
+        withArgs: function () {
+            var args = slice.call(arguments);
+
+            if (this.fakes) {
+                var match = matchingFake(this.fakes, args, true);
+
+                if (match) {
+                    return match;
+                }
+            } else {
+                this.fakes = [];
+            }
+
+            var original = this;
+            var fake = this._create();
+            fake.matchingAguments = args;
+            fake.parent = this;
+            push.call(this.fakes, fake);
+
+            fake.withArgs = function () {
+                return original.withArgs.apply(original, arguments);
+            };
+
+            for (var i = 0; i < this.args.length; i++) {
+                if (fake.matches(this.args[i])) {
+                    incrementCallCount.call(fake);
+                    push.call(fake.thisValues, this.thisValues[i]);
+                    push.call(fake.args, this.args[i]);
+                    push.call(fake.returnValues, this.returnValues[i]);
+                    push.call(fake.exceptions, this.exceptions[i]);
+                    push.call(fake.callIds, this.callIds[i]);
+                }
+            }
+            createCallProperties.call(fake);
+
+            return fake;
+        },
+
+        matches: function (args, strict) {
+            var margs = this.matchingAguments;
+
+            if (margs.length <= args.length &&
+                sinon.deepEqual(margs, args.slice(0, margs.length))) {
+                return !strict || margs.length == args.length;
+            }
+        },
+
+        printf: function (format) {
+            var spy = this;
+            var args = slice.call(arguments, 1);
+            var formatter;
+
+            return (format || "").replace(/%(.)/g, function (match, specifyer) {
+                formatter = spyApi.formatters[specifyer];
+
+                if (typeof formatter == "function") {
+                    return formatter.call(null, spy, args);
+                } else if (!isNaN(parseInt(specifyer, 10))) {
+                    return sinon.format(args[specifyer - 1]);
+                }
+
+                return "%" + specifyer;
+            });
+        }
+    };
+
+    function delegateToCalls(method, matchAny, actual, notCalled) {
+        spyApi[method] = function () {
+            if (!this.called) {
+                if (notCalled) {
+                    return notCalled.apply(this, arguments);
+                }
+                return false;
+            }
+
+            var currentCall;
+            var matches = 0;
+
+            for (var i = 0, l = this.callCount; i < l; i += 1) {
+                currentCall = this.getCall(i);
+
+                if (currentCall[actual || method].apply(currentCall, arguments)) {
+                    matches += 1;
+
+                    if (matchAny) {
+                        return true;
+                    }
+                }
+            }
+
+            return matches === this.callCount;
+        };
+    }
+
+    delegateToCalls("calledOn", true);
+    delegateToCalls("alwaysCalledOn", false, "calledOn");
+    delegateToCalls("calledWith", true);
+    delegateToCalls("calledWithMatch", true);
+    delegateToCalls("alwaysCalledWith", false, "calledWith");
+    delegateToCalls("alwaysCalledWithMatch", false, "calledWithMatch");
+    delegateToCalls("calledWithExactly", true);
+    delegateToCalls("alwaysCalledWithExactly", false, "calledWithExactly");
+    delegateToCalls("neverCalledWith", false, "notCalledWith",
+        function () { return true; });
+    delegateToCalls("neverCalledWithMatch", false, "notCalledWithMatch",
+        function () { return true; });
+    delegateToCalls("threw", true);
+    delegateToCalls("alwaysThrew", false, "threw");
+    delegateToCalls("returned", true);
+    delegateToCalls("alwaysReturned", false, "returned");
+    delegateToCalls("calledWithNew", true);
+    delegateToCalls("alwaysCalledWithNew", false, "calledWithNew");
+    delegateToCalls("callArg", false, "callArgWith", function () {
+        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+    });
+    spyApi.callArgWith = spyApi.callArg;
+    delegateToCalls("callArgOn", false, "callArgOnWith", function () {
+        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+    });
+    spyApi.callArgOnWith = spyApi.callArgOn;
+    delegateToCalls("yield", false, "yield", function () {
+        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+    });
+    // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
+    spyApi.invokeCallback = spyApi.yield;
+    delegateToCalls("yieldOn", false, "yieldOn", function () {
+        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+    });
+    delegateToCalls("yieldTo", false, "yieldTo", function (property) {
+        throw new Error(this.toString() + " cannot yield to '" + property +
+            "' since it was not yet invoked.");
+    });
+    delegateToCalls("yieldToOn", false, "yieldToOn", function (property) {
+        throw new Error(this.toString() + " cannot yield to '" + property +
+            "' since it was not yet invoked.");
+    });
+
+    spyApi.formatters = {
+        "c": function (spy) {
+            return sinon.timesInWords(spy.callCount);
+        },
+
+        "n": function (spy) {
+            return spy.toString();
+        },
+
+        "C": function (spy) {
+            var calls = [];
+
+            for (var i = 0, l = spy.callCount; i < l; ++i) {
+                var stringifiedCall = "    " + spy.getCall(i).toString();
+                if (/\n/.test(calls[i - 1])) {
+                    stringifiedCall = "\n" + stringifiedCall;
+                }
+                push.call(calls, stringifiedCall);
+            }
+
+            return calls.length > 0 ? "\n" + calls.join("\n") : "";
+        },
+
+        "t": function (spy) {
+            var objects = [];
+
+            for (var i = 0, l = spy.callCount; i < l; ++i) {
+                push.call(objects, sinon.format(spy.thisValues[i]));
+            }
+
+            return objects.join(", ");
+        },
+
+        "*": function (spy, args) {
+            var formatted = [];
+
+            for (var i = 0, l = args.length; i < l; ++i) {
+                push.call(formatted, sinon.format(args[i]));
+            }
+
+            return formatted.join(", ");
+        }
+    };
+
+    sinon.extend(spy, spyApi);
+
+    spy.spyCall = sinon.spyCall;
+
+    if (commonJSModule) {
+        module.exports = spy;
+    } else {
+        sinon.spy = spy;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global module, require, sinon, process, setImmediate, setTimeout*/
+/**
+ * Stub behavior
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @author Tim Fischbach (mail@timfischbach.de)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    var slice = Array.prototype.slice;
+    var join = Array.prototype.join;
+    var proto;
+
+    var nextTick = (function () {
+        if (typeof process === "object" && typeof process.nextTick === "function") {
+            return process.nextTick;
+        } else if (typeof setImmediate === "function") {
+            return setImmediate;
+        } else {
+            return function (callback) {
+                setTimeout(callback, 0);
+            };
+        }
+    })();
+
+    function throwsException(error, message) {
+        if (typeof error == "string") {
+            this.exception = new Error(message || "");
+            this.exception.name = error;
+        } else if (!error) {
+            this.exception = new Error("Error");
+        } else {
+            this.exception = error;
+        }
+
+        return this;
+    }
+
+    function getCallback(behavior, args) {
+        var callArgAt = behavior.callArgAt;
+
+        if (callArgAt < 0) {
+            var callArgProp = behavior.callArgProp;
+
+            for (var i = 0, l = args.length; i < l; ++i) {
+                if (!callArgProp && typeof args[i] == "function") {
+                    return args[i];
+                }
+
+                if (callArgProp && args[i] &&
+                    typeof args[i][callArgProp] == "function") {
+                    return args[i][callArgProp];
+                }
+            }
+
+            return null;
+        }
+
+        return args[callArgAt];
+    }
+
+    function getCallbackError(behavior, func, args) {
+        if (behavior.callArgAt < 0) {
+            var msg;
+
+            if (behavior.callArgProp) {
+                msg = sinon.functionName(behavior.stub) +
+                    " expected to yield to '" + behavior.callArgProp +
+                    "', but no object with such a property was passed.";
+            } else {
+                msg = sinon.functionName(behavior.stub) +
+                    " expected to yield, but no callback was passed.";
+            }
+
+            if (args.length > 0) {
+                msg += " Received [" + join.call(args, ", ") + "]";
+            }
+
+            return msg;
+        }
+
+        return "argument at index " + behavior.callArgAt + " is not a function: " + func;
+    }
+
+    function callCallback(behavior, args) {
+        if (typeof behavior.callArgAt == "number") {
+            var func = getCallback(behavior, args);
+
+            if (typeof func != "function") {
+                throw new TypeError(getCallbackError(behavior, func, args));
+            }
+
+            if (behavior.callbackAsync) {
+                nextTick(function() {
+                    func.apply(behavior.callbackContext, behavior.callbackArguments);
+                });
+            } else {
+                func.apply(behavior.callbackContext, behavior.callbackArguments);
+            }
+        }
+    }
+
+    proto = {
+        create: function(stub) {
+            var behavior = sinon.extend({}, sinon.behavior);
+            delete behavior.create;
+            behavior.stub = stub;
+
+            return behavior;
+        },
+
+        isPresent: function() {
+            return (typeof this.callArgAt == 'number' ||
+                    this.exception ||
+                    typeof this.returnArgAt == 'number' ||
+                    this.returnThis ||
+                    this.returnValueDefined);
+        },
+
+        invoke: function(context, args) {
+            callCallback(this, args);
+
+            if (this.exception) {
+                throw this.exception;
+            } else if (typeof this.returnArgAt == 'number') {
+                return args[this.returnArgAt];
+            } else if (this.returnThis) {
+                return context;
+            }
+
+            return this.returnValue;
+        },
+
+        onCall: function(index) {
+            return this.stub.onCall(index);
+        },
+
+        onFirstCall: function() {
+            return this.stub.onFirstCall();
+        },
+
+        onSecondCall: function() {
+            return this.stub.onSecondCall();
+        },
+
+        onThirdCall: function() {
+            return this.stub.onThirdCall();
+        },
+
+        withArgs: function(/* arguments */) {
+            throw new Error('Defining a stub by invoking "stub.onCall(...).withArgs(...)" is not supported. ' +
+                            'Use "stub.withArgs(...).onCall(...)" to define sequential behavior for calls with certain arguments.');
+        },
+
+        callsArg: function callsArg(pos) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = [];
+            this.callbackContext = undefined;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        callsArgOn: function callsArgOn(pos, context) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = [];
+            this.callbackContext = context;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        callsArgWith: function callsArgWith(pos) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = slice.call(arguments, 1);
+            this.callbackContext = undefined;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        callsArgOnWith: function callsArgWith(pos, context) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = slice.call(arguments, 2);
+            this.callbackContext = context;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yields: function () {
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 0);
+            this.callbackContext = undefined;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yieldsOn: function (context) {
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 1);
+            this.callbackContext = context;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yieldsTo: function (prop) {
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 1);
+            this.callbackContext = undefined;
+            this.callArgProp = prop;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yieldsToOn: function (prop, context) {
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 2);
+            this.callbackContext = context;
+            this.callArgProp = prop;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+
+        "throws": throwsException,
+        throwsException: throwsException,
+
+        returns: function returns(value) {
+            this.returnValue = value;
+            this.returnValueDefined = true;
+
+            return this;
+        },
+
+        returnsArg: function returnsArg(pos) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+
+            this.returnArgAt = pos;
+
+            return this;
+        },
+
+        returnsThis: function returnsThis() {
+            this.returnThis = true;
+
+            return this;
+        }
+    };
+
+    // create asynchronous versions of callsArg* and yields* methods
+    for (var method in proto) {
+        // need to avoid creating anotherasync versions of the newly added async methods
+        if (proto.hasOwnProperty(method) &&
+            method.match(/^(callsArg|yields)/) &&
+            !method.match(/Async/)) {
+            proto[method + 'Async'] = (function (syncFnName) {
+                return function () {
+                    var result = this[syncFnName].apply(this, arguments);
+                    this.callbackAsync = true;
+                    return result;
+                };
+            })(method);
+        }
+    }
+
+    if (commonJSModule) {
+        module.exports = proto;
+    } else {
+        sinon.behavior = proto;
+    }
+}(typeof sinon == "object" && sinon || null));
+/**
+ * @depend ../sinon.js
+ * @depend spy.js
+ * @depend behavior.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global module, require, sinon*/
+/**
+ * Stub functions
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function stub(object, property, func) {
+        if (!!func && typeof func != "function") {
+            throw new TypeError("Custom stub should be function");
+        }
+
+        var wrapper;
+
+        if (func) {
+            wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
+        } else {
+            wrapper = stub.create();
+        }
+
+        if (!object && typeof property === "undefined") {
+            return sinon.stub.create();
+        }
+
+        if (typeof property === "undefined" && typeof object == "object") {
+            for (var prop in object) {
+                if (typeof object[prop] === "function") {
+                    stub(object, prop);
+                }
+            }
+
+            return object;
+        }
+
+        return sinon.wrapMethod(object, property, wrapper);
+    }
+
+    function getDefaultBehavior(stub) {
+        return stub.defaultBehavior || getParentBehaviour(stub) || sinon.behavior.create(stub);
+    }
+
+    function getParentBehaviour(stub) {
+        return (stub.parent && getCurrentBehavior(stub.parent));
+    }
+
+    function getCurrentBehavior(stub) {
+        var behavior = stub.behaviors[stub.callCount - 1];
+        return behavior && behavior.isPresent() ? behavior : getDefaultBehavior(stub);
+    }
+
+    var uuid = 0;
+
+    sinon.extend(stub, (function () {
+        var proto = {
+            create: function create() {
+                var functionStub = function () {
+                    return getCurrentBehavior(functionStub).invoke(this, arguments);
+                };
+
+                functionStub.id = "stub#" + uuid++;
+                var orig = functionStub;
+                functionStub = sinon.spy.create(functionStub);
+                functionStub.func = orig;
+
+                sinon.extend(functionStub, stub);
+                functionStub._create = sinon.stub.create;
+                functionStub.displayName = "stub";
+                functionStub.toString = sinon.functionToString;
+
+                functionStub.defaultBehavior = null;
+                functionStub.behaviors = [];
+
+                return functionStub;
+            },
+
+            resetBehavior: function () {
+                var i;
+
+                this.defaultBehavior = null;
+                this.behaviors = [];
+
+                delete this.returnValue;
+                delete this.returnArgAt;
+                this.returnThis = false;
+
+                if (this.fakes) {
+                    for (i = 0; i < this.fakes.length; i++) {
+                        this.fakes[i].resetBehavior();
+                    }
+                }
+            },
+
+            onCall: function(index) {
+                if (!this.behaviors[index]) {
+                    this.behaviors[index] = sinon.behavior.create(this);
+                }
+
+                return this.behaviors[index];
+            },
+
+            onFirstCall: function() {
+                return this.onCall(0);
+            },
+
+            onSecondCall: function() {
+                return this.onCall(1);
+            },
+
+            onThirdCall: function() {
+                return this.onCall(2);
+            }
+        };
+
+        for (var method in sinon.behavior) {
+            if (sinon.behavior.hasOwnProperty(method) &&
+                !proto.hasOwnProperty(method) &&
+                method != 'create' &&
+                method != 'withArgs' &&
+                method != 'invoke') {
+                proto[method] = (function(behaviorMethod) {
+                    return function() {
+                        this.defaultBehavior = this.defaultBehavior || sinon.behavior.create(this);
+                        this.defaultBehavior[behaviorMethod].apply(this.defaultBehavior, arguments);
+                        return this;
+                    };
+                }(method));
+            }
+        }
+
+        return proto;
+    }()));
+
+    if (commonJSModule) {
+        module.exports = stub;
+    } else {
+        sinon.stub = stub;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false*/
+/*global module, require, sinon*/
+/**
+ * Mock functions.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    var push = [].push;
+    var match;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    match = sinon.match;
+
+    if (!match && commonJSModule) {
+        match = require("./match");
+    }
+
+    function mock(object) {
+        if (!object) {
+            return sinon.expectation.create("Anonymous mock");
+        }
+
+        return mock.create(object);
+    }
+
+    sinon.mock = mock;
+
+    sinon.extend(mock, (function () {
+        function each(collection, callback) {
+            if (!collection) {
+                return;
+            }
+
+            for (var i = 0, l = collection.length; i < l; i += 1) {
+                callback(collection[i]);
+            }
+        }
+
+        return {
+            create: function create(object) {
+                if (!object) {
+                    throw new TypeError("object is null");
+                }
+
+                var mockObject = sinon.extend({}, mock);
+                mockObject.object = object;
+                delete mockObject.create;
+
+                return mockObject;
+            },
+
+            expects: function expects(method) {
+                if (!method) {
+                    throw new TypeError("method is falsy");
+                }
+
+                if (!this.expectations) {
+                    this.expectations = {};
+                    this.proxies = [];
+                }
+
+                if (!this.expectations[method]) {
+                    this.expectations[method] = [];
+                    var mockObject = this;
+
+                    sinon.wrapMethod(this.object, method, function () {
+                        return mockObject.invokeMethod(method, this, arguments);
+                    });
+
+                    push.call(this.proxies, method);
+                }
+
+                var expectation = sinon.expectation.create(method);
+                push.call(this.expectations[method], expectation);
+
+                return expectation;
+            },
+
+            restore: function restore() {
+                var object = this.object;
+
+                each(this.proxies, function (proxy) {
+                    if (typeof object[proxy].restore == "function") {
+                        object[proxy].restore();
+                    }
+                });
+            },
+
+            verify: function verify() {
+                var expectations = this.expectations || {};
+                var messages = [], met = [];
+
+                each(this.proxies, function (proxy) {
+                    each(expectations[proxy], function (expectation) {
+                        if (!expectation.met()) {
+                            push.call(messages, expectation.toString());
+                        } else {
+                            push.call(met, expectation.toString());
+                        }
+                    });
+                });
+
+                this.restore();
+
+                if (messages.length > 0) {
+                    sinon.expectation.fail(messages.concat(met).join("\n"));
+                } else {
+                    sinon.expectation.pass(messages.concat(met).join("\n"));
+                }
+
+                return true;
+            },
+
+            invokeMethod: function invokeMethod(method, thisValue, args) {
+                var expectations = this.expectations && this.expectations[method];
+                var length = expectations && expectations.length || 0, i;
+
+                for (i = 0; i < length; i += 1) {
+                    if (!expectations[i].met() &&
+                        expectations[i].allowsCall(thisValue, args)) {
+                        return expectations[i].apply(thisValue, args);
+                    }
+                }
+
+                var messages = [], available, exhausted = 0;
+
+                for (i = 0; i < length; i += 1) {
+                    if (expectations[i].allowsCall(thisValue, args)) {
+                        available = available || expectations[i];
+                    } else {
+                        exhausted += 1;
+                    }
+                    push.call(messages, "    " + expectations[i].toString());
+                }
+
+                if (exhausted === 0) {
+                    return available.apply(thisValue, args);
+                }
+
+                messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
+                    proxy: method,
+                    args: args
+                }));
+
+                sinon.expectation.fail(messages.join("\n"));
+            }
+        };
+    }()));
+
+    var times = sinon.timesInWords;
+
+    sinon.expectation = (function () {
+        var slice = Array.prototype.slice;
+        var _invoke = sinon.spy.invoke;
+
+        function callCountInWords(callCount) {
+            if (callCount == 0) {
+                return "never called";
+            } else {
+                return "called " + times(callCount);
+            }
+        }
+
+        function expectedCallCountInWords(expectation) {
+            var min = expectation.minCalls;
+            var max = expectation.maxCalls;
+
+            if (typeof min == "number" && typeof max == "number") {
+                var str = times(min);
+
+                if (min != max) {
+                    str = "at least " + str + " and at most " + times(max);
+                }
+
+                return str;
+            }
+
+            if (typeof min == "number") {
+                return "at least " + times(min);
+            }
+
+            return "at most " + times(max);
+        }
+
+        function receivedMinCalls(expectation) {
+            var hasMinLimit = typeof expectation.minCalls == "number";
+            return !hasMinLimit || expectation.callCount >= expectation.minCalls;
+        }
+
+        function receivedMaxCalls(expectation) {
+            if (typeof expectation.maxCalls != "number") {
+                return false;
+            }
+
+            return expectation.callCount == expectation.maxCalls;
+        }
+
+        function verifyMatcher(possibleMatcher, arg){
+            if (match && match.isMatcher(possibleMatcher)) {
+                return possibleMatcher.test(arg);
+            } else {
+                return true;
+            }
+        }
+
+        return {
+            minCalls: 1,
+            maxCalls: 1,
+
+            create: function create(methodName) {
+                var expectation = sinon.extend(sinon.stub.create(), sinon.expectation);
+                delete expectation.create;
+                expectation.method = methodName;
+
+                return expectation;
+            },
+
+            invoke: function invoke(func, thisValue, args) {
+                this.verifyCallAllowed(thisValue, args);
+
+                return _invoke.apply(this, arguments);
+            },
+
+            atLeast: function atLeast(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not number");
+                }
+
+                if (!this.limitsSet) {
+                    this.maxCalls = null;
+                    this.limitsSet = true;
+                }
+
+                this.minCalls = num;
+
+                return this;
+            },
+
+            atMost: function atMost(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not number");
+                }
+
+                if (!this.limitsSet) {
+                    this.minCalls = null;
+                    this.limitsSet = true;
+                }
+
+                this.maxCalls = num;
+
+                return this;
+            },
+
+            never: function never() {
+                return this.exactly(0);
+            },
+
+            once: function once() {
+                return this.exactly(1);
+            },
+
+            twice: function twice() {
+                return this.exactly(2);
+            },
+
+            thrice: function thrice() {
+                return this.exactly(3);
+            },
+
+            exactly: function exactly(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not a number");
+                }
+
+                this.atLeast(num);
+                return this.atMost(num);
+            },
+
+            met: function met() {
+                return !this.failed && receivedMinCalls(this);
+            },
+
+            verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
+                if (receivedMaxCalls(this)) {
+                    this.failed = true;
+                    sinon.expectation.fail(this.method + " already called " + times(this.maxCalls));
+                }
+
+                if ("expectedThis" in this && this.expectedThis !== thisValue) {
+                    sinon.expectation.fail(this.method + " called with " + thisValue + " as thisValue, expected " +
+                        this.expectedThis);
+                }
+
+                if (!("expectedArguments" in this)) {
+                    return;
+                }
+
+                if (!args) {
+                    sinon.expectation.fail(this.method + " received no arguments, expected " +
+                        sinon.format(this.expectedArguments));
+                }
+
+                if (args.length < this.expectedArguments.length) {
+                    sinon.expectation.fail(this.method + " received too few arguments (" + sinon.format(args) +
+                        "), expected " + sinon.format(this.expectedArguments));
+                }
+
+                if (this.expectsExactArgCount &&
+                    args.length != this.expectedArguments.length) {
+                    sinon.expectation.fail(this.method + " received too many arguments (" + sinon.format(args) +
+                        "), expected " + sinon.format(this.expectedArguments));
+                }
+
+                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+
+                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
+                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
+                            ", didn't match " + this.expectedArguments.toString());
+                    }
+
+                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
+                            ", expected " + sinon.format(this.expectedArguments));
+                    }
+                }
+            },
+
+            allowsCall: function allowsCall(thisValue, args) {
+                if (this.met() && receivedMaxCalls(this)) {
+                    return false;
+                }
+
+                if ("expectedThis" in this && this.expectedThis !== thisValue) {
+                    return false;
+                }
+
+                if (!("expectedArguments" in this)) {
+                    return true;
+                }
+
+                args = args || [];
+
+                if (args.length < this.expectedArguments.length) {
+                    return false;
+                }
+
+                if (this.expectsExactArgCount &&
+                    args.length != this.expectedArguments.length) {
+                    return false;
+                }
+
+                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
+                        return false;
+                    }
+
+                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+                        return false;
+                    }
+                }
+
+                return true;
+            },
+
+            withArgs: function withArgs() {
+                this.expectedArguments = slice.call(arguments);
+                return this;
+            },
+
+            withExactArgs: function withExactArgs() {
+                this.withArgs.apply(this, arguments);
+                this.expectsExactArgCount = true;
+                return this;
+            },
+
+            on: function on(thisValue) {
+                this.expectedThis = thisValue;
+                return this;
+            },
+
+            toString: function () {
+                var args = (this.expectedArguments || []).slice();
+
+                if (!this.expectsExactArgCount) {
+                    push.call(args, "[...]");
+                }
+
+                var callStr = sinon.spyCall.toString.call({
+                    proxy: this.method || "anonymous mock expectation",
+                    args: args
+                });
+
+                var message = callStr.replace(", [...", "[, ...") + " " +
+                    expectedCallCountInWords(this);
+
+                if (this.met()) {
+                    return "Expectation met: " + message;
+                }
+
+                return "Expected " + message + " (" +
+                    callCountInWords(this.callCount) + ")";
+            },
+
+            verify: function verify() {
+                if (!this.met()) {
+                    sinon.expectation.fail(this.toString());
+                } else {
+                    sinon.expectation.pass(this.toString());
+                }
+
+                return true;
+            },
+
+            pass: function(message) {
+              sinon.assert.pass(message);
+            },
+            fail: function (message) {
+                var exception = new Error(message);
+                exception.name = "ExpectationError";
+
+                throw exception;
+            }
+        };
+    }());
+
+    if (commonJSModule) {
+        module.exports = mock;
+    } else {
+        sinon.mock = mock;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true*/
+/*global module, require, sinon*/
+/**
+ * Collections of stubs, spies and mocks.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    var push = [].push;
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function getFakes(fakeCollection) {
+        if (!fakeCollection.fakes) {
+            fakeCollection.fakes = [];
+        }
+
+        return fakeCollection.fakes;
+    }
+
+    function each(fakeCollection, method) {
+        var fakes = getFakes(fakeCollection);
+
+        for (var i = 0, l = fakes.length; i < l; i += 1) {
+            if (typeof fakes[i][method] == "function") {
+                fakes[i][method]();
+            }
+        }
+    }
+
+    function compact(fakeCollection) {
+        var fakes = getFakes(fakeCollection);
+        var i = 0;
+        while (i < fakes.length) {
+          fakes.splice(i, 1);
+        }
+    }
+
+    var collection = {
+        verify: function resolve() {
+            each(this, "verify");
+        },
+
+        restore: function restore() {
+            each(this, "restore");
+            compact(this);
+        },
+
+        verifyAndRestore: function verifyAndRestore() {
+            var exception;
+
+            try {
+                this.verify();
+            } catch (e) {
+                exception = e;
+            }
+
+            this.restore();
+
+            if (exception) {
+                throw exception;
+            }
+        },
+
+        add: function add(fake) {
+            push.call(getFakes(this), fake);
+            return fake;
+        },
+
+        spy: function spy() {
+            return this.add(sinon.spy.apply(sinon, arguments));
+        },
+
+        stub: function stub(object, property, value) {
+            if (property) {
+                var original = object[property];
+
+                if (typeof original != "function") {
+                    if (!hasOwnProperty.call(object, property)) {
+                        throw new TypeError("Cannot stub non-existent own property " + property);
+                    }
+
+                    object[property] = value;
+
+                    return this.add({
+                        restore: function () {
+                            object[property] = original;
+                        }
+                    });
+                }
+            }
+            if (!property && !!object && typeof object == "object") {
+                var stubbedObj = sinon.stub.apply(sinon, arguments);
+
+                for (var prop in stubbedObj) {
+                    if (typeof stubbedObj[prop] === "function") {
+                        this.add(stubbedObj[prop]);
+                    }
+                }
+
+                return stubbedObj;
+            }
+
+            return this.add(sinon.stub.apply(sinon, arguments));
+        },
+
+        mock: function mock() {
+            return this.add(sinon.mock.apply(sinon, arguments));
+        },
+
+        inject: function inject(obj) {
+            var col = this;
+
+            obj.spy = function () {
+                return col.spy.apply(col, arguments);
+            };
+
+            obj.stub = function () {
+                return col.stub.apply(col, arguments);
+            };
+
+            obj.mock = function () {
+                return col.mock.apply(col, arguments);
+            };
+
+            return obj;
+        }
+    };
+
+    if (commonJSModule) {
+        module.exports = collection;
+    } else {
+        sinon.collection = collection;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
+/*global module, require, window*/
+/**
+ * Fake timer API
+ * setTimeout
+ * setInterval
+ * clearTimeout
+ * clearInterval
+ * tick
+ * reset
+ * Date
+ *
+ * Inspired by jsUnitMockTimeOut from JsUnit
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    var sinon = {};
+}
+
+(function (global) {
+    var id = 1;
+
+    function addTimer(args, recurring) {
+        if (args.length === 0) {
+            throw new Error("Function requires at least 1 parameter");
+        }
+
+        if (typeof args[0] === "undefined") {
+            throw new Error("Callback must be provided to timer calls");
+        }
+
+        var toId = id++;
+        var delay = args[1] || 0;
+
+        if (!this.timeouts) {
+            this.timeouts = {};
+        }
+
+        this.timeouts[toId] = {
+            id: toId,
+            func: args[0],
+            callAt: this.now + delay,
+            invokeArgs: Array.prototype.slice.call(args, 2)
+        };
+
+        if (recurring === true) {
+            this.timeouts[toId].interval = delay;
+        }
+
+        return toId;
+    }
+
+    function parseTime(str) {
+        if (!str) {
+            return 0;
+        }
+
+        var strings = str.split(":");
+        var l = strings.length, i = l;
+        var ms = 0, parsed;
+
+        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
+            throw new Error("tick only understands numbers and 'h:m:s'");
+        }
+
+        while (i--) {
+            parsed = parseInt(strings[i], 10);
+
+            if (parsed >= 60) {
+                throw new Error("Invalid time " + str);
+            }
+
+            ms += parsed * Math.pow(60, (l - i - 1));
+        }
+
+        return ms * 1000;
+    }
+
+    function createObject(object) {
+        var newObject;
+
+        if (Object.create) {
+            newObject = Object.create(object);
+        } else {
+            var F = function () {};
+            F.prototype = object;
+            newObject = new F();
+        }
+
+        newObject.Date.clock = newObject;
+        return newObject;
+    }
+
+    sinon.clock = {
+        now: 0,
+
+        create: function create(now) {
+            var clock = createObject(this);
+
+            if (typeof now == "number") {
+                clock.now = now;
+            }
+
+            if (!!now && typeof now == "object") {
+                throw new TypeError("now should be milliseconds since UNIX epoch");
+            }
+
+            return clock;
+        },
+
+        setTimeout: function setTimeout(callback, timeout) {
+            return addTimer.call(this, arguments, false);
+        },
+
+        clearTimeout: function clearTimeout(timerId) {
+            if (!this.timeouts) {
+                this.timeouts = [];
+            }
+
+            if (timerId in this.timeouts) {
+                delete this.timeouts[timerId];
+            }
+        },
+
+        setInterval: function setInterval(callback, timeout) {
+            return addTimer.call(this, arguments, true);
+        },
+
+        clearInterval: function clearInterval(timerId) {
+            this.clearTimeout(timerId);
+        },
+
+        setImmediate: function setImmediate(callback) {
+            var passThruArgs = Array.prototype.slice.call(arguments, 1);
+
+            return addTimer.call(this, [callback, 0].concat(passThruArgs), false);
+        },
+
+        clearImmediate: function clearImmediate(timerId) {
+            this.clearTimeout(timerId);
+        },
+
+        tick: function tick(ms) {
+            ms = typeof ms == "number" ? ms : parseTime(ms);
+            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
+            var timer = this.firstTimerInRange(tickFrom, tickTo);
+
+            var firstException;
+            while (timer && tickFrom <= tickTo) {
+                if (this.timeouts[timer.id]) {
+                    tickFrom = this.now = timer.callAt;
+                    try {
+                      this.callTimer(timer);
+                    } catch (e) {
+                      firstException = firstException || e;
+                    }
+                }
+
+                timer = this.firstTimerInRange(previous, tickTo);
+                previous = tickFrom;
+            }
+
+            this.now = tickTo;
+
+            if (firstException) {
+              throw firstException;
+            }
+
+            return this.now;
+        },
+
+        firstTimerInRange: function (from, to) {
+            var timer, smallest = null, originalTimer;
+
+            for (var id in this.timeouts) {
+                if (this.timeouts.hasOwnProperty(id)) {
+                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
+                        continue;
+                    }
+
+                    if (smallest === null || this.timeouts[id].callAt < smallest) {
+                        originalTimer = this.timeouts[id];
+                        smallest = this.timeouts[id].callAt;
+
+                        timer = {
+                            func: this.timeouts[id].func,
+                            callAt: this.timeouts[id].callAt,
+                            interval: this.timeouts[id].interval,
+                            id: this.timeouts[id].id,
+                            invokeArgs: this.timeouts[id].invokeArgs
+                        };
+                    }
+                }
+            }
+
+            return timer || null;
+        },
+
+        callTimer: function (timer) {
+            if (typeof timer.interval == "number") {
+                this.timeouts[timer.id].callAt += timer.interval;
+            } else {
+                delete this.timeouts[timer.id];
+            }
+
+            try {
+                if (typeof timer.func == "function") {
+                    timer.func.apply(null, timer.invokeArgs);
+                } else {
+                    eval(timer.func);
+                }
+            } catch (e) {
+              var exception = e;
+            }
+
+            if (!this.timeouts[timer.id]) {
+                if (exception) {
+                  throw exception;
+                }
+                return;
+            }
+
+            if (exception) {
+              throw exception;
+            }
+        },
+
+        reset: function reset() {
+            this.timeouts = {};
+        },
+
+        Date: (function () {
+            var NativeDate = Date;
+
+            function ClockDate(year, month, date, hour, minute, second, ms) {
+                // Defensive and verbose to avoid potential harm in passing
+                // explicit undefined when user does not pass argument
+                switch (arguments.length) {
+                case 0:
+                    return new NativeDate(ClockDate.clock.now);
+                case 1:
+                    return new NativeDate(year);
+                case 2:
+                    return new NativeDate(year, month);
+                case 3:
+                    return new NativeDate(year, month, date);
+                case 4:
+                    return new NativeDate(year, month, date, hour);
+                case 5:
+                    return new NativeDate(year, month, date, hour, minute);
+                case 6:
+                    return new NativeDate(year, month, date, hour, minute, second);
+                default:
+                    return new NativeDate(year, month, date, hour, minute, second, ms);
+                }
+            }
+
+            return mirrorDateProperties(ClockDate, NativeDate);
+        }())
+    };
+
+    function mirrorDateProperties(target, source) {
+        if (source.now) {
+            target.now = function now() {
+                return target.clock.now;
+            };
+        } else {
+            delete target.now;
+        }
+
+        if (source.toSource) {
+            target.toSource = function toSource() {
+                return source.toSource();
+            };
+        } else {
+            delete target.toSource;
+        }
+
+        target.toString = function toString() {
+            return source.toString();
+        };
+
+        target.prototype = source.prototype;
+        target.parse = source.parse;
+        target.UTC = source.UTC;
+        target.prototype.toUTCString = source.prototype.toUTCString;
+
+        for (var prop in source) {
+            if (source.hasOwnProperty(prop)) {
+                target[prop] = source[prop];
+            }
+        }
+
+        return target;
+    }
+
+    var methods = ["Date", "setTimeout", "setInterval",
+                   "clearTimeout", "clearInterval"];
+
+    if (typeof global.setImmediate !== "undefined") {
+        methods.push("setImmediate");
+    }
+
+    if (typeof global.clearImmediate !== "undefined") {
+        methods.push("clearImmediate");
+    }
+
+    function restore() {
+        var method;
+
+        for (var i = 0, l = this.methods.length; i < l; i++) {
+            method = this.methods[i];
+
+            if (global[method].hadOwnProperty) {
+                global[method] = this["_" + method];
+            } else {
+                try {
+                    delete global[method];
+                } catch (e) {}
+            }
+        }
+
+        // Prevent multiple executions which will completely remove these props
+        this.methods = [];
+    }
+
+    function stubGlobal(method, clock) {
+        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
+        clock["_" + method] = global[method];
+
+        if (method == "Date") {
+            var date = mirrorDateProperties(clock[method], global[method]);
+            global[method] = date;
+        } else {
+            global[method] = function () {
+                return clock[method].apply(clock, arguments);
+            };
+
+            for (var prop in clock[method]) {
+                if (clock[method].hasOwnProperty(prop)) {
+                    global[method][prop] = clock[method][prop];
+                }
+            }
+        }
+
+        global[method].clock = clock;
+    }
+
+    sinon.useFakeTimers = function useFakeTimers(now) {
+        var clock = sinon.clock.create(now);
+        clock.restore = restore;
+        clock.methods = Array.prototype.slice.call(arguments,
+                                                   typeof now == "number" ? 1 : 0);
+
+        if (clock.methods.length === 0) {
+            clock.methods = methods;
+        }
+
+        for (var i = 0, l = clock.methods.length; i < l; i++) {
+            stubGlobal(clock.methods[i], clock);
+        }
+
+        return clock;
+    };
+}(typeof global != "undefined" && typeof global !== "function" ? global : this));
+
+sinon.timers = {
+    setTimeout: setTimeout,
+    clearTimeout: clearTimeout,
+    setImmediate: (typeof setImmediate !== "undefined" ? setImmediate : undefined),
+    clearImmediate: (typeof clearImmediate !== "undefined" ? clearImmediate: undefined),
+    setInterval: setInterval,
+    clearInterval: clearInterval,
+    Date: Date
+};
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = sinon;
+}
+
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Minimal Event interface implementation
+ *
+ * Original implementation by Sven Fuchs: https://gist.github.com/995028
+ * Modifications and tests by Christian Johansen.
+ *
+ * @author Sven Fuchs (svenfuchs@artweb-design.de)
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2011 Sven Fuchs, Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    this.sinon = {};
+}
+
+(function () {
+    var push = [].push;
+
+    sinon.Event = function Event(type, bubbles, cancelable, target) {
+        this.initEvent(type, bubbles, cancelable, target);
+    };
+
+    sinon.Event.prototype = {
+        initEvent: function(type, bubbles, cancelable, target) {
+            this.type = type;
+            this.bubbles = bubbles;
+            this.cancelable = cancelable;
+            this.target = target;
+        },
+
+        stopPropagation: function () {},
+
+        preventDefault: function () {
+            this.defaultPrevented = true;
+        }
+    };
+
+    sinon.ProgressEvent = function ProgressEvent(type, progressEventRaw, target) {
+        this.initEvent(type, false, false, target);
+        this.loaded = progressEventRaw.loaded || null;
+        this.total = progressEventRaw.total || null;
+    };
+
+    sinon.ProgressEvent.prototype = new sinon.Event();
+
+    sinon.ProgressEvent.prototype.constructor =  sinon.ProgressEvent;
+
+    sinon.CustomEvent = function CustomEvent(type, customData, target) {
+        this.initEvent(type, false, false, target);
+        this.detail = customData.detail || null;
+    };
+
+    sinon.CustomEvent.prototype = new sinon.Event();
+
+    sinon.CustomEvent.prototype.constructor =  sinon.CustomEvent;
+
+    sinon.EventTarget = {
+        addEventListener: function addEventListener(event, listener) {
+            this.eventListeners = this.eventListeners || {};
+            this.eventListeners[event] = this.eventListeners[event] || [];
+            push.call(this.eventListeners[event], listener);
+        },
+
+        removeEventListener: function removeEventListener(event, listener) {
+            var listeners = this.eventListeners && this.eventListeners[event] || [];
+
+            for (var i = 0, l = listeners.length; i < l; ++i) {
+                if (listeners[i] == listener) {
+                    return listeners.splice(i, 1);
+                }
+            }
+        },
+
+        dispatchEvent: function dispatchEvent(event) {
+            var type = event.type;
+            var listeners = this.eventListeners && this.eventListeners[type] || [];
+
+            for (var i = 0; i < listeners.length; i++) {
+                if (typeof listeners[i] == "function") {
+                    listeners[i].call(this, event);
+                } else {
+                    listeners[i].handleEvent(event);
+                }
+            }
+
+            return !!event.defaultPrevented;
+        }
+    };
+}());
+
+/**
+ * @depend ../../sinon.js
+ * @depend event.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Fake XMLHttpRequest object
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+// wrapper for global
+(function(global) {
+    if (typeof sinon === "undefined") {
+        global.sinon = {};
+    }
+
+    var supportsProgress = typeof ProgressEvent !== "undefined";
+    var supportsCustomEvent = typeof CustomEvent !== "undefined";
+    sinon.xhr = { XMLHttpRequest: global.XMLHttpRequest };
+    var xhr = sinon.xhr;
+    xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
+    xhr.GlobalActiveXObject = global.ActiveXObject;
+    xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
+    xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
+    xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
+                                     ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
+    xhr.supportsCORS = 'withCredentials' in (new sinon.xhr.GlobalXMLHttpRequest());
+
+    /*jsl:ignore*/
+    var unsafeHeaders = {
+        "Accept-Charset": true,
+        "Accept-Encoding": true,
+        "Connection": true,
+        "Content-Length": true,
+        "Cookie": true,
+        "Cookie2": true,
+        "Content-Transfer-Encoding": true,
+        "Date": true,
+        "Expect": true,
+        "Host": true,
+        "Keep-Alive": true,
+        "Referer": true,
+        "TE": true,
+        "Trailer": true,
+        "Transfer-Encoding": true,
+        "Upgrade": true,
+        "User-Agent": true,
+        "Via": true
+    };
+    /*jsl:end*/
+
+    function FakeXMLHttpRequest() {
+        this.readyState = FakeXMLHttpRequest.UNSENT;
+        this.requestHeaders = {};
+        this.requestBody = null;
+        this.status = 0;
+        this.statusText = "";
+        this.upload = new UploadProgress();
+        if (sinon.xhr.supportsCORS) {
+            this.withCredentials = false;
+        }
+
+
+        var xhr = this;
+        var events = ["loadstart", "load", "abort", "loadend"];
+
+        function addEventListener(eventName) {
+            xhr.addEventListener(eventName, function (event) {
+                var listener = xhr["on" + eventName];
+
+                if (listener && typeof listener == "function") {
+                    listener.call(this, event);
+                }
+            });
+        }
+
+        for (var i = events.length - 1; i >= 0; i--) {
+            addEventListener(events[i]);
+        }
+
+        if (typeof FakeXMLHttpRequest.onCreate == "function") {
+            FakeXMLHttpRequest.onCreate(this);
+        }
+    }
+
+    // An upload object is created for each
+    // FakeXMLHttpRequest and allows upload
+    // events to be simulated using uploadProgress
+    // and uploadError.
+    function UploadProgress() {
+        this.eventListeners = {
+            "progress": [],
+            "load": [],
+            "abort": [],
+            "error": []
+        }
+    }
+
+    UploadProgress.prototype.addEventListener = function(event, listener) {
+        this.eventListeners[event].push(listener);
+    };
+
+    UploadProgress.prototype.removeEventListener = function(event, listener) {
+        var listeners = this.eventListeners[event] || [];
+
+        for (var i = 0, l = listeners.length; i < l; ++i) {
+            if (listeners[i] == listener) {
+                return listeners.splice(i, 1);
+            }
+        }
+    };
+
+    UploadProgress.prototype.dispatchEvent = function(event) {
+        var listeners = this.eventListeners[event.type] || [];
+
+        for (var i = 0, listener; (listener = listeners[i]) != null; i++) {
+            listener(event);
+        }
+    };
+
+    function verifyState(xhr) {
+        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+
+        if (xhr.sendFlag) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+    }
+
+    // filtering to enable a white-list version of Sinon FakeXhr,
+    // where whitelisted requests are passed through to real XHR
+    function each(collection, callback) {
+        if (!collection) return;
+        for (var i = 0, l = collection.length; i < l; i += 1) {
+            callback(collection[i]);
+        }
+    }
+    function some(collection, callback) {
+        for (var index = 0; index < collection.length; index++) {
+            if(callback(collection[index]) === true) return true;
+        }
+        return false;
+    }
+    // largest arity in XHR is 5 - XHR#open
+    var apply = function(obj,method,args) {
+        switch(args.length) {
+        case 0: return obj[method]();
+        case 1: return obj[method](args[0]);
+        case 2: return obj[method](args[0],args[1]);
+        case 3: return obj[method](args[0],args[1],args[2]);
+        case 4: return obj[method](args[0],args[1],args[2],args[3]);
+        case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
+        }
+    };
+
+    FakeXMLHttpRequest.filters = [];
+    FakeXMLHttpRequest.addFilter = function(fn) {
+        this.filters.push(fn)
+    };
+    var IE6Re = /MSIE 6/;
+    FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
+        var xhr = new sinon.xhr.workingXHR();
+        each(["open","setRequestHeader","send","abort","getResponseHeader",
+              "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
+             function(method) {
+                 fakeXhr[method] = function() {
+                   return apply(xhr,method,arguments);
+                 };
+             });
+
+        var copyAttrs = function(args) {
+            each(args, function(attr) {
+              try {
+                fakeXhr[attr] = xhr[attr]
+              } catch(e) {
+                if(!IE6Re.test(navigator.userAgent)) throw e;
+              }
+            });
+        };
+
+        var stateChange = function() {
+            fakeXhr.readyState = xhr.readyState;
+            if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                copyAttrs(["status","statusText"]);
+            }
+            if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
+                copyAttrs(["responseText"]);
+            }
+            if(xhr.readyState === FakeXMLHttpRequest.DONE) {
+                copyAttrs(["responseXML"]);
+            }
+            if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr, { target: fakeXhr });
+        };
+        if(xhr.addEventListener) {
+          for(var event in fakeXhr.eventListeners) {
+              if(fakeXhr.eventListeners.hasOwnProperty(event)) {
+                  each(fakeXhr.eventListeners[event],function(handler) {
+                      xhr.addEventListener(event, handler);
+                  });
+              }
+          }
+          xhr.addEventListener("readystatechange",stateChange);
+        } else {
+          xhr.onreadystatechange = stateChange;
+        }
+        apply(xhr,"open",xhrArgs);
+    };
+    FakeXMLHttpRequest.useFilters = false;
+
+    function verifyRequestOpened(xhr) {
+        if (xhr.readyState != FakeXMLHttpRequest.OPENED) {
+            throw new Error("INVALID_STATE_ERR - " + xhr.readyState);
+        }
+    }
+
+    function verifyRequestSent(xhr) {
+        if (xhr.readyState == FakeXMLHttpRequest.DONE) {
+            throw new Error("Request done");
+        }
+    }
+
+    function verifyHeadersReceived(xhr) {
+        if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
+            throw new Error("No headers received");
+        }
+    }
+
+    function verifyResponseBodyType(body) {
+        if (typeof body != "string") {
+            var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
+                                 body + ", which is not a string.");
+            error.name = "InvalidBodyException";
+            throw error;
+        }
+    }
+
+    sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
+        async: true,
+
+        open: function open(method, url, async, username, password) {
+            this.method = method;
+            this.url = url;
+            this.async = typeof async == "boolean" ? async : true;
+            this.username = username;
+            this.password = password;
+            this.responseText = null;
+            this.responseXML = null;
+            this.requestHeaders = {};
+            this.sendFlag = false;
+            if(sinon.FakeXMLHttpRequest.useFilters === true) {
+                var xhrArgs = arguments;
+                var defake = some(FakeXMLHttpRequest.filters,function(filter) {
+                    return filter.apply(this,xhrArgs)
+                });
+                if (defake) {
+                  return sinon.FakeXMLHttpRequest.defake(this,arguments);
+                }
+            }
+            this.readyStateChange(FakeXMLHttpRequest.OPENED);
+        },
+
+        readyStateChange: function readyStateChange(state) {
+            this.readyState = state;
+
+            if (typeof this.onreadystatechange == "function") {
+                try {
+                    this.onreadystatechange();
+                } catch (e) {
+                    sinon.logError("Fake XHR onreadystatechange handler", e);
+                }
+            }
+
+            this.dispatchEvent(new sinon.Event("readystatechange"));
+
+            switch (this.readyState) {
+                case FakeXMLHttpRequest.DONE:
+                    this.dispatchEvent(new sinon.Event("load", false, false, this));
+                    this.dispatchEvent(new sinon.Event("loadend", false, false, this));
+                    this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
+                    if (supportsProgress) {
+                        this.upload.dispatchEvent(new sinon.ProgressEvent('progress', {loaded: 100, total: 100}));
+                    }
+                    break;
+            }
+        },
+
+        setRequestHeader: function setRequestHeader(header, value) {
+            verifyState(this);
+
+            if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
+                throw new Error("Refused to set unsafe header \"" + header + "\"");
+            }
+
+            if (this.requestHeaders[header]) {
+                this.requestHeaders[header] += "," + value;
+            } else {
+                this.requestHeaders[header] = value;
+            }
+        },
+
+        // Helps testing
+        setResponseHeaders: function setResponseHeaders(headers) {
+            verifyRequestOpened(this);
+            this.responseHeaders = {};
+
+            for (var header in headers) {
+                if (headers.hasOwnProperty(header)) {
+                    this.responseHeaders[header] = headers[header];
+                }
+            }
+
+            if (this.async) {
+                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
+            } else {
+                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
+            }
+        },
+
+        // Currently treats ALL data as a DOMString (i.e. no Document)
+        send: function send(data) {
+            verifyState(this);
+
+            if (!/^(get|head)$/i.test(this.method)) {
+                if (this.requestHeaders["Content-Type"]) {
+                    var value = this.requestHeaders["Content-Type"].split(";");
+                    this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
+                } else {
+                    this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
+                }
+
+                this.requestBody = data;
+            }
+
+            this.errorFlag = false;
+            this.sendFlag = this.async;
+            this.readyStateChange(FakeXMLHttpRequest.OPENED);
+
+            if (typeof this.onSend == "function") {
+                this.onSend(this);
+            }
+
+            this.dispatchEvent(new sinon.Event("loadstart", false, false, this));
+        },
+
+        abort: function abort() {
+            this.aborted = true;
+            this.responseText = null;
+            this.errorFlag = true;
+            this.requestHeaders = {};
+
+            if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
+                this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
+                this.sendFlag = false;
+            }
+
+            this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
+
+            this.dispatchEvent(new sinon.Event("abort", false, false, this));
+
+            this.upload.dispatchEvent(new sinon.Event("abort", false, false, this));
+
+            if (typeof this.onerror === "function") {
+                this.onerror();
+            }
+        },
+
+        getResponseHeader: function getResponseHeader(header) {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return null;
+            }
+
+            if (/^Set-Cookie2?$/i.test(header)) {
+                return null;
+            }
+
+            header = header.toLowerCase();
+
+            for (var h in this.responseHeaders) {
+                if (h.toLowerCase() == header) {
+                    return this.responseHeaders[h];
+                }
+            }
+
+            return null;
+        },
+
+        getAllResponseHeaders: function getAllResponseHeaders() {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return "";
+            }
+
+            var headers = "";
+
+            for (var header in this.responseHeaders) {
+                if (this.responseHeaders.hasOwnProperty(header) &&
+                    !/^Set-Cookie2?$/i.test(header)) {
+                    headers += header + ": " + this.responseHeaders[header] + "\r\n";
+                }
+            }
+
+            return headers;
+        },
+
+        setResponseBody: function setResponseBody(body) {
+            verifyRequestSent(this);
+            verifyHeadersReceived(this);
+            verifyResponseBodyType(body);
+
+            var chunkSize = this.chunkSize || 10;
+            var index = 0;
+            this.responseText = "";
+
+            do {
+                if (this.async) {
+                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
+                }
+
+                this.responseText += body.substring(index, index + chunkSize);
+                index += chunkSize;
+            } while (index < body.length);
+
+            var type = this.getResponseHeader("Content-Type");
+
+            if (this.responseText &&
+                (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
+                try {
+                    this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
+                } catch (e) {
+                    // Unable to parse XML - no biggie
+                }
+            }
+
+            if (this.async) {
+                this.readyStateChange(FakeXMLHttpRequest.DONE);
+            } else {
+                this.readyState = FakeXMLHttpRequest.DONE;
+            }
+        },
+
+        respond: function respond(status, headers, body) {
+            this.status = typeof status == "number" ? status : 200;
+            this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
+            this.setResponseHeaders(headers || {});
+            this.setResponseBody(body || "");
+        },
+
+        uploadProgress: function uploadProgress(progressEventRaw) {
+            if (supportsProgress) {
+                this.upload.dispatchEvent(new sinon.ProgressEvent("progress", progressEventRaw));
+            }
+        },
+
+        uploadError: function uploadError(error) {
+            if (supportsCustomEvent) {
+                this.upload.dispatchEvent(new sinon.CustomEvent("error", {"detail": error}));
+            }
+        }
+    });
+
+    sinon.extend(FakeXMLHttpRequest, {
+        UNSENT: 0,
+        OPENED: 1,
+        HEADERS_RECEIVED: 2,
+        LOADING: 3,
+        DONE: 4
+    });
+
+    // Borrowed from JSpec
+    FakeXMLHttpRequest.parseXML = function parseXML(text) {
+        var xmlDoc;
+
+        if (typeof DOMParser != "undefined") {
+            var parser = new DOMParser();
+            xmlDoc = parser.parseFromString(text, "text/xml");
+        } else {
+            xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+            xmlDoc.async = "false";
+            xmlDoc.loadXML(text);
+        }
+
+        return xmlDoc;
+    };
+
+    FakeXMLHttpRequest.statusCodes = {
+        100: "Continue",
+        101: "Switching Protocols",
+        200: "OK",
+        201: "Created",
+        202: "Accepted",
+        203: "Non-Authoritative Information",
+        204: "No Content",
+        205: "Reset Content",
+        206: "Partial Content",
+        300: "Multiple Choice",
+        301: "Moved Permanently",
+        302: "Found",
+        303: "See Other",
+        304: "Not Modified",
+        305: "Use Proxy",
+        307: "Temporary Redirect",
+        400: "Bad Request",
+        401: "Unauthorized",
+        402: "Payment Required",
+        403: "Forbidden",
+        404: "Not Found",
+        405: "Method Not Allowed",
+        406: "Not Acceptable",
+        407: "Proxy Authentication Required",
+        408: "Request Timeout",
+        409: "Conflict",
+        410: "Gone",
+        411: "Length Required",
+        412: "Precondition Failed",
+        413: "Request Entity Too Large",
+        414: "Request-URI Too Long",
+        415: "Unsupported Media Type",
+        416: "Requested Range Not Satisfiable",
+        417: "Expectation Failed",
+        422: "Unprocessable Entity",
+        500: "Internal Server Error",
+        501: "Not Implemented",
+        502: "Bad Gateway",
+        503: "Service Unavailable",
+        504: "Gateway Timeout",
+        505: "HTTP Version Not Supported"
+    };
+
+    sinon.useFakeXMLHttpRequest = function () {
+        sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
+            if (xhr.supportsXHR) {
+                global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
+            }
+
+            if (xhr.supportsActiveX) {
+                global.ActiveXObject = xhr.GlobalActiveXObject;
+            }
+
+            delete sinon.FakeXMLHttpRequest.restore;
+
+            if (keepOnCreate !== true) {
+                delete sinon.FakeXMLHttpRequest.onCreate;
+            }
+        };
+        if (xhr.supportsXHR) {
+            global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
+        }
+
+        if (xhr.supportsActiveX) {
+            global.ActiveXObject = function ActiveXObject(objId) {
+                if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
+
+                    return new sinon.FakeXMLHttpRequest();
+                }
+
+                return new xhr.GlobalActiveXObject(objId);
+            };
+        }
+
+        return sinon.FakeXMLHttpRequest;
+    };
+
+    sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
+
+})(typeof global === "object" ? global : this);
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = sinon;
+}
+
+/**
+ * @depend fake_xml_http_request.js
+ */
+/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
+/*global module, require, window*/
+/**
+ * The Sinon "server" mimics a web server that receives requests from
+ * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
+ * both synchronously and asynchronously. To respond synchronuously, canned
+ * answers have to be provided upfront.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    var sinon = {};
+}
+
+sinon.fakeServer = (function () {
+    var push = [].push;
+    function F() {}
+
+    function create(proto) {
+        F.prototype = proto;
+        return new F();
+    }
+
+    function responseArray(handler) {
+        var response = handler;
+
+        if (Object.prototype.toString.call(handler) != "[object Array]") {
+            response = [200, {}, handler];
+        }
+
+        if (typeof response[2] != "string") {
+            throw new TypeError("Fake server response body should be string, but was " +
+                                typeof response[2]);
+        }
+
+        return response;
+    }
+
+    var wloc = typeof window !== "undefined" ? window.location : {};
+    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
+
+    function matchOne(response, reqMethod, reqUrl) {
+        var rmeth = response.method;
+        var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
+        var url = response.url;
+        var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
+
+        return matchMethod && matchUrl;
+    }
+
+    function match(response, request) {
+        var requestUrl = request.url;
+
+        if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
+            requestUrl = requestUrl.replace(rCurrLoc, "");
+        }
+
+        if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
+            if (typeof response.response == "function") {
+                var ru = response.url;
+                var args = [request].concat(ru && typeof ru.exec == "function" ? ru.exec(requestUrl).slice(1) : []);
+                return response.response.apply(response, args);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    function log(response, request) {
+        var str;
+
+        str =  "Request:\n"  + sinon.format(request)  + "\n\n";
+        str += "Response:\n" + sinon.format(response) + "\n\n";
+
+        sinon.log(str);
+    }
+
+    return {
+        create: function () {
+            var server = create(this);
+            this.xhr = sinon.useFakeXMLHttpRequest();
+            server.requests = [];
+
+            this.xhr.onCreate = function (xhrObj) {
+                server.addRequest(xhrObj);
+            };
+
+            return server;
+        },
+
+        addRequest: function addRequest(xhrObj) {
+            var server = this;
+            push.call(this.requests, xhrObj);
+
+            xhrObj.onSend = function () {
+                server.handleRequest(this);
+
+                if (server.autoRespond && !server.responding) {
+                    setTimeout(function () {
+                        server.responding = false;
+                        server.respond();
+                    }, server.autoRespondAfter || 10);
+
+                    server.responding = true;
+                }
+            };
+        },
+
+        getHTTPMethod: function getHTTPMethod(request) {
+            if (this.fakeHTTPMethods && /post/i.test(request.method)) {
+                var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
+                return !!matches ? matches[1] : request.method;
+            }
+
+            return request.method;
+        },
+
+        handleRequest: function handleRequest(xhr) {
+            if (xhr.async) {
+                if (!this.queue) {
+                    this.queue = [];
+                }
+
+                push.call(this.queue, xhr);
+            } else {
+                this.processRequest(xhr);
+            }
+        },
+
+        respondWith: function respondWith(method, url, body) {
+            if (arguments.length == 1 && typeof method != "function") {
+                this.response = responseArray(method);
+                return;
+            }
+
+            if (!this.responses) { this.responses = []; }
+
+            if (arguments.length == 1) {
+                body = method;
+                url = method = null;
+            }
+
+            if (arguments.length == 2) {
+                body = url;
+                url = method;
+                method = null;
+            }
+
+            push.call(this.responses, {
+                method: method,
+                url: url,
+                response: typeof body == "function" ? body : responseArray(body)
+            });
+        },
+
+        respond: function respond() {
+            if (arguments.length > 0) this.respondWith.apply(this, arguments);
+            var queue = this.queue || [];
+            var requests = queue.splice(0);
+            var request;
+
+            while(request = requests.shift()) {
+                this.processRequest(request);
+            }
+        },
+
+        processRequest: function processRequest(request) {
+            try {
+                if (request.aborted) {
+                    return;
+                }
+
+                var response = this.response || [404, {}, ""];
+
+                if (this.responses) {
+                    for (var l = this.responses.length, i = l - 1; i >= 0; i--) {
+                        if (match.call(this, this.responses[i], request)) {
+                            response = this.responses[i].response;
+                            break;
+                        }
+                    }
+                }
+
+                if (request.readyState != 4) {
+                    log(response, request);
+
+                    request.respond(response[0], response[1], response[2]);
+                }
+            } catch (e) {
+                sinon.logError("Fake server request processing", e);
+            }
+        },
+
+        restore: function restore() {
+            return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
+        }
+    };
+}());
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = sinon;
+}
+
+/**
+ * @depend fake_server.js
+ * @depend fake_timers.js
+ */
+/*jslint browser: true, eqeqeq: false, onevar: false*/
+/*global sinon*/
+/**
+ * Add-on for sinon.fakeServer that automatically handles a fake timer along with
+ * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
+ * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
+ * it polls the object for completion with setInterval. Dispite the direct
+ * motivation, there is nothing jQuery-specific in this file, so it can be used
+ * in any environment where the ajax implementation depends on setInterval or
+ * setTimeout.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function () {
+    function Server() {}
+    Server.prototype = sinon.fakeServer;
+
+    sinon.fakeServerWithClock = new Server();
+
+    sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
+        if (xhr.async) {
+            if (typeof setTimeout.clock == "object") {
+                this.clock = setTimeout.clock;
+            } else {
+                this.clock = sinon.useFakeTimers();
+                this.resetClock = true;
+            }
+
+            if (!this.longestTimeout) {
+                var clockSetTimeout = this.clock.setTimeout;
+                var clockSetInterval = this.clock.setInterval;
+                var server = this;
+
+                this.clock.setTimeout = function (fn, timeout) {
+                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+                    return clockSetTimeout.apply(this, arguments);
+                };
+
+                this.clock.setInterval = function (fn, timeout) {
+                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+                    return clockSetInterval.apply(this, arguments);
+                };
+            }
+        }
+
+        return sinon.fakeServer.addRequest.call(this, xhr);
+    };
+
+    sinon.fakeServerWithClock.respond = function respond() {
+        var returnVal = sinon.fakeServer.respond.apply(this, arguments);
+
+        if (this.clock) {
+            this.clock.tick(this.longestTimeout || 0);
+            this.longestTimeout = 0;
+
+            if (this.resetClock) {
+                this.clock.restore();
+                this.resetClock = false;
+            }
+        }
+
+        return returnVal;
+    };
+
+    sinon.fakeServerWithClock.restore = function restore() {
+        if (this.clock) {
+            this.clock.restore();
+        }
+
+        return sinon.fakeServer.restore.apply(this, arguments);
+    };
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend collection.js
+ * @depend util/fake_timers.js
+ * @depend util/fake_server_with_clock.js
+ */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global require, module*/
+/**
+ * Manages fake collections as well as fake utilities such as Sinon's
+ * timers and fake XHR implementation in one convenient object.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof module !== 'undefined' && module.exports) {
+    var sinon = require("../sinon");
+    sinon.extend(sinon, require("./util/fake_timers"));
+}
+
+(function () {
+    var push = [].push;
+
+    function exposeValue(sandbox, config, key, value) {
+        if (!value) {
+            return;
+        }
+
+        if (config.injectInto && !(key in config.injectInto)) {
+            config.injectInto[key] = value;
+            sandbox.injectedKeys.push(key);
+        } else {
+            push.call(sandbox.args, value);
+        }
+    }
+
+    function prepareSandboxFromConfig(config) {
+        var sandbox = sinon.create(sinon.sandbox);
+
+        if (config.useFakeServer) {
+            if (typeof config.useFakeServer == "object") {
+                sandbox.serverPrototype = config.useFakeServer;
+            }
+
+            sandbox.useFakeServer();
+        }
+
+        if (config.useFakeTimers) {
+            if (typeof config.useFakeTimers == "object") {
+                sandbox.useFakeTimers.apply(sandbox, config.useFakeTimers);
+            } else {
+                sandbox.useFakeTimers();
+            }
+        }
+
+        return sandbox;
+    }
+
+    sinon.sandbox = sinon.extend(sinon.create(sinon.collection), {
+        useFakeTimers: function useFakeTimers() {
+            this.clock = sinon.useFakeTimers.apply(sinon, arguments);
+
+            return this.add(this.clock);
+        },
+
+        serverPrototype: sinon.fakeServer,
+
+        useFakeServer: function useFakeServer() {
+            var proto = this.serverPrototype || sinon.fakeServer;
+
+            if (!proto || !proto.create) {
+                return null;
+            }
+
+            this.server = proto.create();
+            return this.add(this.server);
+        },
+
+        inject: function (obj) {
+            sinon.collection.inject.call(this, obj);
+
+            if (this.clock) {
+                obj.clock = this.clock;
+            }
+
+            if (this.server) {
+                obj.server = this.server;
+                obj.requests = this.server.requests;
+            }
+
+            return obj;
+        },
+
+        restore: function () {
+            sinon.collection.restore.apply(this, arguments);
+            this.restoreContext();
+        },
+
+        restoreContext: function () {
+            if (this.injectedKeys) {
+                for (var i = 0, j = this.injectedKeys.length; i < j; i++) {
+                    delete this.injectInto[this.injectedKeys[i]];
+                }
+                this.injectedKeys = [];
+            }
+        },
+
+        create: function (config) {
+            if (!config) {
+                return sinon.create(sinon.sandbox);
+            }
+
+            var sandbox = prepareSandboxFromConfig(config);
+            sandbox.args = sandbox.args || [];
+            sandbox.injectedKeys = [];
+            sandbox.injectInto = config.injectInto;
+            var prop, value, exposed = sandbox.inject({});
+
+            if (config.properties) {
+                for (var i = 0, l = config.properties.length; i < l; i++) {
+                    prop = config.properties[i];
+                    value = exposed[prop] || prop == "sandbox" && sandbox;
+                    exposeValue(sandbox, config, prop, value);
+                }
+            } else {
+                exposeValue(sandbox, config, "sandbox", value);
+            }
+
+            return sandbox;
+        }
+    });
+
+    sinon.sandbox.useFakeXMLHttpRequest = sinon.sandbox.useFakeServer;
+
+    if (typeof module !== 'undefined' && module.exports) {
+        module.exports = sinon.sandbox;
+    }
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ * @depend sandbox.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Test function, sandboxes fakes
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function test(callback) {
+        var type = typeof callback;
+
+        if (type != "function") {
+            throw new TypeError("sinon.test needs to wrap a test function, got " + type);
+        }
+
+        return function () {
+            var config = sinon.getConfig(sinon.config);
+            config.injectInto = config.injectIntoThis && this || config.injectInto;
+            var sandbox = sinon.sandbox.create(config);
+            var exception, result;
+            var args = Array.prototype.slice.call(arguments).concat(sandbox.args);
+
+            try {
+                result = callback.apply(this, args);
+            } catch (e) {
+                exception = e;
+            }
+
+            if (typeof exception !== "undefined") {
+                sandbox.restore();
+                throw exception;
+            }
+            else {
+                sandbox.verifyAndRestore();
+            }
+
+            return result;
+        };
+    }
+
+    test.config = {
+        injectIntoThis: true,
+        injectInto: null,
+        properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+        useFakeTimers: true,
+        useFakeServer: true
+    };
+
+    if (commonJSModule) {
+        module.exports = test;
+    } else {
+        sinon.test = test;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend test.js
+ */
+/*jslint eqeqeq: false, onevar: false, eqeqeq: false*/
+/*global module, require, sinon*/
+/**
+ * Test case, sandboxes all test functions
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon || !Object.prototype.hasOwnProperty) {
+        return;
+    }
+
+    function createTest(property, setUp, tearDown) {
+        return function () {
+            if (setUp) {
+                setUp.apply(this, arguments);
+            }
+
+            var exception, result;
+
+            try {
+                result = property.apply(this, arguments);
+            } catch (e) {
+                exception = e;
+            }
+
+            if (tearDown) {
+                tearDown.apply(this, arguments);
+            }
+
+            if (exception) {
+                throw exception;
+            }
+
+            return result;
+        };
+    }
+
+    function testCase(tests, prefix) {
+        /*jsl:ignore*/
+        if (!tests || typeof tests != "object") {
+            throw new TypeError("sinon.testCase needs an object with test functions");
+        }
+        /*jsl:end*/
+
+        prefix = prefix || "test";
+        var rPrefix = new RegExp("^" + prefix);
+        var methods = {}, testName, property, method;
+        var setUp = tests.setUp;
+        var tearDown = tests.tearDown;
+
+        for (testName in tests) {
+            if (tests.hasOwnProperty(testName)) {
+                property = tests[testName];
+
+                if (/^(setUp|tearDown)$/.test(testName)) {
+                    continue;
+                }
+
+                if (typeof property == "function" && rPrefix.test(testName)) {
+                    method = property;
+
+                    if (setUp || tearDown) {
+                        method = createTest(property, setUp, tearDown);
+                    }
+
+                    methods[testName] = sinon.test(method);
+                } else {
+                    methods[testName] = tests[testName];
+                }
+            }
+        }
+
+        return methods;
+    }
+
+    if (commonJSModule) {
+        module.exports = testCase;
+    } else {
+        sinon.testCase = testCase;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Assertions matching the test spy retrieval interface.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon, global) {
+    var commonJSModule = typeof module !== "undefined" && module.exports;
+    var slice = Array.prototype.slice;
+    var assert;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function verifyIsStub() {
+        var method;
+
+        for (var i = 0, l = arguments.length; i < l; ++i) {
+            method = arguments[i];
+
+            if (!method) {
+                assert.fail("fake is not a spy");
+            }
+
+            if (typeof method != "function") {
+                assert.fail(method + " is not a function");
+            }
+
+            if (typeof method.getCall != "function") {
+                assert.fail(method + " is not stubbed");
+            }
+        }
+    }
+
+    function failAssertion(object, msg) {
+        object = object || global;
+        var failMethod = object.fail || assert.fail;
+        failMethod.call(object, msg);
+    }
+
+    function mirrorPropAsAssertion(name, method, message) {
+        if (arguments.length == 2) {
+            message = method;
+            method = name;
+        }
+
+        assert[name] = function (fake) {
+            verifyIsStub(fake);
+
+            var args = slice.call(arguments, 1);
+            var failed = false;
+
+            if (typeof method == "function") {
+                failed = !method(fake);
+            } else {
+                failed = typeof fake[method] == "function" ?
+                    !fake[method].apply(fake, args) : !fake[method];
+            }
+
+            if (failed) {
+                failAssertion(this, fake.printf.apply(fake, [message].concat(args)));
+            } else {
+                assert.pass(name);
+            }
+        };
+    }
+
+    function exposedName(prefix, prop) {
+        return !prefix || /^fail/.test(prop) ? prop :
+            prefix + prop.slice(0, 1).toUpperCase() + prop.slice(1);
+    }
+
+    assert = {
+        failException: "AssertError",
+
+        fail: function fail(message) {
+            var error = new Error(message);
+            error.name = this.failException || assert.failException;
+
+            throw error;
+        },
+
+        pass: function pass(assertion) {},
+
+        callOrder: function assertCallOrder() {
+            verifyIsStub.apply(null, arguments);
+            var expected = "", actual = "";
+
+            if (!sinon.calledInOrder(arguments)) {
+                try {
+                    expected = [].join.call(arguments, ", ");
+                    var calls = slice.call(arguments);
+                    var i = calls.length;
+                    while (i) {
+                        if (!calls[--i].called) {
+                            calls.splice(i, 1);
+                        }
+                    }
+                    actual = sinon.orderByFirstCall(calls).join(", ");
+                } catch (e) {
+                    // If this fails, we'll just fall back to the blank string
+                }
+
+                failAssertion(this, "expected " + expected + " to be " +
+                              "called in order but were called as " + actual);
+            } else {
+                assert.pass("callOrder");
+            }
+        },
+
+        callCount: function assertCallCount(method, count) {
+            verifyIsStub(method);
+
+            if (method.callCount != count) {
+                var msg = "expected %n to be called " + sinon.timesInWords(count) +
+                    " but was called %c%C";
+                failAssertion(this, method.printf(msg));
+            } else {
+                assert.pass("callCount");
+            }
+        },
+
+        expose: function expose(target, options) {
+            if (!target) {
+                throw new TypeError("target is null or undefined");
+            }
+
+            var o = options || {};
+            var prefix = typeof o.prefix == "undefined" && "assert" || o.prefix;
+            var includeFail = typeof o.includeFail == "undefined" || !!o.includeFail;
+
+            for (var method in this) {
+                if (method != "export" && (includeFail || !/^(fail)/.test(method))) {
+                    target[exposedName(prefix, method)] = this[method];
+                }
+            }
+
+            return target;
+        },
+
+        match: function match(actual, expectation) {
+            var matcher = sinon.match(expectation);
+            if (matcher.test(actual)) {
+                assert.pass("match");
+            } else {
+                var formatted = [
+                    "expected value to match",
+                    "    expected = " + sinon.format(expectation),
+                    "    actual = " + sinon.format(actual)
+                ]
+                failAssertion(this, formatted.join("\n"));
+            }
+        }
+    };
+
+    mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
+    mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
+                          "expected %n to not have been called but was called %c%C");
+    mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
+    mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
+    mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
+    mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
+    mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
+    mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
+    mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
+    mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
+    mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
+    mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
+    mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
+    mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
+    mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
+    mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
+    mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
+    mirrorPropAsAssertion("threw", "%n did not throw exception%C");
+    mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
+
+    if (commonJSModule) {
+        module.exports = assert;
+    } else {
+        sinon.assert = assert;
+    }
+}(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : (typeof self != "undefined") ? self : global));
+
+return sinon;}.call(typeof window != 'undefined' && window || {}));
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
new file mode 100644
index 000000000000..2e6556c9afb4
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -0,0 +1,5 @@
+get_link_to_share=Get a link to share with a friend to Video Chat.
+get_a_call_url=Get a call url
+renew=Renew
+unable_retrieve_url=Sorry, we were unable to retrieve a call url.
+share_link_url=Share the link below with your friend to start your call!
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 506fc4462b52..f43e673d6ccd 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -64,6 +64,7 @@
     locale/browser/devtools/font-inspector.dtd     (%chrome/browser/devtools/font-inspector.dtd)
     locale/browser/devtools/app-manager.dtd        (%chrome/browser/devtools/app-manager.dtd)
     locale/browser/devtools/app-manager.properties (%chrome/browser/devtools/app-manager.properties)
+    locale/browser/loop/loop.properties            (%chrome/browser/loop/loop.properties)
     locale/browser/newTab.dtd                      (%chrome/browser/newTab.dtd)
     locale/browser/newTab.properties               (%chrome/browser/newTab.properties)
     locale/browser/pageInfo.dtd                    (%chrome/browser/pageInfo.dtd)

From f49be3f572cc1338f929cd35b735f8e96481419d Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:41 +0100
Subject: [PATCH 005/117] Bug 985596 Set up the conversation window
 infrastructure and obtain the list of calls. r=dmose

---
 .../components/loop/content/conversation.html | 19 +++++++
 browser/components/loop/content/js/client.js  | 54 +++++++++++++++++--
 .../loop/content/js/conversation.js           | 38 +++++++++++++
 browser/components/loop/jar.mn                |  3 +-
 .../loop/test/mocha-test/client_test.js       | 43 +++++++++++++++
 5 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 browser/components/loop/content/conversation.html
 create mode 100644 browser/components/loop/content/js/conversation.js

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
new file mode 100644
index 000000000000..778bfadfb98f
--- /dev/null
+++ b/browser/components/loop/content/conversation.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Conversation</title>
+    <link rel="stylesheet" type="text/css" href="shared/css/common.css">
+    <link rel="stylesheet" type="text/css" href="shared/css/conversation.css">
+ </head>
+  <body onload="loop.conversation.init();">
+    <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
+    <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
+    <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
+    <script type="text/javascript" src="js/client.js"></script>
+    <script type="text/javascript" src="js/conversation.js"></script>
+  </body>
+</html>
diff --git a/browser/components/loop/content/js/client.js b/browser/components/loop/content/js/client.js
index 30493de7bc46..ca000d2298e4 100644
--- a/browser/components/loop/content/js/client.js
+++ b/browser/components/loop/content/js/client.js
@@ -49,12 +49,58 @@ loop.Client = (function($) {
         }
       }, "json");
 
-      req.fail(function(xhr, type, err) {
+      req.fail(function(jqXHR, testStatus, errorThrown) {
         var error = "Unknown error.";
-        if (xhr && xhr.responseJSON && xhr.responseJSON.error) {
-          error = xhr.responseJSON.error;
+        if (jqXHR && jqXHR.responseJSON && jqXHR.responseJSON.error) {
+          error = jqXHR.responseJSON.error;
         }
-        var message = "HTTP error " + xhr.status + ": " + err + "; " + error;
+        var message = "HTTP error " + jqXHR.status + ": " +
+          errorThrown + "; " + error;
+        console.error(message);
+        cb(new Error(message));
+      });
+    },
+
+    /**
+     * Requests call information from the server
+     *
+     * @param  {Function} cb Callback(err, calls)
+     */
+    requestCallsInfo: function(cb) {
+      var endpoint = this.settings.baseApiUrl + "/calls";
+
+      // We do a basic validation here that we have an object,
+      // and pass the full information back.
+      function validate(callsData) {
+        if (typeof callsData !== "object" ||
+            !callsData.hasOwnProperty("calls")) {
+          var message = "Invalid calls data received";
+          console.error(message, callsData);
+          throw new Error(message);
+        }
+        return callsData.calls;
+      }
+
+      // XXX We'll want to figure out a way to store the version from each
+      // request here. As this is typically the date, we just need to store the
+      // time last requested.
+      // XXX It is likely that we'll want to move some of this to whatever
+      // opens the chat window.
+      var req = $.get(endpoint + "?version=0", function(callsData) {
+        try {
+          cb(null, validate(callsData));
+        } catch (err) {
+          cb(err);
+        }
+      }, "json");
+
+      req.fail(function(jqXHR, testStatus, errorThrown) {
+        var error = "Unknown error.";
+        if (jqXHR && jqXHR.responseJSON && jqXHR.responseJSON.error) {
+          error = jqXHR.responseJSON.error;
+        }
+        var message = "HTTP error " + jqXHR.status + ": " +
+          errorThrown + "; " + error;
         console.error(message);
         cb(new Error(message));
       });
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
new file mode 100644
index 000000000000..ff3c5dc3199c
--- /dev/null
+++ b/browser/components/loop/content/js/conversation.js
@@ -0,0 +1,38 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*global loop*/
+// XXX This file needs unit testing
+
+var loop = loop || {};
+loop.conversation = (function(_, __) {
+  "use strict";
+
+  // XXX: baseApiUrl should be configurable (browser pref)
+  var baseApiUrl = "http://localhost:5000";
+
+  /**
+   * Panel initialisation.
+   */
+  function init() {
+    // Send a message to the server to get the call info
+    this.client = new loop.Client({
+      baseApiUrl: baseApiUrl
+    });
+
+    // Get the call information
+    this.client.requestCallsInfo(function(err, calls) {
+      if (err) {
+        console.error("Error getting call data: ", err);
+        return;
+      }
+
+      console.log("Received Calls Data: ", calls);
+    });
+  }
+
+  return {
+    init: init
+  };
+})(_);
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 4007a0191e09..9bed7eb30c1c 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
+  content/browser/loop/conversation.html             (content/conversation.html)
   content/browser/loop/panel.html                    (content/panel.html)
   content/browser/loop/shared/css/common.css         (content/shared/css/common.css)
   content/browser/loop/shared/css/panel.css          (content/shared/css/panel.css)
@@ -14,6 +15,6 @@ browser.jar:
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
   content/browser/loop/libs/l10n.js                  (content/libs/l10n.js)
   content/browser/loop/js/fxcom.js                   (content/js/fxcom.js)
+  content/browser/loop/js/conversation.js            (content/js/conversation.js)
   content/browser/loop/js/client.js                  (content/js/client.js)
   content/browser/loop/js/panel.js                   (content/js/panel.js)
-
diff --git a/browser/components/loop/test/mocha-test/client_test.js b/browser/components/loop/test/mocha-test/client_test.js
index ac9b4c0e836d..425d12d76038 100644
--- a/browser/components/loop/test/mocha-test/client_test.js
+++ b/browser/components/loop/test/mocha-test/client_test.js
@@ -65,5 +65,48 @@ describe("loop.Client", function() {
         }));
       });
     });
+
+    describe("#requestCallsInfo", function() {
+      var client;
+
+      beforeEach(function() {
+        client = new loop.Client({baseApiUrl: "http://fake.api"});
+      });
+
+      it("should request data for all calls", function() {
+        var callback = sinon.spy();
+        client.requestCallsInfo(callback);
+
+        expect(requests).to.have.length.of(1);
+        expect(requests[0].url).to.be.equal("http://fake.api/calls?version=0");
+        expect(requests[0].method).to.be.equal("GET");
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                                 '{"calls": [{"apiKey": "fake"}]}');
+        sinon.assert.calledWithExactly(callback, null, [{apiKey: "fake"}]);
+      });
+
+      it("should send an error when the request fails", function() {
+        var callback = sinon.spy();
+        client.requestCallsInfo(callback);
+
+        requests[0].respond(400, {"Content-Type": "application/json"},
+                                 '{"error": "my error"}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /HTTP error 400: Bad Request; my error/.test(err.message);
+        }));
+      });
+
+      it("should send an error if the data is not valid", function() {
+        var callback = sinon.spy();
+        client.requestCallsInfo(callback);
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                                 '{"bad": {}}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /Invalid calls data received/.test(err.message);
+        }));
+      });
+    });
   });
 });

From ebcac0b50b6ad0ad8bb3b28c488135c4c0595512 Mon Sep 17 00:00:00 2001
From: Romain Gauthier <romain.gauthier@monkeypatch.me>
Date: Thu, 29 May 2014 21:13:42 +0100
Subject: [PATCH 006/117] Bug 987597: Send an caller identifier when obtaining
 a call-url. r=Standard8

---
 browser/components/loop/content/js/client.js  |  6 +++--
 browser/components/loop/content/js/panel.js   | 27 ++++++++++++++++---
 browser/components/loop/content/panel.html    |  7 +++--
 .../loop/content/shared/css/common.css        |  6 +++++
 .../loop/test/mocha-test/client_test.js       |  4 +--
 .../loop/test/mocha-test/panel_test.js        |  5 +++-
 .../en-US/chrome/browser/loop/loop.properties |  3 ++-
 7 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/browser/components/loop/content/js/client.js b/browser/components/loop/content/js/client.js
index ca000d2298e4..f0d76a7f1e2d 100644
--- a/browser/components/loop/content/js/client.js
+++ b/browser/components/loop/content/js/client.js
@@ -25,11 +25,13 @@ loop.Client = (function($) {
     /**
      * Requests a call URL to the Loop server.
      *
+     * @param  {String} simplepushUrl a registered Simple Push URL
+     * @param  {string} nickname the nickname of the future caller
      * @param  {Function} cb Callback(err, callUrl)
      */
-    requestCallUrl: function(simplepushUrl, cb) {
+    requestCallUrl: function(nickname, cb) {
       var endpoint = this.settings.baseApiUrl + "/call-url/",
-          reqData = {simplepushUrl: simplepushUrl};
+          reqData  = {callerId: nickname};
 
       function validate(callUrlData) {
         if (typeof callUrlData !== "object" ||
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 6b76eddbd0bb..a8d65e487966 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -92,7 +92,9 @@ loop.panel = (function(_, __) {
     el: "#default-view",
 
     events: {
-      "click a.get-url": "getCallUrl"
+      "keyup input[name=caller]": "changeButtonState",
+      "click a.get-url": "getCallUrl",
+      "click a.go-back": "goBack"
     },
 
     initialize: function() {
@@ -116,22 +118,39 @@ loop.panel = (function(_, __) {
 
     getCallUrl: function(event) {
       event.preventDefault();
-      var simplepushUrl = "http://fake.url/"; // XXX: send a real simplepush url
-      this.client.requestCallUrl(simplepushUrl, function(err, callUrl) {
+      var nickname = this.$("input[name=caller]").val();
+      var callback = function(err, callUrl) {
         if (err) {
           this.notify(__("unable_retrieve_url"), "error");
           return;
         }
         this.onCallUrlReceived(callUrl);
-      }.bind(this));
+      }.bind(this);
+
+      this.client.requestCallUrl(nickname, callback);
+    },
+
+    goBack: function(event) {
+      this.$(".action .result").hide();
+      this.$(".action .invite").show();
+      this.$(".description p").text(__("get_link_to_share"));
     },
 
     onCallUrlReceived: function(callUrl) {
       this.notificationCollection.reset();
       this.$(".action .invite").hide();
+      this.$(".action .invite input").val("");
       this.$(".action .result input").val(callUrl);
       this.$(".action .result").show();
       this.$(".description p").text(__("share_link_url"));
+    },
+
+    changeButtonState: function() {
+      var enabled = !!this.$("input[name=caller]").val();
+      if (enabled)
+        this.$("a.get-url").removeClass("disabled");
+      else
+        this.$("a.get-url").addClass("disabled");
     }
   });
 
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index 8d2922a5aa81..c9acb6ac9811 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -20,12 +20,15 @@
       <div class="action">
         <div class="messages"></div>
         <p class="invite">
-          <a class="get-url btn btn-success" href=""
+          <input type="text" name="caller" data-l10n-id="caller">
+          <a class="get-url btn btn-success disabled" href=""
              data-l10n-id="get_a_call_url">Get a call url</a>
         </p>
         <p class="result hide">
           <input id="call-url" type="url" readonly>
-          <a class="get-url btn btn-info" href="" data-l10n-id="renew">Renew</a>
+          <a class="go-back btn btn-info" href="" data-l10n-id="new_url">
+            New url
+          </a>
         </p>
       </div>
     </div>
diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index c4b969ec4f46..46d8cdad9178 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -85,6 +85,12 @@ img {
   background: #d9534f;
 }
 
+.disabled {
+    cursor: not-allowed;
+    pointer-events: none;
+    opacity: 0.65;
+}
+
 /* Alerts */
 .alert {
   background: #eee;
diff --git a/browser/components/loop/test/mocha-test/client_test.js b/browser/components/loop/test/mocha-test/client_test.js
index 425d12d76038..d1610dc4b83c 100644
--- a/browser/components/loop/test/mocha-test/client_test.js
+++ b/browser/components/loop/test/mocha-test/client_test.js
@@ -43,7 +43,7 @@ describe("loop.Client", function() {
 
       it("should request for a call url", function() {
         var callback = sinon.spy();
-        client.requestCallUrl("fakeSimplepushUrl", callback);
+        client.requestCallUrl("foo", callback);
 
         expect(requests).to.have.length.of(1);
 
@@ -54,7 +54,7 @@ describe("loop.Client", function() {
 
       it("should send an error when the request fails", function() {
         var callback = sinon.spy();
-        client.requestCallUrl("fakeSimplepushUrl", callback);
+        client.requestCallUrl("foo", callback);
 
         expect(requests).to.have.length.of(1);
 
diff --git a/browser/components/loop/test/mocha-test/panel_test.js b/browser/components/loop/test/mocha-test/panel_test.js
index 7a1dfe66c338..288befd64cde 100644
--- a/browser/components/loop/test/mocha-test/panel_test.js
+++ b/browser/components/loop/test/mocha-test/panel_test.js
@@ -91,6 +91,8 @@ describe("loop.panel", function() {
         '  <div class="action">',
         '    <div class="messages"></div>',
         '    <p class="invite">',
+        '      <input type="text" placeholder="Nickname of the future caller"',
+        '             name="caller" value="foo"/>',
         '      <a class="get-url" href="">Get a call url</a>',
         '    </p>',
         '    <p class="result hide">',
@@ -111,6 +113,7 @@ describe("loop.panel", function() {
         view.getCallUrl({preventDefault: sandbox.spy()});
 
         sinon.assert.calledOnce(requestCallUrl);
+        sinon.assert.calledWith(requestCallUrl, "foo");
       });
     });
 
@@ -121,7 +124,7 @@ describe("loop.panel", function() {
 
         view.onCallUrlReceived("http://call.me/");
 
-        expect(view.$("input").val()).eql("http://call.me/");
+        expect(view.$("#call-url").val()).eql("http://call.me/");
       });
     });
   });
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 2e6556c9afb4..091d3625fdab 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -1,5 +1,6 @@
 get_link_to_share=Get a link to share with a friend to Video Chat.
 get_a_call_url=Get a call url
-renew=Renew
+new_url=New url
 unable_retrieve_url=Sorry, we were unable to retrieve a call url.
 share_link_url=Share the link below with your friend to start your call!
+caller.placeholder=Identify this call

From 6d2216f217745ddfdd2a13669581d1bf9992fbed Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:13:42 +0100
Subject: [PATCH 007/117] Bug 988457 - Remove loop shared dir, add README for
 building, r=Standard8

---
 browser/components/loop/README.txt            |   16 +
 browser/components/loop/content/.gitignore    |    1 +
 .../components/loop/content/shared/README.md  |   12 -
 .../loop/content/shared/css/common.css        |  144 --
 .../loop/content/shared/css/conversation.css  |   43 -
 .../loop/content/shared/css/panel.css         |   60 -
 .../loop/content/shared/css/readme.html       |  173 ---
 .../loop/content/shared/img/icon_32.png       |  Bin 2351 -> 0 bytes
 .../loop/content/shared/img/icon_64.png       |  Bin 4081 -> 0 bytes
 .../content/shared/libs/backbone-1.1.2.js     |    9 -
 .../loop/content/shared/libs/jquery-2.1.0.js  |    4 -
 .../loop/content/shared/libs/lodash-2.4.1.js  |   56 -
 .../content/shared/libs/webl10n-20130617.js   | 1157 -----------------
 13 files changed, 17 insertions(+), 1658 deletions(-)
 create mode 100644 browser/components/loop/README.txt
 create mode 100644 browser/components/loop/content/.gitignore
 delete mode 100644 browser/components/loop/content/shared/README.md
 delete mode 100644 browser/components/loop/content/shared/css/common.css
 delete mode 100644 browser/components/loop/content/shared/css/conversation.css
 delete mode 100644 browser/components/loop/content/shared/css/panel.css
 delete mode 100644 browser/components/loop/content/shared/css/readme.html
 delete mode 100644 browser/components/loop/content/shared/img/icon_32.png
 delete mode 100644 browser/components/loop/content/shared/img/icon_64.png
 delete mode 100644 browser/components/loop/content/shared/libs/backbone-1.1.2.js
 delete mode 100644 browser/components/loop/content/shared/libs/jquery-2.1.0.js
 delete mode 100644 browser/components/loop/content/shared/libs/lodash-2.4.1.js
 delete mode 100644 browser/components/loop/content/shared/libs/webl10n-20130617.js

diff --git a/browser/components/loop/README.txt b/browser/components/loop/README.txt
new file mode 100644
index 000000000000..cdcc80fb79cb
--- /dev/null
+++ b/browser/components/loop/README.txt
@@ -0,0 +1,16 @@
+In order for the loop component to build, do the following:
+
+* if you have an existing content/shared directory, move it out of the way:
+
+mv content/shared content/shared.old
+
+* create a symlink to the authoritative version of the shared directory in your
+loop-client repo
+
+ln -s /loop-client-repo-root-dir/static/shared ./content
+
+Note that changes to the shared directory affect both the standlone loop-client
+and the desktop client.  This means that sometimes, in order to
+make a desktop client patch, you'll need to get reviews on patches to both
+mozilla-central/gecko-dev as well as loop-client.  
+
diff --git a/browser/components/loop/content/.gitignore b/browser/components/loop/content/.gitignore
new file mode 100644
index 000000000000..8a205e8dc3e7
--- /dev/null
+++ b/browser/components/loop/content/.gitignore
@@ -0,0 +1 @@
+shared
diff --git a/browser/components/loop/content/shared/README.md b/browser/components/loop/content/shared/README.md
deleted file mode 100644
index 8773432f4e32..000000000000
--- a/browser/components/loop/content/shared/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Loop Shared Web Assets
-======================
-
-This directory contains web assets shared across the Loop client webapp and the
-Loop Firefox Component.
-
-Warning
--------
-
-Any modification in these files will have possible side effects on both the
-Firefox component and the webapp. The `css/readme.html` file uses all the shared
-styles, you should use it as a way of checking for visual regressions.
diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
deleted file mode 100644
index 46d8cdad9178..000000000000
--- a/browser/components/loop/content/shared/css/common.css
+++ /dev/null
@@ -1,144 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Generic rules */
-
-/**
- * "Fixes" the Box Model.
- * @see http://www.paulirish.com/2012/box-sizing-border-box-ftw/
- */
-*, *:before, *:after {
-  box-sizing: border-box;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans;
-  font-size: 14px;
-  background: #f2f2f2;
-}
-
-button {
-  font-size: .9em; /* for some reason, text is larger within <button> */
-}
-
-img {
-  border: none;
-}
-
-/* Helpers */
-
-/**
- * Clearfix impl. for modern browsers
- * 1. The space content is one way to avoid an Opera bug when the
- *    contenteditable attribute is included anywhere else in the document.
- *    Otherwise it causes space to appear at the top and bottom of elements
- *    that are clearfixed.
- * 2. The use of `table` rather than `block` is only necessary if using
- *    `:before` to contain the top-margins of child elements.
- */
-.cf:before,
-.cf:after {
-  content: " ";   /* 1 */
-  display: table; /* 2 */
-}
-
-.cf:after {
-  clear: both;
-}
-
-.hide {
-  display: none;
-}
-
-.tc {
-  text-align: center;
-}
-
-/* Buttons */
-
-.btn {
-  display: inline-block;
-  background: #aaa;
-  border: none;
-  color: #fff;
-  text-decoration: none;
-  padding: .25em .5em .3em;
-  border-radius: .2em;
-}
-
-.btn-info {
-  background: #428BCA;
-}
-
-.btn-success {
-  background: #5cb85c;
-}
-
-.btn-warning {
-  background: #f0ad4e;
-}
-
-.btn-error {
-  background: #d9534f;
-}
-
-.disabled {
-    cursor: not-allowed;
-    pointer-events: none;
-    opacity: 0.65;
-}
-
-/* Alerts */
-.alert {
-  background: #eee;
-  padding: .2em 1em;
-  margin-bottom: 1em;
-}
-
-.alert p.message {
-  padding: 0;
-  margin: 0;
-}
-
-.alert.alert-error {
-  background: #f99;
-  border: 1px solid #f77;
-}
-
-.alert .close {
-  position: relative;
-  top: 0;
-  right: -.8em;
-}
-
-/* Misc */
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 1em;
-  color: #000;
-  opacity: .2;
-}
-
-.close:before {
-  /* \2716 is unicode representation of the close button icon */
-  content: '\2716';
-}
-
-button.close {
-  background: none;
-  border: none;
-  padding: none;
-  cursor: pointer;
-}
-
-/* Transitions */
-.fade-out {
-  transition: opacity 0.5s ease-in;
-  opacity: 0;
-}
diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
deleted file mode 100644
index d65bdced5a03..000000000000
--- a/browser/components/loop/content/shared/css/conversation.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Conversation window styles */
-
-.conversation .controls {
-  background: #f2f2f2;
-  padding: .5em;
-}
-
-.conversation .media video {
-  background: #eee;
-}
-
-/* Nested video elements */
-
-.conversation .media.nested {
-  position: relative;
-}
-
-.conversation .media.nested .remote {
-  width: 100%;
-}
-
-.conversation .media.nested .local {
-  position: absolute;
-  bottom: .8em;
-  right: .8em;
-  width: 30%;
-  max-width: 140px;
-}
-
-/* Side by side video elements */
-
-.conversation .media.side-by-side .remote {
-  width: 50%;
-  float: left;
-}
-
-.conversation .media.side-by-side .local {
-  width: 50%;
-}
diff --git a/browser/components/loop/content/shared/css/panel.css b/browser/components/loop/content/shared/css/panel.css
deleted file mode 100644
index d75b141b979f..000000000000
--- a/browser/components/loop/content/shared/css/panel.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Panel styles */
-
-.spacer {
-  margin-bottom: 1em;
-}
-
-.share {
-  background: #f2f2f2;
-}
-
-.share .description {
-  background: #f7f7f7 url("../img/icon_32.png") no-repeat 1em 1.5em;
-  border-bottom: 1px solid #c3c3c3;
-  padding: 1em 1em 0 4em;
-}
-
-.share .description .field {
-  padding-bottom: 1em;
-  border-bottom: 1px dotted #ddd;
-}
-
-.share .description select {
-  float: right;
-}
-
-.share .description .preview video {
-  background: #ccc;
-  float: right;
-  width: 180px;
-}
-
-.share .action {
-  clear: right;
-  padding: 1em;
-  border-top: 1px solid #fafafa;
-}
-
-.share .action p {
-  margin: 0 0 1em 0;
-}
-
-.share .action input {
-  font-size: .9em;
-  width: 60%;
-  padding: .4em;
-}
-
-/* Specific cases */
-
-.share.generate-url .action {
-  text-align: center;
-}
-
-.share .action .messages p {
-  margin: 0;
-}
diff --git a/browser/components/loop/content/shared/css/readme.html b/browser/components/loop/content/shared/css/readme.html
deleted file mode 100644
index 0a714552c79d..000000000000
--- a/browser/components/loop/content/shared/css/readme.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-
-<!-- This file is intended to help frontend developers to easily identify what
-     are the available styles for the Loop UI components. -->
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Loop UI shared CSS information/demo</title>
-  <link type="text/css" rel="stylesheet" href="common.css">
-  <link type="text/css" rel="stylesheet" href="panel.css">
-  <link type="text/css" rel="stylesheet" href="conversation.css">
-  <style>
-    body {
-      width: 600px;
-      margin: 1em auto;
-      background: #fff;
-      font-family: Helvetica, Arial, sans;
-    }
-  </style>
-</head>
-<body>
-  <h1>Loop UI toolkit</h1>
-
-  <h2>Logo icons</h2>
-
-  <p>
-    <img src="../img/icon_32.png"> 32x32 transparent PNG
-    <img src="../img/icon_64.png"> 64x64 transparent PNG
-  </p>
-
-  <p><em><strong>Note:</strong> these are temporary.</em></p>
-
-  <h2>Share panel</h2>
-
-  <h3>Simple</h3>
-
-  <div class="share">
-    <form class="description">
-      <p>This is a simple message.</p>
-    </form>
-    <div class="action">
-      <p><input type="url" value="http://loop.im/plop75"></p>
-      <p>Your name will appear as <a href="">Unnamed</a>.</p>
-    </div>
-  </div>
-
-  <h3>Featuring options</h3>
-
-  <div class="share">
-    <form class="description">
-      <p class="field">
-        <label>Share this link with a friend to
-          <select>
-            <option>browse together</option>
-            <option selected="selected">video chat</option>
-            <option>audio chat</option>
-            <option>text chat</option>
-          </select>
-        </label>
-      </p>
-      <p class="field">
-        <label>
-          Use webcam <select><option>Foo</option></select>
-        </label>
-      </p>
-      <p class="field">
-        <label>Use whatever
-          <select><option>Long foo is long indeed</option></select>
-        </label>
-      </p>
-      <p class="preview cf">
-        Preview <video></video>
-      </p>
-    </form>
-    <div class="action">
-      <p><input type="url" value="http://loop.im/plop75"></p>
-      <p>Your name will appear as <a href="">Unnamed</a>.</p>
-    </div>
-  </div>
-
-  <h2>Conversation window</h2>
-
-  <p><em>The conversation component adapts automatically to its container to
-    occupy all the available space.</em></p>
-
-  <h3>Large</h3>
-
-  <div class="conversation">
-    <div class="media nested">
-      <video class="remote"></video>
-      <video class="local"></video>
-    </div>
-  </div>
-
-  <h3>Large with controls</h3>
-
-  <div class="conversation">
-    <nav class="controls">
-      <button class="btn">Start</button>
-      <button class="btn">Stop</button>
-    </nav>
-    <div class="media nested">
-      <video class="remote"></video>
-      <video class="local"></video>
-    </div>
-  </div>
-
-  <h3>Small (think chat window)</h3>
-
-  <div style="width: 204px">
-    <div class="conversation">
-      <div class="media nested">
-        <video class="remote"></video>
-        <video class="local"></video>
-      </div>
-    </div>
-  </div>
-
-  <h3>Side by side</h3>
-
-  <div class="conversation">
-    <div class="media side-by-side">
-      <video class="remote"></video>
-      <video class="local"></video>
-    </div>
-  </div>
-
-  <h2>Buttons</h2>
-
-  <h3>Using <code>&lt;a&gt;</code></h3>
-
-  <p>
-    <a href="" class="btn">default</a>
-    <a href="" class="btn btn-info">info</a>
-    <a href="" class="btn btn-success">success</a>
-    <a href="" class="btn btn-warning">warning</a>
-    <a href="" class="btn btn-error">error</a>
-  </p>
-
-  <h3>Inline</h3>
-
-  <p>Click <a href="" class="btn btn-info">here</a>.</p>
-
-  <h3>Using <code>&lt;button&gt;</code></h3>
-
-  <p>
-    <button class="btn">default</button>
-    <button class="btn btn-info">info</button>
-    <button class="btn btn-success">success</button>
-    <button class="btn btn-warning">warning</button>
-    <button class="btn btn-error">error</button>
-  </p>
-
-  <h2>Alerts</h2>
-
-  <div class="alert alert-error">
-    <button class="close"
-            onclick="var el=this.parentNode;el.classList.add('fade-out');setTimeout(el.remove.bind(el), 500);"></button>
-    <p class="message">Oops! Something went really wrong.</p>
-  </div>
-
-  <script>
-  window.onload = function() {
-    [].forEach.call(document.querySelectorAll("video"), function(video) {
-      video.setAttribute("src", "http://v2v.cc/~j/theora_testsuite/320x240.ogg");
-    });
-  }
-  </script>
-</body>
-</html>
diff --git a/browser/components/loop/content/shared/img/icon_32.png b/browser/components/loop/content/shared/img/icon_32.png
deleted file mode 100644
index 03cc4d461f83d29d4c842d9cc2172f2c310197f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2351
zcmaJ@dpuO@8lD-_B;>YFq02IeUCfm+GYsZpa+}%G>`WIiW)`L~7c;|*soXkDp;8?b
zD%qLc<wzGLm+g|umZB6D)n<2;6mgW;C1<9c_W9#<*6+90_r2fmd7k(E-uL-q?G9zF
zF*UX|hCm>ufdTX|-3sVmxRLHFSF7LZ78`{>N3l*4qfl~XAcVq~M1w$}h#L!rfn0ua
zLL2A}ffzUl*c=6i8A9SoL`be4gH(y6IyMC2?W>Y<c|uSDM1!#cF&Xiut`PwU_+&)5
z2NTVd(!e-DfLaEwQ?uASwU9^TBYb@TZxu-=AOaO!KqZP7%SkFS;<GMEx7Qz|5Wr`M
zLP$pZSrmsE3eY4n5b!{Hxbe^!cfgZ~#CTxb2^d!Zi^kwkXdDWIbHiXsXd(&Y0epE7
zx@<Cj3@MDx_>xN(kr8nUg_MLsDV0j35{Hz?Vo?|(k%&TLQCO^-4&f$G7Av?aH?iDd
zPJs@}c`|`iA&`gxy&^YSlBggfbd~;j1(EcttXTe~O}d7mR9q<vgGB4EGzVld|36eD
z`ihn-!oa`k{hz{ecCr*ig@JNOqKu~-T#SQ0m6Sx2fn0?|#+FFp=eiggCs9b`aS|y&
zqX8~VE>9rV$KQV@Fqx!4v0T9w^T0ql8KILv3Iu!-o`%JssT2<nJcEG2_~Qsz0)gRA
z#ZnkFcN~RCpX1UcyhITwR?Knve{u2O<m$a3lIk+kL75;4<TGRv5%BrWB*C|9!F^Nj
z3zz@xTHL?MMd^w`=_mVNlb$=$*+;+q>RVm#)%l=UXLp&-*EO-{@*$9UWr1`GTh&_?
zE{wPS(Yj%x_wXZ;S6!deIOV>fXqVA_cMcWswsW-%4qlk$ciubNf>K&)#7zCiL+cC|
z3u-=xVqZ02VKvYF)Dm8*i+M#euwd=hRq)<X@p~f93-^lHawMkOwKS&wc42%hYjkEb
zdHV~KgSTUBsPOq?u<Wh2J>F!rG*ONhK5>R0eY&Q#Fj3La_laC@XLJJkw}b?YA7l{<
zHl@8)A@soB2wMAZ^P|t;^$r52b9r-9`_Hw$1Y<lm?fFXRa$sQK;A-J-_Kut0OtjGp
zz~9GJ@b(MzPJRFZ``8HI3R#|J_G_(w+C1y<9=xljujfPkmM}J(zTIcV_*IExn91yi
ze9Opn@?fG<Q|(LW<6KjX!|g4V@hfu8{r5}FVQ(Rw6Jxi6QyP<aMh~;yBR4xiG%D-L
zT+hj?l616*PYffi)8t-Jffc@b!8xsq8W@E=E`q`w7kRfLZp`-jHm!r@o-ynX=uRNE
zpsSnAGMg4RDofAgW;KB@SNUz$tGnTy&;wJrr8S<;c%)_2m6Z0Iz1Oc>PvJ~+hH5b!
z523B`fdTE3yG#3##aYQYuM%v=y!VGV{rtmW_Ahaid<Xj3VZW8u#*;Q$?&?S+^xlPl
zpl&4V$mT6IgXQ1Nu=nD`;pv}VKi&}gE(8kG25Ljp(cRB4?P<K*@?-V3^pW)PoYM{k
z;111vEGNs_m3^b8;n?Yu6@%JW6L3gK`H87rr(@$SWB}Fo4!dGnv(Wb^*iCW!IU3|5
zX=eD3?qk|6L5q9Ee)Cd%n#s0E;gg!3c(<3cL-U5#|5Elb!9%zqqDVV92%UuIy{z3+
zS<N)`%A7P%CZ=UkM4bB4WkGvOR}#4WgrhDgnVajk4~|9BxUos*j}gt!9XaZ@tJ4+%
z*LDuOpaSkJqm?)JALuS#)YY;>{LWD0S72tlwY^~Rrf1{yuBuxlTcfzFvHgB`eB~_B
zGjUN~gO@7fxZ!l&V903jTk7yBXXlgYer>gMtm!`w?GKF#UjH$r%q1vd@al~SMV6~g
zzLm+cjoHwY?C78?z=o0qYpkfea`kj=M6;jte0TwaZzFn_%Zf^~zZ+NeVkV+ubu0NT
zM2%#ScWDaaiaNS0Igu!M{l*B7x@v9$^U(U@ppn;ID0<qRq#VzKLR-%i@=Ep}=nmtK
z3xPwV-HbART-;EY|MWHOWlwxW65PGIYTxYS_DD_B#J;HcnHN};CEGHfgE@-}d>`PH
z&+i)^IcuS|hwZhSi8xlWT>kN2hbsXnO<L@2X#-f~w6^v40|Oh9`c93`ENkzHKiusr
zea9<ta~dldvJh=@9jQ8P8PSbc+PR`)M@&b<r85OvG!<o;aDro~0_OETWvYLAVIgb2
zLCSRpc(S8O3vh~k(`>g^n+pBT&N&z{-u0-<z)(DCZBSoe|59O_hiExZFN=Bl+QzQv
zXrs&v#_|Cc%s%aK;BD)iQ6c)@|F(};e9-F3xzsqRmt)yW+j02O;+++akAjBtE;X5n
z5^n8l{oRqYbmUY0wpp#0#jj4sONOTz(?e5j26u3)_z#ypD_(5*a0xj>W1Nxq-bYC!
zzHNPH*JgD@Quu`Vz^$m}Zn9i!nm8h?WUgFS#~VLEK54#D>)PJzf=ZA7u*<RSvidpx
z(&kdPEQU3>Vp_8Y{JSBL5Z77kMNL0YD|PQJG_1A*IEOHMqXsWeQ2jPBt9{SzeR9_1
zO%-94_rpa~+VI}tfxd)t$K6(t%bWpDY8{v=q&CnsycbWmJ_=QK9_qT*=#;nmA|jtB
z9_bmGcy>xr(ImfTzre|LL+mZ347$p2m7fzZ5o`A5(dFFiwXYk^UFg>edU?lo*bI~V
z!lB@LvpOFm&A!a+?=$OgS=@+xr{foSA9`r+Cjza@8s{y6Ja7oJUD$uAL;njC=+B~`
IrAB4^2kB(P6951J

diff --git a/browser/components/loop/content/shared/img/icon_64.png b/browser/components/loop/content/shared/img/icon_64.png
deleted file mode 100644
index 8368d7c5cd9818703ad4293c2e2f13441f452b4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4081
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

diff --git a/browser/components/loop/content/shared/libs/backbone-1.1.2.js b/browser/components/loop/content/shared/libs/backbone-1.1.2.js
deleted file mode 100644
index 2c123e771579..000000000000
--- a/browser/components/loop/content/shared/libs/backbone-1.1.2.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//     Backbone.js 1.1.2
-
-//     (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
-//     Backbone may be freely distributed under the MIT license.
-//     For all details and documentation:
-//     http://backbonejs.org
-
-(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r){var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this.id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this.isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChanged(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]=t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","className","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});
-//# sourceMappingURL=backbone-min.map
diff --git a/browser/components/loop/content/shared/libs/jquery-2.1.0.js b/browser/components/loop/content/shared/libs/jquery-2.1.0.js
deleted file mode 100644
index cbe6abe59a81..000000000000
--- a/browser/components/loop/content/shared/libs/jquery-2.1.0.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v2.1.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m=a.document,n="2.1.0",o=function(a,b){return new o.fn.init(a,b)},p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};o.fn=o.prototype={jquery:n,constructor:o,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=o.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return o.each(this,a,b)},map:function(a){return this.pushStack(o.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},o.extend=o.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||o.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(o.isPlainObject(d)||(e=o.isArray(d)))?(e?(e=!1,f=c&&o.isArray(c)?c:[]):f=c&&o.isPlainObject(c)?c:{},g[b]=o.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},o.extend({expando:"jQuery"+(n+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===o.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isPlainObject:function(a){if("object"!==o.type(a)||a.nodeType||o.isWindow(a))return!1;try{if(a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(b){return!1}return!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=o.trim(a),a&&(1===a.indexOf("use strict")?(b=m.createElement("script"),b.text=a,m.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":k.call(a)},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?o.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),o.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||o.guid++,f):void 0},now:Date.now,support:l}),o.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=o.type(a);return"function"===c||o.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);o.find=t,o.expr=t.selectors,o.expr[":"]=o.expr.pseudos,o.unique=t.uniqueSort,o.text=t.getText,o.isXMLDoc=t.isXML,o.contains=t.contains;var u=o.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(o.isFunction(b))return o.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return o.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return o.filter(b,a,c);b=o.filter(b,a)}return o.grep(a,function(a){return g.call(b,a)>=0!==c})}o.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?o.find.matchesSelector(d,a)?[d]:[]:o.find.matches(a,o.grep(b,function(a){return 1===a.nodeType}))},o.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(o(a).filter(function(){for(b=0;c>b;b++)if(o.contains(e[b],this))return!0}));for(b=0;c>b;b++)o.find(a,e[b],d);return d=this.pushStack(c>1?o.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?o(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=o.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof o?b[0]:b,o.merge(this,o.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:m,!0)),v.test(c[1])&&o.isPlainObject(b))for(c in b)o.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=m.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=m,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):o.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(o):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),o.makeArray(a,this))};A.prototype=o.fn,y=o(m);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};o.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&o(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),o.fn.extend({has:function(a){var b=o(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(o.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?o(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&o.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?o.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(o(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(o.unique(o.merge(this.get(),o(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}o.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return o.dir(a,"parentNode")},parentsUntil:function(a,b,c){return o.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return o.dir(a,"nextSibling")},prevAll:function(a){return o.dir(a,"previousSibling")},nextUntil:function(a,b,c){return o.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return o.dir(a,"previousSibling",c)},siblings:function(a){return o.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return o.sibling(a.firstChild)},contents:function(a){return a.contentDocument||o.merge([],a.childNodes)}},function(a,b){o.fn[a]=function(c,d){var e=o.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=o.filter(d,e)),this.length>1&&(C[a]||o.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return o.each(a.match(E)||[],function(a,c){b[c]=!0}),b}o.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):o.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){o.each(b,function(b,c){var d=o.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&o.each(arguments,function(a,b){var c;while((c=o.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?o.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},o.extend({Deferred:function(a){var b=[["resolve","done",o.Callbacks("once memory"),"resolved"],["reject","fail",o.Callbacks("once memory"),"rejected"],["notify","progress",o.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return o.Deferred(function(c){o.each(b,function(b,f){var g=o.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&o.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?o.extend(a,d):d}},e={};return d.pipe=d.then,o.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&o.isFunction(a.promise)?e:0,g=1===f?a:o.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&o.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;o.fn.ready=function(a){return o.ready.promise().done(a),this},o.extend({isReady:!1,readyWait:1,holdReady:function(a){a?o.readyWait++:o.ready(!0)},ready:function(a){(a===!0?--o.readyWait:o.isReady)||(o.isReady=!0,a!==!0&&--o.readyWait>0||(H.resolveWith(m,[o]),o.fn.trigger&&o(m).trigger("ready").off("ready")))}});function I(){m.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),o.ready()}o.ready.promise=function(b){return H||(H=o.Deferred(),"complete"===m.readyState?setTimeout(o.ready):(m.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},o.ready.promise();var J=o.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===o.type(c)){e=!0;for(h in c)o.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,o.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(o(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};o.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=o.expando+Math.random()}K.uid=1,K.accepts=o.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,o.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(o.isEmptyObject(f))o.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,o.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{o.isArray(b)?d=b.concat(b.map(o.camelCase)):(e=o.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!o.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?o.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}o.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),o.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;
-while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=o.camelCase(d.slice(5)),P(f,d,e[d]));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=o.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),o.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||o.isArray(c)?d=L.access(a,b,o.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=o.queue(a,b),d=c.length,e=c.shift(),f=o._queueHooks(a,b),g=function(){o.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:o.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),o.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?o.queue(this[0],a):void 0===b?this:this.each(function(){var c=o.queue(this,a,b);o._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&o.dequeue(this,a)})},dequeue:function(a){return this.each(function(){o.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=o.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===o.css(a,"display")||!o.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=m.createDocumentFragment(),b=a.appendChild(m.createElement("div"));b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";l.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return m.activeElement}catch(a){}}o.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=o.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof o!==U&&o.event.triggered!==b.type?o.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],n=q=h[1],p=(h[2]||"").split(".").sort(),n&&(l=o.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=o.event.special[n]||{},k=o.extend({type:n,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&o.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(n,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),o.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],n=q=h[1],p=(h[2]||"").split(".").sort(),n){l=o.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||o.removeEvent(a,n,r.handle),delete i[n])}else for(n in i)o.event.remove(a,n+b[j],c,d,!0);o.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,p=[d||m],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||m,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+o.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[o.expando]?b:new o.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:o.makeArray(c,[b]),n=o.event.special[q]||{},e||!n.trigger||n.trigger.apply(d,c)!==!1)){if(!e&&!n.noBubble&&!o.isWindow(d)){for(i=n.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||m)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:n.bindType||q,l=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),l&&l.apply(g,c),l=k&&g[k],l&&l.apply&&o.acceptData(g)&&(b.result=l.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||n._default&&n._default.apply(p.pop(),c)!==!1||!o.acceptData(d)||k&&o.isFunction(d[q])&&!o.isWindow(d)&&(h=d[k],h&&(d[k]=null),o.event.triggered=q,d[q](),o.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=o.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=o.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=o.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((o.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?o(e,this).index(i)>=0:o.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||m,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[o.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new o.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=m),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&o.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return o.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=o.extend(new o.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?o.event.trigger(e,null,b):o.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},o.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},o.Event=function(a,b){return this instanceof o.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.getPreventDefault&&a.getPreventDefault()?Z:$):this.type=a,b&&o.extend(this,b),this.timeStamp=a&&a.timeStamp||o.now(),void(this[o.expando]=!0)):new o.Event(a,b)},o.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z,this.stopPropagation()}},o.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){o.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!o.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.focusinBubbles||o.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){o.event.simulate(b,a.target,o.event.fix(a),!0)};o.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),o.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return o().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=o.guid++)),this.each(function(){o.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,o(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){o.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){o.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?o.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return o.nodeName(a,"table")&&o.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)o.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=o.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&o.nodeName(a,b)?o.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}o.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=o.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||o.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,n=a.length;n>m;m++)if(e=a[m],e||0===e)if("object"===o.type(e))o.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;o.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===o.inArray(e,d))&&(i=o.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f,g,h=o.event.special,i=0;void 0!==(c=a[i]);i++){if(o.acceptData(c)&&(f=c[L.expando],f&&(b=L.cache[f]))){if(d=Object.keys(b.events||{}),d.length)for(g=0;void 0!==(e=d[g]);g++)h[e]?o.event.remove(c,e):o.removeEvent(c,e,b.handle);L.cache[f]&&delete L.cache[f]}delete M.cache[c[M.expando]]}}}),o.fn.extend({text:function(a){return J(this,function(a){return void 0===a?o.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?o.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||o.cleanData(ob(c)),c.parentNode&&(b&&o.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(o.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return o.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(o.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,o.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,n=k-1,p=a[0],q=o.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(c=o.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=o.map(ob(c,"script"),kb),g=f.length;k>j;j++)h=c,j!==n&&(h=o.clone(h,!0,!0),g&&o.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,o.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&o.contains(i,h)&&(h.src?o._evalUrl&&o._evalUrl(h.src):o.globalEval(h.textContent.replace(hb,"")))}return this}}),o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){o.fn[a]=function(a){for(var c,d=[],e=o(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),o(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d=o(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:o.css(d[0],"display");return d.detach(),e}function tb(a){var b=m,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||o("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||o.contains(a.ownerDocument,a)||(g=o.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",e=m.documentElement,f=m.createElement("div"),g=m.createElement("div");g.style.backgroundClip="content-box",g.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===g.style.backgroundClip,f.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",f.appendChild(g);function h(){g.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",e.appendChild(f);var d=a.getComputedStyle(g,null);b="1%"!==d.top,c="4px"===d.width,e.removeChild(f)}a.getComputedStyle&&o.extend(l,{pixelPosition:function(){return h(),b},boxSizingReliable:function(){return null==c&&h(),c},reliableMarginRight:function(){var b,c=g.appendChild(m.createElement("div"));return c.style.cssText=g.style.cssText=d,c.style.marginRight=c.style.width="0",g.style.width="1px",e.appendChild(f),b=!parseFloat(a.getComputedStyle(c,null).marginRight),e.removeChild(f),g.innerHTML="",b}})}(),o.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:0,fontWeight:400},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=o.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=o.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=o.css(a,"border"+R[f]+"Width",!0,e))):(g+=o.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=o.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===o.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):f[g]||(e=S(d),(c&&"none"!==c||!e)&&L.set(d,"olddisplay",e?c:o.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}o.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=o.camelCase(b),i=a.style;return b=o.cssProps[h]||(o.cssProps[h]=Fb(i,h)),g=o.cssHooks[b]||o.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(o.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||o.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]="",i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=o.camelCase(b);return b=o.cssProps[h]||(o.cssProps[h]=Fb(a.style,h)),g=o.cssHooks[b]||o.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||o.isNumeric(f)?f||0:e):e}}),o.each(["height","width"],function(a,b){o.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&zb.test(o.css(a,"display"))?o.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===o.css(a,"boxSizing",!1,e),e):0)}}}),o.cssHooks.marginRight=yb(l.reliableMarginRight,function(a,b){return b?o.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),o.each({margin:"",padding:"",border:"Width"},function(a,b){o.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(o.cssHooks[a+b].set=Gb)}),o.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(o.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=o.css(a,b[g],!1,d);return f}return void 0!==c?o.style(a,b,c):o.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?o(this).show():o(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}o.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(o.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?o.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=o.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){o.fx.step[a.prop]?o.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[o.cssProps[a.prop]]||o.cssHooks[a.prop])?o.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},o.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},o.fx=Kb.prototype.init,o.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(o.cssNumber[a]?"":"px"),g=(o.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(o.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,o.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=o.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k=this,l={},m=a.style,n=a.nodeType&&S(a),p=L.get(a,"fxshow");c.queue||(h=o._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,k.always(function(){k.always(function(){h.unqueued--,o.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],j=o.css(a,"display"),"none"===j&&(j=tb(a.nodeName)),"inline"===j&&"none"===o.css(a,"float")&&(m.display="inline-block")),c.overflow&&(m.overflow="hidden",k.always(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(n?"hide":"show")){if("show"!==e||!p||void 0===p[d])continue;n=!0}l[d]=p&&p[d]||o.style(a,d)}if(!o.isEmptyObject(l)){p?"hidden"in p&&(n=p.hidden):p=L.access(a,"fxshow",{}),f&&(p.hidden=!n),n?o(a).show():k.done(function(){o(a).hide()}),k.done(function(){var b;L.remove(a,"fxshow");for(b in l)o.style(a,b,l[b])});for(d in l)g=Ub(n?p[d]:0,d,k),d in p||(p[d]=g.start,n&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=o.camelCase(c),e=b[d],f=a[c],o.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=o.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=o.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:o.extend({},b),opts:o.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=o.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return o.map(k,Ub,j),o.isFunction(j.opts.start)&&j.opts.start.call(a,j),o.fx.timer(o.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}o.Animation=o.extend(Xb,{tweener:function(a,b){o.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),o.speed=function(a,b,c){var d=a&&"object"==typeof a?o.extend({},a):{complete:c||!c&&b||o.isFunction(a)&&a,duration:a,easing:c&&b||b&&!o.isFunction(b)&&b};return d.duration=o.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in o.fx.speeds?o.fx.speeds[d.duration]:o.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){o.isFunction(d.old)&&d.old.call(this),d.queue&&o.dequeue(this,d.queue)},d},o.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=o.isEmptyObject(a),f=o.speed(b,c,d),g=function(){var b=Xb(this,o.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=o.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&o.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=o.timers,g=d?d.length:0;for(c.finish=!0,o.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),o.each(["toggle","show","hide"],function(a,b){var c=o.fn[b];o.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),o.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){o.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),o.timers=[],o.fx.tick=function(){var a,b=0,c=o.timers;for(Lb=o.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||o.fx.stop(),Lb=void 0},o.fx.timer=function(a){o.timers.push(a),a()?o.fx.start():o.timers.pop()},o.fx.interval=13,o.fx.start=function(){Mb||(Mb=setInterval(o.fx.tick,o.fx.interval))},o.fx.stop=function(){clearInterval(Mb),Mb=null},o.fx.speeds={slow:600,fast:200,_default:400},o.fn.delay=function(a,b){return a=o.fx?o.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=m.createElement("input"),b=m.createElement("select"),c=b.appendChild(m.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=m.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var Yb,Zb,$b=o.expr.attrHandle;o.fn.extend({attr:function(a,b){return J(this,o.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){o.removeAttr(this,a)})}}),o.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?o.prop(a,b,c):(1===f&&o.isXMLDoc(a)||(b=b.toLowerCase(),d=o.attrHooks[b]||(o.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=o.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void o.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=o.propFix[c]||c,o.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&o.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?o.removeAttr(a,c):a.setAttribute(c,c),c}},o.each(o.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||o.find.attr;$b[b]=function(a,b,d){var e,f;
-return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;o.fn.extend({prop:function(a,b){return J(this,o.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[o.propFix[a]||a]})}}),o.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!o.isXMLDoc(a),f&&(b=o.propFix[b]||b,e=o.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),l.optSelected||(o.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),o.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){o.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;o.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(o.isFunction(a))return this.each(function(b){o(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=o.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(o.isFunction(a))return this.each(function(b){o(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?o.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(o.isFunction(a)?function(c){o(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=o(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;o.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=o.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,o(this).val()):a,null==e?e="":"number"==typeof e?e+="":o.isArray(e)&&(e=o.map(e,function(a){return null==a?"":a+""})),b=o.valHooks[this.type]||o.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=o.valHooks[e.type]||o.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),o.extend({valHooks:{select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&o.nodeName(c.parentNode,"optgroup"))){if(b=o(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=o.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=o.inArray(o(d).val(),f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),o.each(["radio","checkbox"],function(){o.valHooks[this]={set:function(a,b){return o.isArray(b)?a.checked=o.inArray(o(a).val(),b)>=0:void 0}},l.checkOn||(o.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),o.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){o.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),o.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=o.now(),dc=/\?/;o.parseJSON=function(a){return JSON.parse(a+"")},o.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&o.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=m.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(o.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,o.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=o.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&o.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}o.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":o.parseJSON,"text xml":o.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,o.ajaxSettings),b):tc(o.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=o.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?o(l):o.event,n=o.Deferred(),p=o.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(n.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=o.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=o.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===o.active++&&o.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(o.lastModified[d]&&v.setRequestHeader("If-Modified-Since",o.lastModified[d]),o.etag[d]&&v.setRequestHeader("If-None-Match",o.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(o.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(o.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?n.resolveWith(l,[r,x,v]):n.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--o.active||o.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return o.get(a,b,c,"json")},getScript:function(a,b){return o.get(a,void 0,b,"script")}}),o.each(["get","post"],function(a,b){o[b]=function(a,c,d,e){return o.isFunction(c)&&(e=e||d,d=c,c=void 0),o.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),o.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){o.fn[b]=function(a){return this.on(b,a)}}),o._evalUrl=function(a){return o.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},o.fn.extend({wrapAll:function(a){var b;return o.isFunction(a)?this.each(function(b){o(this).wrapAll(a.call(this,b))}):(this[0]&&(b=o(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(o.isFunction(a)?function(b){o(this).wrapInner(a.call(this,b))}:function(){var b=o(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=o.isFunction(a);return this.each(function(c){o(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){o.nodeName(this,"body")||o(this).replaceWith(this.childNodes)}).end()}}),o.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},o.expr.filters.visible=function(a){return!o.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(o.isArray(b))o.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==o.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}o.param=function(a,b){var c,d=[],e=function(a,b){b=o.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=o.ajaxSettings&&o.ajaxSettings.traditional),o.isArray(a)||a.jquery&&!o.isPlainObject(a))o.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},o.fn.extend({serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=o.prop(this,"elements");return a?o.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!o(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=o(this).val();return null==c?null:o.isArray(c)?o.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),o.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=o.ajaxSettings.xhr();a.ActiveXObject&&o(a).on("unload",function(){for(var a in Dc)Dc[a]()}),l.cors=!!Fc&&"withCredentials"in Fc,l.ajax=Fc=!!Fc,o.ajaxTransport(function(a){var b;return l.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort"),f.send(a.hasContent&&a.data||null)},abort:function(){b&&b()}}:void 0}),o.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return o.globalEval(a),a}}}),o.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),o.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=o("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),m.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;o.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||o.expando+"_"+cc++;return this[a]=!0,a}}),o.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=o.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||o.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&o.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),o.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||m;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=o.buildFragment([a],b,e),e&&e.length&&o(e).remove(),o.merge([],d.childNodes))};var Ic=o.fn.load;o.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h),a=a.slice(0,h)),o.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&o.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?o("<div>").append(o.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},o.expr.filters.animated=function(a){return o.grep(o.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return o.isWindow(a)?a:9===a.nodeType&&a.defaultView}o.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=o.css(a,"position"),l=o(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=o.css(a,"top"),i=o.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),o.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},o.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){o.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,o.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===o.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),o.nodeName(a[0],"html")||(d=a.offset()),d.top+=o.css(a[0],"borderTopWidth",!0),d.left+=o.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-o.css(c,"marginTop",!0),left:b.left-d.left-o.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!o.nodeName(a,"html")&&"static"===o.css(a,"position"))a=a.offsetParent;return a||Jc})}}),o.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;o.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),o.each(["top","left"],function(a,b){o.cssHooks[b]=yb(l.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?o(a).position()[b]+"px":c):void 0})}),o.each({Height:"height",Width:"width"},function(a,b){o.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){o.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return o.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?o.css(b,c,g):o.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),o.fn.size=function(){return this.length},o.fn.andSelf=o.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return o});var Lc=a.jQuery,Mc=a.$;return o.noConflict=function(b){return a.$===o&&(a.$=Mc),b&&a.jQuery===o&&(a.jQuery=Lc),o},typeof b===U&&(a.jQuery=a.$=o),o});
diff --git a/browser/components/loop/content/shared/libs/lodash-2.4.1.js b/browser/components/loop/content/shared/libs/lodash-2.4.1.js
deleted file mode 100644
index 85a9626340c7..000000000000
--- a/browser/components/loop/content/shared/libs/lodash-2.4.1.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @license
- * Lo-Dash 2.4.1 (Custom Build) lodash.com/license | Underscore.js 1.5.2 underscorejs.org/LICENSE
- * Build: `lodash modern -o ./dist/lodash.js`
- */
-;(function(){function n(n,t,e){e=(e||0)-1;for(var r=n?n.length:0;++e<r;)if(n[e]===t)return e;return-1}function t(t,e){var r=typeof e;if(t=t.l,"boolean"==r||null==e)return t[e]?0:-1;"number"!=r&&"string"!=r&&(r="object");var u="number"==r?e:m+e;return t=(t=t[r])&&t[u],"object"==r?t&&-1<n(t,e)?0:-1:t?0:-1}function e(n){var t=this.l,e=typeof n;if("boolean"==e||null==n)t[n]=true;else{"number"!=e&&"string"!=e&&(e="object");var r="number"==e?n:m+n,t=t[e]||(t[e]={});"object"==e?(t[r]||(t[r]=[])).push(n):t[r]=true
-}}function r(n){return n.charCodeAt(0)}function u(n,t){for(var e=n.m,r=t.m,u=-1,o=e.length;++u<o;){var i=e[u],a=r[u];if(i!==a){if(i>a||typeof i=="undefined")return 1;if(i<a||typeof a=="undefined")return-1}}return n.n-t.n}function o(n){var t=-1,r=n.length,u=n[0],o=n[r/2|0],i=n[r-1];if(u&&typeof u=="object"&&o&&typeof o=="object"&&i&&typeof i=="object")return false;for(u=f(),u["false"]=u["null"]=u["true"]=u.undefined=false,o=f(),o.k=n,o.l=u,o.push=e;++t<r;)o.push(n[t]);return o}function i(n){return"\\"+U[n]
-}function a(){return h.pop()||[]}function f(){return g.pop()||{k:null,l:null,m:null,"false":false,n:0,"null":false,number:null,object:null,push:null,string:null,"true":false,undefined:false,o:null}}function l(n){n.length=0,h.length<_&&h.push(n)}function c(n){var t=n.l;t&&c(t),n.k=n.l=n.m=n.object=n.number=n.string=n.o=null,g.length<_&&g.push(n)}function p(n,t,e){t||(t=0),typeof e=="undefined"&&(e=n?n.length:0);var r=-1;e=e-t||0;for(var u=Array(0>e?0:e);++r<e;)u[r]=n[t+r];return u}function s(e){function h(n,t,e){if(!n||!V[typeof n])return n;
-t=t&&typeof e=="undefined"?t:tt(t,e,3);for(var r=-1,u=V[typeof n]&&Fe(n),o=u?u.length:0;++r<o&&(e=u[r],false!==t(n[e],e,n)););return n}function g(n,t,e){var r;if(!n||!V[typeof n])return n;t=t&&typeof e=="undefined"?t:tt(t,e,3);for(r in n)if(false===t(n[r],r,n))break;return n}function _(n,t,e){var r,u=n,o=u;if(!u)return o;for(var i=arguments,a=0,f=typeof e=="number"?2:i.length;++a<f;)if((u=i[a])&&V[typeof u])for(var l=-1,c=V[typeof u]&&Fe(u),p=c?c.length:0;++l<p;)r=c[l],"undefined"==typeof o[r]&&(o[r]=u[r]);
-return o}function U(n,t,e){var r,u=n,o=u;if(!u)return o;var i=arguments,a=0,f=typeof e=="number"?2:i.length;if(3<f&&"function"==typeof i[f-2])var l=tt(i[--f-1],i[f--],2);else 2<f&&"function"==typeof i[f-1]&&(l=i[--f]);for(;++a<f;)if((u=i[a])&&V[typeof u])for(var c=-1,p=V[typeof u]&&Fe(u),s=p?p.length:0;++c<s;)r=p[c],o[r]=l?l(o[r],u[r]):u[r];return o}function H(n){var t,e=[];if(!n||!V[typeof n])return e;for(t in n)me.call(n,t)&&e.push(t);return e}function J(n){return n&&typeof n=="object"&&!Te(n)&&me.call(n,"__wrapped__")?n:new Q(n)
-}function Q(n,t){this.__chain__=!!t,this.__wrapped__=n}function X(n){function t(){if(r){var n=p(r);be.apply(n,arguments)}if(this instanceof t){var o=nt(e.prototype),n=e.apply(o,n||arguments);return wt(n)?n:o}return e.apply(u,n||arguments)}var e=n[0],r=n[2],u=n[4];return $e(t,n),t}function Z(n,t,e,r,u){if(e){var o=e(n);if(typeof o!="undefined")return o}if(!wt(n))return n;var i=ce.call(n);if(!K[i])return n;var f=Ae[i];switch(i){case T:case F:return new f(+n);case W:case P:return new f(n);case z:return o=f(n.source,C.exec(n)),o.lastIndex=n.lastIndex,o
-}if(i=Te(n),t){var c=!r;r||(r=a()),u||(u=a());for(var s=r.length;s--;)if(r[s]==n)return u[s];o=i?f(n.length):{}}else o=i?p(n):U({},n);return i&&(me.call(n,"index")&&(o.index=n.index),me.call(n,"input")&&(o.input=n.input)),t?(r.push(n),u.push(o),(i?St:h)(n,function(n,i){o[i]=Z(n,t,e,r,u)}),c&&(l(r),l(u)),o):o}function nt(n){return wt(n)?ke(n):{}}function tt(n,t,e){if(typeof n!="function")return Ut;if(typeof t=="undefined"||!("prototype"in n))return n;var r=n.__bindData__;if(typeof r=="undefined"&&(De.funcNames&&(r=!n.name),r=r||!De.funcDecomp,!r)){var u=ge.call(n);
-De.funcNames||(r=!O.test(u)),r||(r=E.test(u),$e(n,r))}if(false===r||true!==r&&1&r[1])return n;switch(e){case 1:return function(e){return n.call(t,e)};case 2:return function(e,r){return n.call(t,e,r)};case 3:return function(e,r,u){return n.call(t,e,r,u)};case 4:return function(e,r,u,o){return n.call(t,e,r,u,o)}}return Mt(n,t)}function et(n){function t(){var n=f?i:this;if(u){var h=p(u);be.apply(h,arguments)}return(o||c)&&(h||(h=p(arguments)),o&&be.apply(h,o),c&&h.length<a)?(r|=16,et([e,s?r:-4&r,h,null,i,a])):(h||(h=arguments),l&&(e=n[v]),this instanceof t?(n=nt(e.prototype),h=e.apply(n,h),wt(h)?h:n):e.apply(n,h))
-}var e=n[0],r=n[1],u=n[2],o=n[3],i=n[4],a=n[5],f=1&r,l=2&r,c=4&r,s=8&r,v=e;return $e(t,n),t}function rt(e,r){var u=-1,i=st(),a=e?e.length:0,f=a>=b&&i===n,l=[];if(f){var p=o(r);p?(i=t,r=p):f=false}for(;++u<a;)p=e[u],0>i(r,p)&&l.push(p);return f&&c(r),l}function ut(n,t,e,r){r=(r||0)-1;for(var u=n?n.length:0,o=[];++r<u;){var i=n[r];if(i&&typeof i=="object"&&typeof i.length=="number"&&(Te(i)||yt(i))){t||(i=ut(i,t,e));var a=-1,f=i.length,l=o.length;for(o.length+=f;++a<f;)o[l++]=i[a]}else e||o.push(i)}return o
-}function ot(n,t,e,r,u,o){if(e){var i=e(n,t);if(typeof i!="undefined")return!!i}if(n===t)return 0!==n||1/n==1/t;if(n===n&&!(n&&V[typeof n]||t&&V[typeof t]))return false;if(null==n||null==t)return n===t;var f=ce.call(n),c=ce.call(t);if(f==D&&(f=q),c==D&&(c=q),f!=c)return false;switch(f){case T:case F:return+n==+t;case W:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case z:case P:return n==oe(t)}if(c=f==$,!c){var p=me.call(n,"__wrapped__"),s=me.call(t,"__wrapped__");if(p||s)return ot(p?n.__wrapped__:n,s?t.__wrapped__:t,e,r,u,o);
-if(f!=q)return false;if(f=n.constructor,p=t.constructor,f!=p&&!(dt(f)&&f instanceof f&&dt(p)&&p instanceof p)&&"constructor"in n&&"constructor"in t)return false}for(f=!u,u||(u=a()),o||(o=a()),p=u.length;p--;)if(u[p]==n)return o[p]==t;var v=0,i=true;if(u.push(n),o.push(t),c){if(p=n.length,v=t.length,(i=v==p)||r)for(;v--;)if(c=p,s=t[v],r)for(;c--&&!(i=ot(n[c],s,e,r,u,o)););else if(!(i=ot(n[v],s,e,r,u,o)))break}else g(t,function(t,a,f){return me.call(f,a)?(v++,i=me.call(n,a)&&ot(n[a],t,e,r,u,o)):void 0}),i&&!r&&g(n,function(n,t,e){return me.call(e,t)?i=-1<--v:void 0
-});return u.pop(),o.pop(),f&&(l(u),l(o)),i}function it(n,t,e,r,u){(Te(t)?St:h)(t,function(t,o){var i,a,f=t,l=n[o];if(t&&((a=Te(t))||Pe(t))){for(f=r.length;f--;)if(i=r[f]==t){l=u[f];break}if(!i){var c;e&&(f=e(l,t),c=typeof f!="undefined")&&(l=f),c||(l=a?Te(l)?l:[]:Pe(l)?l:{}),r.push(t),u.push(l),c||it(l,t,e,r,u)}}else e&&(f=e(l,t),typeof f=="undefined"&&(f=t)),typeof f!="undefined"&&(l=f);n[o]=l})}function at(n,t){return n+he(Re()*(t-n+1))}function ft(e,r,u){var i=-1,f=st(),p=e?e.length:0,s=[],v=!r&&p>=b&&f===n,h=u||v?a():s;
-for(v&&(h=o(h),f=t);++i<p;){var g=e[i],y=u?u(g,i,e):g;(r?!i||h[h.length-1]!==y:0>f(h,y))&&((u||v)&&h.push(y),s.push(g))}return v?(l(h.k),c(h)):u&&l(h),s}function lt(n){return function(t,e,r){var u={};e=J.createCallback(e,r,3),r=-1;var o=t?t.length:0;if(typeof o=="number")for(;++r<o;){var i=t[r];n(u,i,e(i,r,t),t)}else h(t,function(t,r,o){n(u,t,e(t,r,o),o)});return u}}function ct(n,t,e,r,u,o){var i=1&t,a=4&t,f=16&t,l=32&t;if(!(2&t||dt(n)))throw new ie;f&&!e.length&&(t&=-17,f=e=false),l&&!r.length&&(t&=-33,l=r=false);
-var c=n&&n.__bindData__;return c&&true!==c?(c=p(c),c[2]&&(c[2]=p(c[2])),c[3]&&(c[3]=p(c[3])),!i||1&c[1]||(c[4]=u),!i&&1&c[1]&&(t|=8),!a||4&c[1]||(c[5]=o),f&&be.apply(c[2]||(c[2]=[]),e),l&&we.apply(c[3]||(c[3]=[]),r),c[1]|=t,ct.apply(null,c)):(1==t||17===t?X:et)([n,t,e,r,u,o])}function pt(n){return Be[n]}function st(){var t=(t=J.indexOf)===Wt?n:t;return t}function vt(n){return typeof n=="function"&&pe.test(n)}function ht(n){var t,e;return n&&ce.call(n)==q&&(t=n.constructor,!dt(t)||t instanceof t)?(g(n,function(n,t){e=t
-}),typeof e=="undefined"||me.call(n,e)):false}function gt(n){return We[n]}function yt(n){return n&&typeof n=="object"&&typeof n.length=="number"&&ce.call(n)==D||false}function mt(n,t,e){var r=Fe(n),u=r.length;for(t=tt(t,e,3);u--&&(e=r[u],false!==t(n[e],e,n)););return n}function bt(n){var t=[];return g(n,function(n,e){dt(n)&&t.push(e)}),t.sort()}function _t(n){for(var t=-1,e=Fe(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function dt(n){return typeof n=="function"}function wt(n){return!(!n||!V[typeof n])
-}function jt(n){return typeof n=="number"||n&&typeof n=="object"&&ce.call(n)==W||false}function kt(n){return typeof n=="string"||n&&typeof n=="object"&&ce.call(n)==P||false}function xt(n){for(var t=-1,e=Fe(n),r=e.length,u=Xt(r);++t<r;)u[t]=n[e[t]];return u}function Ct(n,t,e){var r=-1,u=st(),o=n?n.length:0,i=false;return e=(0>e?Ie(0,o+e):e)||0,Te(n)?i=-1<u(n,t,e):typeof o=="number"?i=-1<(kt(n)?n.indexOf(t,e):u(n,t,e)):h(n,function(n){return++r<e?void 0:!(i=n===t)}),i}function Ot(n,t,e){var r=true;t=J.createCallback(t,e,3),e=-1;
-var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&(r=!!t(n[e],e,n)););else h(n,function(n,e,u){return r=!!t(n,e,u)});return r}function Nt(n,t,e){var r=[];t=J.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u;){var o=n[e];t(o,e,n)&&r.push(o)}else h(n,function(n,e,u){t(n,e,u)&&r.push(n)});return r}function It(n,t,e){t=J.createCallback(t,e,3),e=-1;var r=n?n.length:0;if(typeof r!="number"){var u;return h(n,function(n,e,r){return t(n,e,r)?(u=n,false):void 0}),u}for(;++e<r;){var o=n[e];
-if(t(o,e,n))return o}}function St(n,t,e){var r=-1,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:tt(t,e,3),typeof u=="number")for(;++r<u&&false!==t(n[r],r,n););else h(n,t);return n}function Et(n,t,e){var r=n?n.length:0;if(t=t&&typeof e=="undefined"?t:tt(t,e,3),typeof r=="number")for(;r--&&false!==t(n[r],r,n););else{var u=Fe(n),r=u.length;h(n,function(n,e,o){return e=u?u[--r]:--r,t(o[e],e,o)})}return n}function Rt(n,t,e){var r=-1,u=n?n.length:0;if(t=J.createCallback(t,e,3),typeof u=="number")for(var o=Xt(u);++r<u;)o[r]=t(n[r],r,n);
-else o=[],h(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function At(n,t,e){var u=-1/0,o=u;if(typeof t!="function"&&e&&e[t]===n&&(t=null),null==t&&Te(n)){e=-1;for(var i=n.length;++e<i;){var a=n[e];a>o&&(o=a)}}else t=null==t&&kt(n)?r:J.createCallback(t,e,3),St(n,function(n,e,r){e=t(n,e,r),e>u&&(u=e,o=n)});return o}function Dt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=J.createCallback(t,r,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(e=n[++o]);++o<i;)e=t(e,n[o],o,n);else h(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)
-});return e}function $t(n,t,e,r){var u=3>arguments.length;return t=J.createCallback(t,r,4),Et(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)}),e}function Tt(n){var t=-1,e=n?n.length:0,r=Xt(typeof e=="number"?e:0);return St(n,function(n){var e=at(0,++t);r[t]=r[e],r[e]=n}),r}function Ft(n,t,e){var r;t=J.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&!(r=t(n[e],e,n)););else h(n,function(n,e,u){return!(r=t(n,e,u))});return!!r}function Bt(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=-1;
-for(t=J.createCallback(t,e,3);++o<u&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[0]:v;return p(n,0,Se(Ie(0,r),u))}function Wt(t,e,r){if(typeof r=="number"){var u=t?t.length:0;r=0>r?Ie(0,u+r):r||0}else if(r)return r=zt(t,e),t[r]===e?r:-1;return n(t,e,r)}function qt(n,t,e){if(typeof t!="number"&&null!=t){var r=0,u=-1,o=n?n.length:0;for(t=J.createCallback(t,e,3);++u<o&&t(n[u],u,n);)r++}else r=null==t||e?1:Ie(0,t);return p(n,r)}function zt(n,t,e,r){var u=0,o=n?n.length:u;for(e=e?J.createCallback(e,r,1):Ut,t=e(t);u<o;)r=u+o>>>1,e(n[r])<t?u=r+1:o=r;
-return u}function Pt(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=typeof t!="function"&&r&&r[t]===n?null:t,t=false),null!=e&&(e=J.createCallback(e,r,3)),ft(n,t,e)}function Kt(){for(var n=1<arguments.length?arguments:arguments[0],t=-1,e=n?At(Ve(n,"length")):0,r=Xt(0>e?0:e);++t<e;)r[t]=Ve(n,t);return r}function Lt(n,t){var e=-1,r=n?n.length:0,u={};for(t||!r||Te(n[0])||(t=[]);++e<r;){var o=n[e];t?u[o]=t[e]:o&&(u[o[0]]=o[1])}return u}function Mt(n,t){return 2<arguments.length?ct(n,17,p(arguments,2),null,t):ct(n,1,null,null,t)
-}function Vt(n,t,e){function r(){c&&ve(c),i=c=p=v,(g||h!==t)&&(s=Ue(),a=n.apply(l,o),c||i||(o=l=null))}function u(){var e=t-(Ue()-f);0<e?c=_e(u,e):(i&&ve(i),e=p,i=c=p=v,e&&(s=Ue(),a=n.apply(l,o),c||i||(o=l=null)))}var o,i,a,f,l,c,p,s=0,h=false,g=true;if(!dt(n))throw new ie;if(t=Ie(0,t)||0,true===e)var y=true,g=false;else wt(e)&&(y=e.leading,h="maxWait"in e&&(Ie(t,e.maxWait)||0),g="trailing"in e?e.trailing:g);return function(){if(o=arguments,f=Ue(),l=this,p=g&&(c||!y),false===h)var e=y&&!c;else{i||y||(s=f);var v=h-(f-s),m=0>=v;
-m?(i&&(i=ve(i)),s=f,a=n.apply(l,o)):i||(i=_e(r,v))}return m&&c?c=ve(c):c||t===h||(c=_e(u,t)),e&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a}}function Ut(n){return n}function Gt(n,t,e){var r=true,u=t&&bt(t);t&&(e||u.length)||(null==e&&(e=t),o=Q,t=n,n=J,u=bt(t)),false===e?r=false:wt(e)&&"chain"in e&&(r=e.chain);var o=n,i=dt(o);St(u,function(e){var u=n[e]=t[e];i&&(o.prototype[e]=function(){var t=this.__chain__,e=this.__wrapped__,i=[e];if(be.apply(i,arguments),i=u.apply(n,i),r||t){if(e===i&&wt(i))return this;
-i=new o(i),i.__chain__=t}return i})})}function Ht(){}function Jt(n){return function(t){return t[n]}}function Qt(){return this.__wrapped__}e=e?Y.defaults(G.Object(),e,Y.pick(G,A)):G;var Xt=e.Array,Yt=e.Boolean,Zt=e.Date,ne=e.Function,te=e.Math,ee=e.Number,re=e.Object,ue=e.RegExp,oe=e.String,ie=e.TypeError,ae=[],fe=re.prototype,le=e._,ce=fe.toString,pe=ue("^"+oe(ce).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$"),se=te.ceil,ve=e.clearTimeout,he=te.floor,ge=ne.prototype.toString,ye=vt(ye=re.getPrototypeOf)&&ye,me=fe.hasOwnProperty,be=ae.push,_e=e.setTimeout,de=ae.splice,we=ae.unshift,je=function(){try{var n={},t=vt(t=re.defineProperty)&&t,e=t(n,n,n)&&t
-}catch(r){}return e}(),ke=vt(ke=re.create)&&ke,xe=vt(xe=Xt.isArray)&&xe,Ce=e.isFinite,Oe=e.isNaN,Ne=vt(Ne=re.keys)&&Ne,Ie=te.max,Se=te.min,Ee=e.parseInt,Re=te.random,Ae={};Ae[$]=Xt,Ae[T]=Yt,Ae[F]=Zt,Ae[B]=ne,Ae[q]=re,Ae[W]=ee,Ae[z]=ue,Ae[P]=oe,Q.prototype=J.prototype;var De=J.support={};De.funcDecomp=!vt(e.a)&&E.test(s),De.funcNames=typeof ne.name=="string",J.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:N,variable:"",imports:{_:J}},ke||(nt=function(){function n(){}return function(t){if(wt(t)){n.prototype=t;
-var r=new n;n.prototype=null}return r||e.Object()}}());var $e=je?function(n,t){M.value=t,je(n,"__bindData__",M)}:Ht,Te=xe||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&ce.call(n)==$||false},Fe=Ne?function(n){return wt(n)?Ne(n):[]}:H,Be={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},We=_t(Be),qe=ue("("+Fe(We).join("|")+")","g"),ze=ue("["+Fe(Be).join("")+"]","g"),Pe=ye?function(n){if(!n||ce.call(n)!=q)return false;var t=n.valueOf,e=vt(t)&&(e=ye(t))&&ye(e);return e?n==e||ye(n)==e:ht(n)
-}:ht,Ke=lt(function(n,t,e){me.call(n,e)?n[e]++:n[e]=1}),Le=lt(function(n,t,e){(me.call(n,e)?n[e]:n[e]=[]).push(t)}),Me=lt(function(n,t,e){n[e]=t}),Ve=Rt,Ue=vt(Ue=Zt.now)&&Ue||function(){return(new Zt).getTime()},Ge=8==Ee(d+"08")?Ee:function(n,t){return Ee(kt(n)?n.replace(I,""):n,t||0)};return J.after=function(n,t){if(!dt(t))throw new ie;return function(){return 1>--n?t.apply(this,arguments):void 0}},J.assign=U,J.at=function(n){for(var t=arguments,e=-1,r=ut(t,true,false,1),t=t[2]&&t[2][t[1]]===n?1:r.length,u=Xt(t);++e<t;)u[e]=n[r[e]];
-return u},J.bind=Mt,J.bindAll=function(n){for(var t=1<arguments.length?ut(arguments,true,false,1):bt(n),e=-1,r=t.length;++e<r;){var u=t[e];n[u]=ct(n[u],1,null,null,n)}return n},J.bindKey=function(n,t){return 2<arguments.length?ct(t,19,p(arguments,2),null,n):ct(t,3,null,null,n)},J.chain=function(n){return n=new Q(n),n.__chain__=true,n},J.compact=function(n){for(var t=-1,e=n?n.length:0,r=[];++t<e;){var u=n[t];u&&r.push(u)}return r},J.compose=function(){for(var n=arguments,t=n.length;t--;)if(!dt(n[t]))throw new ie;
-return function(){for(var t=arguments,e=n.length;e--;)t=[n[e].apply(this,t)];return t[0]}},J.constant=function(n){return function(){return n}},J.countBy=Ke,J.create=function(n,t){var e=nt(n);return t?U(e,t):e},J.createCallback=function(n,t,e){var r=typeof n;if(null==n||"function"==r)return tt(n,t,e);if("object"!=r)return Jt(n);var u=Fe(n),o=u[0],i=n[o];return 1!=u.length||i!==i||wt(i)?function(t){for(var e=u.length,r=false;e--&&(r=ot(t[u[e]],n[u[e]],null,true)););return r}:function(n){return n=n[o],i===n&&(0!==i||1/i==1/n)
-}},J.curry=function(n,t){return t=typeof t=="number"?t:+t||n.length,ct(n,4,null,null,null,t)},J.debounce=Vt,J.defaults=_,J.defer=function(n){if(!dt(n))throw new ie;var t=p(arguments,1);return _e(function(){n.apply(v,t)},1)},J.delay=function(n,t){if(!dt(n))throw new ie;var e=p(arguments,2);return _e(function(){n.apply(v,e)},t)},J.difference=function(n){return rt(n,ut(arguments,true,true,1))},J.filter=Nt,J.flatten=function(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=typeof t!="function"&&r&&r[t]===n?null:t,t=false),null!=e&&(n=Rt(n,e,r)),ut(n,t)
-},J.forEach=St,J.forEachRight=Et,J.forIn=g,J.forInRight=function(n,t,e){var r=[];g(n,function(n,t){r.push(t,n)});var u=r.length;for(t=tt(t,e,3);u--&&false!==t(r[u--],r[u],n););return n},J.forOwn=h,J.forOwnRight=mt,J.functions=bt,J.groupBy=Le,J.indexBy=Me,J.initial=function(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=J.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else r=null==t||e?1:t||r;return p(n,0,Se(Ie(0,u-r),u))},J.intersection=function(){for(var e=[],r=-1,u=arguments.length,i=a(),f=st(),p=f===n,s=a();++r<u;){var v=arguments[r];
-(Te(v)||yt(v))&&(e.push(v),i.push(p&&v.length>=b&&o(r?e[r]:s)))}var p=e[0],h=-1,g=p?p.length:0,y=[];n:for(;++h<g;){var m=i[0],v=p[h];if(0>(m?t(m,v):f(s,v))){for(r=u,(m||s).push(v);--r;)if(m=i[r],0>(m?t(m,v):f(e[r],v)))continue n;y.push(v)}}for(;u--;)(m=i[u])&&c(m);return l(i),l(s),y},J.invert=_t,J.invoke=function(n,t){var e=p(arguments,2),r=-1,u=typeof t=="function",o=n?n.length:0,i=Xt(typeof o=="number"?o:0);return St(n,function(n){i[++r]=(u?t:n[t]).apply(n,e)}),i},J.keys=Fe,J.map=Rt,J.mapValues=function(n,t,e){var r={};
-return t=J.createCallback(t,e,3),h(n,function(n,e,u){r[e]=t(n,e,u)}),r},J.max=At,J.memoize=function(n,t){function e(){var r=e.cache,u=t?t.apply(this,arguments):m+arguments[0];return me.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}if(!dt(n))throw new ie;return e.cache={},e},J.merge=function(n){var t=arguments,e=2;if(!wt(n))return n;if("number"!=typeof t[2]&&(e=t.length),3<e&&"function"==typeof t[e-2])var r=tt(t[--e-1],t[e--],2);else 2<e&&"function"==typeof t[e-1]&&(r=t[--e]);for(var t=p(arguments,1,e),u=-1,o=a(),i=a();++u<e;)it(n,t[u],r,o,i);
-return l(o),l(i),n},J.min=function(n,t,e){var u=1/0,o=u;if(typeof t!="function"&&e&&e[t]===n&&(t=null),null==t&&Te(n)){e=-1;for(var i=n.length;++e<i;){var a=n[e];a<o&&(o=a)}}else t=null==t&&kt(n)?r:J.createCallback(t,e,3),St(n,function(n,e,r){e=t(n,e,r),e<u&&(u=e,o=n)});return o},J.omit=function(n,t,e){var r={};if(typeof t!="function"){var u=[];g(n,function(n,t){u.push(t)});for(var u=rt(u,ut(arguments,true,false,1)),o=-1,i=u.length;++o<i;){var a=u[o];r[a]=n[a]}}else t=J.createCallback(t,e,3),g(n,function(n,e,u){t(n,e,u)||(r[e]=n)
-});return r},J.once=function(n){var t,e;if(!dt(n))throw new ie;return function(){return t?e:(t=true,e=n.apply(this,arguments),n=null,e)}},J.pairs=function(n){for(var t=-1,e=Fe(n),r=e.length,u=Xt(r);++t<r;){var o=e[t];u[t]=[o,n[o]]}return u},J.partial=function(n){return ct(n,16,p(arguments,1))},J.partialRight=function(n){return ct(n,32,null,p(arguments,1))},J.pick=function(n,t,e){var r={};if(typeof t!="function")for(var u=-1,o=ut(arguments,true,false,1),i=wt(n)?o.length:0;++u<i;){var a=o[u];a in n&&(r[a]=n[a])
-}else t=J.createCallback(t,e,3),g(n,function(n,e,u){t(n,e,u)&&(r[e]=n)});return r},J.pluck=Ve,J.property=Jt,J.pull=function(n){for(var t=arguments,e=0,r=t.length,u=n?n.length:0;++e<r;)for(var o=-1,i=t[e];++o<u;)n[o]===i&&(de.call(n,o--,1),u--);return n},J.range=function(n,t,e){n=+n||0,e=typeof e=="number"?e:+e||1,null==t&&(t=n,n=0);var r=-1;t=Ie(0,se((t-n)/(e||1)));for(var u=Xt(t);++r<t;)u[r]=n,n+=e;return u},J.reject=function(n,t,e){return t=J.createCallback(t,e,3),Nt(n,function(n,e,r){return!t(n,e,r)
-})},J.remove=function(n,t,e){var r=-1,u=n?n.length:0,o=[];for(t=J.createCallback(t,e,3);++r<u;)e=n[r],t(e,r,n)&&(o.push(e),de.call(n,r--,1),u--);return o},J.rest=qt,J.shuffle=Tt,J.sortBy=function(n,t,e){var r=-1,o=Te(t),i=n?n.length:0,p=Xt(typeof i=="number"?i:0);for(o||(t=J.createCallback(t,e,3)),St(n,function(n,e,u){var i=p[++r]=f();o?i.m=Rt(t,function(t){return n[t]}):(i.m=a())[0]=t(n,e,u),i.n=r,i.o=n}),i=p.length,p.sort(u);i--;)n=p[i],p[i]=n.o,o||l(n.m),c(n);return p},J.tap=function(n,t){return t(n),n
-},J.throttle=function(n,t,e){var r=true,u=true;if(!dt(n))throw new ie;return false===e?r=false:wt(e)&&(r="leading"in e?e.leading:r,u="trailing"in e?e.trailing:u),L.leading=r,L.maxWait=t,L.trailing=u,Vt(n,t,L)},J.times=function(n,t,e){n=-1<(n=+n)?n:0;var r=-1,u=Xt(n);for(t=tt(t,e,1);++r<n;)u[r]=t(r);return u},J.toArray=function(n){return n&&typeof n.length=="number"?p(n):xt(n)},J.transform=function(n,t,e,r){var u=Te(n);if(null==e)if(u)e=[];else{var o=n&&n.constructor;e=nt(o&&o.prototype)}return t&&(t=J.createCallback(t,r,4),(u?St:h)(n,function(n,r,u){return t(e,n,r,u)
-})),e},J.union=function(){return ft(ut(arguments,true,true))},J.uniq=Pt,J.values=xt,J.where=Nt,J.without=function(n){return rt(n,p(arguments,1))},J.wrap=function(n,t){return ct(t,16,[n])},J.xor=function(){for(var n=-1,t=arguments.length;++n<t;){var e=arguments[n];if(Te(e)||yt(e))var r=r?ft(rt(r,e).concat(rt(e,r))):e}return r||[]},J.zip=Kt,J.zipObject=Lt,J.collect=Rt,J.drop=qt,J.each=St,J.eachRight=Et,J.extend=U,J.methods=bt,J.object=Lt,J.select=Nt,J.tail=qt,J.unique=Pt,J.unzip=Kt,Gt(J),J.clone=function(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=t,t=false),Z(n,t,typeof e=="function"&&tt(e,r,1))
-},J.cloneDeep=function(n,t,e){return Z(n,true,typeof t=="function"&&tt(t,e,1))},J.contains=Ct,J.escape=function(n){return null==n?"":oe(n).replace(ze,pt)},J.every=Ot,J.find=It,J.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=J.createCallback(t,e,3);++r<u;)if(t(n[r],r,n))return r;return-1},J.findKey=function(n,t,e){var r;return t=J.createCallback(t,e,3),h(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},J.findLast=function(n,t,e){var r;return t=J.createCallback(t,e,3),Et(n,function(n,e,u){return t(n,e,u)?(r=n,false):void 0
-}),r},J.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=J.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},J.findLastKey=function(n,t,e){var r;return t=J.createCallback(t,e,3),mt(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},J.has=function(n,t){return n?me.call(n,t):false},J.identity=Ut,J.indexOf=Wt,J.isArguments=yt,J.isArray=Te,J.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&ce.call(n)==T||false},J.isDate=function(n){return n&&typeof n=="object"&&ce.call(n)==F||false
-},J.isElement=function(n){return n&&1===n.nodeType||false},J.isEmpty=function(n){var t=true;if(!n)return t;var e=ce.call(n),r=n.length;return e==$||e==P||e==D||e==q&&typeof r=="number"&&dt(n.splice)?!r:(h(n,function(){return t=false}),t)},J.isEqual=function(n,t,e,r){return ot(n,t,typeof e=="function"&&tt(e,r,2))},J.isFinite=function(n){return Ce(n)&&!Oe(parseFloat(n))},J.isFunction=dt,J.isNaN=function(n){return jt(n)&&n!=+n},J.isNull=function(n){return null===n},J.isNumber=jt,J.isObject=wt,J.isPlainObject=Pe,J.isRegExp=function(n){return n&&typeof n=="object"&&ce.call(n)==z||false
-},J.isString=kt,J.isUndefined=function(n){return typeof n=="undefined"},J.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?Ie(0,r+e):Se(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},J.mixin=Gt,J.noConflict=function(){return e._=le,this},J.noop=Ht,J.now=Ue,J.parseInt=Ge,J.random=function(n,t,e){var r=null==n,u=null==t;return null==e&&(typeof n=="boolean"&&u?(e=n,n=1):u||typeof t!="boolean"||(e=t,u=true)),r&&u&&(t=1),n=+n||0,u?(t=n,n=0):t=+t||0,e||n%1||t%1?(e=Re(),Se(n+e*(t-n+parseFloat("1e-"+((e+"").length-1))),t)):at(n,t)
-},J.reduce=Dt,J.reduceRight=$t,J.result=function(n,t){if(n){var e=n[t];return dt(e)?n[t]():e}},J.runInContext=s,J.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Fe(n).length},J.some=Ft,J.sortedIndex=zt,J.template=function(n,t,e){var r=J.templateSettings;n=oe(n||""),e=_({},e,r);var u,o=_({},e.imports,r.imports),r=Fe(o),o=xt(o),a=0,f=e.interpolate||S,l="__p+='",f=ue((e.escape||S).source+"|"+f.source+"|"+(f===N?x:S).source+"|"+(e.evaluate||S).source+"|$","g");n.replace(f,function(t,e,r,o,f,c){return r||(r=o),l+=n.slice(a,c).replace(R,i),e&&(l+="'+__e("+e+")+'"),f&&(u=true,l+="';"+f+";\n__p+='"),r&&(l+="'+((__t=("+r+"))==null?'':__t)+'"),a=c+t.length,t
-}),l+="';",f=e=e.variable,f||(e="obj",l="with("+e+"){"+l+"}"),l=(u?l.replace(w,""):l).replace(j,"$1").replace(k,"$1;"),l="function("+e+"){"+(f?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var c=ne(r,"return "+l).apply(v,o)}catch(p){throw p.source=l,p}return t?c(t):(c.source=l,c)},J.unescape=function(n){return null==n?"":oe(n).replace(qe,gt)},J.uniqueId=function(n){var t=++y;return oe(null==n?"":n)+t
-},J.all=Ot,J.any=Ft,J.detect=It,J.findWhere=It,J.foldl=Dt,J.foldr=$t,J.include=Ct,J.inject=Dt,Gt(function(){var n={};return h(J,function(t,e){J.prototype[e]||(n[e]=t)}),n}(),false),J.first=Bt,J.last=function(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=J.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[u-1]:v;return p(n,Ie(0,u-r))},J.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=xt(n)),null==t||e?n?n[at(0,n.length-1)]:v:(n=Tt(n),n.length=Se(Ie(0,t),n.length),n)
-},J.take=Bt,J.head=Bt,h(J,function(n,t){var e="sample"!==t;J.prototype[t]||(J.prototype[t]=function(t,r){var u=this.__chain__,o=n(this.__wrapped__,t,r);return u||null!=t&&(!r||e&&typeof t=="function")?new Q(o,u):o})}),J.VERSION="2.4.1",J.prototype.chain=function(){return this.__chain__=true,this},J.prototype.toString=function(){return oe(this.__wrapped__)},J.prototype.value=Qt,J.prototype.valueOf=Qt,St(["join","pop","shift"],function(n){var t=ae[n];J.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);
-return n?new Q(e,n):e}}),St(["push","reverse","sort","unshift"],function(n){var t=ae[n];J.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),St(["concat","slice","splice"],function(n){var t=ae[n];J.prototype[n]=function(){return new Q(t.apply(this.__wrapped__,arguments),this.__chain__)}}),J}var v,h=[],g=[],y=0,m=+new Date+"",b=75,_=40,d=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",w=/\b__p\+='';/g,j=/\b(__p\+=)''\+/g,k=/(__e\(.*?\)|\b__t\))\+'';/g,x=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,C=/\w*$/,O=/^\s*function[ \n\r\t]+\w/,N=/<%=([\s\S]+?)%>/g,I=RegExp("^["+d+"]*0+(?=.$)"),S=/($^)/,E=/\bthis\b/,R=/['\n\r\t\u2028\u2029\\]/g,A="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setTimeout".split(" "),D="[object Arguments]",$="[object Array]",T="[object Boolean]",F="[object Date]",B="[object Function]",W="[object Number]",q="[object Object]",z="[object RegExp]",P="[object String]",K={};
-K[B]=false,K[D]=K[$]=K[T]=K[F]=K[W]=K[q]=K[z]=K[P]=true;var L={leading:false,maxWait:0,trailing:false},M={configurable:false,enumerable:false,value:null,writable:false},V={"boolean":false,"function":true,object:true,number:false,string:false,undefined:false},U={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},G=V[typeof window]&&window||this,H=V[typeof exports]&&exports&&!exports.nodeType&&exports,J=V[typeof module]&&module&&!module.nodeType&&module,Q=J&&J.exports===H&&H,X=V[typeof global]&&global;!X||X.global!==X&&X.window!==X||(G=X);
-var Y=s();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(G._=Y, define(function(){return Y})):H&&J?Q?(J.exports=Y)._=Y:H._=Y:G._=Y}).call(this);
\ No newline at end of file
diff --git a/browser/components/loop/content/shared/libs/webl10n-20130617.js b/browser/components/loop/content/shared/libs/webl10n-20130617.js
deleted file mode 100644
index 9d99c6889150..000000000000
--- a/browser/components/loop/content/shared/libs/webl10n-20130617.js
+++ /dev/null
@@ -1,1157 +0,0 @@
-/**
- * Copyright (c) 2011-2013 Fabien Cazenave, Mozilla.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-/*jshint browser: true, devel: true, es5: true, globalstrict: true */
-'use strict';
-
-document.webL10n = (function(window, document, undefined) {
-  var gL10nData = {};
-  var gTextData = '';
-  var gTextProp = 'textContent';
-  var gLanguage = '';
-  var gMacros = {};
-  var gReadyState = 'loading';
-
-
-  /**
-   * Synchronously loading l10n resources significantly minimizes flickering
-   * from displaying the app with non-localized strings and then updating the
-   * strings. Although this will block all script execution on this page, we
-   * expect that the l10n resources are available locally on flash-storage.
-   *
-   * As synchronous XHR is generally considered as a bad idea, we're still
-   * loading l10n resources asynchronously -- but we keep this in a setting,
-   * just in case... and applications using this library should hide their
-   * content until the `localized' event happens.
-   */
-
-  var gAsyncResourceLoading = true; // read-only
-
-
-  /**
-   * Debug helpers
-   *
-   *   gDEBUG == 0: don't display any console message
-   *   gDEBUG == 1: display only warnings, not logs
-   *   gDEBUG == 2: display all console messages
-   */
-
-  var gDEBUG = 1;
-
-  function consoleLog(message) {
-    if (gDEBUG >= 2) {
-      console.log('[l10n] ' + message);
-    }
-  };
-
-  function consoleWarn(message) {
-    if (gDEBUG) {
-      console.warn('[l10n] ' + message);
-    }
-  };
-
-
-  /**
-   * DOM helpers for the so-called "HTML API".
-   *
-   * These functions are written for modern browsers. For old versions of IE,
-   * they're overridden in the 'startup' section at the end of this file.
-   */
-
-  function getL10nResourceLinks() {
-    return document.querySelectorAll('link[type="application/l10n"]');
-  }
-
-  function getL10nDictionary() {
-    var script = document.querySelector('script[type="application/l10n"]');
-    // TODO: support multiple and external JSON dictionaries
-    return script ? JSON.parse(script.innerHTML) : null;
-  }
-
-  function getTranslatableChildren(element) {
-    return element ? element.querySelectorAll('*[data-l10n-id]') : [];
-  }
-
-  function getL10nAttributes(element) {
-    if (!element)
-      return {};
-
-    var l10nId = element.getAttribute('data-l10n-id');
-    var l10nArgs = element.getAttribute('data-l10n-args');
-    var args = {};
-    if (l10nArgs) {
-      try {
-        args = JSON.parse(l10nArgs);
-      } catch (e) {
-        consoleWarn('could not parse arguments for #' + l10nId);
-      }
-    }
-    return { id: l10nId, args: args };
-  }
-
-  function fireL10nReadyEvent(lang) {
-    var evtObject = document.createEvent('Event');
-    evtObject.initEvent('localized', true, false);
-    evtObject.language = lang;
-    document.dispatchEvent(evtObject);
-  }
-
-  function xhrLoadText(url, onSuccess, onFailure, asynchronous) {
-    onSuccess = onSuccess || function _onSuccess(data) {};
-    onFailure = onFailure || function _onFailure() {
-      consoleWarn(url + ' not found.');
-    };
-
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', url, asynchronous);
-    if (xhr.overrideMimeType) {
-      xhr.overrideMimeType('text/plain; charset=utf-8');
-    }
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState == 4) {
-        if (xhr.status == 200 || xhr.status === 0) {
-          onSuccess(xhr.responseText);
-        } else {
-          onFailure();
-        }
-      }
-    };
-    xhr.onerror = onFailure;
-    xhr.ontimeout = onFailure;
-
-    // in Firefox OS with the app:// protocol, trying to XHR a non-existing
-    // URL will raise an exception here -- hence this ugly try...catch.
-    try {
-      xhr.send(null);
-    } catch (e) {
-      onFailure();
-    }
-  }
-
-
-  /**
-   * l10n resource parser:
-   *  - reads (async XHR) the l10n resource matching `lang';
-   *  - imports linked resources (synchronously) when specified;
-   *  - parses the text data (fills `gL10nData' and `gTextData');
-   *  - triggers success/failure callbacks when done.
-   *
-   * @param {string} href
-   *    URL of the l10n resource to parse.
-   *
-   * @param {string} lang
-   *    locale (language) to parse.
-   *
-   * @param {Function} successCallback
-   *    triggered when the l10n resource has been successully parsed.
-   *
-   * @param {Function} failureCallback
-   *    triggered when the an error has occured.
-   *
-   * @return {void}
-   *    uses the following global variables: gL10nData, gTextData, gTextProp.
-   */
-
-  function parseResource(href, lang, successCallback, failureCallback) {
-    var baseURL = href.replace(/[^\/]*$/, '') || './';
-
-    // handle escaped characters (backslashes) in a string
-    function evalString(text) {
-      if (text.lastIndexOf('\\') < 0)
-        return text;
-      return text.replace(/\\\\/g, '\\')
-                 .replace(/\\n/g, '\n')
-                 .replace(/\\r/g, '\r')
-                 .replace(/\\t/g, '\t')
-                 .replace(/\\b/g, '\b')
-                 .replace(/\\f/g, '\f')
-                 .replace(/\\{/g, '{')
-                 .replace(/\\}/g, '}')
-                 .replace(/\\"/g, '"')
-                 .replace(/\\'/g, "'");
-    }
-
-    // parse *.properties text data into an l10n dictionary
-    function parseProperties(text) {
-      var dictionary = [];
-
-      // token expressions
-      var reBlank = /^\s*|\s*$/;
-      var reComment = /^\s*#|^\s*$/;
-      var reSection = /^\s*\[(.*)\]\s*$/;
-      var reImport = /^\s*@import\s+url\((.*)\)\s*$/i;
-      var reSplit = /^([^=\s]*)\s*=\s*(.+)$/; // TODO: escape EOLs with '\'
-
-      // parse the *.properties file into an associative array
-      function parseRawLines(rawText, extendedSyntax) {
-        var entries = rawText.replace(reBlank, '').split(/[\r\n]+/);
-        var currentLang = '*';
-        var genericLang = lang.replace(/-[a-z]+$/i, '');
-        var skipLang = false;
-        var match = '';
-
-        for (var i = 0; i < entries.length; i++) {
-          var line = entries[i];
-
-          // comment or blank line?
-          if (reComment.test(line))
-            continue;
-
-          // the extended syntax supports [lang] sections and @import rules
-          if (extendedSyntax) {
-            if (reSection.test(line)) { // section start?
-              match = reSection.exec(line);
-              currentLang = match[1];
-              skipLang = (currentLang !== '*') &&
-                  (currentLang !== lang) && (currentLang !== genericLang);
-              continue;
-            } else if (skipLang) {
-              continue;
-            }
-            if (reImport.test(line)) { // @import rule?
-              match = reImport.exec(line);
-              loadImport(baseURL + match[1]); // load the resource synchronously
-            }
-          }
-
-          // key-value pair
-          var tmp = line.match(reSplit);
-          if (tmp && tmp.length == 3) {
-            dictionary[tmp[1]] = evalString(tmp[2]);
-          }
-        }
-      }
-
-      // import another *.properties file
-      function loadImport(url) {
-        xhrLoadText(url, function(content) {
-          parseRawLines(content, false); // don't allow recursive imports
-        }, null, false); // load synchronously
-      }
-
-      // fill the dictionary
-      parseRawLines(text, true);
-      return dictionary;
-    }
-
-    // load and parse l10n data (warning: global variables are used here)
-    xhrLoadText(href, function(response) {
-      gTextData += response; // mostly for debug
-
-      // parse *.properties text data into an l10n dictionary
-      var data = parseProperties(response);
-
-      // find attribute descriptions, if any
-      for (var key in data) {
-        var id, prop, index = key.lastIndexOf('.');
-        if (index > 0) { // an attribute has been specified
-          id = key.substring(0, index);
-          prop = key.substr(index + 1);
-        } else { // no attribute: assuming text content by default
-          id = key;
-          prop = gTextProp;
-        }
-        if (!gL10nData[id]) {
-          gL10nData[id] = {};
-        }
-        gL10nData[id][prop] = data[key];
-      }
-
-      // trigger callback
-      if (successCallback) {
-        successCallback();
-      }
-    }, failureCallback, gAsyncResourceLoading);
-  };
-
-  // load and parse all resources for the specified locale
-  function loadLocale(lang, callback) {
-    callback = callback || function _callback() {};
-
-    clear();
-    gLanguage = lang;
-
-    // check all <link type="application/l10n" href="..." /> nodes
-    // and load the resource files
-    var langLinks = getL10nResourceLinks();
-    var langCount = langLinks.length;
-    if (langCount == 0) {
-      // we might have a pre-compiled dictionary instead
-      var dict = getL10nDictionary();
-      if (dict && dict.locales && dict.default_locale) {
-        consoleLog('using the embedded JSON directory, early way out');
-        gL10nData = dict.locales[lang] || dict.locales[dict.default_locale];
-        callback();
-      } else {
-        consoleLog('no resource to load, early way out');
-      }
-      // early way out
-      fireL10nReadyEvent(lang);
-      gReadyState = 'complete';
-      return;
-    }
-
-    // start the callback when all resources are loaded
-    var onResourceLoaded = null;
-    var gResourceCount = 0;
-    onResourceLoaded = function() {
-      gResourceCount++;
-      if (gResourceCount >= langCount) {
-        callback();
-        fireL10nReadyEvent(lang);
-        gReadyState = 'complete';
-      }
-    };
-
-    // load all resource files
-    function l10nResourceLink(link) {
-      var href = link.href;
-      var type = link.type;
-      this.load = function(lang, callback) {
-        var applied = lang;
-        parseResource(href, lang, callback, function() {
-          consoleWarn(href + ' not found.');
-          applied = '';
-        });
-        return applied; // return lang if found, an empty string if not found
-      };
-    }
-
-    for (var i = 0; i < langCount; i++) {
-      var resource = new l10nResourceLink(langLinks[i]);
-      var rv = resource.load(lang, onResourceLoaded);
-      if (rv != lang) { // lang not found, used default resource instead
-        consoleWarn('"' + lang + '" resource not found');
-        gLanguage = '';
-      }
-    }
-  }
-
-  // clear all l10n data
-  function clear() {
-    gL10nData = {};
-    gTextData = '';
-    gLanguage = '';
-    // TODO: clear all non predefined macros.
-    // There's no such macro /yet/ but we're planning to have some...
-  }
-
-
-  /**
-   * Get rules for plural forms (shared with JetPack), see:
-   * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-   * https://github.com/mozilla/addon-sdk/blob/master/python-lib/plural-rules-generator.p
-   *
-   * @param {string} lang
-   *    locale (language) used.
-   *
-   * @return {Function}
-   *    returns a function that gives the plural form name for a given integer:
-   *       var fun = getPluralRules('en');
-   *       fun(1)    -> 'one'
-   *       fun(0)    -> 'other'
-   *       fun(1000) -> 'other'.
-   */
-
-  function getPluralRules(lang) {
-    var locales2rules = {
-      'af': 3,
-      'ak': 4,
-      'am': 4,
-      'ar': 1,
-      'asa': 3,
-      'az': 0,
-      'be': 11,
-      'bem': 3,
-      'bez': 3,
-      'bg': 3,
-      'bh': 4,
-      'bm': 0,
-      'bn': 3,
-      'bo': 0,
-      'br': 20,
-      'brx': 3,
-      'bs': 11,
-      'ca': 3,
-      'cgg': 3,
-      'chr': 3,
-      'cs': 12,
-      'cy': 17,
-      'da': 3,
-      'de': 3,
-      'dv': 3,
-      'dz': 0,
-      'ee': 3,
-      'el': 3,
-      'en': 3,
-      'eo': 3,
-      'es': 3,
-      'et': 3,
-      'eu': 3,
-      'fa': 0,
-      'ff': 5,
-      'fi': 3,
-      'fil': 4,
-      'fo': 3,
-      'fr': 5,
-      'fur': 3,
-      'fy': 3,
-      'ga': 8,
-      'gd': 24,
-      'gl': 3,
-      'gsw': 3,
-      'gu': 3,
-      'guw': 4,
-      'gv': 23,
-      'ha': 3,
-      'haw': 3,
-      'he': 2,
-      'hi': 4,
-      'hr': 11,
-      'hu': 0,
-      'id': 0,
-      'ig': 0,
-      'ii': 0,
-      'is': 3,
-      'it': 3,
-      'iu': 7,
-      'ja': 0,
-      'jmc': 3,
-      'jv': 0,
-      'ka': 0,
-      'kab': 5,
-      'kaj': 3,
-      'kcg': 3,
-      'kde': 0,
-      'kea': 0,
-      'kk': 3,
-      'kl': 3,
-      'km': 0,
-      'kn': 0,
-      'ko': 0,
-      'ksb': 3,
-      'ksh': 21,
-      'ku': 3,
-      'kw': 7,
-      'lag': 18,
-      'lb': 3,
-      'lg': 3,
-      'ln': 4,
-      'lo': 0,
-      'lt': 10,
-      'lv': 6,
-      'mas': 3,
-      'mg': 4,
-      'mk': 16,
-      'ml': 3,
-      'mn': 3,
-      'mo': 9,
-      'mr': 3,
-      'ms': 0,
-      'mt': 15,
-      'my': 0,
-      'nah': 3,
-      'naq': 7,
-      'nb': 3,
-      'nd': 3,
-      'ne': 3,
-      'nl': 3,
-      'nn': 3,
-      'no': 3,
-      'nr': 3,
-      'nso': 4,
-      'ny': 3,
-      'nyn': 3,
-      'om': 3,
-      'or': 3,
-      'pa': 3,
-      'pap': 3,
-      'pl': 13,
-      'ps': 3,
-      'pt': 3,
-      'rm': 3,
-      'ro': 9,
-      'rof': 3,
-      'ru': 11,
-      'rwk': 3,
-      'sah': 0,
-      'saq': 3,
-      'se': 7,
-      'seh': 3,
-      'ses': 0,
-      'sg': 0,
-      'sh': 11,
-      'shi': 19,
-      'sk': 12,
-      'sl': 14,
-      'sma': 7,
-      'smi': 7,
-      'smj': 7,
-      'smn': 7,
-      'sms': 7,
-      'sn': 3,
-      'so': 3,
-      'sq': 3,
-      'sr': 11,
-      'ss': 3,
-      'ssy': 3,
-      'st': 3,
-      'sv': 3,
-      'sw': 3,
-      'syr': 3,
-      'ta': 3,
-      'te': 3,
-      'teo': 3,
-      'th': 0,
-      'ti': 4,
-      'tig': 3,
-      'tk': 3,
-      'tl': 4,
-      'tn': 3,
-      'to': 0,
-      'tr': 0,
-      'ts': 3,
-      'tzm': 22,
-      'uk': 11,
-      'ur': 3,
-      've': 3,
-      'vi': 0,
-      'vun': 3,
-      'wa': 4,
-      'wae': 3,
-      'wo': 0,
-      'xh': 3,
-      'xog': 3,
-      'yo': 0,
-      'zh': 0,
-      'zu': 3
-    };
-
-    // utility functions for plural rules methods
-    function isIn(n, list) {
-      return list.indexOf(n) !== -1;
-    }
-    function isBetween(n, start, end) {
-      return start <= n && n <= end;
-    }
-
-    // list of all plural rules methods:
-    // map an integer to the plural form name to use
-    var pluralRules = {
-      '0': function(n) {
-        return 'other';
-      },
-      '1': function(n) {
-        if ((isBetween((n % 100), 3, 10)))
-          return 'few';
-        if (n === 0)
-          return 'zero';
-        if ((isBetween((n % 100), 11, 99)))
-          return 'many';
-        if (n == 2)
-          return 'two';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '2': function(n) {
-        if (n !== 0 && (n % 10) === 0)
-          return 'many';
-        if (n == 2)
-          return 'two';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '3': function(n) {
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '4': function(n) {
-        if ((isBetween(n, 0, 1)))
-          return 'one';
-        return 'other';
-      },
-      '5': function(n) {
-        if ((isBetween(n, 0, 2)) && n != 2)
-          return 'one';
-        return 'other';
-      },
-      '6': function(n) {
-        if (n === 0)
-          return 'zero';
-        if ((n % 10) == 1 && (n % 100) != 11)
-          return 'one';
-        return 'other';
-      },
-      '7': function(n) {
-        if (n == 2)
-          return 'two';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '8': function(n) {
-        if ((isBetween(n, 3, 6)))
-          return 'few';
-        if ((isBetween(n, 7, 10)))
-          return 'many';
-        if (n == 2)
-          return 'two';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '9': function(n) {
-        if (n === 0 || n != 1 && (isBetween((n % 100), 1, 19)))
-          return 'few';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '10': function(n) {
-        if ((isBetween((n % 10), 2, 9)) && !(isBetween((n % 100), 11, 19)))
-          return 'few';
-        if ((n % 10) == 1 && !(isBetween((n % 100), 11, 19)))
-          return 'one';
-        return 'other';
-      },
-      '11': function(n) {
-        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
-          return 'few';
-        if ((n % 10) === 0 ||
-            (isBetween((n % 10), 5, 9)) ||
-            (isBetween((n % 100), 11, 14)))
-          return 'many';
-        if ((n % 10) == 1 && (n % 100) != 11)
-          return 'one';
-        return 'other';
-      },
-      '12': function(n) {
-        if ((isBetween(n, 2, 4)))
-          return 'few';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '13': function(n) {
-        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
-          return 'few';
-        if (n != 1 && (isBetween((n % 10), 0, 1)) ||
-            (isBetween((n % 10), 5, 9)) ||
-            (isBetween((n % 100), 12, 14)))
-          return 'many';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '14': function(n) {
-        if ((isBetween((n % 100), 3, 4)))
-          return 'few';
-        if ((n % 100) == 2)
-          return 'two';
-        if ((n % 100) == 1)
-          return 'one';
-        return 'other';
-      },
-      '15': function(n) {
-        if (n === 0 || (isBetween((n % 100), 2, 10)))
-          return 'few';
-        if ((isBetween((n % 100), 11, 19)))
-          return 'many';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '16': function(n) {
-        if ((n % 10) == 1 && n != 11)
-          return 'one';
-        return 'other';
-      },
-      '17': function(n) {
-        if (n == 3)
-          return 'few';
-        if (n === 0)
-          return 'zero';
-        if (n == 6)
-          return 'many';
-        if (n == 2)
-          return 'two';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '18': function(n) {
-        if (n === 0)
-          return 'zero';
-        if ((isBetween(n, 0, 2)) && n !== 0 && n != 2)
-          return 'one';
-        return 'other';
-      },
-      '19': function(n) {
-        if ((isBetween(n, 2, 10)))
-          return 'few';
-        if ((isBetween(n, 0, 1)))
-          return 'one';
-        return 'other';
-      },
-      '20': function(n) {
-        if ((isBetween((n % 10), 3, 4) || ((n % 10) == 9)) && !(
-            isBetween((n % 100), 10, 19) ||
-            isBetween((n % 100), 70, 79) ||
-            isBetween((n % 100), 90, 99)
-            ))
-          return 'few';
-        if ((n % 1000000) === 0 && n !== 0)
-          return 'many';
-        if ((n % 10) == 2 && !isIn((n % 100), [12, 72, 92]))
-          return 'two';
-        if ((n % 10) == 1 && !isIn((n % 100), [11, 71, 91]))
-          return 'one';
-        return 'other';
-      },
-      '21': function(n) {
-        if (n === 0)
-          return 'zero';
-        if (n == 1)
-          return 'one';
-        return 'other';
-      },
-      '22': function(n) {
-        if ((isBetween(n, 0, 1)) || (isBetween(n, 11, 99)))
-          return 'one';
-        return 'other';
-      },
-      '23': function(n) {
-        if ((isBetween((n % 10), 1, 2)) || (n % 20) === 0)
-          return 'one';
-        return 'other';
-      },
-      '24': function(n) {
-        if ((isBetween(n, 3, 10) || isBetween(n, 13, 19)))
-          return 'few';
-        if (isIn(n, [2, 12]))
-          return 'two';
-        if (isIn(n, [1, 11]))
-          return 'one';
-        return 'other';
-      }
-    };
-
-    // return a function that gives the plural form name for a given integer
-    var index = locales2rules[lang.replace(/-.*$/, '')];
-    if (!(index in pluralRules)) {
-      consoleWarn('plural form unknown for [' + lang + ']');
-      return function() { return 'other'; };
-    }
-    return pluralRules[index];
-  }
-
-  // pre-defined 'plural' macro
-  gMacros.plural = function(str, param, key, prop) {
-    var n = parseFloat(param);
-    if (isNaN(n))
-      return str;
-
-    // TODO: support other properties (l20n still doesn't...)
-    if (prop != gTextProp)
-      return str;
-
-    // initialize _pluralRules
-    if (!gMacros._pluralRules) {
-      gMacros._pluralRules = getPluralRules(gLanguage);
-    }
-    var index = '[' + gMacros._pluralRules(n) + ']';
-
-    // try to find a [zero|one|two] key if it's defined
-    if (n === 0 && (key + '[zero]') in gL10nData) {
-      str = gL10nData[key + '[zero]'][prop];
-    } else if (n == 1 && (key + '[one]') in gL10nData) {
-      str = gL10nData[key + '[one]'][prop];
-    } else if (n == 2 && (key + '[two]') in gL10nData) {
-      str = gL10nData[key + '[two]'][prop];
-    } else if ((key + index) in gL10nData) {
-      str = gL10nData[key + index][prop];
-    } else if ((key + '[other]') in gL10nData) {
-      str = gL10nData[key + '[other]'][prop];
-    }
-
-    return str;
-  };
-
-
-  /**
-   * l10n dictionary functions
-   */
-
-  // fetch an l10n object, warn if not found, apply `args' if possible
-  function getL10nData(key, args) {
-    var data = gL10nData[key];
-    if (!data) {
-      consoleWarn('#' + key + ' is undefined.');
-    }
-
-    /** This is where l10n expressions should be processed.
-      * The plan is to support C-style expressions from the l20n project;
-      * until then, only two kinds of simple expressions are supported:
-      *   {[ index ]} and {{ arguments }}.
-      */
-    var rv = {};
-    for (var prop in data) {
-      var str = data[prop];
-      str = substIndexes(str, args, key, prop);
-      str = substArguments(str, args, key);
-      rv[prop] = str;
-    }
-    return rv;
-  }
-
-  // replace {[macros]} with their values
-  function substIndexes(str, args, key, prop) {
-    var reIndex = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)\s*\]\}/;
-    var reMatch = reIndex.exec(str);
-    if (!reMatch || !reMatch.length)
-      return str;
-
-    // an index/macro has been found
-    // Note: at the moment, only one parameter is supported
-    var macroName = reMatch[1];
-    var paramName = reMatch[2];
-    var param;
-    if (args && paramName in args) {
-      param = args[paramName];
-    } else if (paramName in gL10nData) {
-      param = gL10nData[paramName];
-    }
-
-    // there's no macro parser yet: it has to be defined in gMacros
-    if (macroName in gMacros) {
-      var macro = gMacros[macroName];
-      str = macro(str, param, key, prop);
-    }
-    return str;
-  }
-
-  // replace {{arguments}} with their values
-  function substArguments(str, args, key) {
-    var reArgs = /\{\{\s*(.+?)\s*\}\}/;
-    var match = reArgs.exec(str);
-    while (match) {
-      if (!match || match.length < 2)
-        return str; // argument key not found
-
-      var arg = match[1];
-      var sub = '';
-      if (args && arg in args) {
-        sub = args[arg];
-      } else if (arg in gL10nData) {
-        sub = gL10nData[arg][gTextProp];
-      } else {
-        consoleLog('argument {{' + arg + '}} for #' + key + ' is undefined.');
-        return str;
-      }
-
-      str = str.substring(0, match.index) + sub +
-            str.substr(match.index + match[0].length);
-      match = reArgs.exec(str);
-    }
-    return str;
-  }
-
-  // translate an HTML element
-  function translateElement(element) {
-    var l10n = getL10nAttributes(element);
-    if (!l10n.id)
-      return;
-
-    // get the related l10n object
-    var data = getL10nData(l10n.id, l10n.args);
-    if (!data) {
-      consoleWarn('#' + l10n.id + ' is undefined.');
-      return;
-    }
-
-    // translate element (TODO: security checks?)
-    if (data[gTextProp]) { // XXX
-      if (getChildElementCount(element) === 0) {
-        element[gTextProp] = data[gTextProp];
-      } else {
-        // this element has element children: replace the content of the first
-        // (non-empty) child textNode and clear other child textNodes
-        var children = element.childNodes;
-        var found = false;
-        for (var i = 0, l = children.length; i < l; i++) {
-          if (children[i].nodeType === 3 && /\S/.test(children[i].nodeValue)) {
-            if (found) {
-              children[i].nodeValue = '';
-            } else {
-              children[i].nodeValue = data[gTextProp];
-              found = true;
-            }
-          }
-        }
-        // if no (non-empty) textNode is found, insert a textNode before the
-        // first element child.
-        if (!found) {
-          var textNode = document.createTextNode(data[gTextProp]);
-          element.insertBefore(textNode, element.firstChild);
-        }
-      }
-      delete data[gTextProp];
-    }
-
-    for (var k in data) {
-      element[k] = data[k];
-    }
-  }
-
-  // webkit browsers don't currently support 'children' on SVG elements...
-  function getChildElementCount(element) {
-    if (element.children) {
-      return element.children.length;
-    }
-    if (typeof element.childElementCount !== 'undefined') {
-      return element.childElementCount;
-    }
-    var count = 0;
-    for (var i = 0; i < element.childNodes.length; i++) {
-      count += element.nodeType === 1 ? 1 : 0;
-    }
-    return count;
-  }
-
-  // translate an HTML subtree
-  function translateFragment(element) {
-    element = element || document.documentElement;
-
-    // check all translatable children (= w/ a `data-l10n-id' attribute)
-    var children = getTranslatableChildren(element);
-    var elementCount = children.length;
-    for (var i = 0; i < elementCount; i++) {
-      translateElement(children[i]);
-    }
-
-    // translate element itself if necessary
-    translateElement(element);
-  }
-
-
-  /**
-   * Startup & Public API
-   *
-   * Warning: this part of the code contains browser-specific chunks --
-   * that's where obsolete browsers, namely IE8 and earlier, are handled.
-   *
-   * Unlike the rest of the lib, this section is not shared with FirefoxOS/Gaia.
-   */
-
-  // load the default locale on startup
-  function l10nStartup() {
-    gReadyState = 'interactive';
-
-    // most browsers expose the UI language as `navigator.language'
-    // but IE uses `navigator.userLanguage' instead
-    var userLocale = navigator.language || navigator.userLanguage;
-    consoleLog('loading [' + userLocale + '] resources, ' +
-        (gAsyncResourceLoading ? 'asynchronously.' : 'synchronously.'));
-
-    // load the default locale and translate the document if required
-    if (document.documentElement.lang === userLocale) {
-      loadLocale(userLocale);
-    } else {
-      loadLocale(userLocale, translateFragment);
-    }
-  }
-
-  // browser-specific startup
-  if (document.addEventListener) { // modern browsers and IE9+
-    if (document.readyState === 'loading') {
-      // the document is not fully loaded yet: wait for DOMContentLoaded.
-      document.addEventListener('DOMContentLoaded', l10nStartup);
-    } else {
-      // l10n.js is being loaded with <script defer> or <script async>,
-      // the DOM is ready for parsing.
-      window.setTimeout(l10nStartup);
-    }
-  } else if (window.attachEvent) { // IE8 and before (= oldIE)
-    // TODO: check if jQuery is loaded (CSS selector + JSON + events)
-
-    // dummy `console.log' and `console.warn' functions
-    if (!window.console) {
-      consoleLog = function(message) {}; // just ignore console.log calls
-      consoleWarn = function(message) {
-        if (gDEBUG) {
-          alert('[l10n] ' + message); // vintage debugging, baby!
-        }
-      };
-    }
-
-    // XMLHttpRequest for IE6
-    if (!window.XMLHttpRequest) {
-      xhrLoadText = function(url, onSuccess, onFailure, asynchronous) {
-        onSuccess = onSuccess || function _onSuccess(data) {};
-        onFailure = onFailure || function _onFailure() {
-          consoleWarn(url + ' not found.');
-        };
-        var xhr = new ActiveXObject('Microsoft.XMLHTTP');
-        xhr.open('GET', url, asynchronous);
-        xhr.onreadystatechange = function() {
-          if (xhr.readyState == 4) {
-            if (xhr.status == 200) {
-              onSuccess(xhr.responseText);
-            } else {
-              onFailure();
-            }
-          }
-        };
-        xhr.send(null);
-      }
-    }
-
-    // worst hack ever for IE6 and IE7
-    if (!window.JSON) {
-      getL10nAttributes = function(element) {
-        if (!element)
-          return {};
-        var l10nId = element.getAttribute('data-l10n-id'),
-            l10nArgs = element.getAttribute('data-l10n-args'),
-            args = {};
-        if (l10nArgs) try {
-          args = eval(l10nArgs); // XXX yeah, I know...
-        } catch (e) {
-          consoleWarn('could not parse arguments for #' + l10nId);
-        }
-        return { id: l10nId, args: args };
-      };
-    }
-
-    // override `getTranslatableChildren' and `getL10nResourceLinks'
-    if (!document.querySelectorAll) {
-      getTranslatableChildren = function(element) {
-        if (!element)
-          return [];
-        var nodes = element.getElementsByTagName('*'),
-            l10nElements = [],
-            n = nodes.length;
-        for (var i = 0; i < n; i++) {
-          if (nodes[i].getAttribute('data-l10n-id'))
-            l10nElements.push(nodes[i]);
-        }
-        return l10nElements;
-      };
-      getL10nResourceLinks = function() {
-        var links = document.getElementsByTagName('link'),
-            l10nLinks = [],
-            n = links.length;
-        for (var i = 0; i < n; i++) {
-          if (links[i].type == 'application/l10n')
-            l10nLinks.push(links[i]);
-        }
-        return l10nLinks;
-      };
-    }
-
-    // override `getL10nDictionary'
-    if (!window.JSON || !document.querySelectorAll) {
-      getL10nDictionary = function() {
-        var scripts = document.getElementsByName('script');
-        for (var i = 0; i < scripts.length; i++) {
-          if (scripts[i].type == 'application/l10n') {
-            return eval(scripts[i].innerHTML);
-          }
-        }
-        return null;
-      };
-    }
-
-    // fire non-standard `localized' DOM events
-    if (document.createEventObject && !document.createEvent) {
-      fireL10nReadyEvent = function(lang) {
-        // hack to simulate a custom event in IE:
-        // to catch this event, add an event handler to `onpropertychange'
-        document.documentElement.localized = 1;
-      };
-    }
-
-    // startup for IE<9
-    window.attachEvent('onload', function() {
-      gTextProp = document.body.textContent ? 'textContent' : 'innerText';
-      l10nStartup();
-    });
-  }
-
-  // cross-browser API (sorry, oldIE doesn't support getters & setters)
-  return {
-    // get a localized string
-    get: function(key, args, fallback) {
-      var data = getL10nData(key, args) || fallback;
-      if (data) { // XXX double-check this
-        return gTextProp in data ? data[gTextProp] : '';
-      }
-      return '{{' + key + '}}';
-    },
-
-    // debug
-    getData: function() { return gL10nData; },
-    getText: function() { return gTextData; },
-
-    // get|set the document language
-    getLanguage: function() { return gLanguage; },
-    setLanguage: function(lang) { loadLocale(lang, translateFragment); },
-
-    // get the direction (ltr|rtl) of the current language
-    getDirection: function() {
-      // http://www.w3.org/International/questions/qa-scripts
-      // Arabic, Hebrew, Farsi, Pashto, Urdu
-      var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
-      return (rtlList.indexOf(gLanguage) >= 0) ? 'rtl' : 'ltr';
-    },
-
-    // translate an element or document fragment
-    translate: translateFragment,
-
-    // this can be used to prevent race conditions
-    getReadyState: function() { return gReadyState; },
-    ready: function(callback) {
-      if (!callback) {
-        return;
-      } else if (gReadyState == 'complete' || gReadyState == 'interactive') {
-        window.setTimeout(callback);
-      } else if (document.addEventListener) {
-        document.addEventListener('localized', callback);
-      } else if (document.attachEvent) {
-        document.documentElement.attachEvent('onpropertychange', function(e) {
-          if (e.propertyName === 'localized') {
-            callback();
-          }
-        });
-      }
-    }
-  };
-}) (window, document);
-
-// gettext-like shortcut for document.webL10n.get
-if (window._ === undefined) {
-  var _ = document.webL10n.get;
-}
-

From dd49c47299bc9e64c88b0378fc50982285b68273 Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:13:42 +0100
Subject: [PATCH 008/117] Bug 989127 - README build clarifications r=Standard8

---
 browser/components/loop/README.txt | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/browser/components/loop/README.txt b/browser/components/loop/README.txt
index cdcc80fb79cb..af205db04c9d 100644
--- a/browser/components/loop/README.txt
+++ b/browser/components/loop/README.txt
@@ -5,11 +5,26 @@ In order for the loop component to build, do the following:
 mv content/shared content/shared.old
 
 * create a symlink to the authoritative version of the shared directory in your
-loop-client repo
+loop-client repo.  If you first set the env vars referenced below,
+you should be able to copy-paste these lines:
 
-ln -s /loop-client-repo-root-dir/static/shared ./content
+ln -s ${LOOP_CLIENT_REPO_DIR}/static/shared \
+  ${GECKO_SRC_DIR}/browser/components/loop/content/shared
 
-Note that changes to the shared directory affect both the standlone loop-client
+Once you're done, the browser/components/loop/content should look something
+like this:
+
+$ ls -l !$
+ls -l browser/components/loop/content
+total 32
+-rw-r--r--  1 dmose  staff   900 Mar 27 16:17 conversation.html
+drwxr-xr-x  6 dmose  staff   204 Mar 27 16:17 js
+drwxr-xr-x  3 dmose  staff   102 Mar 26 15:36 libs
+-rw-r--r--  1 dmose  staff  2159 Mar 26 15:36 panel.html
+lrwxr-xr-x  1 dmose  staff    40 Mar 26 15:41 shared -> /Users/dmose/r/loop-client/static/shared
+
+
+Note that changes to the shared directory affect both the standalone loop-client
 and the desktop client.  This means that sometimes, in order to
 make a desktop client patch, you'll need to get reviews on patches to both
 mozilla-central/gecko-dev as well as loop-client.  

From f3c2ed47a96bf46d12cc07518c997de47bb21e19 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:42 +0100
Subject: [PATCH 009/117] Bug 985596 - Updated shared assets & tests layout.
 r=Standard8

--HG--
rename : browser/components/loop/test/mocha-test/README.md => browser/components/loop/test/desktop-local/README.md
rename : browser/components/loop/test/mocha-test/client_test.js => browser/components/loop/test/desktop-local/client_test.js
rename : browser/components/loop/test/mocha-test/index.html => browser/components/loop/test/desktop-local/index.html
rename : browser/components/loop/test/mocha-test/panel_test.js => browser/components/loop/test/desktop-local/panel_test.js
---
 browser/components/loop/README.txt            |   37 +-
 browser/components/loop/make-links.sh         |   25 +
 browser/components/loop/test/.gitignore       |    1 +
 .../{mocha-test => desktop-local}/README.md   |    0
 .../client_test.js                            |    0
 .../{mocha-test => desktop-local}/index.html  |   14 +-
 .../panel_test.js                             |    0
 browser/components/loop/test/index.html       |   17 +
 .../components/loop/test/vendor/chai-1.9.0.js | 4696 -------------
 .../loop/test/vendor/mocha-1.17.1.css         |  270 -
 .../loop/test/vendor/mocha-1.17.1.js          | 5812 -----------------
 .../loop/test/vendor/sinon-1.9.0.js           | 4794 --------------
 12 files changed, 59 insertions(+), 15607 deletions(-)
 create mode 100755 browser/components/loop/make-links.sh
 create mode 100644 browser/components/loop/test/.gitignore
 rename browser/components/loop/test/{mocha-test => desktop-local}/README.md (100%)
 rename browser/components/loop/test/{mocha-test => desktop-local}/client_test.js (100%)
 rename browser/components/loop/test/{mocha-test => desktop-local}/index.html (73%)
 rename browser/components/loop/test/{mocha-test => desktop-local}/panel_test.js (100%)
 create mode 100644 browser/components/loop/test/index.html
 delete mode 100644 browser/components/loop/test/vendor/chai-1.9.0.js
 delete mode 100644 browser/components/loop/test/vendor/mocha-1.17.1.css
 delete mode 100644 browser/components/loop/test/vendor/mocha-1.17.1.js
 delete mode 100644 browser/components/loop/test/vendor/sinon-1.9.0.js

diff --git a/browser/components/loop/README.txt b/browser/components/loop/README.txt
index af205db04c9d..2ac0262d6215 100644
--- a/browser/components/loop/README.txt
+++ b/browser/components/loop/README.txt
@@ -1,31 +1,12 @@
-In order for the loop component to build, do the following:
+In order for the loop component to build, run the make-links.sh script to
+setup symlinks from the Gecko tree into your loop-client-repo for shared code,
+noting that you'll need to put the correct path inside the [[ ]] placeholder
+(and remove the [[ ]] characters).
 
-* if you have an existing content/shared directory, move it out of the way:
+$ export LOOP_CLIENT_REPO=[[/absolute-path/to/my/loop-client-repo/clone]]
+$ ./make-links.sh
 
-mv content/shared content/shared.old
-
-* create a symlink to the authoritative version of the shared directory in your
-loop-client repo.  If you first set the env vars referenced below,
-you should be able to copy-paste these lines:
-
-ln -s ${LOOP_CLIENT_REPO_DIR}/static/shared \
-  ${GECKO_SRC_DIR}/browser/components/loop/content/shared
-
-Once you're done, the browser/components/loop/content should look something
-like this:
-
-$ ls -l !$
-ls -l browser/components/loop/content
-total 32
--rw-r--r--  1 dmose  staff   900 Mar 27 16:17 conversation.html
-drwxr-xr-x  6 dmose  staff   204 Mar 27 16:17 js
-drwxr-xr-x  3 dmose  staff   102 Mar 26 15:36 libs
--rw-r--r--  1 dmose  staff  2159 Mar 26 15:36 panel.html
-lrwxr-xr-x  1 dmose  staff    40 Mar 26 15:41 shared -> /Users/dmose/r/loop-client/static/shared
-
-
-Note that changes to the shared directory affect both the standalone loop-client
-and the desktop client.  This means that sometimes, in order to
+Note that changes to the shared directories affect both the standalone
+loop-client and the desktop client. This means that sometimes, in order to
 make a desktop client patch, you'll need to get reviews on patches to both
-mozilla-central/gecko-dev as well as loop-client.  
-
+mozilla-central/gecko-dev as well as loop-client.
diff --git a/browser/components/loop/make-links.sh b/browser/components/loop/make-links.sh
new file mode 100755
index 000000000000..6127b66bf8f4
--- /dev/null
+++ b/browser/components/loop/make-links.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ `basename $PWD` != "loop" ]; then
+  echo "this script must be executed in the loop directory"
+  exit -1
+fi
+
+if [ ! -d "$LOOP_CLIENT_REPO" ]; then
+  echo "LOOP_CLIENT_REPO in the environment must be set to a valid directory"
+  exit -1
+fi
+
+SHARED_CONTENT_TARGET=./content/shared
+rm -f ${SHARED_CONTENT_TARGET}
+
+SHARED_CONTENT=${LOOP_CLIENT_REPO}/content/shared
+ln -s ${SHARED_CONTENT} ${SHARED_CONTENT_TARGET}
+
+SHARED_TEST_TARGET=./test/shared
+rm -f ${SHARED_TEST_TARGET}
+
+SHARED_TEST=${LOOP_CLIENT_REPO}/test/shared
+ln -s ${SHARED_TEST} ${SHARED_TEST_TARGET}
+
+
diff --git a/browser/components/loop/test/.gitignore b/browser/components/loop/test/.gitignore
new file mode 100644
index 000000000000..8a205e8dc3e7
--- /dev/null
+++ b/browser/components/loop/test/.gitignore
@@ -0,0 +1 @@
+shared
diff --git a/browser/components/loop/test/mocha-test/README.md b/browser/components/loop/test/desktop-local/README.md
similarity index 100%
rename from browser/components/loop/test/mocha-test/README.md
rename to browser/components/loop/test/desktop-local/README.md
diff --git a/browser/components/loop/test/mocha-test/client_test.js b/browser/components/loop/test/desktop-local/client_test.js
similarity index 100%
rename from browser/components/loop/test/mocha-test/client_test.js
rename to browser/components/loop/test/desktop-local/client_test.js
diff --git a/browser/components/loop/test/mocha-test/index.html b/browser/components/loop/test/desktop-local/index.html
similarity index 73%
rename from browser/components/loop/test/mocha-test/index.html
rename to browser/components/loop/test/desktop-local/index.html
index f7c280249b86..3db49a20a2b0 100644
--- a/browser/components/loop/test/mocha-test/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -6,7 +6,7 @@
 <head>
   <meta charset="utf-8">
   <title>Loop mocha tests</title>
-  <link rel="stylesheet" media="all" href="../vendor/mocha-1.17.1.css">
+  <link rel="stylesheet" media="all" href="../shared/vendor/mocha-1.17.1.css">
 </head>
 <body>
   <div id="mocha">
@@ -34,13 +34,13 @@
   };
   </script>
   <script src="../../content/libs/l10n.js"></script>
-  <script type="text/javascript" src="../../content/shared/libs/jquery-2.1.0.js"></script>
-  <script type="text/javascript" src="../../content/shared/libs/lodash-2.4.1.js"></script>
-  <script type="text/javascript" src="../../content/shared/libs/backbone-1.1.2.js"></script>
+  <script src="../../content/shared/libs/jquery-2.1.0.js"></script>
+  <script src="../../content/shared/libs/lodash-2.4.1.js"></script>
+  <script src="../../content/shared/libs/backbone-1.1.2.js"></script>
   <!-- test dependencies -->
-  <script src="../vendor/mocha-1.17.1.js"></script>
-  <script src="../vendor/chai-1.9.0.js"></script>
-  <script src="../vendor/sinon-1.9.0.js"></script>
+  <script src="../shared/vendor/mocha-1.17.1.js"></script>
+  <script src="../shared/vendor/chai-1.9.0.js"></script>
+  <script src="../shared/vendor/sinon-1.9.0.js"></script>
   <script>
     chai.Assertion.includeStack = true;
     mocha.setup('bdd');
diff --git a/browser/components/loop/test/mocha-test/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
similarity index 100%
rename from browser/components/loop/test/mocha-test/panel_test.js
rename to browser/components/loop/test/desktop-local/panel_test.js
diff --git a/browser/components/loop/test/index.html b/browser/components/loop/test/index.html
new file mode 100644
index 000000000000..8fde1f177fd4
--- /dev/null
+++ b/browser/components/loop/test/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Loop test index</title>
+</head>
+<body>
+  <h1>Loop tests</h1>
+  <ul>
+    <li><a href="shared/">Shared tests</a></li>
+    <li><a href="desktop-local/">Local tests</a></li>
+  </ul>
+</body>
+</html>
diff --git a/browser/components/loop/test/vendor/chai-1.9.0.js b/browser/components/loop/test/vendor/chai-1.9.0.js
deleted file mode 100644
index 8a6339a1c734..000000000000
--- a/browser/components/loop/test/vendor/chai-1.9.0.js
+++ /dev/null
@@ -1,4696 +0,0 @@
-;(function(){
-
-/**
- * Require the given path.
- *
- * @param {String} path
- * @return {Object} exports
- * @api public
- */
-
-function require(path, parent, orig) {
-  var resolved = require.resolve(path);
-
-  // lookup failed
-  if (null == resolved) {
-    orig = orig || path;
-    parent = parent || 'root';
-    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
-    err.path = orig;
-    err.parent = parent;
-    err.require = true;
-    throw err;
-  }
-
-  var module = require.modules[resolved];
-
-  // perform real require()
-  // by invoking the module's
-  // registered function
-  if (!module._resolving && !module.exports) {
-    var mod = {};
-    mod.exports = {};
-    mod.client = mod.component = true;
-    module._resolving = true;
-    module.call(this, mod.exports, require.relative(resolved), mod);
-    delete module._resolving;
-    module.exports = mod.exports;
-  }
-
-  return module.exports;
-}
-
-/**
- * Registered modules.
- */
-
-require.modules = {};
-
-/**
- * Registered aliases.
- */
-
-require.aliases = {};
-
-/**
- * Resolve `path`.
- *
- * Lookup:
- *
- *   - PATH/index.js
- *   - PATH.js
- *   - PATH
- *
- * @param {String} path
- * @return {String} path or null
- * @api private
- */
-
-require.resolve = function(path) {
-  if (path.charAt(0) === '/') path = path.slice(1);
-
-  var paths = [
-    path,
-    path + '.js',
-    path + '.json',
-    path + '/index.js',
-    path + '/index.json'
-  ];
-
-  for (var i = 0; i < paths.length; i++) {
-    var path = paths[i];
-    if (require.modules.hasOwnProperty(path)) return path;
-    if (require.aliases.hasOwnProperty(path)) return require.aliases[path];
-  }
-};
-
-/**
- * Normalize `path` relative to the current path.
- *
- * @param {String} curr
- * @param {String} path
- * @return {String}
- * @api private
- */
-
-require.normalize = function(curr, path) {
-  var segs = [];
-
-  if ('.' != path.charAt(0)) return path;
-
-  curr = curr.split('/');
-  path = path.split('/');
-
-  for (var i = 0; i < path.length; ++i) {
-    if ('..' == path[i]) {
-      curr.pop();
-    } else if ('.' != path[i] && '' != path[i]) {
-      segs.push(path[i]);
-    }
-  }
-
-  return curr.concat(segs).join('/');
-};
-
-/**
- * Register module at `path` with callback `definition`.
- *
- * @param {String} path
- * @param {Function} definition
- * @api private
- */
-
-require.register = function(path, definition) {
-  require.modules[path] = definition;
-};
-
-/**
- * Alias a module definition.
- *
- * @param {String} from
- * @param {String} to
- * @api private
- */
-
-require.alias = function(from, to) {
-  if (!require.modules.hasOwnProperty(from)) {
-    throw new Error('Failed to alias "' + from + '", it does not exist');
-  }
-  require.aliases[to] = from;
-};
-
-/**
- * Return a require function relative to the `parent` path.
- *
- * @param {String} parent
- * @return {Function}
- * @api private
- */
-
-require.relative = function(parent) {
-  var p = require.normalize(parent, '..');
-
-  /**
-   * lastIndexOf helper.
-   */
-
-  function lastIndexOf(arr, obj) {
-    var i = arr.length;
-    while (i--) {
-      if (arr[i] === obj) return i;
-    }
-    return -1;
-  }
-
-  /**
-   * The relative require() itself.
-   */
-
-  function localRequire(path) {
-    var resolved = localRequire.resolve(path);
-    return require(resolved, parent, path);
-  }
-
-  /**
-   * Resolve relative to the parent.
-   */
-
-  localRequire.resolve = function(path) {
-    var c = path.charAt(0);
-    if ('/' == c) return path.slice(1);
-    if ('.' == c) return require.normalize(p, path);
-
-    // resolve deps by returning
-    // the dep in the nearest "deps"
-    // directory
-    var segs = parent.split('/');
-    var i = lastIndexOf(segs, 'deps') + 1;
-    if (!i) i = 0;
-    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
-    return path;
-  };
-
-  /**
-   * Check if module is defined at `path`.
-   */
-
-  localRequire.exists = function(path) {
-    return require.modules.hasOwnProperty(localRequire.resolve(path));
-  };
-
-  return localRequire;
-};
-require.register("chaijs-assertion-error/index.js", function(exports, require, module){
-/*!
- * assertion-error
- * Copyright(c) 2013 Jake Luer <jake@qualiancy.com>
- * MIT Licensed
- */
-
-/*!
- * Return a function that will copy properties from
- * one object to another excluding any originally
- * listed. Returned function will create a new `{}`.
- *
- * @param {String} excluded properties ...
- * @return {Function}
- */
-
-function exclude () {
-  var excludes = [].slice.call(arguments);
-
-  function excludeProps (res, obj) {
-    Object.keys(obj).forEach(function (key) {
-      if (!~excludes.indexOf(key)) res[key] = obj[key];
-    });
-  }
-
-  return function extendExclude () {
-    var args = [].slice.call(arguments)
-      , i = 0
-      , res = {};
-
-    for (; i < args.length; i++) {
-      excludeProps(res, args[i]);
-    }
-
-    return res;
-  };
-};
-
-/*!
- * Primary Exports
- */
-
-module.exports = AssertionError;
-
-/**
- * ### AssertionError
- *
- * An extension of the JavaScript `Error` constructor for
- * assertion and validation scenarios.
- *
- * @param {String} message
- * @param {Object} properties to include (optional)
- * @param {callee} start stack function (optional)
- */
-
-function AssertionError (message, _props, ssf) {
-  var extend = exclude('name', 'message', 'stack', 'constructor', 'toJSON')
-    , props = extend(_props || {});
-
-  // default values
-  this.message = message || 'Unspecified AssertionError';
-  this.showDiff = false;
-
-  // copy from properties
-  for (var key in props) {
-    this[key] = props[key];
-  }
-
-  // capture stack trace
-  ssf = ssf || arguments.callee;
-  if (ssf && Error.captureStackTrace) {
-    Error.captureStackTrace(this, ssf);
-  }
-}
-
-/*!
- * Inherit from Error.prototype
- */
-
-AssertionError.prototype = Object.create(Error.prototype);
-
-/*!
- * Statically set name
- */
-
-AssertionError.prototype.name = 'AssertionError';
-
-/*!
- * Ensure correct constructor
- */
-
-AssertionError.prototype.constructor = AssertionError;
-
-/**
- * Allow errors to be converted to JSON for static transfer.
- *
- * @param {Boolean} include stack (default: `true`)
- * @return {Object} object that can be `JSON.stringify`
- */
-
-AssertionError.prototype.toJSON = function (stack) {
-  var extend = exclude('constructor', 'toJSON', 'stack')
-    , props = extend({ name: this.name }, this);
-
-  // include stack if exists and not turned off
-  if (false !== stack && this.stack) {
-    props.stack = this.stack;
-  }
-
-  return props;
-};
-
-});
-require.register("chaijs-type-detect/lib/type.js", function(exports, require, module){
-/*!
- * type-detect
- * Copyright(c) 2013 jake luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Primary Exports
- */
-
-var exports = module.exports = getType;
-
-/*!
- * Detectable javascript natives
- */
-
-var natives = {
-    '[object Array]': 'array'
-  , '[object RegExp]': 'regexp'
-  , '[object Function]': 'function'
-  , '[object Arguments]': 'arguments'
-  , '[object Date]': 'date'
-};
-
-/**
- * ### typeOf (obj)
- *
- * Use several different techniques to determine
- * the type of object being tested.
- *
- *
- * @param {Mixed} object
- * @return {String} object type
- * @api public
- */
-
-function getType (obj) {
-  var str = Object.prototype.toString.call(obj);
-  if (natives[str]) return natives[str];
-  if (obj === null) return 'null';
-  if (obj === undefined) return 'undefined';
-  if (obj === Object(obj)) return 'object';
-  return typeof obj;
-}
-
-exports.Library = Library;
-
-/**
- * ### Library
- *
- * Create a repository for custom type detection.
- *
- * ```js
- * var lib = new type.Library;
- * ```
- *
- */
-
-function Library () {
-  this.tests = {};
-}
-
-/**
- * #### .of (obj)
- *
- * Expose replacement `typeof` detection to the library.
- *
- * ```js
- * if ('string' === lib.of('hello world')) {
- *   // ...
- * }
- * ```
- *
- * @param {Mixed} object to test
- * @return {String} type
- */
-
-Library.prototype.of = getType;
-
-/**
- * #### .define (type, test)
- *
- * Add a test to for the `.test()` assertion.
- *
- * Can be defined as a regular expression:
- *
- * ```js
- * lib.define('int', /^[0-9]+$/);
- * ```
- *
- * ... or as a function:
- *
- * ```js
- * lib.define('bln', function (obj) {
- *   if ('boolean' === lib.of(obj)) return true;
- *   var blns = [ 'yes', 'no', 'true', 'false', 1, 0 ];
- *   if ('string' === lib.of(obj)) obj = obj.toLowerCase();
- *   return !! ~blns.indexOf(obj);
- * });
- * ```
- *
- * @param {String} type
- * @param {RegExp|Function} test
- * @api public
- */
-
-Library.prototype.define = function (type, test) {
-  if (arguments.length === 1) return this.tests[type];
-  this.tests[type] = test;
-  return this;
-};
-
-/**
- * #### .test (obj, test)
- *
- * Assert that an object is of type. Will first
- * check natives, and if that does not pass it will
- * use the user defined custom tests.
- *
- * ```js
- * assert(lib.test('1', 'int'));
- * assert(lib.test('yes', 'bln'));
- * ```
- *
- * @param {Mixed} object
- * @param {String} type
- * @return {Boolean} result
- * @api public
- */
-
-Library.prototype.test = function (obj, type) {
-  if (type === getType(obj)) return true;
-  var test = this.tests[type];
-
-  if (test && 'regexp' === getType(test)) {
-    return test.test(obj);
-  } else if (test && 'function' === getType(test)) {
-    return test(obj);
-  } else {
-    throw new ReferenceError('Type test "' + type + '" not defined or invalid.');
-  }
-};
-
-});
-require.register("chaijs-deep-eql/lib/eql.js", function(exports, require, module){
-/*!
- * deep-eql
- * Copyright(c) 2013 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependencies
- */
-
-var type = require('type-detect');
-
-/*!
- * Buffer.isBuffer browser shim
- */
-
-var Buffer;
-try { Buffer = require('buffer').Buffer; }
-catch(ex) {
-  Buffer = {};
-  Buffer.isBuffer = function() { return false; }
-}
-
-/*!
- * Primary Export
- */
-
-module.exports = deepEqual;
-
-/**
- * Assert super-strict (egal) equality between
- * two objects of any type.
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @param {Array} memoised (optional)
- * @return {Boolean} equal match
- */
-
-function deepEqual(a, b, m) {
-  if (sameValue(a, b)) {
-    return true;
-  } else if ('date' === type(a)) {
-    return dateEqual(a, b);
-  } else if ('regexp' === type(a)) {
-    return regexpEqual(a, b);
-  } else if (Buffer.isBuffer(a)) {
-    return bufferEqual(a, b);
-  } else if ('arguments' === type(a)) {
-    return argumentsEqual(a, b, m);
-  } else if (!typeEqual(a, b)) {
-    return false;
-  } else if (('object' !== type(a) && 'object' !== type(b))
-  && ('array' !== type(a) && 'array' !== type(b))) {
-    return sameValue(a, b);
-  } else {
-    return objectEqual(a, b, m);
-  }
-}
-
-/*!
- * Strict (egal) equality test. Ensures that NaN always
- * equals NaN and `-0` does not equal `+0`.
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @return {Boolean} equal match
- */
-
-function sameValue(a, b) {
-  if (a === b) return a !== 0 || 1 / a === 1 / b;
-  return a !== a && b !== b;
-}
-
-/*!
- * Compare the types of two given objects and
- * return if they are equal. Note that an Array
- * has a type of `array` (not `object`) and arguments
- * have a type of `arguments` (not `array`/`object`).
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @return {Boolean} result
- */
-
-function typeEqual(a, b) {
-  return type(a) === type(b);
-}
-
-/*!
- * Compare two Date objects by asserting that
- * the time values are equal using `saveValue`.
- *
- * @param {Date} a
- * @param {Date} b
- * @return {Boolean} result
- */
-
-function dateEqual(a, b) {
-  if ('date' !== type(b)) return false;
-  return sameValue(a.getTime(), b.getTime());
-}
-
-/*!
- * Compare two regular expressions by converting them
- * to string and checking for `sameValue`.
- *
- * @param {RegExp} a
- * @param {RegExp} b
- * @return {Boolean} result
- */
-
-function regexpEqual(a, b) {
-  if ('regexp' !== type(b)) return false;
-  return sameValue(a.toString(), b.toString());
-}
-
-/*!
- * Assert deep equality of two `arguments` objects.
- * Unfortunately, these must be sliced to arrays
- * prior to test to ensure no bad behavior.
- *
- * @param {Arguments} a
- * @param {Arguments} b
- * @param {Array} memoize (optional)
- * @return {Boolean} result
- */
-
-function argumentsEqual(a, b, m) {
-  if ('arguments' !== type(b)) return false;
-  a = [].slice.call(a);
-  b = [].slice.call(b);
-  return deepEqual(a, b, m);
-}
-
-/*!
- * Get enumerable properties of a given object.
- *
- * @param {Object} a
- * @return {Array} property names
- */
-
-function enumerable(a) {
-  var res = [];
-  for (var key in a) res.push(key);
-  return res;
-}
-
-/*!
- * Simple equality for flat iterable objects
- * such as Arrays or Node.js buffers.
- *
- * @param {Iterable} a
- * @param {Iterable} b
- * @return {Boolean} result
- */
-
-function iterableEqual(a, b) {
-  if (a.length !==  b.length) return false;
-
-  var i = 0;
-  var match = true;
-
-  for (; i < a.length; i++) {
-    if (a[i] !== b[i]) {
-      match = false;
-      break;
-    }
-  }
-
-  return match;
-}
-
-/*!
- * Extension to `iterableEqual` specifically
- * for Node.js Buffers.
- *
- * @param {Buffer} a
- * @param {Mixed} b
- * @return {Boolean} result
- */
-
-function bufferEqual(a, b) {
-  if (!Buffer.isBuffer(b)) return false;
-  return iterableEqual(a, b);
-}
-
-/*!
- * Block for `objectEqual` ensuring non-existing
- * values don't get in.
- *
- * @param {Mixed} object
- * @return {Boolean} result
- */
-
-function isValue(a) {
-  return a !== null && a !== undefined;
-}
-
-/*!
- * Recursively check the equality of two objects.
- * Once basic sameness has been established it will
- * defer to `deepEqual` for each enumerable key
- * in the object.
- *
- * @param {Mixed} a
- * @param {Mixed} b
- * @return {Boolean} result
- */
-
-function objectEqual(a, b, m) {
-  if (!isValue(a) || !isValue(b)) {
-    return false;
-  }
-
-  if (a.prototype !== b.prototype) {
-    return false;
-  }
-
-  var i;
-  if (m) {
-    for (i = 0; i < m.length; i++) {
-      if ((m[i][0] === a && m[i][1] === b)
-      ||  (m[i][0] === b && m[i][1] === a)) {
-        return true;
-      }
-    }
-  } else {
-    m = [];
-  }
-
-  try {
-    var ka = enumerable(a);
-    var kb = enumerable(b);
-  } catch (ex) {
-    return false;
-  }
-
-  ka.sort();
-  kb.sort();
-
-  if (!iterableEqual(ka, kb)) {
-    return false;
-  }
-
-  m.push([ a, b ]);
-
-  var key;
-  for (i = ka.length - 1; i >= 0; i--) {
-    key = ka[i];
-    if (!deepEqual(a[key], b[key], m)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-});
-require.register("chai/index.js", function(exports, require, module){
-module.exports = require('./lib/chai');
-
-});
-require.register("chai/lib/chai.js", function(exports, require, module){
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-var used = []
-  , exports = module.exports = {};
-
-/*!
- * Chai version
- */
-
-exports.version = '1.8.1';
-
-/*!
- * Assertion Error
- */
-
-exports.AssertionError = require('assertion-error');
-
-/*!
- * Utils for plugins (not exported)
- */
-
-var util = require('./chai/utils');
-
-/**
- * # .use(function)
- *
- * Provides a way to extend the internals of Chai
- *
- * @param {Function}
- * @returns {this} for chaining
- * @api public
- */
-
-exports.use = function (fn) {
-  if (!~used.indexOf(fn)) {
-    fn(this, util);
-    used.push(fn);
-  }
-
-  return this;
-};
-
-/*!
- * Primary `Assertion` prototype
- */
-
-var assertion = require('./chai/assertion');
-exports.use(assertion);
-
-/*!
- * Core Assertions
- */
-
-var core = require('./chai/core/assertions');
-exports.use(core);
-
-/*!
- * Expect interface
- */
-
-var expect = require('./chai/interface/expect');
-exports.use(expect);
-
-/*!
- * Should interface
- */
-
-var should = require('./chai/interface/should');
-exports.use(should);
-
-/*!
- * Assert interface
- */
-
-var assert = require('./chai/interface/assert');
-exports.use(assert);
-
-});
-require.register("chai/lib/chai/assertion.js", function(exports, require, module){
-/*!
- * chai
- * http://chaijs.com
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-module.exports = function (_chai, util) {
-  /*!
-   * Module dependencies.
-   */
-
-  var AssertionError = _chai.AssertionError
-    , flag = util.flag;
-
-  /*!
-   * Module export.
-   */
-
-  _chai.Assertion = Assertion;
-
-  /*!
-   * Assertion Constructor
-   *
-   * Creates object for chaining.
-   *
-   * @api private
-   */
-
-  function Assertion (obj, msg, stack) {
-    flag(this, 'ssfi', stack || arguments.callee);
-    flag(this, 'object', obj);
-    flag(this, 'message', msg);
-  }
-
-  /*!
-    * ### Assertion.includeStack
-    *
-    * User configurable property, influences whether stack trace
-    * is included in Assertion error message. Default of false
-    * suppresses stack trace in the error message
-    *
-    *     Assertion.includeStack = true;  // enable stack on error
-    *
-    * @api public
-    */
-
-  Assertion.includeStack = false;
-
-  /*!
-   * ### Assertion.showDiff
-   *
-   * User configurable property, influences whether or not
-   * the `showDiff` flag should be included in the thrown
-   * AssertionErrors. `false` will always be `false`; `true`
-   * will be true when the assertion has requested a diff
-   * be shown.
-   *
-   * @api public
-   */
-
-  Assertion.showDiff = true;
-
-  Assertion.addProperty = function (name, fn) {
-    util.addProperty(this.prototype, name, fn);
-  };
-
-  Assertion.addMethod = function (name, fn) {
-    util.addMethod(this.prototype, name, fn);
-  };
-
-  Assertion.addChainableMethod = function (name, fn, chainingBehavior) {
-    util.addChainableMethod(this.prototype, name, fn, chainingBehavior);
-  };
-
-  Assertion.overwriteProperty = function (name, fn) {
-    util.overwriteProperty(this.prototype, name, fn);
-  };
-
-  Assertion.overwriteMethod = function (name, fn) {
-    util.overwriteMethod(this.prototype, name, fn);
-  };
-
-  Assertion.overwriteChainableMethod = function (name, fn, chainingBehavior) {
-    util.overwriteChainableMethod(this.prototype, name, fn, chainingBehavior);
-  };
-
-  /*!
-   * ### .assert(expression, message, negateMessage, expected, actual)
-   *
-   * Executes an expression and check expectations. Throws AssertionError for reporting if test doesn't pass.
-   *
-   * @name assert
-   * @param {Philosophical} expression to be tested
-   * @param {String} message to display if fails
-   * @param {String} negatedMessage to display if negated expression fails
-   * @param {Mixed} expected value (remember to check for negation)
-   * @param {Mixed} actual (optional) will default to `this.obj`
-   * @api private
-   */
-
-  Assertion.prototype.assert = function (expr, msg, negateMsg, expected, _actual, showDiff) {
-    var ok = util.test(this, arguments);
-    if (true !== showDiff) showDiff = false;
-    if (true !== Assertion.showDiff) showDiff = false;
-
-    if (!ok) {
-      var msg = util.getMessage(this, arguments)
-        , actual = util.getActual(this, arguments);
-      throw new AssertionError(msg, {
-          actual: actual
-        , expected: expected
-        , showDiff: showDiff
-      }, (Assertion.includeStack) ? this.assert : flag(this, 'ssfi'));
-    }
-  };
-
-  /*!
-   * ### ._obj
-   *
-   * Quick reference to stored `actual` value for plugin developers.
-   *
-   * @api private
-   */
-
-  Object.defineProperty(Assertion.prototype, '_obj',
-    { get: function () {
-        return flag(this, 'object');
-      }
-    , set: function (val) {
-        flag(this, 'object', val);
-      }
-  });
-};
-
-});
-require.register("chai/lib/chai/core/assertions.js", function(exports, require, module){
-/*!
- * chai
- * http://chaijs.com
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-module.exports = function (chai, _) {
-  var Assertion = chai.Assertion
-    , toString = Object.prototype.toString
-    , flag = _.flag;
-
-  /**
-   * ### Language Chains
-   *
-   * The following are provided as chainable getters to
-   * improve the readability of your assertions. They
-   * do not provide an testing capability unless they
-   * have been overwritten by a plugin.
-   *
-   * **Chains**
-   *
-   * - to
-   * - be
-   * - been
-   * - is
-   * - that
-   * - and
-   * - has
-   * - have
-   * - with
-   * - at
-   * - of
-   * - same
-   *
-   * @name language chains
-   * @api public
-   */
-
-  [ 'to', 'be', 'been'
-  , 'is', 'and', 'has', 'have'
-  , 'with', 'that', 'at'
-  , 'of', 'same' ].forEach(function (chain) {
-    Assertion.addProperty(chain, function () {
-      return this;
-    });
-  });
-
-  /**
-   * ### .not
-   *
-   * Negates any of assertions following in the chain.
-   *
-   *     expect(foo).to.not.equal('bar');
-   *     expect(goodFn).to.not.throw(Error);
-   *     expect({ foo: 'baz' }).to.have.property('foo')
-   *       .and.not.equal('bar');
-   *
-   * @name not
-   * @api public
-   */
-
-  Assertion.addProperty('not', function () {
-    flag(this, 'negate', true);
-  });
-
-  /**
-   * ### .deep
-   *
-   * Sets the `deep` flag, later used by the `equal` and
-   * `property` assertions.
-   *
-   *     expect(foo).to.deep.equal({ bar: 'baz' });
-   *     expect({ foo: { bar: { baz: 'quux' } } })
-   *       .to.have.deep.property('foo.bar.baz', 'quux');
-   *
-   * @name deep
-   * @api public
-   */
-
-  Assertion.addProperty('deep', function () {
-    flag(this, 'deep', true);
-  });
-
-  /**
-   * ### .a(type)
-   *
-   * The `a` and `an` assertions are aliases that can be
-   * used either as language chains or to assert a value's
-   * type.
-   *
-   *     // typeof
-   *     expect('test').to.be.a('string');
-   *     expect({ foo: 'bar' }).to.be.an('object');
-   *     expect(null).to.be.a('null');
-   *     expect(undefined).to.be.an('undefined');
-   *
-   *     // language chain
-   *     expect(foo).to.be.an.instanceof(Foo);
-   *
-   * @name a
-   * @alias an
-   * @param {String} type
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function an (type, msg) {
-    if (msg) flag(this, 'message', msg);
-    type = type.toLowerCase();
-    var obj = flag(this, 'object')
-      , article = ~[ 'a', 'e', 'i', 'o', 'u' ].indexOf(type.charAt(0)) ? 'an ' : 'a ';
-
-    this.assert(
-        type === _.type(obj)
-      , 'expected #{this} to be ' + article + type
-      , 'expected #{this} not to be ' + article + type
-    );
-  }
-
-  Assertion.addChainableMethod('an', an);
-  Assertion.addChainableMethod('a', an);
-
-  /**
-   * ### .include(value)
-   *
-   * The `include` and `contain` assertions can be used as either property
-   * based language chains or as methods to assert the inclusion of an object
-   * in an array or a substring in a string. When used as language chains,
-   * they toggle the `contain` flag for the `keys` assertion.
-   *
-   *     expect([1,2,3]).to.include(2);
-   *     expect('foobar').to.contain('foo');
-   *     expect({ foo: 'bar', hello: 'universe' }).to.include.keys('foo');
-   *
-   * @name include
-   * @alias contain
-   * @param {Object|String|Number} obj
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function includeChainingBehavior () {
-    flag(this, 'contains', true);
-  }
-
-  function include (val, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-
-    if (_.type(val) === 'object') {
-      if (!flag(this, 'negate')) {
-        for (var k in val) new Assertion(obj).property(k, val[k]);
-        return;
-      }
-      var subset = {}
-      for (var k in val) subset[k] = obj[k]
-      var expected = _.eql(subset, val);
-    } else {
-      var expected = obj && ~obj.indexOf(val)
-    }
-    this.assert(
-        expected
-      , 'expected #{this} to include ' + _.inspect(val)
-      , 'expected #{this} to not include ' + _.inspect(val));
-  }
-
-  Assertion.addChainableMethod('include', include, includeChainingBehavior);
-  Assertion.addChainableMethod('contain', include, includeChainingBehavior);
-
-  /**
-   * ### .ok
-   *
-   * Asserts that the target is truthy.
-   *
-   *     expect('everthing').to.be.ok;
-   *     expect(1).to.be.ok;
-   *     expect(false).to.not.be.ok;
-   *     expect(undefined).to.not.be.ok;
-   *     expect(null).to.not.be.ok;
-   *
-   * @name ok
-   * @api public
-   */
-
-  Assertion.addProperty('ok', function () {
-    this.assert(
-        flag(this, 'object')
-      , 'expected #{this} to be truthy'
-      , 'expected #{this} to be falsy');
-  });
-
-  /**
-   * ### .true
-   *
-   * Asserts that the target is `true`.
-   *
-   *     expect(true).to.be.true;
-   *     expect(1).to.not.be.true;
-   *
-   * @name true
-   * @api public
-   */
-
-  Assertion.addProperty('true', function () {
-    this.assert(
-        true === flag(this, 'object')
-      , 'expected #{this} to be true'
-      , 'expected #{this} to be false'
-      , this.negate ? false : true
-    );
-  });
-
-  /**
-   * ### .false
-   *
-   * Asserts that the target is `false`.
-   *
-   *     expect(false).to.be.false;
-   *     expect(0).to.not.be.false;
-   *
-   * @name false
-   * @api public
-   */
-
-  Assertion.addProperty('false', function () {
-    this.assert(
-        false === flag(this, 'object')
-      , 'expected #{this} to be false'
-      , 'expected #{this} to be true'
-      , this.negate ? true : false
-    );
-  });
-
-  /**
-   * ### .null
-   *
-   * Asserts that the target is `null`.
-   *
-   *     expect(null).to.be.null;
-   *     expect(undefined).not.to.be.null;
-   *
-   * @name null
-   * @api public
-   */
-
-  Assertion.addProperty('null', function () {
-    this.assert(
-        null === flag(this, 'object')
-      , 'expected #{this} to be null'
-      , 'expected #{this} not to be null'
-    );
-  });
-
-  /**
-   * ### .undefined
-   *
-   * Asserts that the target is `undefined`.
-   *
-   *     expect(undefined).to.be.undefined;
-   *     expect(null).to.not.be.undefined;
-   *
-   * @name undefined
-   * @api public
-   */
-
-  Assertion.addProperty('undefined', function () {
-    this.assert(
-        undefined === flag(this, 'object')
-      , 'expected #{this} to be undefined'
-      , 'expected #{this} not to be undefined'
-    );
-  });
-
-  /**
-   * ### .exist
-   *
-   * Asserts that the target is neither `null` nor `undefined`.
-   *
-   *     var foo = 'hi'
-   *       , bar = null
-   *       , baz;
-   *
-   *     expect(foo).to.exist;
-   *     expect(bar).to.not.exist;
-   *     expect(baz).to.not.exist;
-   *
-   * @name exist
-   * @api public
-   */
-
-  Assertion.addProperty('exist', function () {
-    this.assert(
-        null != flag(this, 'object')
-      , 'expected #{this} to exist'
-      , 'expected #{this} to not exist'
-    );
-  });
-
-
-  /**
-   * ### .empty
-   *
-   * Asserts that the target's length is `0`. For arrays, it checks
-   * the `length` property. For objects, it gets the count of
-   * enumerable keys.
-   *
-   *     expect([]).to.be.empty;
-   *     expect('').to.be.empty;
-   *     expect({}).to.be.empty;
-   *
-   * @name empty
-   * @api public
-   */
-
-  Assertion.addProperty('empty', function () {
-    var obj = flag(this, 'object')
-      , expected = obj;
-
-    if (Array.isArray(obj) || 'string' === typeof object) {
-      expected = obj.length;
-    } else if (typeof obj === 'object') {
-      expected = Object.keys(obj).length;
-    }
-
-    this.assert(
-        !expected
-      , 'expected #{this} to be empty'
-      , 'expected #{this} not to be empty'
-    );
-  });
-
-  /**
-   * ### .arguments
-   *
-   * Asserts that the target is an arguments object.
-   *
-   *     function test () {
-   *       expect(arguments).to.be.arguments;
-   *     }
-   *
-   * @name arguments
-   * @alias Arguments
-   * @api public
-   */
-
-  function checkArguments () {
-    var obj = flag(this, 'object')
-      , type = Object.prototype.toString.call(obj);
-    this.assert(
-        '[object Arguments]' === type
-      , 'expected #{this} to be arguments but got ' + type
-      , 'expected #{this} to not be arguments'
-    );
-  }
-
-  Assertion.addProperty('arguments', checkArguments);
-  Assertion.addProperty('Arguments', checkArguments);
-
-  /**
-   * ### .equal(value)
-   *
-   * Asserts that the target is strictly equal (`===`) to `value`.
-   * Alternately, if the `deep` flag is set, asserts that
-   * the target is deeply equal to `value`.
-   *
-   *     expect('hello').to.equal('hello');
-   *     expect(42).to.equal(42);
-   *     expect(1).to.not.equal(true);
-   *     expect({ foo: 'bar' }).to.not.equal({ foo: 'bar' });
-   *     expect({ foo: 'bar' }).to.deep.equal({ foo: 'bar' });
-   *
-   * @name equal
-   * @alias equals
-   * @alias eq
-   * @alias deep.equal
-   * @param {Mixed} value
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertEqual (val, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    if (flag(this, 'deep')) {
-      return this.eql(val);
-    } else {
-      this.assert(
-          val === obj
-        , 'expected #{this} to equal #{exp}'
-        , 'expected #{this} to not equal #{exp}'
-        , val
-        , this._obj
-        , true
-      );
-    }
-  }
-
-  Assertion.addMethod('equal', assertEqual);
-  Assertion.addMethod('equals', assertEqual);
-  Assertion.addMethod('eq', assertEqual);
-
-  /**
-   * ### .eql(value)
-   *
-   * Asserts that the target is deeply equal to `value`.
-   *
-   *     expect({ foo: 'bar' }).to.eql({ foo: 'bar' });
-   *     expect([ 1, 2, 3 ]).to.eql([ 1, 2, 3 ]);
-   *
-   * @name eql
-   * @alias eqls
-   * @param {Mixed} value
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertEql(obj, msg) {
-    if (msg) flag(this, 'message', msg);
-    this.assert(
-        _.eql(obj, flag(this, 'object'))
-      , 'expected #{this} to deeply equal #{exp}'
-      , 'expected #{this} to not deeply equal #{exp}'
-      , obj
-      , this._obj
-      , true
-    );
-  }
-
-  Assertion.addMethod('eql', assertEql);
-  Assertion.addMethod('eqls', assertEql);
-
-  /**
-   * ### .above(value)
-   *
-   * Asserts that the target is greater than `value`.
-   *
-   *     expect(10).to.be.above(5);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a minimum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.above(2);
-   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
-   *
-   * @name above
-   * @alias gt
-   * @alias greaterThan
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertAbove (n, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    if (flag(this, 'doLength')) {
-      new Assertion(obj, msg).to.have.property('length');
-      var len = obj.length;
-      this.assert(
-          len > n
-        , 'expected #{this} to have a length above #{exp} but got #{act}'
-        , 'expected #{this} to not have a length above #{exp}'
-        , n
-        , len
-      );
-    } else {
-      this.assert(
-          obj > n
-        , 'expected #{this} to be above ' + n
-        , 'expected #{this} to be at most ' + n
-      );
-    }
-  }
-
-  Assertion.addMethod('above', assertAbove);
-  Assertion.addMethod('gt', assertAbove);
-  Assertion.addMethod('greaterThan', assertAbove);
-
-  /**
-   * ### .least(value)
-   *
-   * Asserts that the target is greater than or equal to `value`.
-   *
-   *     expect(10).to.be.at.least(10);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a minimum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.of.at.least(2);
-   *     expect([ 1, 2, 3 ]).to.have.length.of.at.least(3);
-   *
-   * @name least
-   * @alias gte
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertLeast (n, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    if (flag(this, 'doLength')) {
-      new Assertion(obj, msg).to.have.property('length');
-      var len = obj.length;
-      this.assert(
-          len >= n
-        , 'expected #{this} to have a length at least #{exp} but got #{act}'
-        , 'expected #{this} to have a length below #{exp}'
-        , n
-        , len
-      );
-    } else {
-      this.assert(
-          obj >= n
-        , 'expected #{this} to be at least ' + n
-        , 'expected #{this} to be below ' + n
-      );
-    }
-  }
-
-  Assertion.addMethod('least', assertLeast);
-  Assertion.addMethod('gte', assertLeast);
-
-  /**
-   * ### .below(value)
-   *
-   * Asserts that the target is less than `value`.
-   *
-   *     expect(5).to.be.below(10);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a maximum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.below(4);
-   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
-   *
-   * @name below
-   * @alias lt
-   * @alias lessThan
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertBelow (n, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    if (flag(this, 'doLength')) {
-      new Assertion(obj, msg).to.have.property('length');
-      var len = obj.length;
-      this.assert(
-          len < n
-        , 'expected #{this} to have a length below #{exp} but got #{act}'
-        , 'expected #{this} to not have a length below #{exp}'
-        , n
-        , len
-      );
-    } else {
-      this.assert(
-          obj < n
-        , 'expected #{this} to be below ' + n
-        , 'expected #{this} to be at least ' + n
-      );
-    }
-  }
-
-  Assertion.addMethod('below', assertBelow);
-  Assertion.addMethod('lt', assertBelow);
-  Assertion.addMethod('lessThan', assertBelow);
-
-  /**
-   * ### .most(value)
-   *
-   * Asserts that the target is less than or equal to `value`.
-   *
-   *     expect(5).to.be.at.most(5);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a maximum length. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.of.at.most(4);
-   *     expect([ 1, 2, 3 ]).to.have.length.of.at.most(3);
-   *
-   * @name most
-   * @alias lte
-   * @param {Number} value
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertMost (n, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    if (flag(this, 'doLength')) {
-      new Assertion(obj, msg).to.have.property('length');
-      var len = obj.length;
-      this.assert(
-          len <= n
-        , 'expected #{this} to have a length at most #{exp} but got #{act}'
-        , 'expected #{this} to have a length above #{exp}'
-        , n
-        , len
-      );
-    } else {
-      this.assert(
-          obj <= n
-        , 'expected #{this} to be at most ' + n
-        , 'expected #{this} to be above ' + n
-      );
-    }
-  }
-
-  Assertion.addMethod('most', assertMost);
-  Assertion.addMethod('lte', assertMost);
-
-  /**
-   * ### .within(start, finish)
-   *
-   * Asserts that the target is within a range.
-   *
-   *     expect(7).to.be.within(5,10);
-   *
-   * Can also be used in conjunction with `length` to
-   * assert a length range. The benefit being a
-   * more informative error message than if the length
-   * was supplied directly.
-   *
-   *     expect('foo').to.have.length.within(2,4);
-   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
-   *
-   * @name within
-   * @param {Number} start lowerbound inclusive
-   * @param {Number} finish upperbound inclusive
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  Assertion.addMethod('within', function (start, finish, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object')
-      , range = start + '..' + finish;
-    if (flag(this, 'doLength')) {
-      new Assertion(obj, msg).to.have.property('length');
-      var len = obj.length;
-      this.assert(
-          len >= start && len <= finish
-        , 'expected #{this} to have a length within ' + range
-        , 'expected #{this} to not have a length within ' + range
-      );
-    } else {
-      this.assert(
-          obj >= start && obj <= finish
-        , 'expected #{this} to be within ' + range
-        , 'expected #{this} to not be within ' + range
-      );
-    }
-  });
-
-  /**
-   * ### .instanceof(constructor)
-   *
-   * Asserts that the target is an instance of `constructor`.
-   *
-   *     var Tea = function (name) { this.name = name; }
-   *       , Chai = new Tea('chai');
-   *
-   *     expect(Chai).to.be.an.instanceof(Tea);
-   *     expect([ 1, 2, 3 ]).to.be.instanceof(Array);
-   *
-   * @name instanceof
-   * @param {Constructor} constructor
-   * @param {String} message _optional_
-   * @alias instanceOf
-   * @api public
-   */
-
-  function assertInstanceOf (constructor, msg) {
-    if (msg) flag(this, 'message', msg);
-    var name = _.getName(constructor);
-    this.assert(
-        flag(this, 'object') instanceof constructor
-      , 'expected #{this} to be an instance of ' + name
-      , 'expected #{this} to not be an instance of ' + name
-    );
-  };
-
-  Assertion.addMethod('instanceof', assertInstanceOf);
-  Assertion.addMethod('instanceOf', assertInstanceOf);
-
-  /**
-   * ### .property(name, [value])
-   *
-   * Asserts that the target has a property `name`, optionally asserting that
-   * the value of that property is strictly equal to  `value`.
-   * If the `deep` flag is set, you can use dot- and bracket-notation for deep
-   * references into objects and arrays.
-   *
-   *     // simple referencing
-   *     var obj = { foo: 'bar' };
-   *     expect(obj).to.have.property('foo');
-   *     expect(obj).to.have.property('foo', 'bar');
-   *
-   *     // deep referencing
-   *     var deepObj = {
-   *         green: { tea: 'matcha' }
-   *       , teas: [ 'chai', 'matcha', { tea: 'konacha' } ]
-   *     };
-
-   *     expect(deepObj).to.have.deep.property('green.tea', 'matcha');
-   *     expect(deepObj).to.have.deep.property('teas[1]', 'matcha');
-   *     expect(deepObj).to.have.deep.property('teas[2].tea', 'konacha');
-   *
-   * You can also use an array as the starting point of a `deep.property`
-   * assertion, or traverse nested arrays.
-   *
-   *     var arr = [
-   *         [ 'chai', 'matcha', 'konacha' ]
-   *       , [ { tea: 'chai' }
-   *         , { tea: 'matcha' }
-   *         , { tea: 'konacha' } ]
-   *     ];
-   *
-   *     expect(arr).to.have.deep.property('[0][1]', 'matcha');
-   *     expect(arr).to.have.deep.property('[1][2].tea', 'konacha');
-   *
-   * Furthermore, `property` changes the subject of the assertion
-   * to be the value of that property from the original object. This
-   * permits for further chainable assertions on that property.
-   *
-   *     expect(obj).to.have.property('foo')
-   *       .that.is.a('string');
-   *     expect(deepObj).to.have.property('green')
-   *       .that.is.an('object')
-   *       .that.deep.equals({ tea: 'matcha' });
-   *     expect(deepObj).to.have.property('teas')
-   *       .that.is.an('array')
-   *       .with.deep.property('[2]')
-   *         .that.deep.equals({ tea: 'konacha' });
-   *
-   * @name property
-   * @alias deep.property
-   * @param {String} name
-   * @param {Mixed} value (optional)
-   * @param {String} message _optional_
-   * @returns value of property for chaining
-   * @api public
-   */
-
-  Assertion.addMethod('property', function (name, val, msg) {
-    if (msg) flag(this, 'message', msg);
-
-    var descriptor = flag(this, 'deep') ? 'deep property ' : 'property '
-      , negate = flag(this, 'negate')
-      , obj = flag(this, 'object')
-      , value = flag(this, 'deep')
-        ? _.getPathValue(name, obj)
-        : obj[name];
-
-    if (negate && undefined !== val) {
-      if (undefined === value) {
-        msg = (msg != null) ? msg + ': ' : '';
-        throw new Error(msg + _.inspect(obj) + ' has no ' + descriptor + _.inspect(name));
-      }
-    } else {
-      this.assert(
-          undefined !== value
-        , 'expected #{this} to have a ' + descriptor + _.inspect(name)
-        , 'expected #{this} to not have ' + descriptor + _.inspect(name));
-    }
-
-    if (undefined !== val) {
-      this.assert(
-          val === value
-        , 'expected #{this} to have a ' + descriptor + _.inspect(name) + ' of #{exp}, but got #{act}'
-        , 'expected #{this} to not have a ' + descriptor + _.inspect(name) + ' of #{act}'
-        , val
-        , value
-      );
-    }
-
-    flag(this, 'object', value);
-  });
-
-
-  /**
-   * ### .ownProperty(name)
-   *
-   * Asserts that the target has an own property `name`.
-   *
-   *     expect('test').to.have.ownProperty('length');
-   *
-   * @name ownProperty
-   * @alias haveOwnProperty
-   * @param {String} name
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertOwnProperty (name, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    this.assert(
-        obj.hasOwnProperty(name)
-      , 'expected #{this} to have own property ' + _.inspect(name)
-      , 'expected #{this} to not have own property ' + _.inspect(name)
-    );
-  }
-
-  Assertion.addMethod('ownProperty', assertOwnProperty);
-  Assertion.addMethod('haveOwnProperty', assertOwnProperty);
-
-  /**
-   * ### .length(value)
-   *
-   * Asserts that the target's `length` property has
-   * the expected value.
-   *
-   *     expect([ 1, 2, 3]).to.have.length(3);
-   *     expect('foobar').to.have.length(6);
-   *
-   * Can also be used as a chain precursor to a value
-   * comparison for the length property.
-   *
-   *     expect('foo').to.have.length.above(2);
-   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
-   *     expect('foo').to.have.length.below(4);
-   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
-   *     expect('foo').to.have.length.within(2,4);
-   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
-   *
-   * @name length
-   * @alias lengthOf
-   * @param {Number} length
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  function assertLengthChain () {
-    flag(this, 'doLength', true);
-  }
-
-  function assertLength (n, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    new Assertion(obj, msg).to.have.property('length');
-    var len = obj.length;
-
-    this.assert(
-        len == n
-      , 'expected #{this} to have a length of #{exp} but got #{act}'
-      , 'expected #{this} to not have a length of #{act}'
-      , n
-      , len
-    );
-  }
-
-  Assertion.addChainableMethod('length', assertLength, assertLengthChain);
-  Assertion.addMethod('lengthOf', assertLength, assertLengthChain);
-
-  /**
-   * ### .match(regexp)
-   *
-   * Asserts that the target matches a regular expression.
-   *
-   *     expect('foobar').to.match(/^foo/);
-   *
-   * @name match
-   * @param {RegExp} RegularExpression
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  Assertion.addMethod('match', function (re, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    this.assert(
-        re.exec(obj)
-      , 'expected #{this} to match ' + re
-      , 'expected #{this} not to match ' + re
-    );
-  });
-
-  /**
-   * ### .string(string)
-   *
-   * Asserts that the string target contains another string.
-   *
-   *     expect('foobar').to.have.string('bar');
-   *
-   * @name string
-   * @param {String} string
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  Assertion.addMethod('string', function (str, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    new Assertion(obj, msg).is.a('string');
-
-    this.assert(
-        ~obj.indexOf(str)
-      , 'expected #{this} to contain ' + _.inspect(str)
-      , 'expected #{this} to not contain ' + _.inspect(str)
-    );
-  });
-
-
-  /**
-   * ### .keys(key1, [key2], [...])
-   *
-   * Asserts that the target has exactly the given keys, or
-   * asserts the inclusion of some keys when using the
-   * `include` or `contain` modifiers.
-   *
-   *     expect({ foo: 1, bar: 2 }).to.have.keys(['foo', 'bar']);
-   *     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('foo', 'bar');
-   *
-   * @name keys
-   * @alias key
-   * @param {String...|Array} keys
-   * @api public
-   */
-
-  function assertKeys (keys) {
-    var obj = flag(this, 'object')
-      , str
-      , ok = true;
-
-    keys = keys instanceof Array
-      ? keys
-      : Array.prototype.slice.call(arguments);
-
-    if (!keys.length) throw new Error('keys required');
-
-    var actual = Object.keys(obj)
-      , len = keys.length;
-
-    // Inclusion
-    ok = keys.every(function(key){
-      return ~actual.indexOf(key);
-    });
-
-    // Strict
-    if (!flag(this, 'negate') && !flag(this, 'contains')) {
-      ok = ok && keys.length == actual.length;
-    }
-
-    // Key string
-    if (len > 1) {
-      keys = keys.map(function(key){
-        return _.inspect(key);
-      });
-      var last = keys.pop();
-      str = keys.join(', ') + ', and ' + last;
-    } else {
-      str = _.inspect(keys[0]);
-    }
-
-    // Form
-    str = (len > 1 ? 'keys ' : 'key ') + str;
-
-    // Have / include
-    str = (flag(this, 'contains') ? 'contain ' : 'have ') + str;
-
-    // Assertion
-    this.assert(
-        ok
-      , 'expected #{this} to ' + str
-      , 'expected #{this} to not ' + str
-    );
-  }
-
-  Assertion.addMethod('keys', assertKeys);
-  Assertion.addMethod('key', assertKeys);
-
-  /**
-   * ### .throw(constructor)
-   *
-   * Asserts that the function target will throw a specific error, or specific type of error
-   * (as determined using `instanceof`), optionally with a RegExp or string inclusion test
-   * for the error's message.
-   *
-   *     var err = new ReferenceError('This is a bad function.');
-   *     var fn = function () { throw err; }
-   *     expect(fn).to.throw(ReferenceError);
-   *     expect(fn).to.throw(Error);
-   *     expect(fn).to.throw(/bad function/);
-   *     expect(fn).to.not.throw('good function');
-   *     expect(fn).to.throw(ReferenceError, /bad function/);
-   *     expect(fn).to.throw(err);
-   *     expect(fn).to.not.throw(new RangeError('Out of range.'));
-   *
-   * Please note that when a throw expectation is negated, it will check each
-   * parameter independently, starting with error constructor type. The appropriate way
-   * to check for the existence of a type of error but for a message that does not match
-   * is to use `and`.
-   *
-   *     expect(fn).to.throw(ReferenceError)
-   *        .and.not.throw(/good function/);
-   *
-   * @name throw
-   * @alias throws
-   * @alias Throw
-   * @param {ErrorConstructor} constructor
-   * @param {String|RegExp} expected error message
-   * @param {String} message _optional_
-   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-   * @returns error for chaining (null if no error)
-   * @api public
-   */
-
-  function assertThrows (constructor, errMsg, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    new Assertion(obj, msg).is.a('function');
-
-    var thrown = false
-      , desiredError = null
-      , name = null
-      , thrownError = null;
-
-    if (arguments.length === 0) {
-      errMsg = null;
-      constructor = null;
-    } else if (constructor && (constructor instanceof RegExp || 'string' === typeof constructor)) {
-      errMsg = constructor;
-      constructor = null;
-    } else if (constructor && constructor instanceof Error) {
-      desiredError = constructor;
-      constructor = null;
-      errMsg = null;
-    } else if (typeof constructor === 'function') {
-      name = constructor.prototype.name || constructor.name;
-      if (name === 'Error' && constructor !== Error) {
-        name = (new constructor()).name;
-      }
-    } else {
-      constructor = null;
-    }
-
-    try {
-      obj();
-    } catch (err) {
-      // first, check desired error
-      if (desiredError) {
-        this.assert(
-            err === desiredError
-          , 'expected #{this} to throw #{exp} but #{act} was thrown'
-          , 'expected #{this} to not throw #{exp}'
-          , (desiredError instanceof Error ? desiredError.toString() : desiredError)
-          , (err instanceof Error ? err.toString() : err)
-        );
-
-        flag(this, 'object', err);
-        return this;
-      }
-
-      // next, check constructor
-      if (constructor) {
-        this.assert(
-            err instanceof constructor
-          , 'expected #{this} to throw #{exp} but #{act} was thrown'
-          , 'expected #{this} to not throw #{exp} but #{act} was thrown'
-          , name
-          , (err instanceof Error ? err.toString() : err)
-        );
-
-        if (!errMsg) {
-          flag(this, 'object', err);
-          return this;
-        }
-      }
-
-      // next, check message
-      var message = 'object' === _.type(err) && "message" in err
-        ? err.message
-        : '' + err;
-
-      if ((message != null) && errMsg && errMsg instanceof RegExp) {
-        this.assert(
-            errMsg.exec(message)
-          , 'expected #{this} to throw error matching #{exp} but got #{act}'
-          , 'expected #{this} to throw error not matching #{exp}'
-          , errMsg
-          , message
-        );
-
-        flag(this, 'object', err);
-        return this;
-      } else if ((message != null) && errMsg && 'string' === typeof errMsg) {
-        this.assert(
-            ~message.indexOf(errMsg)
-          , 'expected #{this} to throw error including #{exp} but got #{act}'
-          , 'expected #{this} to throw error not including #{act}'
-          , errMsg
-          , message
-        );
-
-        flag(this, 'object', err);
-        return this;
-      } else {
-        thrown = true;
-        thrownError = err;
-      }
-    }
-
-    var actuallyGot = ''
-      , expectedThrown = name !== null
-        ? name
-        : desiredError
-          ? '#{exp}' //_.inspect(desiredError)
-          : 'an error';
-
-    if (thrown) {
-      actuallyGot = ' but #{act} was thrown'
-    }
-
-    this.assert(
-        thrown === true
-      , 'expected #{this} to throw ' + expectedThrown + actuallyGot
-      , 'expected #{this} to not throw ' + expectedThrown + actuallyGot
-      , (desiredError instanceof Error ? desiredError.toString() : desiredError)
-      , (thrownError instanceof Error ? thrownError.toString() : thrownError)
-    );
-
-    flag(this, 'object', thrownError);
-  };
-
-  Assertion.addMethod('throw', assertThrows);
-  Assertion.addMethod('throws', assertThrows);
-  Assertion.addMethod('Throw', assertThrows);
-
-  /**
-   * ### .respondTo(method)
-   *
-   * Asserts that the object or class target will respond to a method.
-   *
-   *     Klass.prototype.bar = function(){};
-   *     expect(Klass).to.respondTo('bar');
-   *     expect(obj).to.respondTo('bar');
-   *
-   * To check if a constructor will respond to a static function,
-   * set the `itself` flag.
-   *
-   *     Klass.baz = function(){};
-   *     expect(Klass).itself.to.respondTo('baz');
-   *
-   * @name respondTo
-   * @param {String} method
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  Assertion.addMethod('respondTo', function (method, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object')
-      , itself = flag(this, 'itself')
-      , context = ('function' === _.type(obj) && !itself)
-        ? obj.prototype[method]
-        : obj[method];
-
-    this.assert(
-        'function' === typeof context
-      , 'expected #{this} to respond to ' + _.inspect(method)
-      , 'expected #{this} to not respond to ' + _.inspect(method)
-    );
-  });
-
-  /**
-   * ### .itself
-   *
-   * Sets the `itself` flag, later used by the `respondTo` assertion.
-   *
-   *     function Foo() {}
-   *     Foo.bar = function() {}
-   *     Foo.prototype.baz = function() {}
-   *
-   *     expect(Foo).itself.to.respondTo('bar');
-   *     expect(Foo).itself.not.to.respondTo('baz');
-   *
-   * @name itself
-   * @api public
-   */
-
-  Assertion.addProperty('itself', function () {
-    flag(this, 'itself', true);
-  });
-
-  /**
-   * ### .satisfy(method)
-   *
-   * Asserts that the target passes a given truth test.
-   *
-   *     expect(1).to.satisfy(function(num) { return num > 0; });
-   *
-   * @name satisfy
-   * @param {Function} matcher
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  Assertion.addMethod('satisfy', function (matcher, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    this.assert(
-        matcher(obj)
-      , 'expected #{this} to satisfy ' + _.objDisplay(matcher)
-      , 'expected #{this} to not satisfy' + _.objDisplay(matcher)
-      , this.negate ? false : true
-      , matcher(obj)
-    );
-  });
-
-  /**
-   * ### .closeTo(expected, delta)
-   *
-   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
-   *
-   *     expect(1.5).to.be.closeTo(1, 0.5);
-   *
-   * @name closeTo
-   * @param {Number} expected
-   * @param {Number} delta
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  Assertion.addMethod('closeTo', function (expected, delta, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-    this.assert(
-        Math.abs(obj - expected) <= delta
-      , 'expected #{this} to be close to ' + expected + ' +/- ' + delta
-      , 'expected #{this} not to be close to ' + expected + ' +/- ' + delta
-    );
-  });
-
-  function isSubsetOf(subset, superset) {
-    return subset.every(function(elem) {
-      return superset.indexOf(elem) !== -1;
-    })
-  }
-
-  /**
-   * ### .members(set)
-   *
-   * Asserts that the target is a superset of `set`,
-   * or that the target and `set` have the same members.
-   *
-   *     expect([1, 2, 3]).to.include.members([3, 2]);
-   *     expect([1, 2, 3]).to.not.include.members([3, 2, 8]);
-   *
-   *     expect([4, 2]).to.have.members([2, 4]);
-   *     expect([5, 2]).to.not.have.members([5, 2, 1]);
-   *
-   * @name members
-   * @param {Array} set
-   * @param {String} message _optional_
-   * @api public
-   */
-
-  Assertion.addMethod('members', function (subset, msg) {
-    if (msg) flag(this, 'message', msg);
-    var obj = flag(this, 'object');
-
-    new Assertion(obj).to.be.an('array');
-    new Assertion(subset).to.be.an('array');
-
-    if (flag(this, 'contains')) {
-      return this.assert(
-          isSubsetOf(subset, obj)
-        , 'expected #{this} to be a superset of #{act}'
-        , 'expected #{this} to not be a superset of #{act}'
-        , obj
-        , subset
-      );
-    }
-
-    this.assert(
-        isSubsetOf(obj, subset) && isSubsetOf(subset, obj)
-        , 'expected #{this} to have the same members as #{act}'
-        , 'expected #{this} to not have the same members as #{act}'
-        , obj
-        , subset
-    );
-  });
-};
-
-});
-require.register("chai/lib/chai/interface/assert.js", function(exports, require, module){
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-
-module.exports = function (chai, util) {
-
-  /*!
-   * Chai dependencies.
-   */
-
-  var Assertion = chai.Assertion
-    , flag = util.flag;
-
-  /*!
-   * Module export.
-   */
-
-  /**
-   * ### assert(expression, message)
-   *
-   * Write your own test expressions.
-   *
-   *     assert('foo' !== 'bar', 'foo is not bar');
-   *     assert(Array.isArray([]), 'empty arrays are arrays');
-   *
-   * @param {Mixed} expression to test for truthiness
-   * @param {String} message to display on error
-   * @name assert
-   * @api public
-   */
-
-  var assert = chai.assert = function (express, errmsg) {
-    var test = new Assertion(null);
-    test.assert(
-        express
-      , errmsg
-      , '[ negation message unavailable ]'
-    );
-  };
-
-  /**
-   * ### .fail(actual, expected, [message], [operator])
-   *
-   * Throw a failure. Node.js `assert` module-compatible.
-   *
-   * @name fail
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @param {String} operator
-   * @api public
-   */
-
-  assert.fail = function (actual, expected, message, operator) {
-    message = message || 'assert.fail()';
-    throw new chai.AssertionError(message, {
-        actual: actual
-      , expected: expected
-      , operator: operator
-    }, assert.fail);
-  };
-
-  /**
-   * ### .ok(object, [message])
-   *
-   * Asserts that `object` is truthy.
-   *
-   *     assert.ok('everything', 'everything is ok');
-   *     assert.ok(false, 'this will fail');
-   *
-   * @name ok
-   * @param {Mixed} object to test
-   * @param {String} message
-   * @api public
-   */
-
-  assert.ok = function (val, msg) {
-    new Assertion(val, msg).is.ok;
-  };
-
-  /**
-   * ### .notOk(object, [message])
-   *
-   * Asserts that `object` is falsy.
-   *
-   *     assert.notOk('everything', 'this will fail');
-   *     assert.notOk(false, 'this will pass');
-   *
-   * @name notOk
-   * @param {Mixed} object to test
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notOk = function (val, msg) {
-    new Assertion(val, msg).is.not.ok;
-  };
-
-  /**
-   * ### .equal(actual, expected, [message])
-   *
-   * Asserts non-strict equality (`==`) of `actual` and `expected`.
-   *
-   *     assert.equal(3, '3', '== coerces values to strings');
-   *
-   * @name equal
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @api public
-   */
-
-  assert.equal = function (act, exp, msg) {
-    var test = new Assertion(act, msg);
-
-    test.assert(
-        exp == flag(test, 'object')
-      , 'expected #{this} to equal #{exp}'
-      , 'expected #{this} to not equal #{act}'
-      , exp
-      , act
-    );
-  };
-
-  /**
-   * ### .notEqual(actual, expected, [message])
-   *
-   * Asserts non-strict inequality (`!=`) of `actual` and `expected`.
-   *
-   *     assert.notEqual(3, 4, 'these numbers are not equal');
-   *
-   * @name notEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notEqual = function (act, exp, msg) {
-    var test = new Assertion(act, msg);
-
-    test.assert(
-        exp != flag(test, 'object')
-      , 'expected #{this} to not equal #{exp}'
-      , 'expected #{this} to equal #{act}'
-      , exp
-      , act
-    );
-  };
-
-  /**
-   * ### .strictEqual(actual, expected, [message])
-   *
-   * Asserts strict equality (`===`) of `actual` and `expected`.
-   *
-   *     assert.strictEqual(true, true, 'these booleans are strictly equal');
-   *
-   * @name strictEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @api public
-   */
-
-  assert.strictEqual = function (act, exp, msg) {
-    new Assertion(act, msg).to.equal(exp);
-  };
-
-  /**
-   * ### .notStrictEqual(actual, expected, [message])
-   *
-   * Asserts strict inequality (`!==`) of `actual` and `expected`.
-   *
-   *     assert.notStrictEqual(3, '3', 'no coercion for strict equality');
-   *
-   * @name notStrictEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notStrictEqual = function (act, exp, msg) {
-    new Assertion(act, msg).to.not.equal(exp);
-  };
-
-  /**
-   * ### .deepEqual(actual, expected, [message])
-   *
-   * Asserts that `actual` is deeply equal to `expected`.
-   *
-   *     assert.deepEqual({ tea: 'green' }, { tea: 'green' });
-   *
-   * @name deepEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @api public
-   */
-
-  assert.deepEqual = function (act, exp, msg) {
-    new Assertion(act, msg).to.eql(exp);
-  };
-
-  /**
-   * ### .notDeepEqual(actual, expected, [message])
-   *
-   * Assert that `actual` is not deeply equal to `expected`.
-   *
-   *     assert.notDeepEqual({ tea: 'green' }, { tea: 'jasmine' });
-   *
-   * @name notDeepEqual
-   * @param {Mixed} actual
-   * @param {Mixed} expected
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notDeepEqual = function (act, exp, msg) {
-    new Assertion(act, msg).to.not.eql(exp);
-  };
-
-  /**
-   * ### .isTrue(value, [message])
-   *
-   * Asserts that `value` is true.
-   *
-   *     var teaServed = true;
-   *     assert.isTrue(teaServed, 'the tea has been served');
-   *
-   * @name isTrue
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isTrue = function (val, msg) {
-    new Assertion(val, msg).is['true'];
-  };
-
-  /**
-   * ### .isFalse(value, [message])
-   *
-   * Asserts that `value` is false.
-   *
-   *     var teaServed = false;
-   *     assert.isFalse(teaServed, 'no tea yet? hmm...');
-   *
-   * @name isFalse
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isFalse = function (val, msg) {
-    new Assertion(val, msg).is['false'];
-  };
-
-  /**
-   * ### .isNull(value, [message])
-   *
-   * Asserts that `value` is null.
-   *
-   *     assert.isNull(err, 'there was no error');
-   *
-   * @name isNull
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNull = function (val, msg) {
-    new Assertion(val, msg).to.equal(null);
-  };
-
-  /**
-   * ### .isNotNull(value, [message])
-   *
-   * Asserts that `value` is not null.
-   *
-   *     var tea = 'tasty chai';
-   *     assert.isNotNull(tea, 'great, time for tea!');
-   *
-   * @name isNotNull
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNotNull = function (val, msg) {
-    new Assertion(val, msg).to.not.equal(null);
-  };
-
-  /**
-   * ### .isUndefined(value, [message])
-   *
-   * Asserts that `value` is `undefined`.
-   *
-   *     var tea;
-   *     assert.isUndefined(tea, 'no tea defined');
-   *
-   * @name isUndefined
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isUndefined = function (val, msg) {
-    new Assertion(val, msg).to.equal(undefined);
-  };
-
-  /**
-   * ### .isDefined(value, [message])
-   *
-   * Asserts that `value` is not `undefined`.
-   *
-   *     var tea = 'cup of chai';
-   *     assert.isDefined(tea, 'tea has been defined');
-   *
-   * @name isDefined
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isDefined = function (val, msg) {
-    new Assertion(val, msg).to.not.equal(undefined);
-  };
-
-  /**
-   * ### .isFunction(value, [message])
-   *
-   * Asserts that `value` is a function.
-   *
-   *     function serveTea() { return 'cup of tea'; };
-   *     assert.isFunction(serveTea, 'great, we can have tea now');
-   *
-   * @name isFunction
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isFunction = function (val, msg) {
-    new Assertion(val, msg).to.be.a('function');
-  };
-
-  /**
-   * ### .isNotFunction(value, [message])
-   *
-   * Asserts that `value` is _not_ a function.
-   *
-   *     var serveTea = [ 'heat', 'pour', 'sip' ];
-   *     assert.isNotFunction(serveTea, 'great, we have listed the steps');
-   *
-   * @name isNotFunction
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNotFunction = function (val, msg) {
-    new Assertion(val, msg).to.not.be.a('function');
-  };
-
-  /**
-   * ### .isObject(value, [message])
-   *
-   * Asserts that `value` is an object (as revealed by
-   * `Object.prototype.toString`).
-   *
-   *     var selection = { name: 'Chai', serve: 'with spices' };
-   *     assert.isObject(selection, 'tea selection is an object');
-   *
-   * @name isObject
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isObject = function (val, msg) {
-    new Assertion(val, msg).to.be.a('object');
-  };
-
-  /**
-   * ### .isNotObject(value, [message])
-   *
-   * Asserts that `value` is _not_ an object.
-   *
-   *     var selection = 'chai'
-   *     assert.isObject(selection, 'tea selection is not an object');
-   *     assert.isObject(null, 'null is not an object');
-   *
-   * @name isNotObject
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNotObject = function (val, msg) {
-    new Assertion(val, msg).to.not.be.a('object');
-  };
-
-  /**
-   * ### .isArray(value, [message])
-   *
-   * Asserts that `value` is an array.
-   *
-   *     var menu = [ 'green', 'chai', 'oolong' ];
-   *     assert.isArray(menu, 'what kind of tea do we want?');
-   *
-   * @name isArray
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isArray = function (val, msg) {
-    new Assertion(val, msg).to.be.an('array');
-  };
-
-  /**
-   * ### .isNotArray(value, [message])
-   *
-   * Asserts that `value` is _not_ an array.
-   *
-   *     var menu = 'green|chai|oolong';
-   *     assert.isNotArray(menu, 'what kind of tea do we want?');
-   *
-   * @name isNotArray
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNotArray = function (val, msg) {
-    new Assertion(val, msg).to.not.be.an('array');
-  };
-
-  /**
-   * ### .isString(value, [message])
-   *
-   * Asserts that `value` is a string.
-   *
-   *     var teaOrder = 'chai';
-   *     assert.isString(teaOrder, 'order placed');
-   *
-   * @name isString
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isString = function (val, msg) {
-    new Assertion(val, msg).to.be.a('string');
-  };
-
-  /**
-   * ### .isNotString(value, [message])
-   *
-   * Asserts that `value` is _not_ a string.
-   *
-   *     var teaOrder = 4;
-   *     assert.isNotString(teaOrder, 'order placed');
-   *
-   * @name isNotString
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNotString = function (val, msg) {
-    new Assertion(val, msg).to.not.be.a('string');
-  };
-
-  /**
-   * ### .isNumber(value, [message])
-   *
-   * Asserts that `value` is a number.
-   *
-   *     var cups = 2;
-   *     assert.isNumber(cups, 'how many cups');
-   *
-   * @name isNumber
-   * @param {Number} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNumber = function (val, msg) {
-    new Assertion(val, msg).to.be.a('number');
-  };
-
-  /**
-   * ### .isNotNumber(value, [message])
-   *
-   * Asserts that `value` is _not_ a number.
-   *
-   *     var cups = '2 cups please';
-   *     assert.isNotNumber(cups, 'how many cups');
-   *
-   * @name isNotNumber
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNotNumber = function (val, msg) {
-    new Assertion(val, msg).to.not.be.a('number');
-  };
-
-  /**
-   * ### .isBoolean(value, [message])
-   *
-   * Asserts that `value` is a boolean.
-   *
-   *     var teaReady = true
-   *       , teaServed = false;
-   *
-   *     assert.isBoolean(teaReady, 'is the tea ready');
-   *     assert.isBoolean(teaServed, 'has tea been served');
-   *
-   * @name isBoolean
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isBoolean = function (val, msg) {
-    new Assertion(val, msg).to.be.a('boolean');
-  };
-
-  /**
-   * ### .isNotBoolean(value, [message])
-   *
-   * Asserts that `value` is _not_ a boolean.
-   *
-   *     var teaReady = 'yep'
-   *       , teaServed = 'nope';
-   *
-   *     assert.isNotBoolean(teaReady, 'is the tea ready');
-   *     assert.isNotBoolean(teaServed, 'has tea been served');
-   *
-   * @name isNotBoolean
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.isNotBoolean = function (val, msg) {
-    new Assertion(val, msg).to.not.be.a('boolean');
-  };
-
-  /**
-   * ### .typeOf(value, name, [message])
-   *
-   * Asserts that `value`'s type is `name`, as determined by
-   * `Object.prototype.toString`.
-   *
-   *     assert.typeOf({ tea: 'chai' }, 'object', 'we have an object');
-   *     assert.typeOf(['chai', 'jasmine'], 'array', 'we have an array');
-   *     assert.typeOf('tea', 'string', 'we have a string');
-   *     assert.typeOf(/tea/, 'regexp', 'we have a regular expression');
-   *     assert.typeOf(null, 'null', 'we have a null');
-   *     assert.typeOf(undefined, 'undefined', 'we have an undefined');
-   *
-   * @name typeOf
-   * @param {Mixed} value
-   * @param {String} name
-   * @param {String} message
-   * @api public
-   */
-
-  assert.typeOf = function (val, type, msg) {
-    new Assertion(val, msg).to.be.a(type);
-  };
-
-  /**
-   * ### .notTypeOf(value, name, [message])
-   *
-   * Asserts that `value`'s type is _not_ `name`, as determined by
-   * `Object.prototype.toString`.
-   *
-   *     assert.notTypeOf('tea', 'number', 'strings are not numbers');
-   *
-   * @name notTypeOf
-   * @param {Mixed} value
-   * @param {String} typeof name
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notTypeOf = function (val, type, msg) {
-    new Assertion(val, msg).to.not.be.a(type);
-  };
-
-  /**
-   * ### .instanceOf(object, constructor, [message])
-   *
-   * Asserts that `value` is an instance of `constructor`.
-   *
-   *     var Tea = function (name) { this.name = name; }
-   *       , chai = new Tea('chai');
-   *
-   *     assert.instanceOf(chai, Tea, 'chai is an instance of tea');
-   *
-   * @name instanceOf
-   * @param {Object} object
-   * @param {Constructor} constructor
-   * @param {String} message
-   * @api public
-   */
-
-  assert.instanceOf = function (val, type, msg) {
-    new Assertion(val, msg).to.be.instanceOf(type);
-  };
-
-  /**
-   * ### .notInstanceOf(object, constructor, [message])
-   *
-   * Asserts `value` is not an instance of `constructor`.
-   *
-   *     var Tea = function (name) { this.name = name; }
-   *       , chai = new String('chai');
-   *
-   *     assert.notInstanceOf(chai, Tea, 'chai is not an instance of tea');
-   *
-   * @name notInstanceOf
-   * @param {Object} object
-   * @param {Constructor} constructor
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notInstanceOf = function (val, type, msg) {
-    new Assertion(val, msg).to.not.be.instanceOf(type);
-  };
-
-  /**
-   * ### .include(haystack, needle, [message])
-   *
-   * Asserts that `haystack` includes `needle`. Works
-   * for strings and arrays.
-   *
-   *     assert.include('foobar', 'bar', 'foobar contains string "bar"');
-   *     assert.include([ 1, 2, 3 ], 3, 'array contains value');
-   *
-   * @name include
-   * @param {Array|String} haystack
-   * @param {Mixed} needle
-   * @param {String} message
-   * @api public
-   */
-
-  assert.include = function (exp, inc, msg) {
-    new Assertion(exp, msg).include(inc);
-  };
-
-  /**
-   * ### .notInclude(haystack, needle, [message])
-   *
-   * Asserts that `haystack` does not include `needle`. Works
-   * for strings and arrays.
-   *i
-   *     assert.notInclude('foobar', 'baz', 'string not include substring');
-   *     assert.notInclude([ 1, 2, 3 ], 4, 'array not include contain value');
-   *
-   * @name notInclude
-   * @param {Array|String} haystack
-   * @param {Mixed} needle
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notInclude = function (exp, inc, msg) {
-    new Assertion(exp, msg).not.include(inc);
-  };
-
-  /**
-   * ### .match(value, regexp, [message])
-   *
-   * Asserts that `value` matches the regular expression `regexp`.
-   *
-   *     assert.match('foobar', /^foo/, 'regexp matches');
-   *
-   * @name match
-   * @param {Mixed} value
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @api public
-   */
-
-  assert.match = function (exp, re, msg) {
-    new Assertion(exp, msg).to.match(re);
-  };
-
-  /**
-   * ### .notMatch(value, regexp, [message])
-   *
-   * Asserts that `value` does not match the regular expression `regexp`.
-   *
-   *     assert.notMatch('foobar', /^foo/, 'regexp does not match');
-   *
-   * @name notMatch
-   * @param {Mixed} value
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notMatch = function (exp, re, msg) {
-    new Assertion(exp, msg).to.not.match(re);
-  };
-
-  /**
-   * ### .property(object, property, [message])
-   *
-   * Asserts that `object` has a property named by `property`.
-   *
-   *     assert.property({ tea: { green: 'matcha' }}, 'tea');
-   *
-   * @name property
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @api public
-   */
-
-  assert.property = function (obj, prop, msg) {
-    new Assertion(obj, msg).to.have.property(prop);
-  };
-
-  /**
-   * ### .notProperty(object, property, [message])
-   *
-   * Asserts that `object` does _not_ have a property named by `property`.
-   *
-   *     assert.notProperty({ tea: { green: 'matcha' }}, 'coffee');
-   *
-   * @name notProperty
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notProperty = function (obj, prop, msg) {
-    new Assertion(obj, msg).to.not.have.property(prop);
-  };
-
-  /**
-   * ### .deepProperty(object, property, [message])
-   *
-   * Asserts that `object` has a property named by `property`, which can be a
-   * string using dot- and bracket-notation for deep reference.
-   *
-   *     assert.deepProperty({ tea: { green: 'matcha' }}, 'tea.green');
-   *
-   * @name deepProperty
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @api public
-   */
-
-  assert.deepProperty = function (obj, prop, msg) {
-    new Assertion(obj, msg).to.have.deep.property(prop);
-  };
-
-  /**
-   * ### .notDeepProperty(object, property, [message])
-   *
-   * Asserts that `object` does _not_ have a property named by `property`, which
-   * can be a string using dot- and bracket-notation for deep reference.
-   *
-   *     assert.notDeepProperty({ tea: { green: 'matcha' }}, 'tea.oolong');
-   *
-   * @name notDeepProperty
-   * @param {Object} object
-   * @param {String} property
-   * @param {String} message
-   * @api public
-   */
-
-  assert.notDeepProperty = function (obj, prop, msg) {
-    new Assertion(obj, msg).to.not.have.deep.property(prop);
-  };
-
-  /**
-   * ### .propertyVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property` with value given
-   * by `value`.
-   *
-   *     assert.propertyVal({ tea: 'is good' }, 'tea', 'is good');
-   *
-   * @name propertyVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.propertyVal = function (obj, prop, val, msg) {
-    new Assertion(obj, msg).to.have.property(prop, val);
-  };
-
-  /**
-   * ### .propertyNotVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property`, but with a value
-   * different from that given by `value`.
-   *
-   *     assert.propertyNotVal({ tea: 'is good' }, 'tea', 'is bad');
-   *
-   * @name propertyNotVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.propertyNotVal = function (obj, prop, val, msg) {
-    new Assertion(obj, msg).to.not.have.property(prop, val);
-  };
-
-  /**
-   * ### .deepPropertyVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property` with value given
-   * by `value`. `property` can use dot- and bracket-notation for deep
-   * reference.
-   *
-   *     assert.deepPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'matcha');
-   *
-   * @name deepPropertyVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.deepPropertyVal = function (obj, prop, val, msg) {
-    new Assertion(obj, msg).to.have.deep.property(prop, val);
-  };
-
-  /**
-   * ### .deepPropertyNotVal(object, property, value, [message])
-   *
-   * Asserts that `object` has a property named by `property`, but with a value
-   * different from that given by `value`. `property` can use dot- and
-   * bracket-notation for deep reference.
-   *
-   *     assert.deepPropertyNotVal({ tea: { green: 'matcha' }}, 'tea.green', 'konacha');
-   *
-   * @name deepPropertyNotVal
-   * @param {Object} object
-   * @param {String} property
-   * @param {Mixed} value
-   * @param {String} message
-   * @api public
-   */
-
-  assert.deepPropertyNotVal = function (obj, prop, val, msg) {
-    new Assertion(obj, msg).to.not.have.deep.property(prop, val);
-  };
-
-  /**
-   * ### .lengthOf(object, length, [message])
-   *
-   * Asserts that `object` has a `length` property with the expected value.
-   *
-   *     assert.lengthOf([1,2,3], 3, 'array has length of 3');
-   *     assert.lengthOf('foobar', 5, 'string has length of 6');
-   *
-   * @name lengthOf
-   * @param {Mixed} object
-   * @param {Number} length
-   * @param {String} message
-   * @api public
-   */
-
-  assert.lengthOf = function (exp, len, msg) {
-    new Assertion(exp, msg).to.have.length(len);
-  };
-
-  /**
-   * ### .throws(function, [constructor/string/regexp], [string/regexp], [message])
-   *
-   * Asserts that `function` will throw an error that is an instance of
-   * `constructor`, or alternately that it will throw an error with message
-   * matching `regexp`.
-   *
-   *     assert.throw(fn, 'function throws a reference error');
-   *     assert.throw(fn, /function throws a reference error/);
-   *     assert.throw(fn, ReferenceError);
-   *     assert.throw(fn, ReferenceError, 'function throws a reference error');
-   *     assert.throw(fn, ReferenceError, /function throws a reference error/);
-   *
-   * @name throws
-   * @alias throw
-   * @alias Throw
-   * @param {Function} function
-   * @param {ErrorConstructor} constructor
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-   * @api public
-   */
-
-  assert.Throw = function (fn, errt, errs, msg) {
-    if ('string' === typeof errt || errt instanceof RegExp) {
-      errs = errt;
-      errt = null;
-    }
-
-    var assertErr = new Assertion(fn, msg).to.Throw(errt, errs);
-    return flag(assertErr, 'object');
-  };
-
-  /**
-   * ### .doesNotThrow(function, [constructor/regexp], [message])
-   *
-   * Asserts that `function` will _not_ throw an error that is an instance of
-   * `constructor`, or alternately that it will not throw an error with message
-   * matching `regexp`.
-   *
-   *     assert.doesNotThrow(fn, Error, 'function does not throw');
-   *
-   * @name doesNotThrow
-   * @param {Function} function
-   * @param {ErrorConstructor} constructor
-   * @param {RegExp} regexp
-   * @param {String} message
-   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
-   * @api public
-   */
-
-  assert.doesNotThrow = function (fn, type, msg) {
-    if ('string' === typeof type) {
-      msg = type;
-      type = null;
-    }
-
-    new Assertion(fn, msg).to.not.Throw(type);
-  };
-
-  /**
-   * ### .operator(val1, operator, val2, [message])
-   *
-   * Compares two values using `operator`.
-   *
-   *     assert.operator(1, '<', 2, 'everything is ok');
-   *     assert.operator(1, '>', 2, 'this will fail');
-   *
-   * @name operator
-   * @param {Mixed} val1
-   * @param {String} operator
-   * @param {Mixed} val2
-   * @param {String} message
-   * @api public
-   */
-
-  assert.operator = function (val, operator, val2, msg) {
-    if (!~['==', '===', '>', '>=', '<', '<=', '!=', '!=='].indexOf(operator)) {
-      throw new Error('Invalid operator "' + operator + '"');
-    }
-    var test = new Assertion(eval(val + operator + val2), msg);
-    test.assert(
-        true === flag(test, 'object')
-      , 'expected ' + util.inspect(val) + ' to be ' + operator + ' ' + util.inspect(val2)
-      , 'expected ' + util.inspect(val) + ' to not be ' + operator + ' ' + util.inspect(val2) );
-  };
-
-  /**
-   * ### .closeTo(actual, expected, delta, [message])
-   *
-   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
-   *
-   *     assert.closeTo(1.5, 1, 0.5, 'numbers are close');
-   *
-   * @name closeTo
-   * @param {Number} actual
-   * @param {Number} expected
-   * @param {Number} delta
-   * @param {String} message
-   * @api public
-   */
-
-  assert.closeTo = function (act, exp, delta, msg) {
-    new Assertion(act, msg).to.be.closeTo(exp, delta);
-  };
-
-  /**
-   * ### .sameMembers(set1, set2, [message])
-   *
-   * Asserts that `set1` and `set2` have the same members.
-   * Order is not taken into account.
-   *
-   *     assert.sameMembers([ 1, 2, 3 ], [ 2, 1, 3 ], 'same members');
-   *
-   * @name sameMembers
-   * @param {Array} superset
-   * @param {Array} subset
-   * @param {String} message
-   * @api public
-   */
-
-  assert.sameMembers = function (set1, set2, msg) {
-    new Assertion(set1, msg).to.have.same.members(set2);
-  }
-
-  /**
-   * ### .includeMembers(superset, subset, [message])
-   *
-   * Asserts that `subset` is included in `superset`.
-   * Order is not taken into account.
-   *
-   *     assert.includeMembers([ 1, 2, 3 ], [ 2, 1 ], 'include members');
-   *
-   * @name includeMembers
-   * @param {Array} superset
-   * @param {Array} subset
-   * @param {String} message
-   * @api public
-   */
-
-  assert.includeMembers = function (superset, subset, msg) {
-    new Assertion(superset, msg).to.include.members(subset);
-  }
-
-  /*!
-   * Undocumented / untested
-   */
-
-  assert.ifError = function (val, msg) {
-    new Assertion(val, msg).to.not.be.ok;
-  };
-
-  /*!
-   * Aliases.
-   */
-
-  (function alias(name, as){
-    assert[as] = assert[name];
-    return alias;
-  })
-  ('Throw', 'throw')
-  ('Throw', 'throws');
-};
-
-});
-require.register("chai/lib/chai/interface/expect.js", function(exports, require, module){
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-module.exports = function (chai, util) {
-  chai.expect = function (val, message) {
-    return new chai.Assertion(val, message);
-  };
-};
-
-
-});
-require.register("chai/lib/chai/interface/should.js", function(exports, require, module){
-/*!
- * chai
- * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-module.exports = function (chai, util) {
-  var Assertion = chai.Assertion;
-
-  function loadShould () {
-    // modify Object.prototype to have `should`
-    Object.defineProperty(Object.prototype, 'should',
-      {
-        set: function (value) {
-          // See https://github.com/chaijs/chai/issues/86: this makes
-          // `whatever.should = someValue` actually set `someValue`, which is
-          // especially useful for `global.should = require('chai').should()`.
-          //
-          // Note that we have to use [[DefineProperty]] instead of [[Put]]
-          // since otherwise we would trigger this very setter!
-          Object.defineProperty(this, 'should', {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-          });
-        }
-      , get: function(){
-          if (this instanceof String || this instanceof Number) {
-            return new Assertion(this.constructor(this));
-          } else if (this instanceof Boolean) {
-            return new Assertion(this == true);
-          }
-          return new Assertion(this);
-        }
-      , configurable: true
-    });
-
-    var should = {};
-
-    should.equal = function (val1, val2, msg) {
-      new Assertion(val1, msg).to.equal(val2);
-    };
-
-    should.Throw = function (fn, errt, errs, msg) {
-      new Assertion(fn, msg).to.Throw(errt, errs);
-    };
-
-    should.exist = function (val, msg) {
-      new Assertion(val, msg).to.exist;
-    }
-
-    // negation
-    should.not = {}
-
-    should.not.equal = function (val1, val2, msg) {
-      new Assertion(val1, msg).to.not.equal(val2);
-    };
-
-    should.not.Throw = function (fn, errt, errs, msg) {
-      new Assertion(fn, msg).to.not.Throw(errt, errs);
-    };
-
-    should.not.exist = function (val, msg) {
-      new Assertion(val, msg).to.not.exist;
-    }
-
-    should['throw'] = should['Throw'];
-    should.not['throw'] = should.not['Throw'];
-
-    return should;
-  };
-
-  chai.should = loadShould;
-  chai.Should = loadShould;
-};
-
-});
-require.register("chai/lib/chai/utils/addChainableMethod.js", function(exports, require, module){
-/*!
- * Chai - addChainingMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependencies
- */
-
-var transferFlags = require('./transferFlags');
-
-/*!
- * Module variables
- */
-
-// Check whether `__proto__` is supported
-var hasProtoSupport = '__proto__' in Object;
-
-// Without `__proto__` support, this module will need to add properties to a function.
-// However, some Function.prototype methods cannot be overwritten,
-// and there seems no easy cross-platform way to detect them (@see chaijs/chai/issues/69).
-var excludeNames = /^(?:length|name|arguments|caller)$/;
-
-// Cache `Function` properties
-var call  = Function.prototype.call,
-    apply = Function.prototype.apply;
-
-/**
- * ### addChainableMethod (ctx, name, method, chainingBehavior)
- *
- * Adds a method to an object, such that the method can also be chained.
- *
- *     utils.addChainableMethod(chai.Assertion.prototype, 'foo', function (str) {
- *       var obj = utils.flag(this, 'object');
- *       new chai.Assertion(obj).to.be.equal(str);
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.addChainableMethod('foo', fn, chainingBehavior);
- *
- * The result can then be used as both a method assertion, executing both `method` and
- * `chainingBehavior`, or as a language chain, which only executes `chainingBehavior`.
- *
- *     expect(fooStr).to.be.foo('bar');
- *     expect(fooStr).to.be.foo.equal('foo');
- *
- * @param {Object} ctx object to which the method is added
- * @param {String} name of method to add
- * @param {Function} method function to be used for `name`, when called
- * @param {Function} chainingBehavior function to be called every time the property is accessed
- * @name addChainableMethod
- * @api public
- */
-
-module.exports = function (ctx, name, method, chainingBehavior) {
-  if (typeof chainingBehavior !== 'function') {
-    chainingBehavior = function () { };
-  }
-
-  var chainableBehavior = {
-      method: method
-    , chainingBehavior: chainingBehavior
-  };
-
-  // save the methods so we can overwrite them later, if we need to.
-  if (!ctx.__methods) {
-    ctx.__methods = {};
-  }
-  ctx.__methods[name] = chainableBehavior;
-
-  Object.defineProperty(ctx, name,
-    { get: function () {
-        chainableBehavior.chainingBehavior.call(this);
-
-        var assert = function () {
-          var result = chainableBehavior.method.apply(this, arguments);
-          return result === undefined ? this : result;
-        };
-
-        // Use `__proto__` if available
-        if (hasProtoSupport) {
-          // Inherit all properties from the object by replacing the `Function` prototype
-          var prototype = assert.__proto__ = Object.create(this);
-          // Restore the `call` and `apply` methods from `Function`
-          prototype.call = call;
-          prototype.apply = apply;
-        }
-        // Otherwise, redefine all properties (slow!)
-        else {
-          var asserterNames = Object.getOwnPropertyNames(ctx);
-          asserterNames.forEach(function (asserterName) {
-            if (!excludeNames.test(asserterName)) {
-              var pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
-              Object.defineProperty(assert, asserterName, pd);
-            }
-          });
-        }
-
-        transferFlags(this, assert);
-        return assert;
-      }
-    , configurable: true
-  });
-};
-
-});
-require.register("chai/lib/chai/utils/addMethod.js", function(exports, require, module){
-/*!
- * Chai - addMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### .addMethod (ctx, name, method)
- *
- * Adds a method to the prototype of an object.
- *
- *     utils.addMethod(chai.Assertion.prototype, 'foo', function (str) {
- *       var obj = utils.flag(this, 'object');
- *       new chai.Assertion(obj).to.be.equal(str);
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.addMethod('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(fooStr).to.be.foo('bar');
- *
- * @param {Object} ctx object to which the method is added
- * @param {String} name of method to add
- * @param {Function} method function to be used for name
- * @name addMethod
- * @api public
- */
-
-module.exports = function (ctx, name, method) {
-  ctx[name] = function () {
-    var result = method.apply(this, arguments);
-    return result === undefined ? this : result;
-  };
-};
-
-});
-require.register("chai/lib/chai/utils/addProperty.js", function(exports, require, module){
-/*!
- * Chai - addProperty utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### addProperty (ctx, name, getter)
- *
- * Adds a property to the prototype of an object.
- *
- *     utils.addProperty(chai.Assertion.prototype, 'foo', function () {
- *       var obj = utils.flag(this, 'object');
- *       new chai.Assertion(obj).to.be.instanceof(Foo);
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.addProperty('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.be.foo;
- *
- * @param {Object} ctx object to which the property is added
- * @param {String} name of property to add
- * @param {Function} getter function to be used for name
- * @name addProperty
- * @api public
- */
-
-module.exports = function (ctx, name, getter) {
-  Object.defineProperty(ctx, name,
-    { get: function () {
-        var result = getter.call(this);
-        return result === undefined ? this : result;
-      }
-    , configurable: true
-  });
-};
-
-});
-require.register("chai/lib/chai/utils/flag.js", function(exports, require, module){
-/*!
- * Chai - flag utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### flag(object ,key, [value])
- *
- * Get or set a flag value on an object. If a
- * value is provided it will be set, else it will
- * return the currently set value or `undefined` if
- * the value is not set.
- *
- *     utils.flag(this, 'foo', 'bar'); // setter
- *     utils.flag(this, 'foo'); // getter, returns `bar`
- *
- * @param {Object} object (constructed Assertion
- * @param {String} key
- * @param {Mixed} value (optional)
- * @name flag
- * @api private
- */
-
-module.exports = function (obj, key, value) {
-  var flags = obj.__flags || (obj.__flags = Object.create(null));
-  if (arguments.length === 3) {
-    flags[key] = value;
-  } else {
-    return flags[key];
-  }
-};
-
-});
-require.register("chai/lib/chai/utils/getActual.js", function(exports, require, module){
-/*!
- * Chai - getActual utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * # getActual(object, [actual])
- *
- * Returns the `actual` value for an Assertion
- *
- * @param {Object} object (constructed Assertion)
- * @param {Arguments} chai.Assertion.prototype.assert arguments
- */
-
-module.exports = function (obj, args) {
-  var actual = args[4];
-  return 'undefined' !== typeof actual ? actual : obj._obj;
-};
-
-});
-require.register("chai/lib/chai/utils/getEnumerableProperties.js", function(exports, require, module){
-/*!
- * Chai - getEnumerableProperties utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### .getEnumerableProperties(object)
- *
- * This allows the retrieval of enumerable property names of an object,
- * inherited or not.
- *
- * @param {Object} object
- * @returns {Array}
- * @name getEnumerableProperties
- * @api public
- */
-
-module.exports = function getEnumerableProperties(object) {
-  var result = [];
-  for (var name in object) {
-    result.push(name);
-  }
-  return result;
-};
-
-});
-require.register("chai/lib/chai/utils/getMessage.js", function(exports, require, module){
-/*!
- * Chai - message composition utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependancies
- */
-
-var flag = require('./flag')
-  , getActual = require('./getActual')
-  , inspect = require('./inspect')
-  , objDisplay = require('./objDisplay');
-
-/**
- * ### .getMessage(object, message, negateMessage)
- *
- * Construct the error message based on flags
- * and template tags. Template tags will return
- * a stringified inspection of the object referenced.
- *
- * Message template tags:
- * - `#{this}` current asserted object
- * - `#{act}` actual value
- * - `#{exp}` expected value
- *
- * @param {Object} object (constructed Assertion)
- * @param {Arguments} chai.Assertion.prototype.assert arguments
- * @name getMessage
- * @api public
- */
-
-module.exports = function (obj, args) {
-  var negate = flag(obj, 'negate')
-    , val = flag(obj, 'object')
-    , expected = args[3]
-    , actual = getActual(obj, args)
-    , msg = negate ? args[2] : args[1]
-    , flagMsg = flag(obj, 'message');
-
-  msg = msg || '';
-  msg = msg
-    .replace(/#{this}/g, objDisplay(val))
-    .replace(/#{act}/g, objDisplay(actual))
-    .replace(/#{exp}/g, objDisplay(expected));
-
-  return flagMsg ? flagMsg + ': ' + msg : msg;
-};
-
-});
-require.register("chai/lib/chai/utils/getName.js", function(exports, require, module){
-/*!
- * Chai - getName utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * # getName(func)
- *
- * Gets the name of a function, in a cross-browser way.
- *
- * @param {Function} a function (usually a constructor)
- */
-
-module.exports = function (func) {
-  if (func.name) return func.name;
-
-  var match = /^\s?function ([^(]*)\(/.exec(func);
-  return match && match[1] ? match[1] : "";
-};
-
-});
-require.register("chai/lib/chai/utils/getPathValue.js", function(exports, require, module){
-/*!
- * Chai - getPathValue utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * @see https://github.com/logicalparadox/filtr
- * MIT Licensed
- */
-
-/**
- * ### .getPathValue(path, object)
- *
- * This allows the retrieval of values in an
- * object given a string path.
- *
- *     var obj = {
- *         prop1: {
- *             arr: ['a', 'b', 'c']
- *           , str: 'Hello'
- *         }
- *       , prop2: {
- *             arr: [ { nested: 'Universe' } ]
- *           , str: 'Hello again!'
- *         }
- *     }
- *
- * The following would be the results.
- *
- *     getPathValue('prop1.str', obj); // Hello
- *     getPathValue('prop1.att[2]', obj); // b
- *     getPathValue('prop2.arr[0].nested', obj); // Universe
- *
- * @param {String} path
- * @param {Object} object
- * @returns {Object} value or `undefined`
- * @name getPathValue
- * @api public
- */
-
-var getPathValue = module.exports = function (path, obj) {
-  var parsed = parsePath(path);
-  return _getPathValue(parsed, obj);
-};
-
-/*!
- * ## parsePath(path)
- *
- * Helper function used to parse string object
- * paths. Use in conjunction with `_getPathValue`.
- *
- *      var parsed = parsePath('myobject.property.subprop');
- *
- * ### Paths:
- *
- * * Can be as near infinitely deep and nested
- * * Arrays are also valid using the formal `myobject.document[3].property`.
- *
- * @param {String} path
- * @returns {Object} parsed
- * @api private
- */
-
-function parsePath (path) {
-  var str = path.replace(/\[/g, '.[')
-    , parts = str.match(/(\\\.|[^.]+?)+/g);
-  return parts.map(function (value) {
-    var re = /\[(\d+)\]$/
-      , mArr = re.exec(value)
-    if (mArr) return { i: parseFloat(mArr[1]) };
-    else return { p: value };
-  });
-};
-
-/*!
- * ## _getPathValue(parsed, obj)
- *
- * Helper companion function for `.parsePath` that returns
- * the value located at the parsed address.
- *
- *      var value = getPathValue(parsed, obj);
- *
- * @param {Object} parsed definition from `parsePath`.
- * @param {Object} object to search against
- * @returns {Object|Undefined} value
- * @api private
- */
-
-function _getPathValue (parsed, obj) {
-  var tmp = obj
-    , res;
-  for (var i = 0, l = parsed.length; i < l; i++) {
-    var part = parsed[i];
-    if (tmp) {
-      if ('undefined' !== typeof part.p)
-        tmp = tmp[part.p];
-      else if ('undefined' !== typeof part.i)
-        tmp = tmp[part.i];
-      if (i == (l - 1)) res = tmp;
-    } else {
-      res = undefined;
-    }
-  }
-  return res;
-};
-
-});
-require.register("chai/lib/chai/utils/getProperties.js", function(exports, require, module){
-/*!
- * Chai - getProperties utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### .getProperties(object)
- *
- * This allows the retrieval of property names of an object, enumerable or not,
- * inherited or not.
- *
- * @param {Object} object
- * @returns {Array}
- * @name getProperties
- * @api public
- */
-
-module.exports = function getProperties(object) {
-  var result = Object.getOwnPropertyNames(subject);
-
-  function addProperty(property) {
-    if (result.indexOf(property) === -1) {
-      result.push(property);
-    }
-  }
-
-  var proto = Object.getPrototypeOf(subject);
-  while (proto !== null) {
-    Object.getOwnPropertyNames(proto).forEach(addProperty);
-    proto = Object.getPrototypeOf(proto);
-  }
-
-  return result;
-};
-
-});
-require.register("chai/lib/chai/utils/index.js", function(exports, require, module){
-/*!
- * chai
- * Copyright(c) 2011 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Main exports
- */
-
-var exports = module.exports = {};
-
-/*!
- * test utility
- */
-
-exports.test = require('./test');
-
-/*!
- * type utility
- */
-
-exports.type = require('./type');
-
-/*!
- * message utility
- */
-
-exports.getMessage = require('./getMessage');
-
-/*!
- * actual utility
- */
-
-exports.getActual = require('./getActual');
-
-/*!
- * Inspect util
- */
-
-exports.inspect = require('./inspect');
-
-/*!
- * Object Display util
- */
-
-exports.objDisplay = require('./objDisplay');
-
-/*!
- * Flag utility
- */
-
-exports.flag = require('./flag');
-
-/*!
- * Flag transferring utility
- */
-
-exports.transferFlags = require('./transferFlags');
-
-/*!
- * Deep equal utility
- */
-
-exports.eql = require('deep-eql');
-
-/*!
- * Deep path value
- */
-
-exports.getPathValue = require('./getPathValue');
-
-/*!
- * Function name
- */
-
-exports.getName = require('./getName');
-
-/*!
- * add Property
- */
-
-exports.addProperty = require('./addProperty');
-
-/*!
- * add Method
- */
-
-exports.addMethod = require('./addMethod');
-
-/*!
- * overwrite Property
- */
-
-exports.overwriteProperty = require('./overwriteProperty');
-
-/*!
- * overwrite Method
- */
-
-exports.overwriteMethod = require('./overwriteMethod');
-
-/*!
- * Add a chainable method
- */
-
-exports.addChainableMethod = require('./addChainableMethod');
-
-/*!
- * Overwrite chainable method
- */
-
-exports.overwriteChainableMethod = require('./overwriteChainableMethod');
-
-
-});
-require.register("chai/lib/chai/utils/inspect.js", function(exports, require, module){
-// This is (almost) directly from Node.js utils
-// https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/util.js
-
-var getName = require('./getName');
-var getProperties = require('./getProperties');
-var getEnumerableProperties = require('./getEnumerableProperties');
-
-module.exports = inspect;
-
-/**
- * Echos the value of a value. Trys to print the value out
- * in the best way possible given the different types.
- *
- * @param {Object} obj The object to print out.
- * @param {Boolean} showHidden Flag that shows hidden (not enumerable)
- *    properties of objects.
- * @param {Number} depth Depth in which to descend in object. Default is 2.
- * @param {Boolean} colors Flag to turn on ANSI escape codes to color the
- *    output. Default is false (no coloring).
- */
-function inspect(obj, showHidden, depth, colors) {
-  var ctx = {
-    showHidden: showHidden,
-    seen: [],
-    stylize: function (str) { return str; }
-  };
-  return formatValue(ctx, obj, (typeof depth === 'undefined' ? 2 : depth));
-}
-
-// https://gist.github.com/1044128/
-var getOuterHTML = function(element) {
-  if ('outerHTML' in element) return element.outerHTML;
-  var ns = "http://www.w3.org/1999/xhtml";
-  var container = document.createElementNS(ns, '_');
-  var elemProto = (window.HTMLElement || window.Element).prototype;
-  var xmlSerializer = new XMLSerializer();
-  var html;
-  if (document.xmlVersion) {
-    return xmlSerializer.serializeToString(element);
-  } else {
-    container.appendChild(element.cloneNode(false));
-    html = container.innerHTML.replace('><', '>' + element.innerHTML + '<');
-    container.innerHTML = '';
-    return html;
-  }
-};
-
-// Returns true if object is a DOM element.
-var isDOMElement = function (object) {
-  if (typeof HTMLElement === 'object') {
-    return object instanceof HTMLElement;
-  } else {
-    return object &&
-      typeof object === 'object' &&
-      object.nodeType === 1 &&
-      typeof object.nodeName === 'string';
-  }
-};
-
-function formatValue(ctx, value, recurseTimes) {
-  // Provide a hook for user-specified inspect functions.
-  // Check that value is an object with an inspect function on it
-  if (value && typeof value.inspect === 'function' &&
-      // Filter out the util module, it's inspect function is special
-      value.inspect !== exports.inspect &&
-      // Also filter out any prototype objects using the circular check.
-      !(value.constructor && value.constructor.prototype === value)) {
-    var ret = value.inspect(recurseTimes);
-    if (typeof ret !== 'string') {
-      ret = formatValue(ctx, ret, recurseTimes);
-    }
-    return ret;
-  }
-
-  // Primitive types cannot have properties
-  var primitive = formatPrimitive(ctx, value);
-  if (primitive) {
-    return primitive;
-  }
-
-  // If it's DOM elem, get outer HTML.
-  if (isDOMElement(value)) {
-    return getOuterHTML(value);
-  }
-
-  // Look up the keys of the object.
-  var visibleKeys = getEnumerableProperties(value);
-  var keys = ctx.showHidden ? getProperties(value) : visibleKeys;
-
-  // Some type of object without properties can be shortcutted.
-  // In IE, errors have a single `stack` property, or if they are vanilla `Error`,
-  // a `stack` plus `description` property; ignore those for consistency.
-  if (keys.length === 0 || (isError(value) && (
-      (keys.length === 1 && keys[0] === 'stack') ||
-      (keys.length === 2 && keys[0] === 'description' && keys[1] === 'stack')
-     ))) {
-    if (typeof value === 'function') {
-      var name = getName(value);
-      var nameSuffix = name ? ': ' + name : '';
-      return ctx.stylize('[Function' + nameSuffix + ']', 'special');
-    }
-    if (isRegExp(value)) {
-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-    }
-    if (isDate(value)) {
-      return ctx.stylize(Date.prototype.toUTCString.call(value), 'date');
-    }
-    if (isError(value)) {
-      return formatError(value);
-    }
-  }
-
-  var base = '', array = false, braces = ['{', '}'];
-
-  // Make Array say that they are Array
-  if (isArray(value)) {
-    array = true;
-    braces = ['[', ']'];
-  }
-
-  // Make functions say that they are functions
-  if (typeof value === 'function') {
-    var name = getName(value);
-    var nameSuffix = name ? ': ' + name : '';
-    base = ' [Function' + nameSuffix + ']';
-  }
-
-  // Make RegExps say that they are RegExps
-  if (isRegExp(value)) {
-    base = ' ' + RegExp.prototype.toString.call(value);
-  }
-
-  // Make dates with properties first say the date
-  if (isDate(value)) {
-    base = ' ' + Date.prototype.toUTCString.call(value);
-  }
-
-  // Make error with message first say the error
-  if (isError(value)) {
-    return formatError(value);
-  }
-
-  if (keys.length === 0 && (!array || value.length == 0)) {
-    return braces[0] + base + braces[1];
-  }
-
-  if (recurseTimes < 0) {
-    if (isRegExp(value)) {
-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-    } else {
-      return ctx.stylize('[Object]', 'special');
-    }
-  }
-
-  ctx.seen.push(value);
-
-  var output;
-  if (array) {
-    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
-  } else {
-    output = keys.map(function(key) {
-      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
-    });
-  }
-
-  ctx.seen.pop();
-
-  return reduceToSingleString(output, base, braces);
-}
-
-
-function formatPrimitive(ctx, value) {
-  switch (typeof value) {
-    case 'undefined':
-      return ctx.stylize('undefined', 'undefined');
-
-    case 'string':
-      var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
-                                               .replace(/'/g, "\\'")
-                                               .replace(/\\"/g, '"') + '\'';
-      return ctx.stylize(simple, 'string');
-
-    case 'number':
-      return ctx.stylize('' + value, 'number');
-
-    case 'boolean':
-      return ctx.stylize('' + value, 'boolean');
-  }
-  // For some reason typeof null is "object", so special case here.
-  if (value === null) {
-    return ctx.stylize('null', 'null');
-  }
-}
-
-
-function formatError(value) {
-  return '[' + Error.prototype.toString.call(value) + ']';
-}
-
-
-function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
-  var output = [];
-  for (var i = 0, l = value.length; i < l; ++i) {
-    if (Object.prototype.hasOwnProperty.call(value, String(i))) {
-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-          String(i), true));
-    } else {
-      output.push('');
-    }
-  }
-  keys.forEach(function(key) {
-    if (!key.match(/^\d+$/)) {
-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-          key, true));
-    }
-  });
-  return output;
-}
-
-
-function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
-  var name, str;
-  if (value.__lookupGetter__) {
-    if (value.__lookupGetter__(key)) {
-      if (value.__lookupSetter__(key)) {
-        str = ctx.stylize('[Getter/Setter]', 'special');
-      } else {
-        str = ctx.stylize('[Getter]', 'special');
-      }
-    } else {
-      if (value.__lookupSetter__(key)) {
-        str = ctx.stylize('[Setter]', 'special');
-      }
-    }
-  }
-  if (visibleKeys.indexOf(key) < 0) {
-    name = '[' + key + ']';
-  }
-  if (!str) {
-    if (ctx.seen.indexOf(value[key]) < 0) {
-      if (recurseTimes === null) {
-        str = formatValue(ctx, value[key], null);
-      } else {
-        str = formatValue(ctx, value[key], recurseTimes - 1);
-      }
-      if (str.indexOf('\n') > -1) {
-        if (array) {
-          str = str.split('\n').map(function(line) {
-            return '  ' + line;
-          }).join('\n').substr(2);
-        } else {
-          str = '\n' + str.split('\n').map(function(line) {
-            return '   ' + line;
-          }).join('\n');
-        }
-      }
-    } else {
-      str = ctx.stylize('[Circular]', 'special');
-    }
-  }
-  if (typeof name === 'undefined') {
-    if (array && key.match(/^\d+$/)) {
-      return str;
-    }
-    name = JSON.stringify('' + key);
-    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
-      name = name.substr(1, name.length - 2);
-      name = ctx.stylize(name, 'name');
-    } else {
-      name = name.replace(/'/g, "\\'")
-                 .replace(/\\"/g, '"')
-                 .replace(/(^"|"$)/g, "'");
-      name = ctx.stylize(name, 'string');
-    }
-  }
-
-  return name + ': ' + str;
-}
-
-
-function reduceToSingleString(output, base, braces) {
-  var numLinesEst = 0;
-  var length = output.reduce(function(prev, cur) {
-    numLinesEst++;
-    if (cur.indexOf('\n') >= 0) numLinesEst++;
-    return prev + cur.length + 1;
-  }, 0);
-
-  if (length > 60) {
-    return braces[0] +
-           (base === '' ? '' : base + '\n ') +
-           ' ' +
-           output.join(',\n  ') +
-           ' ' +
-           braces[1];
-  }
-
-  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
-}
-
-function isArray(ar) {
-  return Array.isArray(ar) ||
-         (typeof ar === 'object' && objectToString(ar) === '[object Array]');
-}
-
-function isRegExp(re) {
-  return typeof re === 'object' && objectToString(re) === '[object RegExp]';
-}
-
-function isDate(d) {
-  return typeof d === 'object' && objectToString(d) === '[object Date]';
-}
-
-function isError(e) {
-  return typeof e === 'object' && objectToString(e) === '[object Error]';
-}
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
-
-});
-require.register("chai/lib/chai/utils/objDisplay.js", function(exports, require, module){
-/*!
- * Chai - flag utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependancies
- */
-
-var inspect = require('./inspect');
-
-/**
- * ### .objDisplay (object)
- *
- * Determines if an object or an array matches
- * criteria to be inspected in-line for error
- * messages or should be truncated.
- *
- * @param {Mixed} javascript object to inspect
- * @name objDisplay
- * @api public
- */
-
-module.exports = function (obj) {
-  var str = inspect(obj)
-    , type = Object.prototype.toString.call(obj);
-
-  if (str.length >= 40) {
-    if (type === '[object Function]') {
-      return !obj.name || obj.name === ''
-        ? '[Function]'
-        : '[Function: ' + obj.name + ']';
-    } else if (type === '[object Array]') {
-      return '[ Array(' + obj.length + ') ]';
-    } else if (type === '[object Object]') {
-      var keys = Object.keys(obj)
-        , kstr = keys.length > 2
-          ? keys.splice(0, 2).join(', ') + ', ...'
-          : keys.join(', ');
-      return '{ Object (' + kstr + ') }';
-    } else {
-      return str;
-    }
-  } else {
-    return str;
-  }
-};
-
-});
-require.register("chai/lib/chai/utils/overwriteMethod.js", function(exports, require, module){
-/*!
- * Chai - overwriteMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### overwriteMethod (ctx, name, fn)
- *
- * Overwites an already existing method and provides
- * access to previous function. Must return function
- * to be used for name.
- *
- *     utils.overwriteMethod(chai.Assertion.prototype, 'equal', function (_super) {
- *       return function (str) {
- *         var obj = utils.flag(this, 'object');
- *         if (obj instanceof Foo) {
- *           new chai.Assertion(obj.value).to.equal(str);
- *         } else {
- *           _super.apply(this, arguments);
- *         }
- *       }
- *     });
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.overwriteMethod('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.equal('bar');
- *
- * @param {Object} ctx object whose method is to be overwritten
- * @param {String} name of method to overwrite
- * @param {Function} method function that returns a function to be used for name
- * @name overwriteMethod
- * @api public
- */
-
-module.exports = function (ctx, name, method) {
-  var _method = ctx[name]
-    , _super = function () { return this; };
-
-  if (_method && 'function' === typeof _method)
-    _super = _method;
-
-  ctx[name] = function () {
-    var result = method(_super).apply(this, arguments);
-    return result === undefined ? this : result;
-  }
-};
-
-});
-require.register("chai/lib/chai/utils/overwriteProperty.js", function(exports, require, module){
-/*!
- * Chai - overwriteProperty utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### overwriteProperty (ctx, name, fn)
- *
- * Overwites an already existing property getter and provides
- * access to previous value. Must return function to use as getter.
- *
- *     utils.overwriteProperty(chai.Assertion.prototype, 'ok', function (_super) {
- *       return function () {
- *         var obj = utils.flag(this, 'object');
- *         if (obj instanceof Foo) {
- *           new chai.Assertion(obj.name).to.equal('bar');
- *         } else {
- *           _super.call(this);
- *         }
- *       }
- *     });
- *
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.overwriteProperty('foo', fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.be.ok;
- *
- * @param {Object} ctx object whose property is to be overwritten
- * @param {String} name of property to overwrite
- * @param {Function} getter function that returns a getter function to be used for name
- * @name overwriteProperty
- * @api public
- */
-
-module.exports = function (ctx, name, getter) {
-  var _get = Object.getOwnPropertyDescriptor(ctx, name)
-    , _super = function () {};
-
-  if (_get && 'function' === typeof _get.get)
-    _super = _get.get
-
-  Object.defineProperty(ctx, name,
-    { get: function () {
-        var result = getter(_super).call(this);
-        return result === undefined ? this : result;
-      }
-    , configurable: true
-  });
-};
-
-});
-require.register("chai/lib/chai/utils/overwriteChainableMethod.js", function(exports, require, module){
-/*!
- * Chai - overwriteChainableMethod utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### overwriteChainableMethod (ctx, name, fn)
- *
- * Overwites an already existing chainable method
- * and provides access to the previous function or
- * property.  Must return functions to be used for
- * name.
- *
- *     utils.overwriteChainableMethod(chai.Assertion.prototype, 'length',
- *       function (_super) {
- *       }
- *     , function (_super) {
- *       }
- *     );
- *
- * Can also be accessed directly from `chai.Assertion`.
- *
- *     chai.Assertion.overwriteChainableMethod('foo', fn, fn);
- *
- * Then can be used as any other assertion.
- *
- *     expect(myFoo).to.have.length(3);
- *     expect(myFoo).to.have.length.above(3);
- *
- * @param {Object} ctx object whose method / property is to be overwritten
- * @param {String} name of method / property to overwrite
- * @param {Function} method function that returns a function to be used for name
- * @param {Function} chainingBehavior function that returns a function to be used for property
- * @name overwriteChainableMethod
- * @api public
- */
-
-module.exports = function (ctx, name, method, chainingBehavior) {
-  var chainableBehavior = ctx.__methods[name];
-
-  var _chainingBehavior = chainableBehavior.chainingBehavior;
-  chainableBehavior.chainingBehavior = function () {
-    var result = chainingBehavior(_chainingBehavior).call(this);
-    return result === undefined ? this : result;
-  };
-
-  var _method = chainableBehavior.method;
-  chainableBehavior.method = function () {
-    var result = method(_method).apply(this, arguments);
-    return result === undefined ? this : result;
-  };
-};
-
-});
-require.register("chai/lib/chai/utils/test.js", function(exports, require, module){
-/*!
- * Chai - test utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Module dependancies
- */
-
-var flag = require('./flag');
-
-/**
- * # test(object, expression)
- *
- * Test and object for expression.
- *
- * @param {Object} object (constructed Assertion)
- * @param {Arguments} chai.Assertion.prototype.assert arguments
- */
-
-module.exports = function (obj, args) {
-  var negate = flag(obj, 'negate')
-    , expr = args[0];
-  return negate ? !expr : expr;
-};
-
-});
-require.register("chai/lib/chai/utils/transferFlags.js", function(exports, require, module){
-/*!
- * Chai - transferFlags utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### transferFlags(assertion, object, includeAll = true)
- *
- * Transfer all the flags for `assertion` to `object`. If
- * `includeAll` is set to `false`, then the base Chai
- * assertion flags (namely `object`, `ssfi`, and `message`)
- * will not be transferred.
- *
- *
- *     var newAssertion = new Assertion();
- *     utils.transferFlags(assertion, newAssertion);
- *
- *     var anotherAsseriton = new Assertion(myObj);
- *     utils.transferFlags(assertion, anotherAssertion, false);
- *
- * @param {Assertion} assertion the assertion to transfer the flags from
- * @param {Object} object the object to transfer the flags too; usually a new assertion
- * @param {Boolean} includeAll
- * @name getAllFlags
- * @api private
- */
-
-module.exports = function (assertion, object, includeAll) {
-  var flags = assertion.__flags || (assertion.__flags = Object.create(null));
-
-  if (!object.__flags) {
-    object.__flags = Object.create(null);
-  }
-
-  includeAll = arguments.length === 3 ? includeAll : true;
-
-  for (var flag in flags) {
-    if (includeAll ||
-        (flag !== 'object' && flag !== 'ssfi' && flag != 'message')) {
-      object.__flags[flag] = flags[flag];
-    }
-  }
-};
-
-});
-require.register("chai/lib/chai/utils/type.js", function(exports, require, module){
-/*!
- * Chai - type utility
- * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/*!
- * Detectable javascript natives
- */
-
-var natives = {
-    '[object Arguments]': 'arguments'
-  , '[object Array]': 'array'
-  , '[object Date]': 'date'
-  , '[object Function]': 'function'
-  , '[object Number]': 'number'
-  , '[object RegExp]': 'regexp'
-  , '[object String]': 'string'
-};
-
-/**
- * ### type(object)
- *
- * Better implementation of `typeof` detection that can
- * be used cross-browser. Handles the inconsistencies of
- * Array, `null`, and `undefined` detection.
- *
- *     utils.type({}) // 'object'
- *     utils.type(null) // `null'
- *     utils.type(undefined) // `undefined`
- *     utils.type([]) // `array`
- *
- * @param {Mixed} object to detect type of
- * @name type
- * @api private
- */
-
-module.exports = function (obj) {
-  var str = Object.prototype.toString.call(obj);
-  if (natives[str]) return natives[str];
-  if (obj === null) return 'null';
-  if (obj === undefined) return 'undefined';
-  if (obj === Object(obj)) return 'object';
-  return typeof obj;
-};
-
-});
-
-
-
-
-require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js");
-require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js");
-require.alias("chaijs-assertion-error/index.js", "assertion-error/index.js");
-require.alias("chaijs-assertion-error/index.js", "chaijs-assertion-error/index.js");
-require.alias("chaijs-deep-eql/lib/eql.js", "chai/deps/deep-eql/lib/eql.js");
-require.alias("chaijs-deep-eql/lib/eql.js", "chai/deps/deep-eql/index.js");
-require.alias("chaijs-deep-eql/lib/eql.js", "deep-eql/index.js");
-require.alias("chaijs-type-detect/lib/type.js", "chaijs-deep-eql/deps/type-detect/lib/type.js");
-require.alias("chaijs-type-detect/lib/type.js", "chaijs-deep-eql/deps/type-detect/index.js");
-require.alias("chaijs-type-detect/lib/type.js", "chaijs-type-detect/index.js");
-require.alias("chaijs-deep-eql/lib/eql.js", "chaijs-deep-eql/index.js");
-require.alias("chai/index.js", "chai/index.js");if (typeof exports == "object") {
-  module.exports = require("chai");
-} else if (typeof define == "function" && define.amd) {
-  define([], function(){ return require("chai"); });
-} else {
-  this["chai"] = require("chai");
-}})();
\ No newline at end of file
diff --git a/browser/components/loop/test/vendor/mocha-1.17.1.css b/browser/components/loop/test/vendor/mocha-1.17.1.css
deleted file mode 100644
index 42b9798fa4e3..000000000000
--- a/browser/components/loop/test/vendor/mocha-1.17.1.css
+++ /dev/null
@@ -1,270 +0,0 @@
-@charset "utf-8";
-
-body {
-  margin:0;
-}
-
-#mocha {
-  font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-  margin: 60px 50px;
-}
-
-#mocha ul,
-#mocha li {
-  margin: 0;
-  padding: 0;
-}
-
-#mocha ul {
-  list-style: none;
-}
-
-#mocha h1,
-#mocha h2 {
-  margin: 0;
-}
-
-#mocha h1 {
-  margin-top: 15px;
-  font-size: 1em;
-  font-weight: 200;
-}
-
-#mocha h1 a {
-  text-decoration: none;
-  color: inherit;
-}
-
-#mocha h1 a:hover {
-  text-decoration: underline;
-}
-
-#mocha .suite .suite h1 {
-  margin-top: 0;
-  font-size: .8em;
-}
-
-#mocha .hidden {
-  display: none;
-}
-
-#mocha h2 {
-  font-size: 12px;
-  font-weight: normal;
-  cursor: pointer;
-}
-
-#mocha .suite {
-  margin-left: 15px;
-}
-
-#mocha .test {
-  margin-left: 15px;
-  overflow: hidden;
-}
-
-#mocha .test.pending:hover h2::after {
-  content: '(pending)';
-  font-family: arial, sans-serif;
-}
-
-#mocha .test.pass.medium .duration {
-  background: #c09853;
-}
-
-#mocha .test.pass.slow .duration {
-  background: #b94a48;
-}
-
-#mocha .test.pass::before {
-  content: '✓';
-  font-size: 12px;
-  display: block;
-  float: left;
-  margin-right: 5px;
-  color: #00d6b2;
-}
-
-#mocha .test.pass .duration {
-  font-size: 9px;
-  margin-left: 5px;
-  padding: 2px 5px;
-  color: #fff;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  -ms-border-radius: 5px;
-  -o-border-radius: 5px;
-  border-radius: 5px;
-}
-
-#mocha .test.pass.fast .duration {
-  display: none;
-}
-
-#mocha .test.pending {
-  color: #0b97c4;
-}
-
-#mocha .test.pending::before {
-  content: '◦';
-  color: #0b97c4;
-}
-
-#mocha .test.fail {
-  color: #c00;
-}
-
-#mocha .test.fail pre {
-  color: black;
-}
-
-#mocha .test.fail::before {
-  content: '✖';
-  font-size: 12px;
-  display: block;
-  float: left;
-  margin-right: 5px;
-  color: #c00;
-}
-
-#mocha .test pre.error {
-  color: #c00;
-  max-height: 300px;
-  overflow: auto;
-}
-
-/**
- * (1): approximate for browsers not supporting calc
- * (2): 42 = 2*15 + 2*10 + 2*1 (padding + margin + border)
- *      ^^ seriously
- */
-#mocha .test pre {
-  display: block;
-  float: left;
-  clear: left;
-  font: 12px/1.5 monaco, monospace;
-  margin: 5px;
-  padding: 15px;
-  border: 1px solid #eee;
-  max-width: 85%; /*(1)*/
-  max-width: calc(100% - 42px); /*(2)*/
-  word-wrap: break-word;
-  border-bottom-color: #ddd;
-  -webkit-border-radius: 3px;
-  -webkit-box-shadow: 0 1px 3px #eee;
-  -moz-border-radius: 3px;
-  -moz-box-shadow: 0 1px 3px #eee;
-  border-radius: 3px;
-}
-
-#mocha .test h2 {
-  position: relative;
-}
-
-#mocha .test a.replay {
-  position: absolute;
-  top: 3px;
-  right: 0;
-  text-decoration: none;
-  vertical-align: middle;
-  display: block;
-  width: 15px;
-  height: 15px;
-  line-height: 15px;
-  text-align: center;
-  background: #eee;
-  font-size: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-  -webkit-transition: opacity 200ms;
-  -moz-transition: opacity 200ms;
-  transition: opacity 200ms;
-  opacity: 0.3;
-  color: #888;
-}
-
-#mocha .test:hover a.replay {
-  opacity: 1;
-}
-
-#mocha-report.pass .test.fail {
-  display: none;
-}
-
-#mocha-report.fail .test.pass {
-  display: none;
-}
-
-#mocha-report.pending .test.pass,
-#mocha-report.pending .test.fail {
-  display: none;
-}
-#mocha-report.pending .test.pass.pending {
-  display: block;
-}
-
-#mocha-error {
-  color: #c00;
-  font-size: 1.5em;
-  font-weight: 100;
-  letter-spacing: 1px;
-}
-
-#mocha-stats {
-  position: fixed;
-  top: 15px;
-  right: 10px;
-  font-size: 12px;
-  margin: 0;
-  color: #888;
-  z-index: 1;
-}
-
-#mocha-stats .progress {
-  float: right;
-  padding-top: 0;
-}
-
-#mocha-stats em {
-  color: black;
-}
-
-#mocha-stats a {
-  text-decoration: none;
-  color: inherit;
-}
-
-#mocha-stats a:hover {
-  border-bottom: 1px solid #eee;
-}
-
-#mocha-stats li {
-  display: inline-block;
-  margin: 0 5px;
-  list-style: none;
-  padding-top: 11px;
-}
-
-#mocha-stats canvas {
-  width: 40px;
-  height: 40px;
-}
-
-#mocha code .comment { color: #ddd; }
-#mocha code .init { color: #2f6fad; }
-#mocha code .string { color: #5890ad; }
-#mocha code .keyword { color: #8a6343; }
-#mocha code .number { color: #2f6fad; }
-
-@media screen and (max-device-width: 480px) {
-  #mocha {
-    margin: 60px 0px;
-  }
-
-  #mocha #stats {
-    position: absolute;
-  }
-}
diff --git a/browser/components/loop/test/vendor/mocha-1.17.1.js b/browser/components/loop/test/vendor/mocha-1.17.1.js
deleted file mode 100644
index 3dcdae6c1bdc..000000000000
--- a/browser/components/loop/test/vendor/mocha-1.17.1.js
+++ /dev/null
@@ -1,5812 +0,0 @@
-;(function(){
-
-// CommonJS require()
-
-function require(p){
-    var path = require.resolve(p)
-      , mod = require.modules[path];
-    if (!mod) throw new Error('failed to require "' + p + '"');
-    if (!mod.exports) {
-      mod.exports = {};
-      mod.call(mod.exports, mod, mod.exports, require.relative(path));
-    }
-    return mod.exports;
-  }
-
-require.modules = {};
-
-require.resolve = function (path){
-    var orig = path
-      , reg = path + '.js'
-      , index = path + '/index.js';
-    return require.modules[reg] && reg
-      || require.modules[index] && index
-      || orig;
-  };
-
-require.register = function (path, fn){
-    require.modules[path] = fn;
-  };
-
-require.relative = function (parent) {
-    return function(p){
-      if ('.' != p.charAt(0)) return require(p);
-
-      var path = parent.split('/')
-        , segs = p.split('/');
-      path.pop();
-
-      for (var i = 0; i < segs.length; i++) {
-        var seg = segs[i];
-        if ('..' == seg) path.pop();
-        else if ('.' != seg) path.push(seg);
-      }
-
-      return require(path.join('/'));
-    };
-  };
-
-
-require.register("browser/debug.js", function(module, exports, require){
-
-module.exports = function(type){
-  return function(){
-  }
-};
-
-}); // module: browser/debug.js
-
-require.register("browser/diff.js", function(module, exports, require){
-/* See LICENSE file for terms of use */
-
-/*
- * Text diff implementation.
- *
- * This library supports the following APIS:
- * JsDiff.diffChars: Character by character diff
- * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
- * JsDiff.diffLines: Line based diff
- *
- * JsDiff.diffCss: Diff targeted at CSS content
- *
- * These methods are based on the implementation proposed in
- * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
- * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
- */
-var JsDiff = (function() {
-  /*jshint maxparams: 5*/
-  function clonePath(path) {
-    return { newPos: path.newPos, components: path.components.slice(0) };
-  }
-  function removeEmpty(array) {
-    var ret = [];
-    for (var i = 0; i < array.length; i++) {
-      if (array[i]) {
-        ret.push(array[i]);
-      }
-    }
-    return ret;
-  }
-  function escapeHTML(s) {
-    var n = s;
-    n = n.replace(/&/g, '&amp;');
-    n = n.replace(/</g, '&lt;');
-    n = n.replace(/>/g, '&gt;');
-    n = n.replace(/"/g, '&quot;');
-
-    return n;
-  }
-
-  var Diff = function(ignoreWhitespace) {
-    this.ignoreWhitespace = ignoreWhitespace;
-  };
-  Diff.prototype = {
-      diff: function(oldString, newString) {
-        // Handle the identity case (this is due to unrolling editLength == 0
-        if (newString === oldString) {
-          return [{ value: newString }];
-        }
-        if (!newString) {
-          return [{ value: oldString, removed: true }];
-        }
-        if (!oldString) {
-          return [{ value: newString, added: true }];
-        }
-
-        newString = this.tokenize(newString);
-        oldString = this.tokenize(oldString);
-
-        var newLen = newString.length, oldLen = oldString.length;
-        var maxEditLength = newLen + oldLen;
-        var bestPath = [{ newPos: -1, components: [] }];
-
-        // Seed editLength = 0
-        var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
-        if (bestPath[0].newPos+1 >= newLen && oldPos+1 >= oldLen) {
-          return bestPath[0].components;
-        }
-
-        for (var editLength = 1; editLength <= maxEditLength; editLength++) {
-          for (var diagonalPath = -1*editLength; diagonalPath <= editLength; diagonalPath+=2) {
-            var basePath;
-            var addPath = bestPath[diagonalPath-1],
-                removePath = bestPath[diagonalPath+1];
-            oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
-            if (addPath) {
-              // No one else is going to attempt to use this value, clear it
-              bestPath[diagonalPath-1] = undefined;
-            }
-
-            var canAdd = addPath && addPath.newPos+1 < newLen;
-            var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
-            if (!canAdd && !canRemove) {
-              bestPath[diagonalPath] = undefined;
-              continue;
-            }
-
-            // Select the diagonal that we want to branch from. We select the prior
-            // path whose position in the new string is the farthest from the origin
-            // and does not pass the bounds of the diff graph
-            if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
-              basePath = clonePath(removePath);
-              this.pushComponent(basePath.components, oldString[oldPos], undefined, true);
-            } else {
-              basePath = clonePath(addPath);
-              basePath.newPos++;
-              this.pushComponent(basePath.components, newString[basePath.newPos], true, undefined);
-            }
-
-            var oldPos = this.extractCommon(basePath, newString, oldString, diagonalPath);
-
-            if (basePath.newPos+1 >= newLen && oldPos+1 >= oldLen) {
-              return basePath.components;
-            } else {
-              bestPath[diagonalPath] = basePath;
-            }
-          }
-        }
-      },
-
-      pushComponent: function(components, value, added, removed) {
-        var last = components[components.length-1];
-        if (last && last.added === added && last.removed === removed) {
-          // We need to clone here as the component clone operation is just
-          // as shallow array clone
-          components[components.length-1] =
-            {value: this.join(last.value, value), added: added, removed: removed };
-        } else {
-          components.push({value: value, added: added, removed: removed });
-        }
-      },
-      extractCommon: function(basePath, newString, oldString, diagonalPath) {
-        var newLen = newString.length,
-            oldLen = oldString.length,
-            newPos = basePath.newPos,
-            oldPos = newPos - diagonalPath;
-        while (newPos+1 < newLen && oldPos+1 < oldLen && this.equals(newString[newPos+1], oldString[oldPos+1])) {
-          newPos++;
-          oldPos++;
-
-          this.pushComponent(basePath.components, newString[newPos], undefined, undefined);
-        }
-        basePath.newPos = newPos;
-        return oldPos;
-      },
-
-      equals: function(left, right) {
-        var reWhitespace = /\S/;
-        if (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right)) {
-          return true;
-        } else {
-          return left === right;
-        }
-      },
-      join: function(left, right) {
-        return left + right;
-      },
-      tokenize: function(value) {
-        return value;
-      }
-  };
-
-  var CharDiff = new Diff();
-
-  var WordDiff = new Diff(true);
-  var WordWithSpaceDiff = new Diff();
-  WordDiff.tokenize = WordWithSpaceDiff.tokenize = function(value) {
-    return removeEmpty(value.split(/(\s+|\b)/));
-  };
-
-  var CssDiff = new Diff(true);
-  CssDiff.tokenize = function(value) {
-    return removeEmpty(value.split(/([{}:;,]|\s+)/));
-  };
-
-  var LineDiff = new Diff();
-  LineDiff.tokenize = function(value) {
-    return value.split(/^/m);
-  };
-
-  return {
-    Diff: Diff,
-
-    diffChars: function(oldStr, newStr) { return CharDiff.diff(oldStr, newStr); },
-    diffWords: function(oldStr, newStr) { return WordDiff.diff(oldStr, newStr); },
-    diffWordsWithSpace: function(oldStr, newStr) { return WordWithSpaceDiff.diff(oldStr, newStr); },
-    diffLines: function(oldStr, newStr) { return LineDiff.diff(oldStr, newStr); },
-
-    diffCss: function(oldStr, newStr) { return CssDiff.diff(oldStr, newStr); },
-
-    createPatch: function(fileName, oldStr, newStr, oldHeader, newHeader) {
-      var ret = [];
-
-      ret.push('Index: ' + fileName);
-      ret.push('===================================================================');
-      ret.push('--- ' + fileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
-      ret.push('+++ ' + fileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
-
-      var diff = LineDiff.diff(oldStr, newStr);
-      if (!diff[diff.length-1].value) {
-        diff.pop();   // Remove trailing newline add
-      }
-      diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier
-
-      function contextLines(lines) {
-        return lines.map(function(entry) { return ' ' + entry; });
-      }
-      function eofNL(curRange, i, current) {
-        var last = diff[diff.length-2],
-            isLast = i === diff.length-2,
-            isLastOfType = i === diff.length-3 && (current.added !== last.added || current.removed !== last.removed);
-
-        // Figure out if this is the last line for the given file and missing NL
-        if (!/\n$/.test(current.value) && (isLast || isLastOfType)) {
-          curRange.push('\\ No newline at end of file');
-        }
-      }
-
-      var oldRangeStart = 0, newRangeStart = 0, curRange = [],
-          oldLine = 1, newLine = 1;
-      for (var i = 0; i < diff.length; i++) {
-        var current = diff[i],
-            lines = current.lines || current.value.replace(/\n$/, '').split('\n');
-        current.lines = lines;
-
-        if (current.added || current.removed) {
-          if (!oldRangeStart) {
-            var prev = diff[i-1];
-            oldRangeStart = oldLine;
-            newRangeStart = newLine;
-
-            if (prev) {
-              curRange = contextLines(prev.lines.slice(-4));
-              oldRangeStart -= curRange.length;
-              newRangeStart -= curRange.length;
-            }
-          }
-          curRange.push.apply(curRange, lines.map(function(entry) { return (current.added?'+':'-') + entry; }));
-          eofNL(curRange, i, current);
-
-          if (current.added) {
-            newLine += lines.length;
-          } else {
-            oldLine += lines.length;
-          }
-        } else {
-          if (oldRangeStart) {
-            // Close out any changes that have been output (or join overlapping)
-            if (lines.length <= 8 && i < diff.length-2) {
-              // Overlapping
-              curRange.push.apply(curRange, contextLines(lines));
-            } else {
-              // end the range and output
-              var contextSize = Math.min(lines.length, 4);
-              ret.push(
-                  '@@ -' + oldRangeStart + ',' + (oldLine-oldRangeStart+contextSize)
-                  + ' +' + newRangeStart + ',' + (newLine-newRangeStart+contextSize)
-                  + ' @@');
-              ret.push.apply(ret, curRange);
-              ret.push.apply(ret, contextLines(lines.slice(0, contextSize)));
-              if (lines.length <= 4) {
-                eofNL(ret, i, current);
-              }
-
-              oldRangeStart = 0;  newRangeStart = 0; curRange = [];
-            }
-          }
-          oldLine += lines.length;
-          newLine += lines.length;
-        }
-      }
-
-      return ret.join('\n') + '\n';
-    },
-
-    applyPatch: function(oldStr, uniDiff) {
-      var diffstr = uniDiff.split('\n');
-      var diff = [];
-      var remEOFNL = false,
-          addEOFNL = false;
-
-      for (var i = (diffstr[0][0]==='I'?4:0); i < diffstr.length; i++) {
-        if(diffstr[i][0] === '@') {
-          var meh = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
-          diff.unshift({
-            start:meh[3],
-            oldlength:meh[2],
-            oldlines:[],
-            newlength:meh[4],
-            newlines:[]
-          });
-        } else if(diffstr[i][0] === '+') {
-          diff[0].newlines.push(diffstr[i].substr(1));
-        } else if(diffstr[i][0] === '-') {
-          diff[0].oldlines.push(diffstr[i].substr(1));
-        } else if(diffstr[i][0] === ' ') {
-          diff[0].newlines.push(diffstr[i].substr(1));
-          diff[0].oldlines.push(diffstr[i].substr(1));
-        } else if(diffstr[i][0] === '\\') {
-          if (diffstr[i-1][0] === '+') {
-            remEOFNL = true;
-          } else if(diffstr[i-1][0] === '-') {
-            addEOFNL = true;
-          }
-        }
-      }
-
-      var str = oldStr.split('\n');
-      for (var i = diff.length - 1; i >= 0; i--) {
-        var d = diff[i];
-        for (var j = 0; j < d.oldlength; j++) {
-          if(str[d.start-1+j] !== d.oldlines[j]) {
-            return false;
-          }
-        }
-        Array.prototype.splice.apply(str,[d.start-1,+d.oldlength].concat(d.newlines));
-      }
-
-      if (remEOFNL) {
-        while (!str[str.length-1]) {
-          str.pop();
-        }
-      } else if (addEOFNL) {
-        str.push('');
-      }
-      return str.join('\n');
-    },
-
-    convertChangesToXML: function(changes){
-      var ret = [];
-      for ( var i = 0; i < changes.length; i++) {
-        var change = changes[i];
-        if (change.added) {
-          ret.push('<ins>');
-        } else if (change.removed) {
-          ret.push('<del>');
-        }
-
-        ret.push(escapeHTML(change.value));
-
-        if (change.added) {
-          ret.push('</ins>');
-        } else if (change.removed) {
-          ret.push('</del>');
-        }
-      }
-      return ret.join('');
-    },
-
-    // See: http://code.google.com/p/google-diff-match-patch/wiki/API
-    convertChangesToDMP: function(changes){
-      var ret = [], change;
-      for ( var i = 0; i < changes.length; i++) {
-        change = changes[i];
-        ret.push([(change.added ? 1 : change.removed ? -1 : 0), change.value]);
-      }
-      return ret;
-    }
-  };
-})();
-
-if (typeof module !== 'undefined') {
-    module.exports = JsDiff;
-}
-
-}); // module: browser/diff.js
-
-require.register("browser/events.js", function(module, exports, require){
-
-/**
- * Module exports.
- */
-
-exports.EventEmitter = EventEmitter;
-
-/**
- * Check if `obj` is an array.
- */
-
-function isArray(obj) {
-  return '[object Array]' == {}.toString.call(obj);
-}
-
-/**
- * Event emitter constructor.
- *
- * @api public
- */
-
-function EventEmitter(){};
-
-/**
- * Adds a listener.
- *
- * @api public
- */
-
-EventEmitter.prototype.on = function (name, fn) {
-  if (!this.$events) {
-    this.$events = {};
-  }
-
-  if (!this.$events[name]) {
-    this.$events[name] = fn;
-  } else if (isArray(this.$events[name])) {
-    this.$events[name].push(fn);
-  } else {
-    this.$events[name] = [this.$events[name], fn];
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.addListener = EventEmitter.prototype.on;
-
-/**
- * Adds a volatile listener.
- *
- * @api public
- */
-
-EventEmitter.prototype.once = function (name, fn) {
-  var self = this;
-
-  function on () {
-    self.removeListener(name, on);
-    fn.apply(this, arguments);
-  };
-
-  on.listener = fn;
-  this.on(name, on);
-
-  return this;
-};
-
-/**
- * Removes a listener.
- *
- * @api public
- */
-
-EventEmitter.prototype.removeListener = function (name, fn) {
-  if (this.$events && this.$events[name]) {
-    var list = this.$events[name];
-
-    if (isArray(list)) {
-      var pos = -1;
-
-      for (var i = 0, l = list.length; i < l; i++) {
-        if (list[i] === fn || (list[i].listener && list[i].listener === fn)) {
-          pos = i;
-          break;
-        }
-      }
-
-      if (pos < 0) {
-        return this;
-      }
-
-      list.splice(pos, 1);
-
-      if (!list.length) {
-        delete this.$events[name];
-      }
-    } else if (list === fn || (list.listener && list.listener === fn)) {
-      delete this.$events[name];
-    }
-  }
-
-  return this;
-};
-
-/**
- * Removes all listeners for an event.
- *
- * @api public
- */
-
-EventEmitter.prototype.removeAllListeners = function (name) {
-  if (name === undefined) {
-    this.$events = {};
-    return this;
-  }
-
-  if (this.$events && this.$events[name]) {
-    this.$events[name] = null;
-  }
-
-  return this;
-};
-
-/**
- * Gets all listeners for a certain event.
- *
- * @api public
- */
-
-EventEmitter.prototype.listeners = function (name) {
-  if (!this.$events) {
-    this.$events = {};
-  }
-
-  if (!this.$events[name]) {
-    this.$events[name] = [];
-  }
-
-  if (!isArray(this.$events[name])) {
-    this.$events[name] = [this.$events[name]];
-  }
-
-  return this.$events[name];
-};
-
-/**
- * Emits an event.
- *
- * @api public
- */
-
-EventEmitter.prototype.emit = function (name) {
-  if (!this.$events) {
-    return false;
-  }
-
-  var handler = this.$events[name];
-
-  if (!handler) {
-    return false;
-  }
-
-  var args = [].slice.call(arguments, 1);
-
-  if ('function' == typeof handler) {
-    handler.apply(this, args);
-  } else if (isArray(handler)) {
-    var listeners = handler.slice();
-
-    for (var i = 0, l = listeners.length; i < l; i++) {
-      listeners[i].apply(this, args);
-    }
-  } else {
-    return false;
-  }
-
-  return true;
-};
-}); // module: browser/events.js
-
-require.register("browser/fs.js", function(module, exports, require){
-
-}); // module: browser/fs.js
-
-require.register("browser/path.js", function(module, exports, require){
-
-}); // module: browser/path.js
-
-require.register("browser/progress.js", function(module, exports, require){
-/**
- * Expose `Progress`.
- */
-
-module.exports = Progress;
-
-/**
- * Initialize a new `Progress` indicator.
- */
-
-function Progress() {
-  this.percent = 0;
-  this.size(0);
-  this.fontSize(11);
-  this.font('helvetica, arial, sans-serif');
-}
-
-/**
- * Set progress size to `n`.
- *
- * @param {Number} n
- * @return {Progress} for chaining
- * @api public
- */
-
-Progress.prototype.size = function(n){
-  this._size = n;
-  return this;
-};
-
-/**
- * Set text to `str`.
- *
- * @param {String} str
- * @return {Progress} for chaining
- * @api public
- */
-
-Progress.prototype.text = function(str){
-  this._text = str;
-  return this;
-};
-
-/**
- * Set font size to `n`.
- *
- * @param {Number} n
- * @return {Progress} for chaining
- * @api public
- */
-
-Progress.prototype.fontSize = function(n){
-  this._fontSize = n;
-  return this;
-};
-
-/**
- * Set font `family`.
- *
- * @param {String} family
- * @return {Progress} for chaining
- */
-
-Progress.prototype.font = function(family){
-  this._font = family;
-  return this;
-};
-
-/**
- * Update percentage to `n`.
- *
- * @param {Number} n
- * @return {Progress} for chaining
- */
-
-Progress.prototype.update = function(n){
-  this.percent = n;
-  return this;
-};
-
-/**
- * Draw on `ctx`.
- *
- * @param {CanvasRenderingContext2d} ctx
- * @return {Progress} for chaining
- */
-
-Progress.prototype.draw = function(ctx){
-  try {
-    var percent = Math.min(this.percent, 100)
-      , size = this._size
-      , half = size / 2
-      , x = half
-      , y = half
-      , rad = half - 1
-      , fontSize = this._fontSize;
-  
-    ctx.font = fontSize + 'px ' + this._font;
-  
-    var angle = Math.PI * 2 * (percent / 100);
-    ctx.clearRect(0, 0, size, size);
-  
-    // outer circle
-    ctx.strokeStyle = '#9f9f9f';
-    ctx.beginPath();
-    ctx.arc(x, y, rad, 0, angle, false);
-    ctx.stroke();
-  
-    // inner circle
-    ctx.strokeStyle = '#eee';
-    ctx.beginPath();
-    ctx.arc(x, y, rad - 1, 0, angle, true);
-    ctx.stroke();
-  
-    // text
-    var text = this._text || (percent | 0) + '%'
-      , w = ctx.measureText(text).width;
-  
-    ctx.fillText(
-        text
-      , x - w / 2 + 1
-      , y + fontSize / 2 - 1);
-  } catch (ex) {} //don't fail if we can't render progress
-  return this;
-};
-
-}); // module: browser/progress.js
-
-require.register("browser/tty.js", function(module, exports, require){
-
-exports.isatty = function(){
-  return true;
-};
-
-exports.getWindowSize = function(){
-  if ('innerHeight' in global) {
-    return [global.innerHeight, global.innerWidth];
-  } else {
-    // In a Web Worker, the DOM Window is not available.
-    return [640, 480];
-  }
-};
-
-}); // module: browser/tty.js
-
-require.register("context.js", function(module, exports, require){
-
-/**
- * Expose `Context`.
- */
-
-module.exports = Context;
-
-/**
- * Initialize a new `Context`.
- *
- * @api private
- */
-
-function Context(){}
-
-/**
- * Set or get the context `Runnable` to `runnable`.
- *
- * @param {Runnable} runnable
- * @return {Context}
- * @api private
- */
-
-Context.prototype.runnable = function(runnable){
-  if (0 == arguments.length) return this._runnable;
-  this.test = this._runnable = runnable;
-  return this;
-};
-
-/**
- * Set test timeout `ms`.
- *
- * @param {Number} ms
- * @return {Context} self
- * @api private
- */
-
-Context.prototype.timeout = function(ms){
-  this.runnable().timeout(ms);
-  return this;
-};
-
-/**
- * Set test slowness threshold `ms`.
- *
- * @param {Number} ms
- * @return {Context} self
- * @api private
- */
-
-Context.prototype.slow = function(ms){
-  this.runnable().slow(ms);
-  return this;
-};
-
-/**
- * Inspect the context void of `._runnable`.
- *
- * @return {String}
- * @api private
- */
-
-Context.prototype.inspect = function(){
-  return JSON.stringify(this, function(key, val){
-    if ('_runnable' == key) return;
-    if ('test' == key) return;
-    return val;
-  }, 2);
-};
-
-}); // module: context.js
-
-require.register("hook.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Runnable = require('./runnable');
-
-/**
- * Expose `Hook`.
- */
-
-module.exports = Hook;
-
-/**
- * Initialize a new `Hook` with the given `title` and callback `fn`.
- *
- * @param {String} title
- * @param {Function} fn
- * @api private
- */
-
-function Hook(title, fn) {
-  Runnable.call(this, title, fn);
-  this.type = 'hook';
-}
-
-/**
- * Inherit from `Runnable.prototype`.
- */
-
-function F(){};
-F.prototype = Runnable.prototype;
-Hook.prototype = new F;
-Hook.prototype.constructor = Hook;
-
-
-/**
- * Get or set the test `err`.
- *
- * @param {Error} err
- * @return {Error}
- * @api public
- */
-
-Hook.prototype.error = function(err){
-  if (0 == arguments.length) {
-    var err = this._error;
-    this._error = null;
-    return err;
-  }
-
-  this._error = err;
-};
-
-}); // module: hook.js
-
-require.register("interfaces/bdd.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Suite = require('../suite')
-  , Test = require('../test')
-  , utils = require('../utils');
-
-/**
- * BDD-style interface:
- *
- *      describe('Array', function(){
- *        describe('#indexOf()', function(){
- *          it('should return -1 when not present', function(){
- *
- *          });
- *
- *          it('should return the index when present', function(){
- *
- *          });
- *        });
- *      });
- *
- */
-
-module.exports = function(suite){
-  var suites = [suite];
-
-  suite.on('pre-require', function(context, file, mocha){
-
-    /**
-     * Execute before running tests.
-     */
-
-    context.before = function(fn){
-      suites[0].beforeAll(fn);
-    };
-
-    /**
-     * Execute after running tests.
-     */
-
-    context.after = function(fn){
-      suites[0].afterAll(fn);
-    };
-
-    /**
-     * Execute before each test case.
-     */
-
-    context.beforeEach = function(fn){
-      suites[0].beforeEach(fn);
-    };
-
-    /**
-     * Execute after each test case.
-     */
-
-    context.afterEach = function(fn){
-      suites[0].afterEach(fn);
-    };
-
-    /**
-     * Describe a "suite" with the given `title`
-     * and callback `fn` containing nested suites
-     * and/or tests.
-     */
-
-    context.describe = context.context = function(title, fn){
-      var suite = Suite.create(suites[0], title);
-      suites.unshift(suite);
-      fn.call(suite);
-      suites.shift();
-      return suite;
-    };
-
-    /**
-     * Pending describe.
-     */
-
-    context.xdescribe =
-    context.xcontext =
-    context.describe.skip = function(title, fn){
-      var suite = Suite.create(suites[0], title);
-      suite.pending = true;
-      suites.unshift(suite);
-      fn.call(suite);
-      suites.shift();
-    };
-
-    /**
-     * Exclusive suite.
-     */
-
-    context.describe.only = function(title, fn){
-      var suite = context.describe(title, fn);
-      mocha.grep(suite.fullTitle());
-      return suite;
-    };
-
-    /**
-     * Describe a specification or test-case
-     * with the given `title` and callback `fn`
-     * acting as a thunk.
-     */
-
-    context.it = context.specify = function(title, fn){
-      var suite = suites[0];
-      if (suite.pending) var fn = null;
-      var test = new Test(title, fn);
-      suite.addTest(test);
-      return test;
-    };
-
-    /**
-     * Exclusive test-case.
-     */
-
-    context.it.only = function(title, fn){
-      var test = context.it(title, fn);
-      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
-      mocha.grep(new RegExp(reString));
-      return test;
-    };
-
-    /**
-     * Pending test case.
-     */
-
-    context.xit =
-    context.xspecify =
-    context.it.skip = function(title){
-      context.it(title);
-    };
-  });
-};
-
-}); // module: interfaces/bdd.js
-
-require.register("interfaces/exports.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Suite = require('../suite')
-  , Test = require('../test');
-
-/**
- * TDD-style interface:
- *
- *     exports.Array = {
- *       '#indexOf()': {
- *         'should return -1 when the value is not present': function(){
- *
- *         },
- *
- *         'should return the correct index when the value is present': function(){
- *
- *         }
- *       }
- *     };
- *
- */
-
-module.exports = function(suite){
-  var suites = [suite];
-
-  suite.on('require', visit);
-
-  function visit(obj) {
-    var suite;
-    for (var key in obj) {
-      if ('function' == typeof obj[key]) {
-        var fn = obj[key];
-        switch (key) {
-          case 'before':
-            suites[0].beforeAll(fn);
-            break;
-          case 'after':
-            suites[0].afterAll(fn);
-            break;
-          case 'beforeEach':
-            suites[0].beforeEach(fn);
-            break;
-          case 'afterEach':
-            suites[0].afterEach(fn);
-            break;
-          default:
-            suites[0].addTest(new Test(key, fn));
-        }
-      } else {
-        var suite = Suite.create(suites[0], key);
-        suites.unshift(suite);
-        visit(obj[key]);
-        suites.shift();
-      }
-    }
-  }
-};
-
-}); // module: interfaces/exports.js
-
-require.register("interfaces/index.js", function(module, exports, require){
-
-exports.bdd = require('./bdd');
-exports.tdd = require('./tdd');
-exports.qunit = require('./qunit');
-exports.exports = require('./exports');
-
-}); // module: interfaces/index.js
-
-require.register("interfaces/qunit.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Suite = require('../suite')
-  , Test = require('../test')
-  , utils = require('../utils');
-
-/**
- * QUnit-style interface:
- *
- *     suite('Array');
- *
- *     test('#length', function(){
- *       var arr = [1,2,3];
- *       ok(arr.length == 3);
- *     });
- *
- *     test('#indexOf()', function(){
- *       var arr = [1,2,3];
- *       ok(arr.indexOf(1) == 0);
- *       ok(arr.indexOf(2) == 1);
- *       ok(arr.indexOf(3) == 2);
- *     });
- *
- *     suite('String');
- *
- *     test('#length', function(){
- *       ok('foo'.length == 3);
- *     });
- *
- */
-
-module.exports = function(suite){
-  var suites = [suite];
-
-  suite.on('pre-require', function(context, file, mocha){
-
-    /**
-     * Execute before running tests.
-     */
-
-    context.before = function(fn){
-      suites[0].beforeAll(fn);
-    };
-
-    /**
-     * Execute after running tests.
-     */
-
-    context.after = function(fn){
-      suites[0].afterAll(fn);
-    };
-
-    /**
-     * Execute before each test case.
-     */
-
-    context.beforeEach = function(fn){
-      suites[0].beforeEach(fn);
-    };
-
-    /**
-     * Execute after each test case.
-     */
-
-    context.afterEach = function(fn){
-      suites[0].afterEach(fn);
-    };
-
-    /**
-     * Describe a "suite" with the given `title`.
-     */
-
-    context.suite = function(title){
-      if (suites.length > 1) suites.shift();
-      var suite = Suite.create(suites[0], title);
-      suites.unshift(suite);
-      return suite;
-    };
-
-    /**
-     * Exclusive test-case.
-     */
-
-    context.suite.only = function(title, fn){
-      var suite = context.suite(title, fn);
-      mocha.grep(suite.fullTitle());
-    };
-
-    /**
-     * Describe a specification or test-case
-     * with the given `title` and callback `fn`
-     * acting as a thunk.
-     */
-
-    context.test = function(title, fn){
-      var test = new Test(title, fn);
-      suites[0].addTest(test);
-      return test;
-    };
-
-    /**
-     * Exclusive test-case.
-     */
-
-    context.test.only = function(title, fn){
-      var test = context.test(title, fn);
-      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
-      mocha.grep(new RegExp(reString));
-    };
-
-    /**
-     * Pending test case.
-     */
-
-    context.test.skip = function(title){
-      context.test(title);
-    };
-  });
-};
-
-}); // module: interfaces/qunit.js
-
-require.register("interfaces/tdd.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Suite = require('../suite')
-  , Test = require('../test')
-  , utils = require('../utils');;
-
-/**
- * TDD-style interface:
- *
- *      suite('Array', function(){
- *        suite('#indexOf()', function(){
- *          suiteSetup(function(){
- *
- *          });
- *
- *          test('should return -1 when not present', function(){
- *
- *          });
- *
- *          test('should return the index when present', function(){
- *
- *          });
- *
- *          suiteTeardown(function(){
- *
- *          });
- *        });
- *      });
- *
- */
-
-module.exports = function(suite){
-  var suites = [suite];
-
-  suite.on('pre-require', function(context, file, mocha){
-
-    /**
-     * Execute before each test case.
-     */
-
-    context.setup = function(fn){
-      suites[0].beforeEach(fn);
-    };
-
-    /**
-     * Execute after each test case.
-     */
-
-    context.teardown = function(fn){
-      suites[0].afterEach(fn);
-    };
-
-    /**
-     * Execute before the suite.
-     */
-
-    context.suiteSetup = function(fn){
-      suites[0].beforeAll(fn);
-    };
-
-    /**
-     * Execute after the suite.
-     */
-
-    context.suiteTeardown = function(fn){
-      suites[0].afterAll(fn);
-    };
-
-    /**
-     * Describe a "suite" with the given `title`
-     * and callback `fn` containing nested suites
-     * and/or tests.
-     */
-
-    context.suite = function(title, fn){
-      var suite = Suite.create(suites[0], title);
-      suites.unshift(suite);
-      fn.call(suite);
-      suites.shift();
-      return suite;
-    };
-
-    /**
-     * Pending suite.
-     */
-    context.suite.skip = function(title, fn) {
-      var suite = Suite.create(suites[0], title);
-      suite.pending = true;
-      suites.unshift(suite);
-      fn.call(suite);
-      suites.shift();
-    };
-
-    /**
-     * Exclusive test-case.
-     */
-
-    context.suite.only = function(title, fn){
-      var suite = context.suite(title, fn);
-      mocha.grep(suite.fullTitle());
-    };
-
-    /**
-     * Describe a specification or test-case
-     * with the given `title` and callback `fn`
-     * acting as a thunk.
-     */
-
-    context.test = function(title, fn){
-      var suite = suites[0];
-      if (suite.pending) var fn = null;
-      var test = new Test(title, fn);
-      suite.addTest(test);
-      return test;
-    };
-
-    /**
-     * Exclusive test-case.
-     */
-
-    context.test.only = function(title, fn){
-      var test = context.test(title, fn);
-      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
-      mocha.grep(new RegExp(reString));
-    };
-
-    /**
-     * Pending test case.
-     */
-
-    context.test.skip = function(title){
-      context.test(title);
-    };
-  });
-};
-
-}); // module: interfaces/tdd.js
-
-require.register("mocha.js", function(module, exports, require){
-/*!
- * mocha
- * Copyright(c) 2011 TJ Holowaychuk <tj@vision-media.ca>
- * MIT Licensed
- */
-
-/**
- * Module dependencies.
- */
-
-var path = require('browser/path')
-  , utils = require('./utils');
-
-/**
- * Expose `Mocha`.
- */
-
-exports = module.exports = Mocha;
-
-/**
- * Expose internals.
- */
-
-exports.utils = utils;
-exports.interfaces = require('./interfaces');
-exports.reporters = require('./reporters');
-exports.Runnable = require('./runnable');
-exports.Context = require('./context');
-exports.Runner = require('./runner');
-exports.Suite = require('./suite');
-exports.Hook = require('./hook');
-exports.Test = require('./test');
-
-/**
- * Return image `name` path.
- *
- * @param {String} name
- * @return {String}
- * @api private
- */
-
-function image(name) {
-  return __dirname + '/../images/' + name + '.png';
-}
-
-/**
- * Setup mocha with `options`.
- *
- * Options:
- *
- *   - `ui` name "bdd", "tdd", "exports" etc
- *   - `reporter` reporter instance, defaults to `mocha.reporters.Dot`
- *   - `globals` array of accepted globals
- *   - `timeout` timeout in milliseconds
- *   - `bail` bail on the first test failure
- *   - `slow` milliseconds to wait before considering a test slow
- *   - `ignoreLeaks` ignore global leaks
- *   - `grep` string or regexp to filter tests with
- *
- * @param {Object} options
- * @api public
- */
-
-function Mocha(options) {
-  options = options || {};
-  this.files = [];
-  this.options = options;
-  this.grep(options.grep);
-  this.suite = new exports.Suite('', new exports.Context);
-  this.ui(options.ui);
-  this.bail(options.bail);
-  this.reporter(options.reporter);
-  if (null != options.timeout) this.timeout(options.timeout);
-  this.useColors(options.useColors)
-  if (options.slow) this.slow(options.slow);
-
-  this.suite.on('pre-require', function (context) {
-    exports.afterEach = context.afterEach || context.teardown;
-    exports.after = context.after || context.suiteTeardown;
-    exports.beforeEach = context.beforeEach || context.setup;
-    exports.before = context.before || context.suiteSetup;
-    exports.describe = context.describe || context.suite;
-    exports.it = context.it || context.test;
-    exports.setup = context.setup || context.beforeEach;
-    exports.suiteSetup = context.suiteSetup || context.before;
-    exports.suiteTeardown = context.suiteTeardown || context.after;
-    exports.suite = context.suite || context.describe;
-    exports.teardown = context.teardown || context.afterEach;
-    exports.test = context.test || context.it;
-  });
-}
-
-/**
- * Enable or disable bailing on the first failure.
- *
- * @param {Boolean} [bail]
- * @api public
- */
-
-Mocha.prototype.bail = function(bail){
-  if (0 == arguments.length) bail = true;
-  this.suite.bail(bail);
-  return this;
-};
-
-/**
- * Add test `file`.
- *
- * @param {String} file
- * @api public
- */
-
-Mocha.prototype.addFile = function(file){
-  this.files.push(file);
-  return this;
-};
-
-/**
- * Set reporter to `reporter`, defaults to "dot".
- *
- * @param {String|Function} reporter name or constructor
- * @api public
- */
-
-Mocha.prototype.reporter = function(reporter){
-  if ('function' == typeof reporter) {
-    this._reporter = reporter;
-  } else {
-    reporter = reporter || 'dot';
-    var _reporter;
-    try { _reporter = require('./reporters/' + reporter); } catch (err) {};
-    if (!_reporter) try { _reporter = require(reporter); } catch (err) {};
-    if (!_reporter && reporter === 'teamcity')
-      console.warn('The Teamcity reporter was moved to a package named ' +
-        'mocha-teamcity-reporter ' +
-        '(https://npmjs.org/package/mocha-teamcity-reporter).');
-    if (!_reporter) throw new Error('invalid reporter "' + reporter + '"');
-    this._reporter = _reporter;
-  }
-  return this;
-};
-
-/**
- * Set test UI `name`, defaults to "bdd".
- *
- * @param {String} bdd
- * @api public
- */
-
-Mocha.prototype.ui = function(name){
-  name = name || 'bdd';
-  this._ui = exports.interfaces[name];
-  if (!this._ui) try { this._ui = require(name); } catch (err) {};
-  if (!this._ui) throw new Error('invalid interface "' + name + '"');
-  this._ui = this._ui(this.suite);
-  return this;
-};
-
-/**
- * Load registered files.
- *
- * @api private
- */
-
-Mocha.prototype.loadFiles = function(fn){
-  var self = this;
-  var suite = this.suite;
-  var pending = this.files.length;
-  this.files.forEach(function(file){
-    file = path.resolve(file);
-    suite.emit('pre-require', global, file, self);
-    suite.emit('require', require(file), file, self);
-    suite.emit('post-require', global, file, self);
-    --pending || (fn && fn());
-  });
-};
-
-/**
- * Enable growl support.
- *
- * @api private
- */
-
-Mocha.prototype._growl = function(runner, reporter) {
-  var notify = require('growl');
-
-  runner.on('end', function(){
-    var stats = reporter.stats;
-    if (stats.failures) {
-      var msg = stats.failures + ' of ' + runner.total + ' tests failed';
-      notify(msg, { name: 'mocha', title: 'Failed', image: image('error') });
-    } else {
-      notify(stats.passes + ' tests passed in ' + stats.duration + 'ms', {
-          name: 'mocha'
-        , title: 'Passed'
-        , image: image('ok')
-      });
-    }
-  });
-};
-
-/**
- * Add regexp to grep, if `re` is a string it is escaped.
- *
- * @param {RegExp|String} re
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.grep = function(re){
-  this.options.grep = 'string' == typeof re
-    ? new RegExp(utils.escapeRegexp(re))
-    : re;
-  return this;
-};
-
-/**
- * Invert `.grep()` matches.
- *
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.invert = function(){
-  this.options.invert = true;
-  return this;
-};
-
-/**
- * Ignore global leaks.
- *
- * @param {Boolean} ignore
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.ignoreLeaks = function(ignore){
-  this.options.ignoreLeaks = !!ignore;
-  return this;
-};
-
-/**
- * Enable global leak checking.
- *
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.checkLeaks = function(){
-  this.options.ignoreLeaks = false;
-  return this;
-};
-
-/**
- * Enable growl support.
- *
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.growl = function(){
-  this.options.growl = true;
-  return this;
-};
-
-/**
- * Ignore `globals` array or string.
- *
- * @param {Array|String} globals
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.globals = function(globals){
-  this.options.globals = (this.options.globals || []).concat(globals);
-  return this;
-};
-
-/**
- * Emit color output.
- *
- * @param {Boolean} colors
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.useColors = function(colors){
-  this.options.useColors = arguments.length && colors != undefined
-    ? colors
-    : true;
-  return this;
-};
-
-/**
- * Use inline diffs rather than +/-.
- *
- * @param {Boolean} inlineDiffs
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.useInlineDiffs = function(inlineDiffs) {
-  this.options.useInlineDiffs = arguments.length && inlineDiffs != undefined
-  ? inlineDiffs
-  : false;
-  return this;
-};
-
-/**
- * Set the timeout in milliseconds.
- *
- * @param {Number} timeout
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.timeout = function(timeout){
-  this.suite.timeout(timeout);
-  return this;
-};
-
-/**
- * Set slowness threshold in milliseconds.
- *
- * @param {Number} slow
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.slow = function(slow){
-  this.suite.slow(slow);
-  return this;
-};
-
-/**
- * Makes all tests async (accepting a callback)
- *
- * @return {Mocha}
- * @api public
- */
-
-Mocha.prototype.asyncOnly = function(){
-  this.options.asyncOnly = true;
-  return this;
-};
-
-/**
- * Run tests and invoke `fn()` when complete.
- *
- * @param {Function} fn
- * @return {Runner}
- * @api public
- */
-
-Mocha.prototype.run = function(fn){
-  if (this.files.length) this.loadFiles();
-  var suite = this.suite;
-  var options = this.options;
-  var runner = new exports.Runner(suite);
-  var reporter = new this._reporter(runner);
-  runner.ignoreLeaks = false !== options.ignoreLeaks;
-  runner.asyncOnly = options.asyncOnly;
-  if (options.grep) runner.grep(options.grep, options.invert);
-  if (options.globals) runner.globals(options.globals);
-  if (options.growl) this._growl(runner, reporter);
-  exports.reporters.Base.useColors = options.useColors;
-  exports.reporters.Base.inlineDiffs = options.useInlineDiffs;
-  return runner.run(fn);
-};
-
-}); // module: mocha.js
-
-require.register("ms.js", function(module, exports, require){
-/**
- * Helpers.
- */
-
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var y = d * 365.25;
-
-/**
- * Parse or format the given `val`.
- *
- * Options:
- *
- *  - `long` verbose formatting [false]
- *
- * @param {String|Number} val
- * @param {Object} options
- * @return {String|Number}
- * @api public
- */
-
-module.exports = function(val, options){
-  options = options || {};
-  if ('string' == typeof val) return parse(val);
-  return options.long ? longFormat(val) : shortFormat(val);
-};
-
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @param {String} str
- * @return {Number}
- * @api private
- */
-
-function parse(str) {
-  var match = /^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)?$/i.exec(str);
-  if (!match) return;
-  var n = parseFloat(match[1]);
-  var type = (match[2] || 'ms').toLowerCase();
-  switch (type) {
-    case 'years':
-    case 'year':
-    case 'y':
-      return n * y;
-    case 'days':
-    case 'day':
-    case 'd':
-      return n * d;
-    case 'hours':
-    case 'hour':
-    case 'h':
-      return n * h;
-    case 'minutes':
-    case 'minute':
-    case 'm':
-      return n * m;
-    case 'seconds':
-    case 'second':
-    case 's':
-      return n * s;
-    case 'ms':
-      return n;
-  }
-}
-
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function shortFormat(ms) {
-  if (ms >= d) return Math.round(ms / d) + 'd';
-  if (ms >= h) return Math.round(ms / h) + 'h';
-  if (ms >= m) return Math.round(ms / m) + 'm';
-  if (ms >= s) return Math.round(ms / s) + 's';
-  return ms + 'ms';
-}
-
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function longFormat(ms) {
-  return plural(ms, d, 'day')
-    || plural(ms, h, 'hour')
-    || plural(ms, m, 'minute')
-    || plural(ms, s, 'second')
-    || ms + ' ms';
-}
-
-/**
- * Pluralization helper.
- */
-
-function plural(ms, n, name) {
-  if (ms < n) return;
-  if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;
-  return Math.ceil(ms / n) + ' ' + name + 's';
-}
-
-}); // module: ms.js
-
-require.register("reporters/base.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var tty = require('browser/tty')
-  , diff = require('browser/diff')
-  , ms = require('../ms')
-  , utils = require('../utils');
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Check if both stdio streams are associated with a tty.
- */
-
-var isatty = tty.isatty(1) && tty.isatty(2);
-
-/**
- * Expose `Base`.
- */
-
-exports = module.exports = Base;
-
-/**
- * Enable coloring by default.
- */
-
-exports.useColors = isatty || (process.env.MOCHA_COLORS !== undefined);
-
-/**
- * Inline diffs instead of +/-
- */
-
-exports.inlineDiffs = false;
-
-/**
- * Default color map.
- */
-
-exports.colors = {
-    'pass': 90
-  , 'fail': 31
-  , 'bright pass': 92
-  , 'bright fail': 91
-  , 'bright yellow': 93
-  , 'pending': 36
-  , 'suite': 0
-  , 'error title': 0
-  , 'error message': 31
-  , 'error stack': 90
-  , 'checkmark': 32
-  , 'fast': 90
-  , 'medium': 33
-  , 'slow': 31
-  , 'green': 32
-  , 'light': 90
-  , 'diff gutter': 90
-  , 'diff added': 42
-  , 'diff removed': 41
-};
-
-/**
- * Default symbol map.
- */
-
-exports.symbols = {
-  ok: '✓',
-  err: '✖',
-  dot: '․'
-};
-
-// With node.js on Windows: use symbols available in terminal default fonts
-if ('win32' == process.platform) {
-  exports.symbols.ok = '\u221A';
-  exports.symbols.err = '\u00D7';
-  exports.symbols.dot = '.';
-}
-
-/**
- * Color `str` with the given `type`,
- * allowing colors to be disabled,
- * as well as user-defined color
- * schemes.
- *
- * @param {String} type
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-var color = exports.color = function(type, str) {
-  if (!exports.useColors) return str;
-  return '\u001b[' + exports.colors[type] + 'm' + str + '\u001b[0m';
-};
-
-/**
- * Expose term window size, with some
- * defaults for when stderr is not a tty.
- */
-
-exports.window = {
-  width: isatty
-    ? process.stdout.getWindowSize
-      ? process.stdout.getWindowSize(1)[0]
-      : tty.getWindowSize()[1]
-    : 75
-};
-
-/**
- * Expose some basic cursor interactions
- * that are common among reporters.
- */
-
-exports.cursor = {
-  hide: function(){
-    isatty && process.stdout.write('\u001b[?25l');
-  },
-
-  show: function(){
-    isatty && process.stdout.write('\u001b[?25h');
-  },
-
-  deleteLine: function(){
-    isatty && process.stdout.write('\u001b[2K');
-  },
-
-  beginningOfLine: function(){
-    isatty && process.stdout.write('\u001b[0G');
-  },
-
-  CR: function(){
-    if (isatty) {
-      exports.cursor.deleteLine();
-      exports.cursor.beginningOfLine();
-    } else {
-      process.stdout.write('\r');
-    }
-  }
-};
-
-/**
- * Outut the given `failures` as a list.
- *
- * @param {Array} failures
- * @api public
- */
-
-exports.list = function(failures){
-  console.error();
-  failures.forEach(function(test, i){
-    // format
-    var fmt = color('error title', '  %s) %s:\n')
-      + color('error message', '     %s')
-      + color('error stack', '\n%s\n');
-
-    // msg
-    var err = test.err
-      , message = err.message || ''
-      , stack = err.stack || message
-      , index = stack.indexOf(message) + message.length
-      , msg = stack.slice(0, index)
-      , actual = err.actual
-      , expected = err.expected
-      , escape = true;
-
-    // uncaught
-    if (err.uncaught) {
-      msg = 'Uncaught ' + msg;
-    }
-
-    // explicitly show diff
-    if (err.showDiff && sameType(actual, expected)) {
-      escape = false;
-      err.actual = actual = stringify(canonicalize(actual));
-      err.expected = expected = stringify(canonicalize(expected));
-    }
-
-    // actual / expected diff
-    if ('string' == typeof actual && 'string' == typeof expected) {
-      fmt = color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
-      var match = message.match(/^([^:]+): expected/);
-      msg = '\n      ' + color('error message', match ? match[1] : msg);
-
-      if (exports.inlineDiffs) {
-        msg += inlineDiff(err, escape);
-      } else {
-        msg += unifiedDiff(err, escape);
-      }
-    }
-
-    // indent stack trace without msg
-    stack = stack.slice(index ? index + 1 : index)
-      .replace(/^/gm, '  ');
-
-    console.error(fmt, (i + 1), test.fullTitle(), msg, stack);
-  });
-};
-
-/**
- * Initialize a new `Base` reporter.
- *
- * All other reporters generally
- * inherit from this reporter, providing
- * stats such as test duration, number
- * of tests passed / failed etc.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function Base(runner) {
-  var self = this
-    , stats = this.stats = { suites: 0, tests: 0, passes: 0, pending: 0, failures: 0 }
-    , failures = this.failures = [];
-
-  if (!runner) return;
-  this.runner = runner;
-
-  runner.stats = stats;
-
-  runner.on('start', function(){
-    stats.start = new Date;
-  });
-
-  runner.on('suite', function(suite){
-    stats.suites = stats.suites || 0;
-    suite.root || stats.suites++;
-  });
-
-  runner.on('test end', function(test){
-    stats.tests = stats.tests || 0;
-    stats.tests++;
-  });
-
-  runner.on('pass', function(test){
-    stats.passes = stats.passes || 0;
-
-    var medium = test.slow() / 2;
-    test.speed = test.duration > test.slow()
-      ? 'slow'
-      : test.duration > medium
-        ? 'medium'
-        : 'fast';
-
-    stats.passes++;
-  });
-
-  runner.on('fail', function(test, err){
-    stats.failures = stats.failures || 0;
-    stats.failures++;
-    test.err = err;
-    failures.push(test);
-  });
-
-  runner.on('end', function(){
-    stats.end = new Date;
-    stats.duration = new Date - stats.start;
-  });
-
-  runner.on('pending', function(){
-    stats.pending++;
-  });
-}
-
-/**
- * Output common epilogue used by many of
- * the bundled reporters.
- *
- * @api public
- */
-
-Base.prototype.epilogue = function(){
-  var stats = this.stats;
-  var tests;
-  var fmt;
-
-  console.log();
-
-  // passes
-  fmt = color('bright pass', ' ')
-    + color('green', ' %d passing')
-    + color('light', ' (%s)');
-
-  console.log(fmt,
-    stats.passes || 0,
-    ms(stats.duration));
-
-  // pending
-  if (stats.pending) {
-    fmt = color('pending', ' ')
-      + color('pending', ' %d pending');
-
-    console.log(fmt, stats.pending);
-  }
-
-  // failures
-  if (stats.failures) {
-    fmt = color('fail', '  %d failing');
-
-    console.error(fmt,
-      stats.failures);
-
-    Base.list(this.failures);
-    console.error();
-  }
-
-  console.log();
-};
-
-/**
- * Pad the given `str` to `len`.
- *
- * @param {String} str
- * @param {String} len
- * @return {String}
- * @api private
- */
-
-function pad(str, len) {
-  str = String(str);
-  return Array(len - str.length + 1).join(' ') + str;
-}
-
-
-/**
- * Returns an inline diff between 2 strings with coloured ANSI output
- *
- * @param {Error} Error with actual/expected
- * @return {String} Diff
- * @api private
- */
-
-function inlineDiff(err, escape) {
-  var msg = errorDiff(err, 'WordsWithSpace', escape);
-
-  // linenos
-  var lines = msg.split('\n');
-  if (lines.length > 4) {
-    var width = String(lines.length).length;
-    msg = lines.map(function(str, i){
-      return pad(++i, width) + ' |' + ' ' + str;
-    }).join('\n');
-  }
-
-  // legend
-  msg = '\n'
-    + color('diff removed', 'actual')
-    + ' '
-    + color('diff added', 'expected')
-    + '\n\n'
-    + msg
-    + '\n';
-
-  // indent
-  msg = msg.replace(/^/gm, '      ');
-  return msg;
-}
-
-/**
- * Returns a unified diff between 2 strings
- *
- * @param {Error} Error with actual/expected
- * @return {String} Diff
- * @api private
- */
-
-function unifiedDiff(err, escape) {
-  var indent = '      ';
-  function cleanUp(line) {
-    if (escape) {
-      line = escapeInvisibles(line);
-    }
-    if (line[0] === '+') return indent + colorLines('diff added', line);
-    if (line[0] === '-') return indent + colorLines('diff removed', line);
-    if (line.match(/\@\@/)) return null;
-    if (line.match(/\\ No newline/)) return null;
-    else return indent + line;
-  }
-  function notBlank(line) {
-    return line != null;
-  }
-  msg = diff.createPatch('string', err.actual, err.expected);
-  var lines = msg.split('\n').splice(4);
-  return '\n      '
-         + colorLines('diff added',   '+ expected') + ' '
-         + colorLines('diff removed', '- actual')
-         + '\n\n'
-         + lines.map(cleanUp).filter(notBlank).join('\n');
-}
-
-/**
- * Return a character diff for `err`.
- *
- * @param {Error} err
- * @return {String}
- * @api private
- */
-
-function errorDiff(err, type, escape) {
-  var actual   = escape ? escapeInvisibles(err.actual)   : err.actual;
-  var expected = escape ? escapeInvisibles(err.expected) : err.expected;
-  return diff['diff' + type](actual, expected).map(function(str){
-    if (str.added) return colorLines('diff added', str.value);
-    if (str.removed) return colorLines('diff removed', str.value);
-    return str.value;
-  }).join('');
-}
-
-/**
- * Returns a string with all invisible characters in plain text
- *
- * @param {String} line
- * @return {String}
- * @api private
- */
-function escapeInvisibles(line) {
-    return line.replace(/\t/g, '<tab>')
-               .replace(/\r/g, '<CR>')
-               .replace(/\n/g, '<LF>\n');
-}
-
-/**
- * Color lines for `str`, using the color `name`.
- *
- * @param {String} name
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-function colorLines(name, str) {
-  return str.split('\n').map(function(str){
-    return color(name, str);
-  }).join('\n');
-}
-
-/**
- * Stringify `obj`.
- *
- * @param {Object} obj
- * @return {String}
- * @api private
- */
-
-function stringify(obj) {
-  if (obj instanceof RegExp) return obj.toString();
-  return JSON.stringify(obj, null, 2);
-}
-
-/**
- * Return a new object that has the keys in sorted order.
- * @param {Object} obj
- * @return {Object}
- * @api private
- */
-
- function canonicalize(obj, stack) {
-   stack = stack || [];
-
-   if (utils.indexOf(stack, obj) !== -1) return obj;
-
-   var canonicalizedObj;
-
-   if ('[object Array]' == {}.toString.call(obj)) {
-     stack.push(obj);
-     canonicalizedObj = utils.map(obj, function(item) {
-       return canonicalize(item, stack);
-     });
-     stack.pop();
-   } else if (typeof obj === 'object' && obj !== null) {
-     stack.push(obj);
-     canonicalizedObj = {};
-     utils.forEach(utils.keys(obj).sort(), function(key) {
-       canonicalizedObj[key] = canonicalize(obj[key], stack);
-     });
-     stack.pop();
-   } else {
-     canonicalizedObj = obj;
-   }
-
-   return canonicalizedObj;
- }
-
-/**
- * Check that a / b have the same type.
- *
- * @param {Object} a
- * @param {Object} b
- * @return {Boolean}
- * @api private
- */
-
-function sameType(a, b) {
-  a = Object.prototype.toString.call(a);
-  b = Object.prototype.toString.call(b);
-  return a == b;
-}
-
-
-}); // module: reporters/base.js
-
-require.register("reporters/doc.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , utils = require('../utils');
-
-/**
- * Expose `Doc`.
- */
-
-exports = module.exports = Doc;
-
-/**
- * Initialize a new `Doc` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function Doc(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , total = runner.total
-    , indents = 2;
-
-  function indent() {
-    return Array(indents).join('  ');
-  }
-
-  runner.on('suite', function(suite){
-    if (suite.root) return;
-    ++indents;
-    console.log('%s<section class="suite">', indent());
-    ++indents;
-    console.log('%s<h1>%s</h1>', indent(), utils.escape(suite.title));
-    console.log('%s<dl>', indent());
-  });
-
-  runner.on('suite end', function(suite){
-    if (suite.root) return;
-    console.log('%s</dl>', indent());
-    --indents;
-    console.log('%s</section>', indent());
-    --indents;
-  });
-
-  runner.on('pass', function(test){
-    console.log('%s  <dt>%s</dt>', indent(), utils.escape(test.title));
-    var code = utils.escape(utils.clean(test.fn.toString()));
-    console.log('%s  <dd><pre><code>%s</code></pre></dd>', indent(), code);
-  });
-}
-
-}); // module: reporters/doc.js
-
-require.register("reporters/dot.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , color = Base.color;
-
-/**
- * Expose `Dot`.
- */
-
-exports = module.exports = Dot;
-
-/**
- * Initialize a new `Dot` matrix test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function Dot(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , n = 0;
-
-  runner.on('start', function(){
-    process.stdout.write('\n  ');
-  });
-
-  runner.on('pending', function(test){
-    process.stdout.write(color('pending', Base.symbols.dot));
-  });
-
-  runner.on('pass', function(test){
-    if (++n % width == 0) process.stdout.write('\n  ');
-    if ('slow' == test.speed) {
-      process.stdout.write(color('bright yellow', Base.symbols.dot));
-    } else {
-      process.stdout.write(color(test.speed, Base.symbols.dot));
-    }
-  });
-
-  runner.on('fail', function(test, err){
-    if (++n % width == 0) process.stdout.write('\n  ');
-    process.stdout.write(color('fail', Base.symbols.dot));
-  });
-
-  runner.on('end', function(){
-    console.log();
-    self.epilogue();
-  });
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-Dot.prototype = new F;
-Dot.prototype.constructor = Dot;
-
-}); // module: reporters/dot.js
-
-require.register("reporters/html-cov.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var JSONCov = require('./json-cov')
-  , fs = require('browser/fs');
-
-/**
- * Expose `HTMLCov`.
- */
-
-exports = module.exports = HTMLCov;
-
-/**
- * Initialize a new `JsCoverage` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function HTMLCov(runner) {
-  var jade = require('jade')
-    , file = __dirname + '/templates/coverage.jade'
-    , str = fs.readFileSync(file, 'utf8')
-    , fn = jade.compile(str, { filename: file })
-    , self = this;
-
-  JSONCov.call(this, runner, false);
-
-  runner.on('end', function(){
-    process.stdout.write(fn({
-        cov: self.cov
-      , coverageClass: coverageClass
-    }));
-  });
-}
-
-/**
- * Return coverage class for `n`.
- *
- * @return {String}
- * @api private
- */
-
-function coverageClass(n) {
-  if (n >= 75) return 'high';
-  if (n >= 50) return 'medium';
-  if (n >= 25) return 'low';
-  return 'terrible';
-}
-}); // module: reporters/html-cov.js
-
-require.register("reporters/html.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , utils = require('../utils')
-  , Progress = require('../browser/progress')
-  , escape = utils.escape;
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Expose `HTML`.
- */
-
-exports = module.exports = HTML;
-
-/**
- * Stats template.
- */
-
-var statsTemplate = '<ul id="mocha-stats">'
-  + '<li class="progress"><canvas width="40" height="40"></canvas></li>'
-  + '<li class="passes"><a href="#">passes:</a> <em>0</em></li>'
-  + '<li class="failures"><a href="#">failures:</a> <em>0</em></li>'
-  + '<li class="duration">duration: <em>0</em>s</li>'
-  + '</ul>';
-
-/**
- * Initialize a new `HTML` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function HTML(runner, root) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , total = runner.total
-    , stat = fragment(statsTemplate)
-    , items = stat.getElementsByTagName('li')
-    , passes = items[1].getElementsByTagName('em')[0]
-    , passesLink = items[1].getElementsByTagName('a')[0]
-    , failures = items[2].getElementsByTagName('em')[0]
-    , failuresLink = items[2].getElementsByTagName('a')[0]
-    , duration = items[3].getElementsByTagName('em')[0]
-    , canvas = stat.getElementsByTagName('canvas')[0]
-    , report = fragment('<ul id="mocha-report"></ul>')
-    , stack = [report]
-    , progress
-    , ctx
-
-  root = root || document.getElementById('mocha');
-
-  if (canvas.getContext) {
-    var ratio = window.devicePixelRatio || 1;
-    canvas.style.width = canvas.width;
-    canvas.style.height = canvas.height;
-    canvas.width *= ratio;
-    canvas.height *= ratio;
-    ctx = canvas.getContext('2d');
-    ctx.scale(ratio, ratio);
-    progress = new Progress;
-  }
-
-  if (!root) return error('#mocha div missing, add it to your document');
-
-  // pass toggle
-  on(passesLink, 'click', function(){
-    unhide();
-    var name = /pass/.test(report.className) ? '' : ' pass';
-    report.className = report.className.replace(/fail|pass/g, '') + name;
-    if (report.className.trim()) hideSuitesWithout('test pass');
-  });
-
-  // failure toggle
-  on(failuresLink, 'click', function(){
-    unhide();
-    var name = /fail/.test(report.className) ? '' : ' fail';
-    report.className = report.className.replace(/fail|pass/g, '') + name;
-    if (report.className.trim()) hideSuitesWithout('test fail');
-  });
-
-  root.appendChild(stat);
-  root.appendChild(report);
-
-  if (progress) progress.size(40);
-
-  runner.on('suite', function(suite){
-    if (suite.root) return;
-
-    // suite
-    var url = self.suiteURL(suite);
-    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
-
-    // container
-    stack[0].appendChild(el);
-    stack.unshift(document.createElement('ul'));
-    el.appendChild(stack[0]);
-  });
-
-  runner.on('suite end', function(suite){
-    if (suite.root) return;
-    stack.shift();
-  });
-
-  runner.on('fail', function(test, err){
-    if ('hook' == test.type) runner.emit('test end', test);
-  });
-
-  runner.on('test end', function(test){
-    // TODO: add to stats
-    var percent = stats.tests / this.total * 100 | 0;
-    if (progress) progress.update(percent).draw(ctx);
-
-    // update stats
-    var ms = new Date - stats.start;
-    text(passes, stats.passes);
-    text(failures, stats.failures);
-    text(duration, (ms / 1000).toFixed(2));
-
-    // test
-    if ('passed' == test.state) {
-      var url = self.testURL(test);
-      var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span> <a href="%s" class="replay">‣</a></h2></li>', test.speed, test.title, test.duration, url);
-    } else if (test.pending) {
-      var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);
-    } else {
-      var el = fragment('<li class="test fail"><h2>%e <a href="?grep=%e" class="replay">‣</a></h2></li>', test.title, encodeURIComponent(test.fullTitle()));
-      var str = test.err.stack || test.err.toString();
-
-      // FF / Opera do not add the message
-      if (!~str.indexOf(test.err.message)) {
-        str = test.err.message + '\n' + str;
-      }
-
-      // <=IE7 stringifies to [Object Error]. Since it can be overloaded, we
-      // check for the result of the stringifying.
-      if ('[object Error]' == str) str = test.err.message;
-
-      // Safari doesn't give you a stack. Let's at least provide a source line.
-      if (!test.err.stack && test.err.sourceURL && test.err.line !== undefined) {
-        str += "\n(" + test.err.sourceURL + ":" + test.err.line + ")";
-      }
-
-      el.appendChild(fragment('<pre class="error">%e</pre>', str));
-    }
-
-    // toggle code
-    // TODO: defer
-    if (!test.pending) {
-      var h2 = el.getElementsByTagName('h2')[0];
-
-      on(h2, 'click', function(){
-        pre.style.display = 'none' == pre.style.display
-          ? 'block'
-          : 'none';
-      });
-
-      var pre = fragment('<pre><code>%e</code></pre>', utils.clean(test.fn.toString()));
-      el.appendChild(pre);
-      pre.style.display = 'none';
-    }
-
-    // Don't call .appendChild if #mocha-report was already .shift()'ed off the stack.
-    if (stack[0]) stack[0].appendChild(el);
-  });
-}
-
-/**
- * Provide suite URL
- *
- * @param {Object} [suite]
- */
-
-HTML.prototype.suiteURL = function(suite){
-  return '?grep=' + encodeURIComponent(suite.fullTitle());
-};
-
-/**
- * Provide test URL
- *
- * @param {Object} [test]
- */
-
-HTML.prototype.testURL = function(test){
-  return '?grep=' + encodeURIComponent(test.fullTitle());
-};
-
-/**
- * Display error `msg`.
- */
-
-function error(msg) {
-  document.body.appendChild(fragment('<div id="mocha-error">%s</div>', msg));
-}
-
-/**
- * Return a DOM fragment from `html`.
- */
-
-function fragment(html) {
-  var args = arguments
-    , div = document.createElement('div')
-    , i = 1;
-
-  div.innerHTML = html.replace(/%([se])/g, function(_, type){
-    switch (type) {
-      case 's': return String(args[i++]);
-      case 'e': return escape(args[i++]);
-    }
-  });
-
-  return div.firstChild;
-}
-
-/**
- * Check for suites that do not have elements
- * with `classname`, and hide them.
- */
-
-function hideSuitesWithout(classname) {
-  var suites = document.getElementsByClassName('suite');
-  for (var i = 0; i < suites.length; i++) {
-    var els = suites[i].getElementsByClassName(classname);
-    if (0 == els.length) suites[i].className += ' hidden';
-  }
-}
-
-/**
- * Unhide .hidden suites.
- */
-
-function unhide() {
-  var els = document.getElementsByClassName('suite hidden');
-  for (var i = 0; i < els.length; ++i) {
-    els[i].className = els[i].className.replace('suite hidden', 'suite');
-  }
-}
-
-/**
- * Set `el` text to `str`.
- */
-
-function text(el, str) {
-  if (el.textContent) {
-    el.textContent = str;
-  } else {
-    el.innerText = str;
-  }
-}
-
-/**
- * Listen on `event` with callback `fn`.
- */
-
-function on(el, event, fn) {
-  if (el.addEventListener) {
-    el.addEventListener(event, fn, false);
-  } else {
-    el.attachEvent('on' + event, fn);
-  }
-}
-
-}); // module: reporters/html.js
-
-require.register("reporters/index.js", function(module, exports, require){
-
-exports.Base = require('./base');
-exports.Dot = require('./dot');
-exports.Doc = require('./doc');
-exports.TAP = require('./tap');
-exports.JSON = require('./json');
-exports.HTML = require('./html');
-exports.List = require('./list');
-exports.Min = require('./min');
-exports.Spec = require('./spec');
-exports.Nyan = require('./nyan');
-exports.XUnit = require('./xunit');
-exports.Markdown = require('./markdown');
-exports.Progress = require('./progress');
-exports.Landing = require('./landing');
-exports.JSONCov = require('./json-cov');
-exports.HTMLCov = require('./html-cov');
-exports.JSONStream = require('./json-stream');
-
-}); // module: reporters/index.js
-
-require.register("reporters/json-cov.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base');
-
-/**
- * Expose `JSONCov`.
- */
-
-exports = module.exports = JSONCov;
-
-/**
- * Initialize a new `JsCoverage` reporter.
- *
- * @param {Runner} runner
- * @param {Boolean} output
- * @api public
- */
-
-function JSONCov(runner, output) {
-  var self = this
-    , output = 1 == arguments.length ? true : output;
-
-  Base.call(this, runner);
-
-  var tests = []
-    , failures = []
-    , passes = [];
-
-  runner.on('test end', function(test){
-    tests.push(test);
-  });
-
-  runner.on('pass', function(test){
-    passes.push(test);
-  });
-
-  runner.on('fail', function(test){
-    failures.push(test);
-  });
-
-  runner.on('end', function(){
-    var cov = global._$jscoverage || {};
-    var result = self.cov = map(cov);
-    result.stats = self.stats;
-    result.tests = tests.map(clean);
-    result.failures = failures.map(clean);
-    result.passes = passes.map(clean);
-    if (!output) return;
-    process.stdout.write(JSON.stringify(result, null, 2 ));
-  });
-}
-
-/**
- * Map jscoverage data to a JSON structure
- * suitable for reporting.
- *
- * @param {Object} cov
- * @return {Object}
- * @api private
- */
-
-function map(cov) {
-  var ret = {
-      instrumentation: 'node-jscoverage'
-    , sloc: 0
-    , hits: 0
-    , misses: 0
-    , coverage: 0
-    , files: []
-  };
-
-  for (var filename in cov) {
-    var data = coverage(filename, cov[filename]);
-    ret.files.push(data);
-    ret.hits += data.hits;
-    ret.misses += data.misses;
-    ret.sloc += data.sloc;
-  }
-
-  ret.files.sort(function(a, b) {
-    return a.filename.localeCompare(b.filename);
-  });
-
-  if (ret.sloc > 0) {
-    ret.coverage = (ret.hits / ret.sloc) * 100;
-  }
-
-  return ret;
-};
-
-/**
- * Map jscoverage data for a single source file
- * to a JSON structure suitable for reporting.
- *
- * @param {String} filename name of the source file
- * @param {Object} data jscoverage coverage data
- * @return {Object}
- * @api private
- */
-
-function coverage(filename, data) {
-  var ret = {
-    filename: filename,
-    coverage: 0,
-    hits: 0,
-    misses: 0,
-    sloc: 0,
-    source: {}
-  };
-
-  data.source.forEach(function(line, num){
-    num++;
-
-    if (data[num] === 0) {
-      ret.misses++;
-      ret.sloc++;
-    } else if (data[num] !== undefined) {
-      ret.hits++;
-      ret.sloc++;
-    }
-
-    ret.source[num] = {
-        source: line
-      , coverage: data[num] === undefined
-        ? ''
-        : data[num]
-    };
-  });
-
-  ret.coverage = ret.hits / ret.sloc * 100;
-
-  return ret;
-}
-
-/**
- * Return a plain-object representation of `test`
- * free of cyclic properties etc.
- *
- * @param {Object} test
- * @return {Object}
- * @api private
- */
-
-function clean(test) {
-  return {
-      title: test.title
-    , fullTitle: test.fullTitle()
-    , duration: test.duration
-  }
-}
-
-}); // module: reporters/json-cov.js
-
-require.register("reporters/json-stream.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , color = Base.color;
-
-/**
- * Expose `List`.
- */
-
-exports = module.exports = List;
-
-/**
- * Initialize a new `List` test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function List(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , total = runner.total;
-
-  runner.on('start', function(){
-    console.log(JSON.stringify(['start', { total: total }]));
-  });
-
-  runner.on('pass', function(test){
-    console.log(JSON.stringify(['pass', clean(test)]));
-  });
-
-  runner.on('fail', function(test, err){
-    console.log(JSON.stringify(['fail', clean(test)]));
-  });
-
-  runner.on('end', function(){
-    process.stdout.write(JSON.stringify(['end', self.stats]));
-  });
-}
-
-/**
- * Return a plain-object representation of `test`
- * free of cyclic properties etc.
- *
- * @param {Object} test
- * @return {Object}
- * @api private
- */
-
-function clean(test) {
-  return {
-      title: test.title
-    , fullTitle: test.fullTitle()
-    , duration: test.duration
-  }
-}
-}); // module: reporters/json-stream.js
-
-require.register("reporters/json.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `JSON`.
- */
-
-exports = module.exports = JSONReporter;
-
-/**
- * Initialize a new `JSON` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function JSONReporter(runner) {
-  var self = this;
-  Base.call(this, runner);
-
-  var tests = []
-    , failures = []
-    , passes = [];
-
-  runner.on('test end', function(test){
-    tests.push(test);
-  });
-
-  runner.on('pass', function(test){
-    passes.push(test);
-  });
-
-  runner.on('fail', function(test){
-    failures.push(test);
-  });
-
-  runner.on('end', function(){
-    var obj = {
-        stats: self.stats
-      , tests: tests.map(clean)
-      , failures: failures.map(clean)
-      , passes: passes.map(clean)
-    };
-
-    process.stdout.write(JSON.stringify(obj, null, 2));
-  });
-}
-
-/**
- * Return a plain-object representation of `test`
- * free of cyclic properties etc.
- *
- * @param {Object} test
- * @return {Object}
- * @api private
- */
-
-function clean(test) {
-  return {
-      title: test.title
-    , fullTitle: test.fullTitle()
-    , duration: test.duration
-  }
-}
-}); // module: reporters/json.js
-
-require.register("reporters/landing.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `Landing`.
- */
-
-exports = module.exports = Landing;
-
-/**
- * Airplane color.
- */
-
-Base.colors.plane = 0;
-
-/**
- * Airplane crash color.
- */
-
-Base.colors['plane crash'] = 31;
-
-/**
- * Runway color.
- */
-
-Base.colors.runway = 90;
-
-/**
- * Initialize a new `Landing` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function Landing(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , total = runner.total
-    , stream = process.stdout
-    , plane = color('plane', '✈')
-    , crashed = -1
-    , n = 0;
-
-  function runway() {
-    var buf = Array(width).join('-');
-    return '  ' + color('runway', buf);
-  }
-
-  runner.on('start', function(){
-    stream.write('\n  ');
-    cursor.hide();
-  });
-
-  runner.on('test end', function(test){
-    // check if the plane crashed
-    var col = -1 == crashed
-      ? width * ++n / total | 0
-      : crashed;
-
-    // show the crash
-    if ('failed' == test.state) {
-      plane = color('plane crash', '✈');
-      crashed = col;
-    }
-
-    // render landing strip
-    stream.write('\u001b[4F\n\n');
-    stream.write(runway());
-    stream.write('\n  ');
-    stream.write(color('runway', Array(col).join('⋅')));
-    stream.write(plane)
-    stream.write(color('runway', Array(width - col).join('⋅') + '\n'));
-    stream.write(runway());
-    stream.write('\u001b[0m');
-  });
-
-  runner.on('end', function(){
-    cursor.show();
-    console.log();
-    self.epilogue();
-  });
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-Landing.prototype = new F;
-Landing.prototype.constructor = Landing;
-
-}); // module: reporters/landing.js
-
-require.register("reporters/list.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `List`.
- */
-
-exports = module.exports = List;
-
-/**
- * Initialize a new `List` test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function List(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , n = 0;
-
-  runner.on('start', function(){
-    console.log();
-  });
-
-  runner.on('test', function(test){
-    process.stdout.write(color('pass', '    ' + test.fullTitle() + ': '));
-  });
-
-  runner.on('pending', function(test){
-    var fmt = color('checkmark', '  -')
-      + color('pending', ' %s');
-    console.log(fmt, test.fullTitle());
-  });
-
-  runner.on('pass', function(test){
-    var fmt = color('checkmark', '  '+Base.symbols.dot)
-      + color('pass', ' %s: ')
-      + color(test.speed, '%dms');
-    cursor.CR();
-    console.log(fmt, test.fullTitle(), test.duration);
-  });
-
-  runner.on('fail', function(test, err){
-    cursor.CR();
-    console.log(color('fail', '  %d) %s'), ++n, test.fullTitle());
-  });
-
-  runner.on('end', self.epilogue.bind(self));
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-List.prototype = new F;
-List.prototype.constructor = List;
-
-
-}); // module: reporters/list.js
-
-require.register("reporters/markdown.js", function(module, exports, require){
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , utils = require('../utils');
-
-/**
- * Expose `Markdown`.
- */
-
-exports = module.exports = Markdown;
-
-/**
- * Initialize a new `Markdown` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function Markdown(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , level = 0
-    , buf = '';
-
-  function title(str) {
-    return Array(level).join('#') + ' ' + str;
-  }
-
-  function indent() {
-    return Array(level).join('  ');
-  }
-
-  function mapTOC(suite, obj) {
-    var ret = obj;
-    obj = obj[suite.title] = obj[suite.title] || { suite: suite };
-    suite.suites.forEach(function(suite){
-      mapTOC(suite, obj);
-    });
-    return ret;
-  }
-
-  function stringifyTOC(obj, level) {
-    ++level;
-    var buf = '';
-    var link;
-    for (var key in obj) {
-      if ('suite' == key) continue;
-      if (key) link = ' - [' + key + '](#' + utils.slug(obj[key].suite.fullTitle()) + ')\n';
-      if (key) buf += Array(level).join('  ') + link;
-      buf += stringifyTOC(obj[key], level);
-    }
-    --level;
-    return buf;
-  }
-
-  function generateTOC(suite) {
-    var obj = mapTOC(suite, {});
-    return stringifyTOC(obj, 0);
-  }
-
-  generateTOC(runner.suite);
-
-  runner.on('suite', function(suite){
-    ++level;
-    var slug = utils.slug(suite.fullTitle());
-    buf += '<a name="' + slug + '"></a>' + '\n';
-    buf += title(suite.title) + '\n';
-  });
-
-  runner.on('suite end', function(suite){
-    --level;
-  });
-
-  runner.on('pass', function(test){
-    var code = utils.clean(test.fn.toString());
-    buf += test.title + '.\n';
-    buf += '\n```js\n';
-    buf += code + '\n';
-    buf += '```\n\n';
-  });
-
-  runner.on('end', function(){
-    process.stdout.write('# TOC\n');
-    process.stdout.write(generateTOC(runner.suite));
-    process.stdout.write(buf);
-  });
-}
-}); // module: reporters/markdown.js
-
-require.register("reporters/min.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base');
-
-/**
- * Expose `Min`.
- */
-
-exports = module.exports = Min;
-
-/**
- * Initialize a new `Min` minimal test reporter (best used with --watch).
- *
- * @param {Runner} runner
- * @api public
- */
-
-function Min(runner) {
-  Base.call(this, runner);
-
-  runner.on('start', function(){
-    // clear screen
-    process.stdout.write('\u001b[2J');
-    // set cursor position
-    process.stdout.write('\u001b[1;3H');
-  });
-
-  runner.on('end', this.epilogue.bind(this));
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-Min.prototype = new F;
-Min.prototype.constructor = Min;
-
-
-}); // module: reporters/min.js
-
-require.register("reporters/nyan.js", function(module, exports, require){
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , color = Base.color;
-
-/**
- * Expose `Dot`.
- */
-
-exports = module.exports = NyanCat;
-
-/**
- * Initialize a new `Dot` matrix test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function NyanCat(runner) {
-  Base.call(this, runner);
-  var self = this
-    , stats = this.stats
-    , width = Base.window.width * .75 | 0
-    , rainbowColors = this.rainbowColors = self.generateColors()
-    , colorIndex = this.colorIndex = 0
-    , numerOfLines = this.numberOfLines = 4
-    , trajectories = this.trajectories = [[], [], [], []]
-    , nyanCatWidth = this.nyanCatWidth = 11
-    , trajectoryWidthMax = this.trajectoryWidthMax = (width - nyanCatWidth)
-    , scoreboardWidth = this.scoreboardWidth = 5
-    , tick = this.tick = 0
-    , n = 0;
-
-  runner.on('start', function(){
-    Base.cursor.hide();
-    self.draw();
-  });
-
-  runner.on('pending', function(test){
-    self.draw();
-  });
-
-  runner.on('pass', function(test){
-    self.draw();
-  });
-
-  runner.on('fail', function(test, err){
-    self.draw();
-  });
-
-  runner.on('end', function(){
-    Base.cursor.show();
-    for (var i = 0; i < self.numberOfLines; i++) write('\n');
-    self.epilogue();
-  });
-}
-
-/**
- * Draw the nyan cat
- *
- * @api private
- */
-
-NyanCat.prototype.draw = function(){
-  this.appendRainbow();
-  this.drawScoreboard();
-  this.drawRainbow();
-  this.drawNyanCat();
-  this.tick = !this.tick;
-};
-
-/**
- * Draw the "scoreboard" showing the number
- * of passes, failures and pending tests.
- *
- * @api private
- */
-
-NyanCat.prototype.drawScoreboard = function(){
-  var stats = this.stats;
-  var colors = Base.colors;
-
-  function draw(color, n) {
-    write(' ');
-    write('\u001b[' + color + 'm' + n + '\u001b[0m');
-    write('\n');
-  }
-
-  draw(colors.green, stats.passes);
-  draw(colors.fail, stats.failures);
-  draw(colors.pending, stats.pending);
-  write('\n');
-
-  this.cursorUp(this.numberOfLines);
-};
-
-/**
- * Append the rainbow.
- *
- * @api private
- */
-
-NyanCat.prototype.appendRainbow = function(){
-  var segment = this.tick ? '_' : '-';
-  var rainbowified = this.rainbowify(segment);
-
-  for (var index = 0; index < this.numberOfLines; index++) {
-    var trajectory = this.trajectories[index];
-    if (trajectory.length >= this.trajectoryWidthMax) trajectory.shift();
-    trajectory.push(rainbowified);
-  }
-};
-
-/**
- * Draw the rainbow.
- *
- * @api private
- */
-
-NyanCat.prototype.drawRainbow = function(){
-  var self = this;
-
-  this.trajectories.forEach(function(line, index) {
-    write('\u001b[' + self.scoreboardWidth + 'C');
-    write(line.join(''));
-    write('\n');
-  });
-
-  this.cursorUp(this.numberOfLines);
-};
-
-/**
- * Draw the nyan cat
- *
- * @api private
- */
-
-NyanCat.prototype.drawNyanCat = function() {
-  var self = this;
-  var startWidth = this.scoreboardWidth + this.trajectories[0].length;
-  var color = '\u001b[' + startWidth + 'C';
-  var padding = '';
-
-  write(color);
-  write('_,------,');
-  write('\n');
-
-  write(color);
-  padding = self.tick ? '  ' : '   ';
-  write('_|' + padding + '/\\_/\\ ');
-  write('\n');
-
-  write(color);
-  padding = self.tick ? '_' : '__';
-  var tail = self.tick ? '~' : '^';
-  var face;
-  write(tail + '|' + padding + this.face() + ' ');
-  write('\n');
-
-  write(color);
-  padding = self.tick ? ' ' : '  ';
-  write(padding + '""  "" ');
-  write('\n');
-
-  this.cursorUp(this.numberOfLines);
-};
-
-/**
- * Draw nyan cat face.
- *
- * @return {String}
- * @api private
- */
-
-NyanCat.prototype.face = function() {
-  var stats = this.stats;
-  if (stats.failures) {
-    return '( x .x)';
-  } else if (stats.pending) {
-    return '( o .o)';
-  } else if(stats.passes) {
-    return '( ^ .^)';
-  } else {
-    return '( - .-)';
-  }
-}
-
-/**
- * Move cursor up `n`.
- *
- * @param {Number} n
- * @api private
- */
-
-NyanCat.prototype.cursorUp = function(n) {
-  write('\u001b[' + n + 'A');
-};
-
-/**
- * Move cursor down `n`.
- *
- * @param {Number} n
- * @api private
- */
-
-NyanCat.prototype.cursorDown = function(n) {
-  write('\u001b[' + n + 'B');
-};
-
-/**
- * Generate rainbow colors.
- *
- * @return {Array}
- * @api private
- */
-
-NyanCat.prototype.generateColors = function(){
-  var colors = [];
-
-  for (var i = 0; i < (6 * 7); i++) {
-    var pi3 = Math.floor(Math.PI / 3);
-    var n = (i * (1.0 / 6));
-    var r = Math.floor(3 * Math.sin(n) + 3);
-    var g = Math.floor(3 * Math.sin(n + 2 * pi3) + 3);
-    var b = Math.floor(3 * Math.sin(n + 4 * pi3) + 3);
-    colors.push(36 * r + 6 * g + b + 16);
-  }
-
-  return colors;
-};
-
-/**
- * Apply rainbow to the given `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-NyanCat.prototype.rainbowify = function(str){
-  var color = this.rainbowColors[this.colorIndex % this.rainbowColors.length];
-  this.colorIndex += 1;
-  return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m';
-};
-
-/**
- * Stdout helper.
- */
-
-function write(string) {
-  process.stdout.write(string);
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-NyanCat.prototype = new F;
-NyanCat.prototype.constructor = NyanCat;
-
-
-}); // module: reporters/nyan.js
-
-require.register("reporters/progress.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `Progress`.
- */
-
-exports = module.exports = Progress;
-
-/**
- * General progress bar color.
- */
-
-Base.colors.progress = 90;
-
-/**
- * Initialize a new `Progress` bar test reporter.
- *
- * @param {Runner} runner
- * @param {Object} options
- * @api public
- */
-
-function Progress(runner, options) {
-  Base.call(this, runner);
-
-  var self = this
-    , options = options || {}
-    , stats = this.stats
-    , width = Base.window.width * .50 | 0
-    , total = runner.total
-    , complete = 0
-    , max = Math.max;
-
-  // default chars
-  options.open = options.open || '[';
-  options.complete = options.complete || '▬';
-  options.incomplete = options.incomplete || Base.symbols.dot;
-  options.close = options.close || ']';
-  options.verbose = false;
-
-  // tests started
-  runner.on('start', function(){
-    console.log();
-    cursor.hide();
-  });
-
-  // tests complete
-  runner.on('test end', function(){
-    complete++;
-    var incomplete = total - complete
-      , percent = complete / total
-      , n = width * percent | 0
-      , i = width - n;
-
-    cursor.CR();
-    process.stdout.write('\u001b[J');
-    process.stdout.write(color('progress', '  ' + options.open));
-    process.stdout.write(Array(n).join(options.complete));
-    process.stdout.write(Array(i).join(options.incomplete));
-    process.stdout.write(color('progress', options.close));
-    if (options.verbose) {
-      process.stdout.write(color('progress', ' ' + complete + ' of ' + total));
-    }
-  });
-
-  // tests are complete, output some stats
-  // and the failures if any
-  runner.on('end', function(){
-    cursor.show();
-    console.log();
-    self.epilogue();
-  });
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-Progress.prototype = new F;
-Progress.prototype.constructor = Progress;
-
-
-}); // module: reporters/progress.js
-
-require.register("reporters/spec.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `Spec`.
- */
-
-exports = module.exports = Spec;
-
-/**
- * Initialize a new `Spec` test reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function Spec(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , indents = 0
-    , n = 0;
-
-  function indent() {
-    return Array(indents).join('  ')
-  }
-
-  runner.on('start', function(){
-    console.log();
-  });
-
-  runner.on('suite', function(suite){
-    ++indents;
-    console.log(color('suite', '%s%s'), indent(), suite.title);
-  });
-
-  runner.on('suite end', function(suite){
-    --indents;
-    if (1 == indents) console.log();
-  });
-
-  runner.on('pending', function(test){
-    var fmt = indent() + color('pending', '  - %s');
-    console.log(fmt, test.title);
-  });
-
-  runner.on('pass', function(test){
-    if ('fast' == test.speed) {
-      var fmt = indent()
-        + color('checkmark', '  ' + Base.symbols.ok)
-        + color('pass', ' %s ');
-      cursor.CR();
-      console.log(fmt, test.title);
-    } else {
-      var fmt = indent()
-        + color('checkmark', '  ' + Base.symbols.ok)
-        + color('pass', ' %s ')
-        + color(test.speed, '(%dms)');
-      cursor.CR();
-      console.log(fmt, test.title, test.duration);
-    }
-  });
-
-  runner.on('fail', function(test, err){
-    cursor.CR();
-    console.log(indent() + color('fail', '  %d) %s'), ++n, test.title);
-  });
-
-  runner.on('end', self.epilogue.bind(self));
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-Spec.prototype = new F;
-Spec.prototype.constructor = Spec;
-
-
-}); // module: reporters/spec.js
-
-require.register("reporters/tap.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , cursor = Base.cursor
-  , color = Base.color;
-
-/**
- * Expose `TAP`.
- */
-
-exports = module.exports = TAP;
-
-/**
- * Initialize a new `TAP` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function TAP(runner) {
-  Base.call(this, runner);
-
-  var self = this
-    , stats = this.stats
-    , n = 1
-    , passes = 0
-    , failures = 0;
-
-  runner.on('start', function(){
-    var total = runner.grepTotal(runner.suite);
-    console.log('%d..%d', 1, total);
-  });
-
-  runner.on('test end', function(){
-    ++n;
-  });
-
-  runner.on('pending', function(test){
-    console.log('ok %d %s # SKIP -', n, title(test));
-  });
-
-  runner.on('pass', function(test){
-    passes++;
-    console.log('ok %d %s', n, title(test));
-  });
-
-  runner.on('fail', function(test, err){
-    failures++;
-    console.log('not ok %d %s', n, title(test));
-    if (err.stack) console.log(err.stack.replace(/^/gm, '  '));
-  });
-
-  runner.on('end', function(){
-    console.log('# tests ' + (passes + failures));
-    console.log('# pass ' + passes);
-    console.log('# fail ' + failures);
-  });
-}
-
-/**
- * Return a TAP-safe title of `test`
- *
- * @param {Object} test
- * @return {String}
- * @api private
- */
-
-function title(test) {
-  return test.fullTitle().replace(/#/g, '');
-}
-
-}); // module: reporters/tap.js
-
-require.register("reporters/xunit.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Base = require('./base')
-  , utils = require('../utils')
-  , escape = utils.escape;
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Expose `XUnit`.
- */
-
-exports = module.exports = XUnit;
-
-/**
- * Initialize a new `XUnit` reporter.
- *
- * @param {Runner} runner
- * @api public
- */
-
-function XUnit(runner) {
-  Base.call(this, runner);
-  var stats = this.stats
-    , tests = []
-    , self = this;
-
-  runner.on('pending', function(test){
-    tests.push(test);
-  });
-
-  runner.on('pass', function(test){
-    tests.push(test);
-  });
-
-  runner.on('fail', function(test){
-    tests.push(test);
-  });
-
-  runner.on('end', function(){
-    console.log(tag('testsuite', {
-        name: 'Mocha Tests'
-      , tests: stats.tests
-      , failures: stats.failures
-      , errors: stats.failures
-      , skipped: stats.tests - stats.failures - stats.passes
-      , timestamp: (new Date).toUTCString()
-      , time: (stats.duration / 1000) || 0
-    }, false));
-
-    tests.forEach(test);
-    console.log('</testsuite>');
-  });
-}
-
-/**
- * Inherit from `Base.prototype`.
- */
-
-function F(){};
-F.prototype = Base.prototype;
-XUnit.prototype = new F;
-XUnit.prototype.constructor = XUnit;
-
-
-/**
- * Output tag for the given `test.`
- */
-
-function test(test) {
-  var attrs = {
-      classname: test.parent.fullTitle()
-    , name: test.title
-    , time: (test.duration / 1000) || 0
-  };
-
-  if ('failed' == test.state) {
-    var err = test.err;
-    attrs.message = escape(err.message);
-    console.log(tag('testcase', attrs, false, tag('failure', attrs, false, cdata(err.stack))));
-  } else if (test.pending) {
-    console.log(tag('testcase', attrs, false, tag('skipped', {}, true)));
-  } else {
-    console.log(tag('testcase', attrs, true) );
-  }
-}
-
-/**
- * HTML tag helper.
- */
-
-function tag(name, attrs, close, content) {
-  var end = close ? '/>' : '>'
-    , pairs = []
-    , tag;
-
-  for (var key in attrs) {
-    pairs.push(key + '="' + escape(attrs[key]) + '"');
-  }
-
-  tag = '<' + name + (pairs.length ? ' ' + pairs.join(' ') : '') + end;
-  if (content) tag += content + '</' + name + end;
-  return tag;
-}
-
-/**
- * Return cdata escaped CDATA `str`.
- */
-
-function cdata(str) {
-  return '<![CDATA[' + escape(str) + ']]>';
-}
-
-}); // module: reporters/xunit.js
-
-require.register("runnable.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var EventEmitter = require('browser/events').EventEmitter
-  , debug = require('browser/debug')('mocha:runnable')
-  , milliseconds = require('./ms');
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-var Date = global.Date
-  , setTimeout = global.setTimeout
-  , setInterval = global.setInterval
-  , clearTimeout = global.clearTimeout
-  , clearInterval = global.clearInterval;
-
-/**
- * Object#toString().
- */
-
-var toString = Object.prototype.toString;
-
-/**
- * Expose `Runnable`.
- */
-
-module.exports = Runnable;
-
-/**
- * Initialize a new `Runnable` with the given `title` and callback `fn`.
- *
- * @param {String} title
- * @param {Function} fn
- * @api private
- */
-
-function Runnable(title, fn) {
-  this.title = title;
-  this.fn = fn;
-  this.async = fn && fn.length;
-  this.sync = ! this.async;
-  this._timeout = 2000;
-  this._slow = 75;
-  this.timedOut = false;
-}
-
-/**
- * Inherit from `EventEmitter.prototype`.
- */
-
-function F(){};
-F.prototype = EventEmitter.prototype;
-Runnable.prototype = new F;
-Runnable.prototype.constructor = Runnable;
-
-
-/**
- * Set & get timeout `ms`.
- *
- * @param {Number|String} ms
- * @return {Runnable|Number} ms or self
- * @api private
- */
-
-Runnable.prototype.timeout = function(ms){
-  if (0 == arguments.length) return this._timeout;
-  if ('string' == typeof ms) ms = milliseconds(ms);
-  debug('timeout %d', ms);
-  this._timeout = ms;
-  if (this.timer) this.resetTimeout();
-  return this;
-};
-
-/**
- * Set & get slow `ms`.
- *
- * @param {Number|String} ms
- * @return {Runnable|Number} ms or self
- * @api private
- */
-
-Runnable.prototype.slow = function(ms){
-  if (0 === arguments.length) return this._slow;
-  if ('string' == typeof ms) ms = milliseconds(ms);
-  debug('timeout %d', ms);
-  this._slow = ms;
-  return this;
-};
-
-/**
- * Return the full title generated by recursively
- * concatenating the parent's full title.
- *
- * @return {String}
- * @api public
- */
-
-Runnable.prototype.fullTitle = function(){
-  return this.parent.fullTitle() + ' ' + this.title;
-};
-
-/**
- * Clear the timeout.
- *
- * @api private
- */
-
-Runnable.prototype.clearTimeout = function(){
-  clearTimeout(this.timer);
-};
-
-/**
- * Inspect the runnable void of private properties.
- *
- * @return {String}
- * @api private
- */
-
-Runnable.prototype.inspect = function(){
-  return JSON.stringify(this, function(key, val){
-    if ('_' == key[0]) return;
-    if ('parent' == key) return '#<Suite>';
-    if ('ctx' == key) return '#<Context>';
-    return val;
-  }, 2);
-};
-
-/**
- * Reset the timeout.
- *
- * @api private
- */
-
-Runnable.prototype.resetTimeout = function(){
-  var self = this;
-  var ms = this.timeout() || 1e9;
-
-  this.clearTimeout();
-  this.timer = setTimeout(function(){
-    self.callback(new Error('timeout of ' + ms + 'ms exceeded'));
-    self.timedOut = true;
-  }, ms);
-};
-
-/**
- * Whitelist these globals for this test run
- *
- * @api private
- */
-Runnable.prototype.globals = function(arr){
-  var self = this;
-  this._allowedGlobals = arr;
-};
-
-/**
- * Run the test and invoke `fn(err)`.
- *
- * @param {Function} fn
- * @api private
- */
-
-Runnable.prototype.run = function(fn){
-  var self = this
-    , ms = this.timeout()
-    , start = new Date
-    , ctx = this.ctx
-    , finished
-    , emitted;
-
-  if (ctx) ctx.runnable(this);
-
-  // timeout
-  if (this.async) {
-    if (ms) {
-      this.timer = setTimeout(function(){
-        done(new Error('timeout of ' + ms + 'ms exceeded'));
-        self.timedOut = true;
-      }, ms);
-    }
-  }
-
-  // called multiple times
-  function multiple(err) {
-    if (emitted) return;
-    emitted = true;
-    self.emit('error', err || new Error('done() called multiple times'));
-  }
-
-  // finished
-  function done(err) {
-    if (self.timedOut) return;
-    if (finished) return multiple(err);
-    self.clearTimeout();
-    self.duration = new Date - start;
-    finished = true;
-    fn(err);
-  }
-
-  // for .resetTimeout()
-  this.callback = done;
-
-  // async
-  if (this.async) {
-    try {
-      this.fn.call(ctx, function(err){
-        if (err instanceof Error || toString.call(err) === "[object Error]") return done(err);
-        if (null != err) return done(new Error('done() invoked with non-Error: ' + err));
-        done();
-      });
-    } catch (err) {
-      done(err);
-    }
-    return;
-  }
-
-  if (this.asyncOnly) {
-    return done(new Error('--async-only option in use without declaring `done()`'));
-  }
-
-  // sync
-  try {
-    if (!this.pending) this.fn.call(ctx);
-    this.duration = new Date - start;
-    fn();
-  } catch (err) {
-    fn(err);
-  }
-};
-
-}); // module: runnable.js
-
-require.register("runner.js", function(module, exports, require){
-/**
- * Module dependencies.
- */
-
-var EventEmitter = require('browser/events').EventEmitter
-  , debug = require('browser/debug')('mocha:runner')
-  , Test = require('./test')
-  , utils = require('./utils')
-  , filter = utils.filter
-  , keys = utils.keys;
-
-/**
- * Non-enumerable globals.
- */
-
-var globals = [
-  'setTimeout',
-  'clearTimeout',
-  'setInterval',
-  'clearInterval',
-  'XMLHttpRequest',
-  'Date'
-];
-
-/**
- * Expose `Runner`.
- */
-
-module.exports = Runner;
-
-/**
- * Initialize a `Runner` for the given `suite`.
- *
- * Events:
- *
- *   - `start`  execution started
- *   - `end`  execution complete
- *   - `suite`  (suite) test suite execution started
- *   - `suite end`  (suite) all tests (and sub-suites) have finished
- *   - `test`  (test) test execution started
- *   - `test end`  (test) test completed
- *   - `hook`  (hook) hook execution started
- *   - `hook end`  (hook) hook complete
- *   - `pass`  (test) test passed
- *   - `fail`  (test, err) test failed
- *   - `pending`  (test) test pending
- *
- * @api public
- */
-
-function Runner(suite) {
-  var self = this;
-  this._globals = [];
-  this._abort = false;
-  this.suite = suite;
-  this.total = suite.total();
-  this.failures = 0;
-  this.on('test end', function(test){ self.checkGlobals(test); });
-  this.on('hook end', function(hook){ self.checkGlobals(hook); });
-  this.grep(/.*/);
-  this.globals(this.globalProps().concat(extraGlobals()));
-}
-
-/**
- * Wrapper for setImmediate, process.nextTick, or browser polyfill.
- *
- * @param {Function} fn
- * @api private
- */
-
-Runner.immediately = global.setImmediate || process.nextTick;
-
-/**
- * Inherit from `EventEmitter.prototype`.
- */
-
-function F(){};
-F.prototype = EventEmitter.prototype;
-Runner.prototype = new F;
-Runner.prototype.constructor = Runner;
-
-
-/**
- * Run tests with full titles matching `re`. Updates runner.total
- * with number of tests matched.
- *
- * @param {RegExp} re
- * @param {Boolean} invert
- * @return {Runner} for chaining
- * @api public
- */
-
-Runner.prototype.grep = function(re, invert){
-  debug('grep %s', re);
-  this._grep = re;
-  this._invert = invert;
-  this.total = this.grepTotal(this.suite);
-  return this;
-};
-
-/**
- * Returns the number of tests matching the grep search for the
- * given suite.
- *
- * @param {Suite} suite
- * @return {Number}
- * @api public
- */
-
-Runner.prototype.grepTotal = function(suite) {
-  var self = this;
-  var total = 0;
-
-  suite.eachTest(function(test){
-    var match = self._grep.test(test.fullTitle());
-    if (self._invert) match = !match;
-    if (match) total++;
-  });
-
-  return total;
-};
-
-/**
- * Return a list of global properties.
- *
- * @return {Array}
- * @api private
- */
-
-Runner.prototype.globalProps = function() {
-  var props = utils.keys(global);
-
-  // non-enumerables
-  for (var i = 0; i < globals.length; ++i) {
-    if (~utils.indexOf(props, globals[i])) continue;
-    props.push(globals[i]);
-  }
-
-  return props;
-};
-
-/**
- * Allow the given `arr` of globals.
- *
- * @param {Array} arr
- * @return {Runner} for chaining
- * @api public
- */
-
-Runner.prototype.globals = function(arr){
-  if (0 == arguments.length) return this._globals;
-  debug('globals %j', arr);
-  this._globals = this._globals.concat(arr);
-  return this;
-};
-
-/**
- * Check for global variable leaks.
- *
- * @api private
- */
-
-Runner.prototype.checkGlobals = function(test){
-  if (this.ignoreLeaks) return;
-  var ok = this._globals;
-
-  var globals = this.globalProps();
-  var isNode = process.kill;
-  var leaks;
-
-  if (test) {
-    ok = ok.concat(test._allowedGlobals || []);
-  }
-
-  if(this.prevGlobalsLength == globals.length) return;
-  this.prevGlobalsLength = globals.length;
-
-  leaks = filterLeaks(ok, globals);
-  this._globals = this._globals.concat(leaks);
-
-  if (leaks.length > 1) {
-    this.fail(test, new Error('global leaks detected: ' + leaks.join(', ') + ''));
-  } else if (leaks.length) {
-    this.fail(test, new Error('global leak detected: ' + leaks[0]));
-  }
-};
-
-/**
- * Fail the given `test`.
- *
- * @param {Test} test
- * @param {Error} err
- * @api private
- */
-
-Runner.prototype.fail = function(test, err){
-  ++this.failures;
-  test.state = 'failed';
-
-  if ('string' == typeof err) {
-    err = new Error('the string "' + err + '" was thrown, throw an Error :)');
-  }
-
-  this.emit('fail', test, err);
-};
-
-/**
- * Fail the given `hook` with `err`.
- *
- * Hook failures work in the following pattern:
- * - If bail, then exit
- * - Failed `before` hook skips all tests in a suite and subsuites,
- *   but jumps to corresponding `after` hook
- * - Failed `before each` hook skips remaining tests in a
- *   suite and jumps to corresponding `after each` hook,
- *   which is run only once
- * - Failed `after` hook does not alter
- *   execution order
- * - Failed `after each` hook skips remaining tests in a
- *   suite and subsuites, but executes other `after each`
- *   hooks
- *
- * @param {Hook} hook
- * @param {Error} err
- * @api private
- */
-
-Runner.prototype.failHook = function(hook, err){
-  this.fail(hook, err);
-  if (this.suite.bail()) {
-    this.emit('end');
-  }
-};
-
-/**
- * Run hook `name` callbacks and then invoke `fn()`.
- *
- * @param {String} name
- * @param {Function} function
- * @api private
- */
-
-Runner.prototype.hook = function(name, fn){
-  var suite = this.suite
-    , hooks = suite['_' + name]
-    , self = this
-    , timer;
-
-  function next(i) {
-    var hook = hooks[i];
-    if (!hook) return fn();
-    if (self.failures && suite.bail()) return fn();
-    self.currentRunnable = hook;
-
-    hook.ctx.currentTest = self.test;
-
-    self.emit('hook', hook);
-
-    hook.on('error', function(err){
-      self.failHook(hook, err);
-    });
-
-    hook.run(function(err){
-      hook.removeAllListeners('error');
-      var testError = hook.error();
-      if (testError) self.fail(self.test, testError);
-      if (err) {
-        self.failHook(hook, err);
-
-        // stop executing hooks, notify callee of hook err
-        return fn(err);
-      }
-      self.emit('hook end', hook);
-      delete hook.ctx.currentTest;
-      next(++i);
-    });
-  }
-
-  Runner.immediately(function(){
-    next(0);
-  });
-};
-
-/**
- * Run hook `name` for the given array of `suites`
- * in order, and callback `fn(err, errSuite)`.
- *
- * @param {String} name
- * @param {Array} suites
- * @param {Function} fn
- * @api private
- */
-
-Runner.prototype.hooks = function(name, suites, fn){
-  var self = this
-    , orig = this.suite;
-
-  function next(suite) {
-    self.suite = suite;
-
-    if (!suite) {
-      self.suite = orig;
-      return fn();
-    }
-
-    self.hook(name, function(err){
-      if (err) {
-        var errSuite = self.suite;
-        self.suite = orig;
-        return fn(err, errSuite);
-      }
-
-      next(suites.pop());
-    });
-  }
-
-  next(suites.pop());
-};
-
-/**
- * Run hooks from the top level down.
- *
- * @param {String} name
- * @param {Function} fn
- * @api private
- */
-
-Runner.prototype.hookUp = function(name, fn){
-  var suites = [this.suite].concat(this.parents()).reverse();
-  this.hooks(name, suites, fn);
-};
-
-/**
- * Run hooks from the bottom up.
- *
- * @param {String} name
- * @param {Function} fn
- * @api private
- */
-
-Runner.prototype.hookDown = function(name, fn){
-  var suites = [this.suite].concat(this.parents());
-  this.hooks(name, suites, fn);
-};
-
-/**
- * Return an array of parent Suites from
- * closest to furthest.
- *
- * @return {Array}
- * @api private
- */
-
-Runner.prototype.parents = function(){
-  var suite = this.suite
-    , suites = [];
-  while (suite = suite.parent) suites.push(suite);
-  return suites;
-};
-
-/**
- * Run the current test and callback `fn(err)`.
- *
- * @param {Function} fn
- * @api private
- */
-
-Runner.prototype.runTest = function(fn){
-  var test = this.test
-    , self = this;
-
-  if (this.asyncOnly) test.asyncOnly = true;
-
-  try {
-    test.on('error', function(err){
-      self.fail(test, err);
-    });
-    test.run(fn);
-  } catch (err) {
-    fn(err);
-  }
-};
-
-/**
- * Run tests in the given `suite` and invoke
- * the callback `fn()` when complete.
- *
- * @param {Suite} suite
- * @param {Function} fn
- * @api private
- */
-
-Runner.prototype.runTests = function(suite, fn){
-  var self = this
-    , tests = suite.tests.slice()
-    , test;
-
-
-  function hookErr(err, errSuite, after) {
-    // before/after Each hook for errSuite failed:
-    var orig = self.suite;
-
-    // for failed 'after each' hook start from errSuite parent,
-    // otherwise start from errSuite itself
-    self.suite = after ? errSuite.parent : errSuite;
-
-    if (self.suite) {
-      // call hookUp afterEach
-      self.hookUp('afterEach', function(err2, errSuite2) {
-        self.suite = orig;
-        // some hooks may fail even now
-        if (err2) return hookErr(err2, errSuite2, true);
-        // report error suite
-        fn(errSuite);
-      });
-    } else {
-      // there is no need calling other 'after each' hooks
-      self.suite = orig;
-      fn(errSuite);
-    }
-  }
-
-  function next(err, errSuite) {
-    // if we bail after first err
-    if (self.failures && suite._bail) return fn();
-
-    if (self._abort) return fn();
-
-    if (err) return hookErr(err, errSuite, true);
-
-    // next test
-    test = tests.shift();
-
-    // all done
-    if (!test) return fn();
-
-    // grep
-    var match = self._grep.test(test.fullTitle());
-    if (self._invert) match = !match;
-    if (!match) return next();
-
-    // pending
-    if (test.pending) {
-      self.emit('pending', test);
-      self.emit('test end', test);
-      return next();
-    }
-
-    // execute test and hook(s)
-    self.emit('test', self.test = test);
-    self.hookDown('beforeEach', function(err, errSuite){
-
-      if (err) return hookErr(err, errSuite, false);
-
-      self.currentRunnable = self.test;
-      self.runTest(function(err){
-        test = self.test;
-
-        if (err) {
-          self.fail(test, err);
-          self.emit('test end', test);
-          return self.hookUp('afterEach', next);
-        }
-
-        test.state = 'passed';
-        self.emit('pass', test);
-        self.emit('test end', test);
-        self.hookUp('afterEach', next);
-      });
-    });
-  }
-
-  this.next = next;
-  next();
-};
-
-/**
- * Run the given `suite` and invoke the
- * callback `fn()` when complete.
- *
- * @param {Suite} suite
- * @param {Function} fn
- * @api private
- */
-
-Runner.prototype.runSuite = function(suite, fn){
-  var total = this.grepTotal(suite)
-    , self = this
-    , i = 0;
-
-  debug('run suite %s', suite.fullTitle());
-
-  if (!total) return fn();
-
-  this.emit('suite', this.suite = suite);
-
-  function next(errSuite) {
-    if (errSuite) {
-      // current suite failed on a hook from errSuite
-      if (errSuite == suite) {
-        // if errSuite is current suite
-        // continue to the next sibling suite
-        return done();
-      } else {
-        // errSuite is among the parents of current suite
-        // stop execution of errSuite and all sub-suites
-        return done(errSuite);
-      }
-    }
-
-    if (self._abort) return done();
-
-    var curr = suite.suites[i++];
-    if (!curr) return done();
-    self.runSuite(curr, next);
-  }
-
-  function done(errSuite) {
-    self.suite = suite;
-    self.hook('afterAll', function(){
-      self.emit('suite end', suite);
-      fn(errSuite);
-    });
-  }
-
-  this.hook('beforeAll', function(err){
-    if (err) return done();
-    self.runTests(suite, next);
-  });
-};
-
-/**
- * Handle uncaught exceptions.
- *
- * @param {Error} err
- * @api private
- */
-
-Runner.prototype.uncaught = function(err){
-  debug('uncaught exception %s', err.message);
-  var runnable = this.currentRunnable;
-  if (!runnable || 'failed' == runnable.state) return;
-  runnable.clearTimeout();
-  err.uncaught = true;
-  this.fail(runnable, err);
-
-  // recover from test
-  if ('test' == runnable.type) {
-    this.emit('test end', runnable);
-    this.hookUp('afterEach', this.next);
-    return;
-  }
-
-  // bail on hooks
-  this.emit('end');
-};
-
-/**
- * Run the root suite and invoke `fn(failures)`
- * on completion.
- *
- * @param {Function} fn
- * @return {Runner} for chaining
- * @api public
- */
-
-Runner.prototype.run = function(fn){
-  var self = this
-    , fn = fn || function(){};
-
-  function uncaught(err){
-    self.uncaught(err);
-  }
-
-  debug('start');
-
-  // callback
-  this.on('end', function(){
-    debug('end');
-    process.removeListener('uncaughtException', uncaught);
-    fn(self.failures);
-  });
-
-  // run suites
-  this.emit('start');
-  this.runSuite(this.suite, function(){
-    debug('finished running');
-    self.emit('end');
-  });
-
-  // uncaught exception
-  process.on('uncaughtException', uncaught);
-
-  return this;
-};
-
-/**
- * Cleanly abort execution
- *
- * @return {Runner} for chaining
- * @api public
- */
-Runner.prototype.abort = function(){
-  debug('aborting');
-  this._abort = true;
-}
-
-/**
- * Filter leaks with the given globals flagged as `ok`.
- *
- * @param {Array} ok
- * @param {Array} globals
- * @return {Array}
- * @api private
- */
-
-function filterLeaks(ok, globals) {
-  return filter(globals, function(key){
-    // Firefox and Chrome exposes iframes as index inside the window object
-    if (/^d+/.test(key)) return false;
-
-    // in firefox
-    // if runner runs in an iframe, this iframe's window.getInterface method not init at first
-    // it is assigned in some seconds
-    if (global.navigator && /^getInterface/.test(key)) return false;
-
-    // an iframe could be approached by window[iframeIndex]
-    // in ie6,7,8 and opera, iframeIndex is enumerable, this could cause leak
-    if (global.navigator && /^\d+/.test(key)) return false;
-
-    // Opera and IE expose global variables for HTML element IDs (issue #243)
-    if (/^mocha-/.test(key)) return false;
-
-    var matched = filter(ok, function(ok){
-      if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]);
-      return key == ok;
-    });
-    return matched.length == 0 && (!global.navigator || 'onerror' !== key);
-  });
-}
-
-/**
- * Array of globals dependent on the environment.
- *
- * @return {Array}
- * @api private
- */
-
- function extraGlobals() {
-  if (typeof(process) === 'object' &&
-      typeof(process.version) === 'string') {
-
-    var nodeVersion = process.version.split('.').reduce(function(a, v) {
-      return a << 8 | v;
-    });
-
-    // 'errno' was renamed to process._errno in v0.9.11.
-
-    if (nodeVersion < 0x00090B) {
-      return ['errno'];
-    }
-  }
-
-  return [];
- }
-
-}); // module: runner.js
-
-require.register("suite.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var EventEmitter = require('browser/events').EventEmitter
-  , debug = require('browser/debug')('mocha:suite')
-  , milliseconds = require('./ms')
-  , utils = require('./utils')
-  , Hook = require('./hook');
-
-/**
- * Expose `Suite`.
- */
-
-exports = module.exports = Suite;
-
-/**
- * Create a new `Suite` with the given `title`
- * and parent `Suite`. When a suite with the
- * same title is already present, that suite
- * is returned to provide nicer reporter
- * and more flexible meta-testing.
- *
- * @param {Suite} parent
- * @param {String} title
- * @return {Suite}
- * @api public
- */
-
-exports.create = function(parent, title){
-  var suite = new Suite(title, parent.ctx);
-  suite.parent = parent;
-  if (parent.pending) suite.pending = true;
-  title = suite.fullTitle();
-  parent.addSuite(suite);
-  return suite;
-};
-
-/**
- * Initialize a new `Suite` with the given
- * `title` and `ctx`.
- *
- * @param {String} title
- * @param {Context} ctx
- * @api private
- */
-
-function Suite(title, ctx) {
-  this.title = title;
-  this.ctx = ctx;
-  this.suites = [];
-  this.tests = [];
-  this.pending = false;
-  this._beforeEach = [];
-  this._beforeAll = [];
-  this._afterEach = [];
-  this._afterAll = [];
-  this.root = !title;
-  this._timeout = 2000;
-  this._slow = 75;
-  this._bail = false;
-}
-
-/**
- * Inherit from `EventEmitter.prototype`.
- */
-
-function F(){};
-F.prototype = EventEmitter.prototype;
-Suite.prototype = new F;
-Suite.prototype.constructor = Suite;
-
-
-/**
- * Return a clone of this `Suite`.
- *
- * @return {Suite}
- * @api private
- */
-
-Suite.prototype.clone = function(){
-  var suite = new Suite(this.title);
-  debug('clone');
-  suite.ctx = this.ctx;
-  suite.timeout(this.timeout());
-  suite.slow(this.slow());
-  suite.bail(this.bail());
-  return suite;
-};
-
-/**
- * Set timeout `ms` or short-hand such as "2s".
- *
- * @param {Number|String} ms
- * @return {Suite|Number} for chaining
- * @api private
- */
-
-Suite.prototype.timeout = function(ms){
-  if (0 == arguments.length) return this._timeout;
-  if ('string' == typeof ms) ms = milliseconds(ms);
-  debug('timeout %d', ms);
-  this._timeout = parseInt(ms, 10);
-  return this;
-};
-
-/**
- * Set slow `ms` or short-hand such as "2s".
- *
- * @param {Number|String} ms
- * @return {Suite|Number} for chaining
- * @api private
- */
-
-Suite.prototype.slow = function(ms){
-  if (0 === arguments.length) return this._slow;
-  if ('string' == typeof ms) ms = milliseconds(ms);
-  debug('slow %d', ms);
-  this._slow = ms;
-  return this;
-};
-
-/**
- * Sets whether to bail after first error.
- *
- * @parma {Boolean} bail
- * @return {Suite|Number} for chaining
- * @api private
- */
-
-Suite.prototype.bail = function(bail){
-  if (0 == arguments.length) return this._bail;
-  debug('bail %s', bail);
-  this._bail = bail;
-  return this;
-};
-
-/**
- * Run `fn(test[, done])` before running tests.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-Suite.prototype.beforeAll = function(fn){
-  if (this.pending) return this;
-  var hook = new Hook('"before all" hook', fn);
-  hook.parent = this;
-  hook.timeout(this.timeout());
-  hook.slow(this.slow());
-  hook.ctx = this.ctx;
-  this._beforeAll.push(hook);
-  this.emit('beforeAll', hook);
-  return this;
-};
-
-/**
- * Run `fn(test[, done])` after running tests.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-Suite.prototype.afterAll = function(fn){
-  if (this.pending) return this;
-  var hook = new Hook('"after all" hook', fn);
-  hook.parent = this;
-  hook.timeout(this.timeout());
-  hook.slow(this.slow());
-  hook.ctx = this.ctx;
-  this._afterAll.push(hook);
-  this.emit('afterAll', hook);
-  return this;
-};
-
-/**
- * Run `fn(test[, done])` before each test case.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-Suite.prototype.beforeEach = function(fn){
-  if (this.pending) return this;
-  var hook = new Hook('"before each" hook', fn);
-  hook.parent = this;
-  hook.timeout(this.timeout());
-  hook.slow(this.slow());
-  hook.ctx = this.ctx;
-  this._beforeEach.push(hook);
-  this.emit('beforeEach', hook);
-  return this;
-};
-
-/**
- * Run `fn(test[, done])` after each test case.
- *
- * @param {Function} fn
- * @return {Suite} for chaining
- * @api private
- */
-
-Suite.prototype.afterEach = function(fn){
-  if (this.pending) return this;
-  var hook = new Hook('"after each" hook', fn);
-  hook.parent = this;
-  hook.timeout(this.timeout());
-  hook.slow(this.slow());
-  hook.ctx = this.ctx;
-  this._afterEach.push(hook);
-  this.emit('afterEach', hook);
-  return this;
-};
-
-/**
- * Add a test `suite`.
- *
- * @param {Suite} suite
- * @return {Suite} for chaining
- * @api private
- */
-
-Suite.prototype.addSuite = function(suite){
-  suite.parent = this;
-  suite.timeout(this.timeout());
-  suite.slow(this.slow());
-  suite.bail(this.bail());
-  this.suites.push(suite);
-  this.emit('suite', suite);
-  return this;
-};
-
-/**
- * Add a `test` to this suite.
- *
- * @param {Test} test
- * @return {Suite} for chaining
- * @api private
- */
-
-Suite.prototype.addTest = function(test){
-  test.parent = this;
-  test.timeout(this.timeout());
-  test.slow(this.slow());
-  test.ctx = this.ctx;
-  this.tests.push(test);
-  this.emit('test', test);
-  return this;
-};
-
-/**
- * Return the full title generated by recursively
- * concatenating the parent's full title.
- *
- * @return {String}
- * @api public
- */
-
-Suite.prototype.fullTitle = function(){
-  if (this.parent) {
-    var full = this.parent.fullTitle();
-    if (full) return full + ' ' + this.title;
-  }
-  return this.title;
-};
-
-/**
- * Return the total number of tests.
- *
- * @return {Number}
- * @api public
- */
-
-Suite.prototype.total = function(){
-  return utils.reduce(this.suites, function(sum, suite){
-    return sum + suite.total();
-  }, 0) + this.tests.length;
-};
-
-/**
- * Iterates through each suite recursively to find
- * all tests. Applies a function in the format
- * `fn(test)`.
- *
- * @param {Function} fn
- * @return {Suite}
- * @api private
- */
-
-Suite.prototype.eachTest = function(fn){
-  utils.forEach(this.tests, fn);
-  utils.forEach(this.suites, function(suite){
-    suite.eachTest(fn);
-  });
-  return this;
-};
-
-}); // module: suite.js
-
-require.register("test.js", function(module, exports, require){
-
-/**
- * Module dependencies.
- */
-
-var Runnable = require('./runnable');
-
-/**
- * Expose `Test`.
- */
-
-module.exports = Test;
-
-/**
- * Initialize a new `Test` with the given `title` and callback `fn`.
- *
- * @param {String} title
- * @param {Function} fn
- * @api private
- */
-
-function Test(title, fn) {
-  Runnable.call(this, title, fn);
-  this.pending = !fn;
-  this.type = 'test';
-}
-
-/**
- * Inherit from `Runnable.prototype`.
- */
-
-function F(){};
-F.prototype = Runnable.prototype;
-Test.prototype = new F;
-Test.prototype.constructor = Test;
-
-
-}); // module: test.js
-
-require.register("utils.js", function(module, exports, require){
-/**
- * Module dependencies.
- */
-
-var fs = require('browser/fs')
-  , path = require('browser/path')
-  , join = path.join
-  , debug = require('browser/debug')('mocha:watch');
-
-/**
- * Ignored directories.
- */
-
-var ignore = ['node_modules', '.git'];
-
-/**
- * Escape special characters in the given string of html.
- *
- * @param  {String} html
- * @return {String}
- * @api private
- */
-
-exports.escape = function(html){
-  return String(html)
-    .replace(/&/g, '&amp;')
-    .replace(/"/g, '&quot;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
-};
-
-/**
- * Array#forEach (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @param {Object} scope
- * @api private
- */
-
-exports.forEach = function(arr, fn, scope){
-  for (var i = 0, l = arr.length; i < l; i++)
-    fn.call(scope, arr[i], i);
-};
-
-/**
- * Array#map (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @param {Object} scope
- * @api private
- */
-
-exports.map = function(arr, fn, scope){
-  var result = [];
-  for (var i = 0, l = arr.length; i < l; i++)
-    result.push(fn.call(scope, arr[i], i));
-  return result;
-};
-
-/**
- * Array#indexOf (<=IE8)
- *
- * @parma {Array} arr
- * @param {Object} obj to find index of
- * @param {Number} start
- * @api private
- */
-
-exports.indexOf = function(arr, obj, start){
-  for (var i = start || 0, l = arr.length; i < l; i++) {
-    if (arr[i] === obj)
-      return i;
-  }
-  return -1;
-};
-
-/**
- * Array#reduce (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @param {Object} initial value
- * @api private
- */
-
-exports.reduce = function(arr, fn, val){
-  var rval = val;
-
-  for (var i = 0, l = arr.length; i < l; i++) {
-    rval = fn(rval, arr[i], i, arr);
-  }
-
-  return rval;
-};
-
-/**
- * Array#filter (<=IE8)
- *
- * @param {Array} array
- * @param {Function} fn
- * @api private
- */
-
-exports.filter = function(arr, fn){
-  var ret = [];
-
-  for (var i = 0, l = arr.length; i < l; i++) {
-    var val = arr[i];
-    if (fn(val, i, arr)) ret.push(val);
-  }
-
-  return ret;
-};
-
-/**
- * Object.keys (<=IE8)
- *
- * @param {Object} obj
- * @return {Array} keys
- * @api private
- */
-
-exports.keys = Object.keys || function(obj) {
-  var keys = []
-    , has = Object.prototype.hasOwnProperty // for `window` on <=IE8
-
-  for (var key in obj) {
-    if (has.call(obj, key)) {
-      keys.push(key);
-    }
-  }
-
-  return keys;
-};
-
-/**
- * Watch the given `files` for changes
- * and invoke `fn(file)` on modification.
- *
- * @param {Array} files
- * @param {Function} fn
- * @api private
- */
-
-exports.watch = function(files, fn){
-  var options = { interval: 100 };
-  files.forEach(function(file){
-    debug('file %s', file);
-    fs.watchFile(file, options, function(curr, prev){
-      if (prev.mtime < curr.mtime) fn(file);
-    });
-  });
-};
-
-/**
- * Ignored files.
- */
-
-function ignored(path){
-  return !~ignore.indexOf(path);
-}
-
-/**
- * Lookup files in the given `dir`.
- *
- * @return {Array}
- * @api private
- */
-
-exports.files = function(dir, ret){
-  ret = ret || [];
-
-  fs.readdirSync(dir)
-  .filter(ignored)
-  .forEach(function(path){
-    path = join(dir, path);
-    if (fs.statSync(path).isDirectory()) {
-      exports.files(path, ret);
-    } else if (path.match(/\.(js|coffee|litcoffee|coffee.md)$/)) {
-      ret.push(path);
-    }
-  });
-
-  return ret;
-};
-
-/**
- * Compute a slug from the given `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-exports.slug = function(str){
-  return str
-    .toLowerCase()
-    .replace(/ +/g, '-')
-    .replace(/[^-\w]/g, '');
-};
-
-/**
- * Strip the function definition from `str`,
- * and re-indent for pre whitespace.
- */
-
-exports.clean = function(str) {
-  str = str
-    .replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, '')
-    .replace(/^function *\(.*\) *{/, '')
-    .replace(/\s+\}$/, '');
-
-  var spaces = str.match(/^\n?( *)/)[1].length
-    , tabs = str.match(/^\n?(\t*)/)[1].length
-    , re = new RegExp('^\n?' + (tabs ? '\t' : ' ') + '{' + (tabs ? tabs : spaces) + '}', 'gm');
-
-  str = str.replace(re, '');
-
-  return exports.trim(str);
-};
-
-/**
- * Escape regular expression characters in `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-exports.escapeRegexp = function(str){
-  return str.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&");
-};
-
-/**
- * Trim the given `str`.
- *
- * @param {String} str
- * @return {String}
- * @api private
- */
-
-exports.trim = function(str){
-  return str.replace(/^\s+|\s+$/g, '');
-};
-
-/**
- * Parse the given `qs`.
- *
- * @param {String} qs
- * @return {Object}
- * @api private
- */
-
-exports.parseQuery = function(qs){
-  return exports.reduce(qs.replace('?', '').split('&'), function(obj, pair){
-    var i = pair.indexOf('=')
-      , key = pair.slice(0, i)
-      , val = pair.slice(++i);
-
-    obj[key] = decodeURIComponent(val);
-    return obj;
-  }, {});
-};
-
-/**
- * Highlight the given string of `js`.
- *
- * @param {String} js
- * @return {String}
- * @api private
- */
-
-function highlight(js) {
-  return js
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/\/\/(.*)/gm, '<span class="comment">//$1</span>')
-    .replace(/('.*?')/gm, '<span class="string">$1</span>')
-    .replace(/(\d+\.\d+)/gm, '<span class="number">$1</span>')
-    .replace(/(\d+)/gm, '<span class="number">$1</span>')
-    .replace(/\bnew *(\w+)/gm, '<span class="keyword">new</span> <span class="init">$1</span>')
-    .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '<span class="keyword">$1</span>')
-}
-
-/**
- * Highlight the contents of tag `name`.
- *
- * @param {String} name
- * @api private
- */
-
-exports.highlightTags = function(name) {
-  var code = document.getElementsByTagName(name);
-  for (var i = 0, len = code.length; i < len; ++i) {
-    code[i].innerHTML = highlight(code[i].innerHTML);
-  }
-};
-
-}); // module: utils.js
-// The global object is "self" in Web Workers.
-global = (function() { return this; })();
-
-/**
- * Save timer references to avoid Sinon interfering (see GH-237).
- */
-
-var Date = global.Date;
-var setTimeout = global.setTimeout;
-var setInterval = global.setInterval;
-var clearTimeout = global.clearTimeout;
-var clearInterval = global.clearInterval;
-
-/**
- * Node shims.
- *
- * These are meant only to allow
- * mocha.js to run untouched, not
- * to allow running node code in
- * the browser.
- */
-
-var process = {};
-process.exit = function(status){};
-process.stdout = {};
-
-var uncaughtExceptionHandlers = [];
-
-/**
- * Remove uncaughtException listener.
- */
-
-process.removeListener = function(e, fn){
-  if ('uncaughtException' == e) {
-    global.onerror = function() {};
-    var i = Mocha.utils.indexOf(uncaughtExceptionHandlers, fn);
-    if (i != -1) { uncaughtExceptionHandlers.splice(i, 1); }
-  }
-};
-
-/**
- * Implements uncaughtException listener.
- */
-
-process.on = function(e, fn){
-  if ('uncaughtException' == e) {
-    global.onerror = function(err, url, line){
-      fn(new Error(err + ' (' + url + ':' + line + ')'));
-      return true;
-    };
-    uncaughtExceptionHandlers.push(fn);
-  }
-};
-
-/**
- * Expose mocha.
- */
-
-var Mocha = global.Mocha = require('mocha'),
-    mocha = global.mocha = new Mocha({ reporter: 'html' });
-
-// The BDD UI is registered by default, but no UI will be functional in the
-// browser without an explicit call to the overridden `mocha.ui` (see below).
-// Ensure that this default UI does not expose its methods to the global scope.
-mocha.suite.removeAllListeners('pre-require');
-
-var immediateQueue = []
-  , immediateTimeout;
-
-function timeslice() {
-  var immediateStart = new Date().getTime();
-  while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
-    immediateQueue.shift()();
-  }
-  if (immediateQueue.length) {
-    immediateTimeout = setTimeout(timeslice, 0);
-  } else {
-    immediateTimeout = null;
-  }
-}
-
-/**
- * High-performance override of Runner.immediately.
- */
-
-Mocha.Runner.immediately = function(callback) {
-  immediateQueue.push(callback);
-  if (!immediateTimeout) {
-    immediateTimeout = setTimeout(timeslice, 0);
-  }
-};
-
-/**
- * Function to allow assertion libraries to throw errors directly into mocha.
- * This is useful when running tests in a browser because window.onerror will
- * only receive the 'message' attribute of the Error.
- */
-mocha.throwError = function(err) {
-  Mocha.utils.forEach(uncaughtExceptionHandlers, function (fn) {
-    fn(err);
-  });
-  throw err;
-};
-
-/**
- * Override ui to ensure that the ui functions are initialized.
- * Normally this would happen in Mocha.prototype.loadFiles.
- */
-
-mocha.ui = function(ui){
-  Mocha.prototype.ui.call(this, ui);
-  this.suite.emit('pre-require', global, null, this);
-  return this;
-};
-
-/**
- * Setup mocha with the given setting options.
- */
-
-mocha.setup = function(opts){
-  if ('string' == typeof opts) opts = { ui: opts };
-  for (var opt in opts) this[opt](opts[opt]);
-  return this;
-};
-
-/**
- * Run mocha, returning the Runner.
- */
-
-mocha.run = function(fn){
-  var options = mocha.options;
-  mocha.globals('location');
-
-  var query = Mocha.utils.parseQuery(global.location.search || '');
-  if (query.grep) mocha.grep(query.grep);
-  if (query.invert) mocha.invert();
-
-  return Mocha.prototype.run.call(mocha, function(){
-    // The DOM Document is not available in Web Workers.
-    if (global.document) {
-      Mocha.utils.highlightTags('code');
-    }
-    if (fn) fn();
-  });
-};
-
-/**
- * Expose the process shim.
- */
-
-Mocha.process = process;
-})();
\ No newline at end of file
diff --git a/browser/components/loop/test/vendor/sinon-1.9.0.js b/browser/components/loop/test/vendor/sinon-1.9.0.js
deleted file mode 100644
index 428b729b649b..000000000000
--- a/browser/components/loop/test/vendor/sinon-1.9.0.js
+++ /dev/null
@@ -1,4794 +0,0 @@
-/**
- * Sinon.JS 1.9.0, 2014/03/05
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-this.sinon = (function () {
-var samsam, formatio;
-function define(mod, deps, fn) { if (mod == "samsam") { samsam = deps(); } else { formatio = fn(samsam); } }
-define.amd = true;
-((typeof define === "function" && define.amd && function (m) { define("samsam", m); }) ||
- (typeof module === "object" &&
-      function (m) { module.exports = m(); }) || // Node
- function (m) { this.samsam = m(); } // Browser globals
-)(function () {
-    var o = Object.prototype;
-    var div = typeof document !== "undefined" && document.createElement("div");
-
-    function isNaN(value) {
-        // Unlike global isNaN, this avoids type coercion
-        // typeof check avoids IE host object issues, hat tip to
-        // lodash
-        var val = value; // JsLint thinks value !== value is "weird"
-        return typeof value === "number" && value !== val;
-    }
-
-    function getClass(value) {
-        // Returns the internal [[Class]] by calling Object.prototype.toString
-        // with the provided value as this. Return value is a string, naming the
-        // internal class, e.g. "Array"
-        return o.toString.call(value).split(/[ \]]/)[1];
-    }
-
-    /**
-     * @name samsam.isArguments
-     * @param Object object
-     *
-     * Returns ``true`` if ``object`` is an ``arguments`` object,
-     * ``false`` otherwise.
-     */
-    function isArguments(object) {
-        if (typeof object !== "object" || typeof object.length !== "number" ||
-                getClass(object) === "Array") {
-            return false;
-        }
-        if (typeof object.callee == "function") { return true; }
-        try {
-            object[object.length] = 6;
-            delete object[object.length];
-        } catch (e) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @name samsam.isElement
-     * @param Object object
-     *
-     * Returns ``true`` if ``object`` is a DOM element node. Unlike
-     * Underscore.js/lodash, this function will return ``false`` if ``object``
-     * is an *element-like* object, i.e. a regular object with a ``nodeType``
-     * property that holds the value ``1``.
-     */
-    function isElement(object) {
-        if (!object || object.nodeType !== 1 || !div) { return false; }
-        try {
-            object.appendChild(div);
-            object.removeChild(div);
-        } catch (e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @name samsam.keys
-     * @param Object object
-     *
-     * Return an array of own property names.
-     */
-    function keys(object) {
-        var ks = [], prop;
-        for (prop in object) {
-            if (o.hasOwnProperty.call(object, prop)) { ks.push(prop); }
-        }
-        return ks;
-    }
-
-    /**
-     * @name samsam.isDate
-     * @param Object value
-     *
-     * Returns true if the object is a ``Date``, or *date-like*. Duck typing
-     * of date objects work by checking that the object has a ``getTime``
-     * function whose return value equals the return value from the object's
-     * ``valueOf``.
-     */
-    function isDate(value) {
-        return typeof value.getTime == "function" &&
-            value.getTime() == value.valueOf();
-    }
-
-    /**
-     * @name samsam.isNegZero
-     * @param Object value
-     *
-     * Returns ``true`` if ``value`` is ``-0``.
-     */
-    function isNegZero(value) {
-        return value === 0 && 1 / value === -Infinity;
-    }
-
-    /**
-     * @name samsam.equal
-     * @param Object obj1
-     * @param Object obj2
-     *
-     * Returns ``true`` if two objects are strictly equal. Compared to
-     * ``===`` there are two exceptions:
-     *
-     *   - NaN is considered equal to NaN
-     *   - -0 and +0 are not considered equal
-     */
-    function identical(obj1, obj2) {
-        if (obj1 === obj2 || (isNaN(obj1) && isNaN(obj2))) {
-            return obj1 !== 0 || isNegZero(obj1) === isNegZero(obj2);
-        }
-    }
-
-
-    /**
-     * @name samsam.deepEqual
-     * @param Object obj1
-     * @param Object obj2
-     *
-     * Deep equal comparison. Two values are "deep equal" if:
-     *
-     *   - They are equal, according to samsam.identical
-     *   - They are both date objects representing the same time
-     *   - They are both arrays containing elements that are all deepEqual
-     *   - They are objects with the same set of properties, and each property
-     *     in ``obj1`` is deepEqual to the corresponding property in ``obj2``
-     *
-     * Supports cyclic objects.
-     */
-    function deepEqualCyclic(obj1, obj2) {
-
-        // used for cyclic comparison
-        // contain already visited objects
-        var objects1 = [],
-            objects2 = [],
-        // contain pathes (position in the object structure)
-        // of the already visited objects
-        // indexes same as in objects arrays
-            paths1 = [],
-            paths2 = [],
-        // contains combinations of already compared objects
-        // in the manner: { "$1['ref']$2['ref']": true }
-            compared = {};
-
-        /**
-         * used to check, if the value of a property is an object
-         * (cyclic logic is only needed for objects)
-         * only needed for cyclic logic
-         */
-        function isObject(value) {
-
-            if (typeof value === 'object' && value !== null &&
-                    !(value instanceof Boolean) &&
-                    !(value instanceof Date)    &&
-                    !(value instanceof Number)  &&
-                    !(value instanceof RegExp)  &&
-                    !(value instanceof String)) {
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * returns the index of the given object in the
-         * given objects array, -1 if not contained
-         * only needed for cyclic logic
-         */
-        function getIndex(objects, obj) {
-
-            var i;
-            for (i = 0; i < objects.length; i++) {
-                if (objects[i] === obj) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-
-        // does the recursion for the deep equal check
-        return (function deepEqual(obj1, obj2, path1, path2) {
-            var type1 = typeof obj1;
-            var type2 = typeof obj2;
-
-            // == null also matches undefined
-            if (obj1 === obj2 ||
-                    isNaN(obj1) || isNaN(obj2) ||
-                    obj1 == null || obj2 == null ||
-                    type1 !== "object" || type2 !== "object") {
-
-                return identical(obj1, obj2);
-            }
-
-            // Elements are only equal if identical(expected, actual)
-            if (isElement(obj1) || isElement(obj2)) { return false; }
-
-            var isDate1 = isDate(obj1), isDate2 = isDate(obj2);
-            if (isDate1 || isDate2) {
-                if (!isDate1 || !isDate2 || obj1.getTime() !== obj2.getTime()) {
-                    return false;
-                }
-            }
-
-            if (obj1 instanceof RegExp && obj2 instanceof RegExp) {
-                if (obj1.toString() !== obj2.toString()) { return false; }
-            }
-
-            var class1 = getClass(obj1);
-            var class2 = getClass(obj2);
-            var keys1 = keys(obj1);
-            var keys2 = keys(obj2);
-
-            if (isArguments(obj1) || isArguments(obj2)) {
-                if (obj1.length !== obj2.length) { return false; }
-            } else {
-                if (type1 !== type2 || class1 !== class2 ||
-                        keys1.length !== keys2.length) {
-                    return false;
-                }
-            }
-
-            var key, i, l,
-                // following vars are used for the cyclic logic
-                value1, value2,
-                isObject1, isObject2,
-                index1, index2,
-                newPath1, newPath2;
-
-            for (i = 0, l = keys1.length; i < l; i++) {
-                key = keys1[i];
-                if (!o.hasOwnProperty.call(obj2, key)) {
-                    return false;
-                }
-
-                // Start of the cyclic logic
-
-                value1 = obj1[key];
-                value2 = obj2[key];
-
-                isObject1 = isObject(value1);
-                isObject2 = isObject(value2);
-
-                // determine, if the objects were already visited
-                // (it's faster to check for isObject first, than to
-                // get -1 from getIndex for non objects)
-                index1 = isObject1 ? getIndex(objects1, value1) : -1;
-                index2 = isObject2 ? getIndex(objects2, value2) : -1;
-
-                // determine the new pathes of the objects
-                // - for non cyclic objects the current path will be extended
-                //   by current property name
-                // - for cyclic objects the stored path is taken
-                newPath1 = index1 !== -1
-                    ? paths1[index1]
-                    : path1 + '[' + JSON.stringify(key) + ']';
-                newPath2 = index2 !== -1
-                    ? paths2[index2]
-                    : path2 + '[' + JSON.stringify(key) + ']';
-
-                // stop recursion if current objects are already compared
-                if (compared[newPath1 + newPath2]) {
-                    return true;
-                }
-
-                // remember the current objects and their pathes
-                if (index1 === -1 && isObject1) {
-                    objects1.push(value1);
-                    paths1.push(newPath1);
-                }
-                if (index2 === -1 && isObject2) {
-                    objects2.push(value2);
-                    paths2.push(newPath2);
-                }
-
-                // remember that the current objects are already compared
-                if (isObject1 && isObject2) {
-                    compared[newPath1 + newPath2] = true;
-                }
-
-                // End of cyclic logic
-
-                // neither value1 nor value2 is a cycle
-                // continue with next level
-                if (!deepEqual(value1, value2, newPath1, newPath2)) {
-                    return false;
-                }
-            }
-
-            return true;
-
-        }(obj1, obj2, '$1', '$2'));
-    }
-
-    var match;
-
-    function arrayContains(array, subset) {
-        if (subset.length === 0) { return true; }
-        var i, l, j, k;
-        for (i = 0, l = array.length; i < l; ++i) {
-            if (match(array[i], subset[0])) {
-                for (j = 0, k = subset.length; j < k; ++j) {
-                    if (!match(array[i + j], subset[j])) { return false; }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @name samsam.match
-     * @param Object object
-     * @param Object matcher
-     *
-     * Compare arbitrary value ``object`` with matcher.
-     */
-    match = function match(object, matcher) {
-        if (matcher && typeof matcher.test === "function") {
-            return matcher.test(object);
-        }
-
-        if (typeof matcher === "function") {
-            return matcher(object) === true;
-        }
-
-        if (typeof matcher === "string") {
-            matcher = matcher.toLowerCase();
-            var notNull = typeof object === "string" || !!object;
-            return notNull &&
-                (String(object)).toLowerCase().indexOf(matcher) >= 0;
-        }
-
-        if (typeof matcher === "number") {
-            return matcher === object;
-        }
-
-        if (typeof matcher === "boolean") {
-            return matcher === object;
-        }
-
-        if (getClass(object) === "Array" && getClass(matcher) === "Array") {
-            return arrayContains(object, matcher);
-        }
-
-        if (matcher && typeof matcher === "object") {
-            var prop;
-            for (prop in matcher) {
-                if (!match(object[prop], matcher[prop])) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        throw new Error("Matcher was not a string, a number, a " +
-                        "function, a boolean or an object");
-    };
-
-    return {
-        isArguments: isArguments,
-        isElement: isElement,
-        isDate: isDate,
-        isNegZero: isNegZero,
-        identical: identical,
-        deepEqual: deepEqualCyclic,
-        match: match,
-        keys: keys
-    };
-});
-((typeof define === "function" && define.amd && function (m) {
-    define("formatio", ["samsam"], m);
-}) || (typeof module === "object" && function (m) {
-    module.exports = m(require("samsam"));
-}) || function (m) { this.formatio = m(this.samsam); }
-)(function (samsam) {
-    
-    var formatio = {
-        excludeConstructors: ["Object", /^.$/],
-        quoteStrings: true
-    };
-
-    var hasOwn = Object.prototype.hasOwnProperty;
-
-    var specialObjects = [];
-    if (typeof global !== "undefined") {
-        specialObjects.push({ object: global, value: "[object global]" });
-    }
-    if (typeof document !== "undefined") {
-        specialObjects.push({
-            object: document,
-            value: "[object HTMLDocument]"
-        });
-    }
-    if (typeof window !== "undefined") {
-        specialObjects.push({ object: window, value: "[object Window]" });
-    }
-
-    function functionName(func) {
-        if (!func) { return ""; }
-        if (func.displayName) { return func.displayName; }
-        if (func.name) { return func.name; }
-        var matches = func.toString().match(/function\s+([^\(]+)/m);
-        return (matches && matches[1]) || "";
-    }
-
-    function constructorName(f, object) {
-        var name = functionName(object && object.constructor);
-        var excludes = f.excludeConstructors ||
-                formatio.excludeConstructors || [];
-
-        var i, l;
-        for (i = 0, l = excludes.length; i < l; ++i) {
-            if (typeof excludes[i] === "string" && excludes[i] === name) {
-                return "";
-            } else if (excludes[i].test && excludes[i].test(name)) {
-                return "";
-            }
-        }
-
-        return name;
-    }
-
-    function isCircular(object, objects) {
-        if (typeof object !== "object") { return false; }
-        var i, l;
-        for (i = 0, l = objects.length; i < l; ++i) {
-            if (objects[i] === object) { return true; }
-        }
-        return false;
-    }
-
-    function ascii(f, object, processed, indent) {
-        if (typeof object === "string") {
-            var qs = f.quoteStrings;
-            var quote = typeof qs !== "boolean" || qs;
-            return processed || quote ? '"' + object + '"' : object;
-        }
-
-        if (typeof object === "function" && !(object instanceof RegExp)) {
-            return ascii.func(object);
-        }
-
-        processed = processed || [];
-
-        if (isCircular(object, processed)) { return "[Circular]"; }
-
-        if (Object.prototype.toString.call(object) === "[object Array]") {
-            return ascii.array.call(f, object, processed);
-        }
-
-        if (!object) { return String((1/object) === -Infinity ? "-0" : object); }
-        if (samsam.isElement(object)) { return ascii.element(object); }
-
-        if (typeof object.toString === "function" &&
-                object.toString !== Object.prototype.toString) {
-            return object.toString();
-        }
-
-        var i, l;
-        for (i = 0, l = specialObjects.length; i < l; i++) {
-            if (object === specialObjects[i].object) {
-                return specialObjects[i].value;
-            }
-        }
-
-        return ascii.object.call(f, object, processed, indent);
-    }
-
-    ascii.func = function (func) {
-        return "function " + functionName(func) + "() {}";
-    };
-
-    ascii.array = function (array, processed) {
-        processed = processed || [];
-        processed.push(array);
-        var i, l, pieces = [];
-        for (i = 0, l = array.length; i < l; ++i) {
-            pieces.push(ascii(this, array[i], processed));
-        }
-        return "[" + pieces.join(", ") + "]";
-    };
-
-    ascii.object = function (object, processed, indent) {
-        processed = processed || [];
-        processed.push(object);
-        indent = indent || 0;
-        var pieces = [], properties = samsam.keys(object).sort();
-        var length = 3;
-        var prop, str, obj, i, l;
-
-        for (i = 0, l = properties.length; i < l; ++i) {
-            prop = properties[i];
-            obj = object[prop];
-
-            if (isCircular(obj, processed)) {
-                str = "[Circular]";
-            } else {
-                str = ascii(this, obj, processed, indent + 2);
-            }
-
-            str = (/\s/.test(prop) ? '"' + prop + '"' : prop) + ": " + str;
-            length += str.length;
-            pieces.push(str);
-        }
-
-        var cons = constructorName(this, object);
-        var prefix = cons ? "[" + cons + "] " : "";
-        var is = "";
-        for (i = 0, l = indent; i < l; ++i) { is += " "; }
-
-        if (length + indent > 80) {
-            return prefix + "{\n  " + is + pieces.join(",\n  " + is) + "\n" +
-                is + "}";
-        }
-        return prefix + "{ " + pieces.join(", ") + " }";
-    };
-
-    ascii.element = function (element) {
-        var tagName = element.tagName.toLowerCase();
-        var attrs = element.attributes, attr, pairs = [], attrName, i, l, val;
-
-        for (i = 0, l = attrs.length; i < l; ++i) {
-            attr = attrs.item(i);
-            attrName = attr.nodeName.toLowerCase().replace("html:", "");
-            val = attr.nodeValue;
-            if (attrName !== "contenteditable" || val !== "inherit") {
-                if (!!val) { pairs.push(attrName + "=\"" + val + "\""); }
-            }
-        }
-
-        var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
-        var content = element.innerHTML;
-
-        if (content.length > 20) {
-            content = content.substr(0, 20) + "[...]";
-        }
-
-        var res = formatted + pairs.join(" ") + ">" + content +
-                "</" + tagName + ">";
-
-        return res.replace(/ contentEditable="inherit"/, "");
-    };
-
-    function Formatio(options) {
-        for (var opt in options) {
-            this[opt] = options[opt];
-        }
-    }
-
-    Formatio.prototype = {
-        functionName: functionName,
-
-        configure: function (options) {
-            return new Formatio(options);
-        },
-
-        constructorName: function (object) {
-            return constructorName(this, object);
-        },
-
-        ascii: function (object, processed, indent) {
-            return ascii(this, object, processed, indent);
-        }
-    };
-
-    return Formatio.prototype;
-});
-/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
-/*global module, require, __dirname, document*/
-/**
- * Sinon core utilities. For internal use only.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-var sinon = (function (formatio) {
-    var div = typeof document != "undefined" && document.createElement("div");
-    var hasOwn = Object.prototype.hasOwnProperty;
-
-    function isDOMNode(obj) {
-        var success = false;
-
-        try {
-            obj.appendChild(div);
-            success = div.parentNode == obj;
-        } catch (e) {
-            return false;
-        } finally {
-            try {
-                obj.removeChild(div);
-            } catch (e) {
-                // Remove failed, not much we can do about that
-            }
-        }
-
-        return success;
-    }
-
-    function isElement(obj) {
-        return div && obj && obj.nodeType === 1 && isDOMNode(obj);
-    }
-
-    function isFunction(obj) {
-        return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
-    }
-
-    function mirrorProperties(target, source) {
-        for (var prop in source) {
-            if (!hasOwn.call(target, prop)) {
-                target[prop] = source[prop];
-            }
-        }
-    }
-
-    function isRestorable (obj) {
-        return typeof obj === "function" && typeof obj.restore === "function" && obj.restore.sinon;
-    }
-
-    var sinon = {
-        wrapMethod: function wrapMethod(object, property, method) {
-            if (!object) {
-                throw new TypeError("Should wrap property of object");
-            }
-
-            if (typeof method != "function") {
-                throw new TypeError("Method wrapper should be function");
-            }
-
-            var wrappedMethod = object[property],
-                error;
-
-            if (!isFunction(wrappedMethod)) {
-                error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
-                                    property + " as function");
-            }
-
-            if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
-                error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
-            }
-
-            if (wrappedMethod.calledBefore) {
-                var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
-                error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
-            }
-
-            if (error) {
-                if (wrappedMethod._stack) {
-                    error.stack += '\n--------------\n' + wrappedMethod._stack;
-                }
-                throw error;
-            }
-
-            // IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
-            // when using hasOwn.call on objects from other frames.
-            var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
-            object[property] = method;
-            method.displayName = property;
-            // Set up a stack trace which can be used later to find what line of
-            // code the original method was created on.
-            method._stack = (new Error('Stack Trace for original')).stack;
-
-            method.restore = function () {
-                // For prototype properties try to reset by delete first.
-                // If this fails (ex: localStorage on mobile safari) then force a reset
-                // via direct assignment.
-                if (!owned) {
-                    delete object[property];
-                }
-                if (object[property] === method) {
-                    object[property] = wrappedMethod;
-                }
-            };
-
-            method.restore.sinon = true;
-            mirrorProperties(method, wrappedMethod);
-
-            return method;
-        },
-
-        extend: function extend(target) {
-            for (var i = 1, l = arguments.length; i < l; i += 1) {
-                for (var prop in arguments[i]) {
-                    if (arguments[i].hasOwnProperty(prop)) {
-                        target[prop] = arguments[i][prop];
-                    }
-
-                    // DONT ENUM bug, only care about toString
-                    if (arguments[i].hasOwnProperty("toString") &&
-                        arguments[i].toString != target.toString) {
-                        target.toString = arguments[i].toString;
-                    }
-                }
-            }
-
-            return target;
-        },
-
-        create: function create(proto) {
-            var F = function () {};
-            F.prototype = proto;
-            return new F();
-        },
-
-        deepEqual: function deepEqual(a, b) {
-            if (sinon.match && sinon.match.isMatcher(a)) {
-                return a.test(b);
-            }
-            if (typeof a != "object" || typeof b != "object") {
-                return a === b;
-            }
-
-            if (isElement(a) || isElement(b)) {
-                return a === b;
-            }
-
-            if (a === b) {
-                return true;
-            }
-
-            if ((a === null && b !== null) || (a !== null && b === null)) {
-                return false;
-            }
-
-            if (a instanceof RegExp && b instanceof RegExp) {
-              return (a.source === b.source) && (a.global === b.global) && 
-                (a.ignoreCase === b.ignoreCase) && (a.multiline === b.multiline);
-            }
-
-            var aString = Object.prototype.toString.call(a);
-            if (aString != Object.prototype.toString.call(b)) {
-                return false;
-            }
-
-            if (aString == "[object Date]") {
-                return a.valueOf() === b.valueOf();
-            }
-
-            var prop, aLength = 0, bLength = 0;
-
-            if (aString == "[object Array]" && a.length !== b.length) {
-                return false;
-            }
-
-            for (prop in a) {
-                aLength += 1;
-
-                if (!deepEqual(a[prop], b[prop])) {
-                    return false;
-                }
-            }
-
-            for (prop in b) {
-                bLength += 1;
-            }
-
-            return aLength == bLength;
-        },
-
-        functionName: function functionName(func) {
-            var name = func.displayName || func.name;
-
-            // Use function decomposition as a last resort to get function
-            // name. Does not rely on function decomposition to work - if it
-            // doesn't debugging will be slightly less informative
-            // (i.e. toString will say 'spy' rather than 'myFunc').
-            if (!name) {
-                var matches = func.toString().match(/function ([^\s\(]+)/);
-                name = matches && matches[1];
-            }
-
-            return name;
-        },
-
-        functionToString: function toString() {
-            if (this.getCall && this.callCount) {
-                var thisValue, prop, i = this.callCount;
-
-                while (i--) {
-                    thisValue = this.getCall(i).thisValue;
-
-                    for (prop in thisValue) {
-                        if (thisValue[prop] === this) {
-                            return prop;
-                        }
-                    }
-                }
-            }
-
-            return this.displayName || "sinon fake";
-        },
-
-        getConfig: function (custom) {
-            var config = {};
-            custom = custom || {};
-            var defaults = sinon.defaultConfig;
-
-            for (var prop in defaults) {
-                if (defaults.hasOwnProperty(prop)) {
-                    config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
-                }
-            }
-
-            return config;
-        },
-
-        format: function (val) {
-            return "" + val;
-        },
-
-        defaultConfig: {
-            injectIntoThis: true,
-            injectInto: null,
-            properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-            useFakeTimers: true,
-            useFakeServer: true
-        },
-
-        timesInWords: function timesInWords(count) {
-            return count == 1 && "once" ||
-                count == 2 && "twice" ||
-                count == 3 && "thrice" ||
-                (count || 0) + " times";
-        },
-
-        calledInOrder: function (spies) {
-            for (var i = 1, l = spies.length; i < l; i++) {
-                if (!spies[i - 1].calledBefore(spies[i]) || !spies[i].called) {
-                    return false;
-                }
-            }
-
-            return true;
-        },
-
-        orderByFirstCall: function (spies) {
-            return spies.sort(function (a, b) {
-                // uuid, won't ever be equal
-                var aCall = a.getCall(0);
-                var bCall = b.getCall(0);
-                var aId = aCall && aCall.callId || -1;
-                var bId = bCall && bCall.callId || -1;
-
-                return aId < bId ? -1 : 1;
-            });
-        },
-
-        log: function () {},
-
-        logError: function (label, err) {
-            var msg = label + " threw exception: ";
-            sinon.log(msg + "[" + err.name + "] " + err.message);
-            if (err.stack) { sinon.log(err.stack); }
-
-            setTimeout(function () {
-                err.message = msg + err.message;
-                throw err;
-            }, 0);
-        },
-
-        typeOf: function (value) {
-            if (value === null) {
-                return "null";
-            }
-            else if (value === undefined) {
-                return "undefined";
-            }
-            var string = Object.prototype.toString.call(value);
-            return string.substring(8, string.length - 1).toLowerCase();
-        },
-
-        createStubInstance: function (constructor) {
-            if (typeof constructor !== "function") {
-                throw new TypeError("The constructor should be a function.");
-            }
-            return sinon.stub(sinon.create(constructor.prototype));
-        },
-
-        restore: function (object) {
-            if (object !== null && typeof object === "object") {
-                for (var prop in object) {
-                    if (isRestorable(object[prop])) {
-                        object[prop].restore();
-                    }
-                }
-            }
-            else if (isRestorable(object)) {
-                object.restore();
-            }
-        }
-    };
-
-    var isNode = typeof module !== "undefined" && module.exports;
-    var isAMD = typeof define === 'function' && typeof define.amd === 'object' && define.amd;
-
-    if (isAMD) {
-        define(function(){
-            return sinon;
-        });
-    } else if (isNode) {
-        try {
-            formatio = require("formatio");
-        } catch (e) {}
-        module.exports = sinon;
-        module.exports.spy = require("./sinon/spy");
-        module.exports.spyCall = require("./sinon/call");
-        module.exports.behavior = require("./sinon/behavior");
-        module.exports.stub = require("./sinon/stub");
-        module.exports.mock = require("./sinon/mock");
-        module.exports.collection = require("./sinon/collection");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.sandbox = require("./sinon/sandbox");
-        module.exports.test = require("./sinon/test");
-        module.exports.testCase = require("./sinon/test_case");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.match = require("./sinon/match");
-    }
-
-    if (formatio) {
-        var formatter = formatio.configure({ quoteStrings: false });
-        sinon.format = function () {
-            return formatter.ascii.apply(formatter, arguments);
-        };
-    } else if (isNode) {
-        try {
-            var util = require("util");
-            sinon.format = function (value) {
-                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
-            };
-        } catch (e) {
-            /* Node, but no util module - would be very old, but better safe than
-             sorry */
-        }
-    }
-
-    return sinon;
-}(typeof formatio == "object" && formatio));
-
-/* @depend ../sinon.js */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Match functions
- *
- * @author Maximilian Antoni (mail@maxantoni.de)
- * @license BSD
- *
- * Copyright (c) 2012 Maximilian Antoni
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function assertType(value, type, name) {
-        var actual = sinon.typeOf(value);
-        if (actual !== type) {
-            throw new TypeError("Expected type of " + name + " to be " +
-                type + ", but was " + actual);
-        }
-    }
-
-    var matcher = {
-        toString: function () {
-            return this.message;
-        }
-    };
-
-    function isMatcher(object) {
-        return matcher.isPrototypeOf(object);
-    }
-
-    function matchObject(expectation, actual) {
-        if (actual === null || actual === undefined) {
-            return false;
-        }
-        for (var key in expectation) {
-            if (expectation.hasOwnProperty(key)) {
-                var exp = expectation[key];
-                var act = actual[key];
-                if (match.isMatcher(exp)) {
-                    if (!exp.test(act)) {
-                        return false;
-                    }
-                } else if (sinon.typeOf(exp) === "object") {
-                    if (!matchObject(exp, act)) {
-                        return false;
-                    }
-                } else if (!sinon.deepEqual(exp, act)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    matcher.or = function (m2) {
-        if (!arguments.length) {
-            throw new TypeError("Matcher expected");
-        } else if (!isMatcher(m2)) {
-            m2 = match(m2);
-        }
-        var m1 = this;
-        var or = sinon.create(matcher);
-        or.test = function (actual) {
-            return m1.test(actual) || m2.test(actual);
-        };
-        or.message = m1.message + ".or(" + m2.message + ")";
-        return or;
-    };
-
-    matcher.and = function (m2) {
-        if (!arguments.length) {
-            throw new TypeError("Matcher expected");
-        } else if (!isMatcher(m2)) {
-            m2 = match(m2);
-        }
-        var m1 = this;
-        var and = sinon.create(matcher);
-        and.test = function (actual) {
-            return m1.test(actual) && m2.test(actual);
-        };
-        and.message = m1.message + ".and(" + m2.message + ")";
-        return and;
-    };
-
-    var match = function (expectation, message) {
-        var m = sinon.create(matcher);
-        var type = sinon.typeOf(expectation);
-        switch (type) {
-        case "object":
-            if (typeof expectation.test === "function") {
-                m.test = function (actual) {
-                    return expectation.test(actual) === true;
-                };
-                m.message = "match(" + sinon.functionName(expectation.test) + ")";
-                return m;
-            }
-            var str = [];
-            for (var key in expectation) {
-                if (expectation.hasOwnProperty(key)) {
-                    str.push(key + ": " + expectation[key]);
-                }
-            }
-            m.test = function (actual) {
-                return matchObject(expectation, actual);
-            };
-            m.message = "match(" + str.join(", ") + ")";
-            break;
-        case "number":
-            m.test = function (actual) {
-                return expectation == actual;
-            };
-            break;
-        case "string":
-            m.test = function (actual) {
-                if (typeof actual !== "string") {
-                    return false;
-                }
-                return actual.indexOf(expectation) !== -1;
-            };
-            m.message = "match(\"" + expectation + "\")";
-            break;
-        case "regexp":
-            m.test = function (actual) {
-                if (typeof actual !== "string") {
-                    return false;
-                }
-                return expectation.test(actual);
-            };
-            break;
-        case "function":
-            m.test = expectation;
-            if (message) {
-                m.message = message;
-            } else {
-                m.message = "match(" + sinon.functionName(expectation) + ")";
-            }
-            break;
-        default:
-            m.test = function (actual) {
-              return sinon.deepEqual(expectation, actual);
-            };
-        }
-        if (!m.message) {
-            m.message = "match(" + expectation + ")";
-        }
-        return m;
-    };
-
-    match.isMatcher = isMatcher;
-
-    match.any = match(function () {
-        return true;
-    }, "any");
-
-    match.defined = match(function (actual) {
-        return actual !== null && actual !== undefined;
-    }, "defined");
-
-    match.truthy = match(function (actual) {
-        return !!actual;
-    }, "truthy");
-
-    match.falsy = match(function (actual) {
-        return !actual;
-    }, "falsy");
-
-    match.same = function (expectation) {
-        return match(function (actual) {
-            return expectation === actual;
-        }, "same(" + expectation + ")");
-    };
-
-    match.typeOf = function (type) {
-        assertType(type, "string", "type");
-        return match(function (actual) {
-            return sinon.typeOf(actual) === type;
-        }, "typeOf(\"" + type + "\")");
-    };
-
-    match.instanceOf = function (type) {
-        assertType(type, "function", "type");
-        return match(function (actual) {
-            return actual instanceof type;
-        }, "instanceOf(" + sinon.functionName(type) + ")");
-    };
-
-    function createPropertyMatcher(propertyTest, messagePrefix) {
-        return function (property, value) {
-            assertType(property, "string", "property");
-            var onlyProperty = arguments.length === 1;
-            var message = messagePrefix + "(\"" + property + "\"";
-            if (!onlyProperty) {
-                message += ", " + value;
-            }
-            message += ")";
-            return match(function (actual) {
-                if (actual === undefined || actual === null ||
-                        !propertyTest(actual, property)) {
-                    return false;
-                }
-                return onlyProperty || sinon.deepEqual(value, actual[property]);
-            }, message);
-        };
-    }
-
-    match.has = createPropertyMatcher(function (actual, property) {
-        if (typeof actual === "object") {
-            return property in actual;
-        }
-        return actual[property] !== undefined;
-    }, "has");
-
-    match.hasOwn = createPropertyMatcher(function (actual, property) {
-        return actual.hasOwnProperty(property);
-    }, "hasOwn");
-
-    match.bool = match.typeOf("boolean");
-    match.number = match.typeOf("number");
-    match.string = match.typeOf("string");
-    match.object = match.typeOf("object");
-    match.func = match.typeOf("function");
-    match.array = match.typeOf("array");
-    match.regexp = match.typeOf("regexp");
-    match.date = match.typeOf("date");
-
-    if (commonJSModule) {
-        module.exports = match;
-    } else {
-        sinon.match = match;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
-  * @depend ../sinon.js
-  * @depend match.js
-  */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
-  * Spy calls
-  *
-  * @author Christian Johansen (christian@cjohansen.no)
-  * @author Maximilian Antoni (mail@maxantoni.de)
-  * @license BSD
-  *
-  * Copyright (c) 2010-2013 Christian Johansen
-  * Copyright (c) 2013 Maximilian Antoni
-  */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function throwYieldError(proxy, text, args) {
-        var msg = sinon.functionName(proxy) + text;
-        if (args.length) {
-            msg += " Received [" + slice.call(args).join(", ") + "]";
-        }
-        throw new Error(msg);
-    }
-
-    var slice = Array.prototype.slice;
-
-    var callProto = {
-        calledOn: function calledOn(thisValue) {
-            if (sinon.match && sinon.match.isMatcher(thisValue)) {
-                return thisValue.test(this.thisValue);
-            }
-            return this.thisValue === thisValue;
-        },
-
-        calledWith: function calledWith() {
-            for (var i = 0, l = arguments.length; i < l; i += 1) {
-                if (!sinon.deepEqual(arguments[i], this.args[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        },
-
-        calledWithMatch: function calledWithMatch() {
-            for (var i = 0, l = arguments.length; i < l; i += 1) {
-                var actual = this.args[i];
-                var expectation = arguments[i];
-                if (!sinon.match || !sinon.match(expectation).test(actual)) {
-                    return false;
-                }
-            }
-            return true;
-        },
-
-        calledWithExactly: function calledWithExactly() {
-            return arguments.length == this.args.length &&
-                this.calledWith.apply(this, arguments);
-        },
-
-        notCalledWith: function notCalledWith() {
-            return !this.calledWith.apply(this, arguments);
-        },
-
-        notCalledWithMatch: function notCalledWithMatch() {
-            return !this.calledWithMatch.apply(this, arguments);
-        },
-
-        returned: function returned(value) {
-            return sinon.deepEqual(value, this.returnValue);
-        },
-
-        threw: function threw(error) {
-            if (typeof error === "undefined" || !this.exception) {
-                return !!this.exception;
-            }
-
-            return this.exception === error || this.exception.name === error;
-        },
-
-        calledWithNew: function calledWithNew() {
-            return this.proxy.prototype && this.thisValue instanceof this.proxy;
-        },
-
-        calledBefore: function (other) {
-            return this.callId < other.callId;
-        },
-
-        calledAfter: function (other) {
-            return this.callId > other.callId;
-        },
-
-        callArg: function (pos) {
-            this.args[pos]();
-        },
-
-        callArgOn: function (pos, thisValue) {
-            this.args[pos].apply(thisValue);
-        },
-
-        callArgWith: function (pos) {
-            this.callArgOnWith.apply(this, [pos, null].concat(slice.call(arguments, 1)));
-        },
-
-        callArgOnWith: function (pos, thisValue) {
-            var args = slice.call(arguments, 2);
-            this.args[pos].apply(thisValue, args);
-        },
-
-        "yield": function () {
-            this.yieldOn.apply(this, [null].concat(slice.call(arguments, 0)));
-        },
-
-        yieldOn: function (thisValue) {
-            var args = this.args;
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (typeof args[i] === "function") {
-                    args[i].apply(thisValue, slice.call(arguments, 1));
-                    return;
-                }
-            }
-            throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
-        },
-
-        yieldTo: function (prop) {
-            this.yieldToOn.apply(this, [prop, null].concat(slice.call(arguments, 1)));
-        },
-
-        yieldToOn: function (prop, thisValue) {
-            var args = this.args;
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (args[i] && typeof args[i][prop] === "function") {
-                    args[i][prop].apply(thisValue, slice.call(arguments, 2));
-                    return;
-                }
-            }
-            throwYieldError(this.proxy, " cannot yield to '" + prop +
-                "' since no callback was passed.", args);
-        },
-
-        toString: function () {
-            var callStr = this.proxy.toString() + "(";
-            var args = [];
-
-            for (var i = 0, l = this.args.length; i < l; ++i) {
-                args.push(sinon.format(this.args[i]));
-            }
-
-            callStr = callStr + args.join(", ") + ")";
-
-            if (typeof this.returnValue != "undefined") {
-                callStr += " => " + sinon.format(this.returnValue);
-            }
-
-            if (this.exception) {
-                callStr += " !" + this.exception.name;
-
-                if (this.exception.message) {
-                    callStr += "(" + this.exception.message + ")";
-                }
-            }
-
-            return callStr;
-        }
-    };
-
-    callProto.invokeCallback = callProto.yield;
-
-    function createSpyCall(spy, thisValue, args, returnValue, exception, id) {
-        if (typeof id !== "number") {
-            throw new TypeError("Call id is not a number");
-        }
-        var proxyCall = sinon.create(callProto);
-        proxyCall.proxy = spy;
-        proxyCall.thisValue = thisValue;
-        proxyCall.args = args;
-        proxyCall.returnValue = returnValue;
-        proxyCall.exception = exception;
-        proxyCall.callId = id;
-
-        return proxyCall;
-    }
-    createSpyCall.toString = callProto.toString; // used by mocks
-
-    if (commonJSModule) {
-        module.exports = createSpyCall;
-    } else {
-        sinon.spyCall = createSpyCall;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-
-/**
-  * @depend ../sinon.js
-  * @depend call.js
-  */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
-  * Spy functions
-  *
-  * @author Christian Johansen (christian@cjohansen.no)
-  * @license BSD
-  *
-  * Copyright (c) 2010-2013 Christian Johansen
-  */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = Array.prototype.push;
-    var slice = Array.prototype.slice;
-    var callId = 0;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function spy(object, property) {
-        if (!property && typeof object == "function") {
-            return spy.create(object);
-        }
-
-        if (!object && !property) {
-            return spy.create(function () { });
-        }
-
-        var method = object[property];
-        return sinon.wrapMethod(object, property, spy.create(method));
-    }
-
-    function matchingFake(fakes, args, strict) {
-        if (!fakes) {
-            return;
-        }
-
-        for (var i = 0, l = fakes.length; i < l; i++) {
-            if (fakes[i].matches(args, strict)) {
-                return fakes[i];
-            }
-        }
-    }
-
-    function incrementCallCount() {
-        this.called = true;
-        this.callCount += 1;
-        this.notCalled = false;
-        this.calledOnce = this.callCount == 1;
-        this.calledTwice = this.callCount == 2;
-        this.calledThrice = this.callCount == 3;
-    }
-
-    function createCallProperties() {
-        this.firstCall = this.getCall(0);
-        this.secondCall = this.getCall(1);
-        this.thirdCall = this.getCall(2);
-        this.lastCall = this.getCall(this.callCount - 1);
-    }
-
-    var vars = "a,b,c,d,e,f,g,h,i,j,k,l";
-    function createProxy(func) {
-        // Retain the function length:
-        var p;
-        if (func.length) {
-            eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
-                ") { return p.invoke(func, this, slice.call(arguments)); });");
-        }
-        else {
-            p = function proxy() {
-                return p.invoke(func, this, slice.call(arguments));
-            };
-        }
-        return p;
-    }
-
-    var uuid = 0;
-
-    // Public API
-    var spyApi = {
-        reset: function () {
-            this.called = false;
-            this.notCalled = true;
-            this.calledOnce = false;
-            this.calledTwice = false;
-            this.calledThrice = false;
-            this.callCount = 0;
-            this.firstCall = null;
-            this.secondCall = null;
-            this.thirdCall = null;
-            this.lastCall = null;
-            this.args = [];
-            this.returnValues = [];
-            this.thisValues = [];
-            this.exceptions = [];
-            this.callIds = [];
-            if (this.fakes) {
-                for (var i = 0; i < this.fakes.length; i++) {
-                    this.fakes[i].reset();
-                }
-            }
-        },
-
-        create: function create(func) {
-            var name;
-
-            if (typeof func != "function") {
-                func = function () { };
-            } else {
-                name = sinon.functionName(func);
-            }
-
-            var proxy = createProxy(func);
-
-            sinon.extend(proxy, spy);
-            delete proxy.create;
-            sinon.extend(proxy, func);
-
-            proxy.reset();
-            proxy.prototype = func.prototype;
-            proxy.displayName = name || "spy";
-            proxy.toString = sinon.functionToString;
-            proxy._create = sinon.spy.create;
-            proxy.id = "spy#" + uuid++;
-
-            return proxy;
-        },
-
-        invoke: function invoke(func, thisValue, args) {
-            var matching = matchingFake(this.fakes, args);
-            var exception, returnValue;
-
-            incrementCallCount.call(this);
-            push.call(this.thisValues, thisValue);
-            push.call(this.args, args);
-            push.call(this.callIds, callId++);
-
-            try {
-                if (matching) {
-                    returnValue = matching.invoke(func, thisValue, args);
-                } else {
-                    returnValue = (this.func || func).apply(thisValue, args);
-                }
-
-                var thisCall = this.getCall(this.callCount - 1);
-                if (thisCall.calledWithNew() && typeof returnValue !== 'object') {
-                    returnValue = thisValue;
-                }
-            } catch (e) {
-                exception = e;
-            }
-
-            push.call(this.exceptions, exception);
-            push.call(this.returnValues, returnValue);
-
-            createCallProperties.call(this);
-
-            if (exception !== undefined) {
-                throw exception;
-            }
-
-            return returnValue;
-        },
-
-        getCall: function getCall(i) {
-            if (i < 0 || i >= this.callCount) {
-                return null;
-            }
-
-            return sinon.spyCall(this, this.thisValues[i], this.args[i],
-                                    this.returnValues[i], this.exceptions[i],
-                                    this.callIds[i]);
-        },
-
-        getCalls: function () {
-            var calls = [];
-            var i;
-
-            for (i = 0; i < this.callCount; i++) {
-                calls.push(this.getCall(i));
-            }
-
-            return calls;
-        },
-
-        calledBefore: function calledBefore(spyFn) {
-            if (!this.called) {
-                return false;
-            }
-
-            if (!spyFn.called) {
-                return true;
-            }
-
-            return this.callIds[0] < spyFn.callIds[spyFn.callIds.length - 1];
-        },
-
-        calledAfter: function calledAfter(spyFn) {
-            if (!this.called || !spyFn.called) {
-                return false;
-            }
-
-            return this.callIds[this.callCount - 1] > spyFn.callIds[spyFn.callCount - 1];
-        },
-
-        withArgs: function () {
-            var args = slice.call(arguments);
-
-            if (this.fakes) {
-                var match = matchingFake(this.fakes, args, true);
-
-                if (match) {
-                    return match;
-                }
-            } else {
-                this.fakes = [];
-            }
-
-            var original = this;
-            var fake = this._create();
-            fake.matchingAguments = args;
-            fake.parent = this;
-            push.call(this.fakes, fake);
-
-            fake.withArgs = function () {
-                return original.withArgs.apply(original, arguments);
-            };
-
-            for (var i = 0; i < this.args.length; i++) {
-                if (fake.matches(this.args[i])) {
-                    incrementCallCount.call(fake);
-                    push.call(fake.thisValues, this.thisValues[i]);
-                    push.call(fake.args, this.args[i]);
-                    push.call(fake.returnValues, this.returnValues[i]);
-                    push.call(fake.exceptions, this.exceptions[i]);
-                    push.call(fake.callIds, this.callIds[i]);
-                }
-            }
-            createCallProperties.call(fake);
-
-            return fake;
-        },
-
-        matches: function (args, strict) {
-            var margs = this.matchingAguments;
-
-            if (margs.length <= args.length &&
-                sinon.deepEqual(margs, args.slice(0, margs.length))) {
-                return !strict || margs.length == args.length;
-            }
-        },
-
-        printf: function (format) {
-            var spy = this;
-            var args = slice.call(arguments, 1);
-            var formatter;
-
-            return (format || "").replace(/%(.)/g, function (match, specifyer) {
-                formatter = spyApi.formatters[specifyer];
-
-                if (typeof formatter == "function") {
-                    return formatter.call(null, spy, args);
-                } else if (!isNaN(parseInt(specifyer, 10))) {
-                    return sinon.format(args[specifyer - 1]);
-                }
-
-                return "%" + specifyer;
-            });
-        }
-    };
-
-    function delegateToCalls(method, matchAny, actual, notCalled) {
-        spyApi[method] = function () {
-            if (!this.called) {
-                if (notCalled) {
-                    return notCalled.apply(this, arguments);
-                }
-                return false;
-            }
-
-            var currentCall;
-            var matches = 0;
-
-            for (var i = 0, l = this.callCount; i < l; i += 1) {
-                currentCall = this.getCall(i);
-
-                if (currentCall[actual || method].apply(currentCall, arguments)) {
-                    matches += 1;
-
-                    if (matchAny) {
-                        return true;
-                    }
-                }
-            }
-
-            return matches === this.callCount;
-        };
-    }
-
-    delegateToCalls("calledOn", true);
-    delegateToCalls("alwaysCalledOn", false, "calledOn");
-    delegateToCalls("calledWith", true);
-    delegateToCalls("calledWithMatch", true);
-    delegateToCalls("alwaysCalledWith", false, "calledWith");
-    delegateToCalls("alwaysCalledWithMatch", false, "calledWithMatch");
-    delegateToCalls("calledWithExactly", true);
-    delegateToCalls("alwaysCalledWithExactly", false, "calledWithExactly");
-    delegateToCalls("neverCalledWith", false, "notCalledWith",
-        function () { return true; });
-    delegateToCalls("neverCalledWithMatch", false, "notCalledWithMatch",
-        function () { return true; });
-    delegateToCalls("threw", true);
-    delegateToCalls("alwaysThrew", false, "threw");
-    delegateToCalls("returned", true);
-    delegateToCalls("alwaysReturned", false, "returned");
-    delegateToCalls("calledWithNew", true);
-    delegateToCalls("alwaysCalledWithNew", false, "calledWithNew");
-    delegateToCalls("callArg", false, "callArgWith", function () {
-        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
-    });
-    spyApi.callArgWith = spyApi.callArg;
-    delegateToCalls("callArgOn", false, "callArgOnWith", function () {
-        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
-    });
-    spyApi.callArgOnWith = spyApi.callArgOn;
-    delegateToCalls("yield", false, "yield", function () {
-        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
-    });
-    // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
-    spyApi.invokeCallback = spyApi.yield;
-    delegateToCalls("yieldOn", false, "yieldOn", function () {
-        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
-    });
-    delegateToCalls("yieldTo", false, "yieldTo", function (property) {
-        throw new Error(this.toString() + " cannot yield to '" + property +
-            "' since it was not yet invoked.");
-    });
-    delegateToCalls("yieldToOn", false, "yieldToOn", function (property) {
-        throw new Error(this.toString() + " cannot yield to '" + property +
-            "' since it was not yet invoked.");
-    });
-
-    spyApi.formatters = {
-        "c": function (spy) {
-            return sinon.timesInWords(spy.callCount);
-        },
-
-        "n": function (spy) {
-            return spy.toString();
-        },
-
-        "C": function (spy) {
-            var calls = [];
-
-            for (var i = 0, l = spy.callCount; i < l; ++i) {
-                var stringifiedCall = "    " + spy.getCall(i).toString();
-                if (/\n/.test(calls[i - 1])) {
-                    stringifiedCall = "\n" + stringifiedCall;
-                }
-                push.call(calls, stringifiedCall);
-            }
-
-            return calls.length > 0 ? "\n" + calls.join("\n") : "";
-        },
-
-        "t": function (spy) {
-            var objects = [];
-
-            for (var i = 0, l = spy.callCount; i < l; ++i) {
-                push.call(objects, sinon.format(spy.thisValues[i]));
-            }
-
-            return objects.join(", ");
-        },
-
-        "*": function (spy, args) {
-            var formatted = [];
-
-            for (var i = 0, l = args.length; i < l; ++i) {
-                push.call(formatted, sinon.format(args[i]));
-            }
-
-            return formatted.join(", ");
-        }
-    };
-
-    sinon.extend(spy, spyApi);
-
-    spy.spyCall = sinon.spyCall;
-
-    if (commonJSModule) {
-        module.exports = spy;
-    } else {
-        sinon.spy = spy;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global module, require, sinon, process, setImmediate, setTimeout*/
-/**
- * Stub behavior
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Tim Fischbach (mail@timfischbach.de)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    var slice = Array.prototype.slice;
-    var join = Array.prototype.join;
-    var proto;
-
-    var nextTick = (function () {
-        if (typeof process === "object" && typeof process.nextTick === "function") {
-            return process.nextTick;
-        } else if (typeof setImmediate === "function") {
-            return setImmediate;
-        } else {
-            return function (callback) {
-                setTimeout(callback, 0);
-            };
-        }
-    })();
-
-    function throwsException(error, message) {
-        if (typeof error == "string") {
-            this.exception = new Error(message || "");
-            this.exception.name = error;
-        } else if (!error) {
-            this.exception = new Error("Error");
-        } else {
-            this.exception = error;
-        }
-
-        return this;
-    }
-
-    function getCallback(behavior, args) {
-        var callArgAt = behavior.callArgAt;
-
-        if (callArgAt < 0) {
-            var callArgProp = behavior.callArgProp;
-
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (!callArgProp && typeof args[i] == "function") {
-                    return args[i];
-                }
-
-                if (callArgProp && args[i] &&
-                    typeof args[i][callArgProp] == "function") {
-                    return args[i][callArgProp];
-                }
-            }
-
-            return null;
-        }
-
-        return args[callArgAt];
-    }
-
-    function getCallbackError(behavior, func, args) {
-        if (behavior.callArgAt < 0) {
-            var msg;
-
-            if (behavior.callArgProp) {
-                msg = sinon.functionName(behavior.stub) +
-                    " expected to yield to '" + behavior.callArgProp +
-                    "', but no object with such a property was passed.";
-            } else {
-                msg = sinon.functionName(behavior.stub) +
-                    " expected to yield, but no callback was passed.";
-            }
-
-            if (args.length > 0) {
-                msg += " Received [" + join.call(args, ", ") + "]";
-            }
-
-            return msg;
-        }
-
-        return "argument at index " + behavior.callArgAt + " is not a function: " + func;
-    }
-
-    function callCallback(behavior, args) {
-        if (typeof behavior.callArgAt == "number") {
-            var func = getCallback(behavior, args);
-
-            if (typeof func != "function") {
-                throw new TypeError(getCallbackError(behavior, func, args));
-            }
-
-            if (behavior.callbackAsync) {
-                nextTick(function() {
-                    func.apply(behavior.callbackContext, behavior.callbackArguments);
-                });
-            } else {
-                func.apply(behavior.callbackContext, behavior.callbackArguments);
-            }
-        }
-    }
-
-    proto = {
-        create: function(stub) {
-            var behavior = sinon.extend({}, sinon.behavior);
-            delete behavior.create;
-            behavior.stub = stub;
-
-            return behavior;
-        },
-
-        isPresent: function() {
-            return (typeof this.callArgAt == 'number' ||
-                    this.exception ||
-                    typeof this.returnArgAt == 'number' ||
-                    this.returnThis ||
-                    this.returnValueDefined);
-        },
-
-        invoke: function(context, args) {
-            callCallback(this, args);
-
-            if (this.exception) {
-                throw this.exception;
-            } else if (typeof this.returnArgAt == 'number') {
-                return args[this.returnArgAt];
-            } else if (this.returnThis) {
-                return context;
-            }
-
-            return this.returnValue;
-        },
-
-        onCall: function(index) {
-            return this.stub.onCall(index);
-        },
-
-        onFirstCall: function() {
-            return this.stub.onFirstCall();
-        },
-
-        onSecondCall: function() {
-            return this.stub.onSecondCall();
-        },
-
-        onThirdCall: function() {
-            return this.stub.onThirdCall();
-        },
-
-        withArgs: function(/* arguments */) {
-            throw new Error('Defining a stub by invoking "stub.onCall(...).withArgs(...)" is not supported. ' +
-                            'Use "stub.withArgs(...).onCall(...)" to define sequential behavior for calls with certain arguments.');
-        },
-
-        callsArg: function callsArg(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = [];
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgOn: function callsArgOn(pos, context) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = [];
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgWith: function callsArgWith(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgOnWith: function callsArgWith(pos, context) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = slice.call(arguments, 2);
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yields: function () {
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 0);
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsOn: function (context) {
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsTo: function (prop) {
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = undefined;
-            this.callArgProp = prop;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsToOn: function (prop, context) {
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 2);
-            this.callbackContext = context;
-            this.callArgProp = prop;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-
-        "throws": throwsException,
-        throwsException: throwsException,
-
-        returns: function returns(value) {
-            this.returnValue = value;
-            this.returnValueDefined = true;
-
-            return this;
-        },
-
-        returnsArg: function returnsArg(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.returnArgAt = pos;
-
-            return this;
-        },
-
-        returnsThis: function returnsThis() {
-            this.returnThis = true;
-
-            return this;
-        }
-    };
-
-    // create asynchronous versions of callsArg* and yields* methods
-    for (var method in proto) {
-        // need to avoid creating anotherasync versions of the newly added async methods
-        if (proto.hasOwnProperty(method) &&
-            method.match(/^(callsArg|yields)/) &&
-            !method.match(/Async/)) {
-            proto[method + 'Async'] = (function (syncFnName) {
-                return function () {
-                    var result = this[syncFnName].apply(this, arguments);
-                    this.callbackAsync = true;
-                    return result;
-                };
-            })(method);
-        }
-    }
-
-    if (commonJSModule) {
-        module.exports = proto;
-    } else {
-        sinon.behavior = proto;
-    }
-}(typeof sinon == "object" && sinon || null));
-/**
- * @depend ../sinon.js
- * @depend spy.js
- * @depend behavior.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global module, require, sinon*/
-/**
- * Stub functions
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function stub(object, property, func) {
-        if (!!func && typeof func != "function") {
-            throw new TypeError("Custom stub should be function");
-        }
-
-        var wrapper;
-
-        if (func) {
-            wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
-        } else {
-            wrapper = stub.create();
-        }
-
-        if (!object && typeof property === "undefined") {
-            return sinon.stub.create();
-        }
-
-        if (typeof property === "undefined" && typeof object == "object") {
-            for (var prop in object) {
-                if (typeof object[prop] === "function") {
-                    stub(object, prop);
-                }
-            }
-
-            return object;
-        }
-
-        return sinon.wrapMethod(object, property, wrapper);
-    }
-
-    function getDefaultBehavior(stub) {
-        return stub.defaultBehavior || getParentBehaviour(stub) || sinon.behavior.create(stub);
-    }
-
-    function getParentBehaviour(stub) {
-        return (stub.parent && getCurrentBehavior(stub.parent));
-    }
-
-    function getCurrentBehavior(stub) {
-        var behavior = stub.behaviors[stub.callCount - 1];
-        return behavior && behavior.isPresent() ? behavior : getDefaultBehavior(stub);
-    }
-
-    var uuid = 0;
-
-    sinon.extend(stub, (function () {
-        var proto = {
-            create: function create() {
-                var functionStub = function () {
-                    return getCurrentBehavior(functionStub).invoke(this, arguments);
-                };
-
-                functionStub.id = "stub#" + uuid++;
-                var orig = functionStub;
-                functionStub = sinon.spy.create(functionStub);
-                functionStub.func = orig;
-
-                sinon.extend(functionStub, stub);
-                functionStub._create = sinon.stub.create;
-                functionStub.displayName = "stub";
-                functionStub.toString = sinon.functionToString;
-
-                functionStub.defaultBehavior = null;
-                functionStub.behaviors = [];
-
-                return functionStub;
-            },
-
-            resetBehavior: function () {
-                var i;
-
-                this.defaultBehavior = null;
-                this.behaviors = [];
-
-                delete this.returnValue;
-                delete this.returnArgAt;
-                this.returnThis = false;
-
-                if (this.fakes) {
-                    for (i = 0; i < this.fakes.length; i++) {
-                        this.fakes[i].resetBehavior();
-                    }
-                }
-            },
-
-            onCall: function(index) {
-                if (!this.behaviors[index]) {
-                    this.behaviors[index] = sinon.behavior.create(this);
-                }
-
-                return this.behaviors[index];
-            },
-
-            onFirstCall: function() {
-                return this.onCall(0);
-            },
-
-            onSecondCall: function() {
-                return this.onCall(1);
-            },
-
-            onThirdCall: function() {
-                return this.onCall(2);
-            }
-        };
-
-        for (var method in sinon.behavior) {
-            if (sinon.behavior.hasOwnProperty(method) &&
-                !proto.hasOwnProperty(method) &&
-                method != 'create' &&
-                method != 'withArgs' &&
-                method != 'invoke') {
-                proto[method] = (function(behaviorMethod) {
-                    return function() {
-                        this.defaultBehavior = this.defaultBehavior || sinon.behavior.create(this);
-                        this.defaultBehavior[behaviorMethod].apply(this.defaultBehavior, arguments);
-                        return this;
-                    };
-                }(method));
-            }
-        }
-
-        return proto;
-    }()));
-
-    if (commonJSModule) {
-        module.exports = stub;
-    } else {
-        sinon.stub = stub;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- */
-/*jslint eqeqeq: false, onevar: false, nomen: false*/
-/*global module, require, sinon*/
-/**
- * Mock functions.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = [].push;
-    var match;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    match = sinon.match;
-
-    if (!match && commonJSModule) {
-        match = require("./match");
-    }
-
-    function mock(object) {
-        if (!object) {
-            return sinon.expectation.create("Anonymous mock");
-        }
-
-        return mock.create(object);
-    }
-
-    sinon.mock = mock;
-
-    sinon.extend(mock, (function () {
-        function each(collection, callback) {
-            if (!collection) {
-                return;
-            }
-
-            for (var i = 0, l = collection.length; i < l; i += 1) {
-                callback(collection[i]);
-            }
-        }
-
-        return {
-            create: function create(object) {
-                if (!object) {
-                    throw new TypeError("object is null");
-                }
-
-                var mockObject = sinon.extend({}, mock);
-                mockObject.object = object;
-                delete mockObject.create;
-
-                return mockObject;
-            },
-
-            expects: function expects(method) {
-                if (!method) {
-                    throw new TypeError("method is falsy");
-                }
-
-                if (!this.expectations) {
-                    this.expectations = {};
-                    this.proxies = [];
-                }
-
-                if (!this.expectations[method]) {
-                    this.expectations[method] = [];
-                    var mockObject = this;
-
-                    sinon.wrapMethod(this.object, method, function () {
-                        return mockObject.invokeMethod(method, this, arguments);
-                    });
-
-                    push.call(this.proxies, method);
-                }
-
-                var expectation = sinon.expectation.create(method);
-                push.call(this.expectations[method], expectation);
-
-                return expectation;
-            },
-
-            restore: function restore() {
-                var object = this.object;
-
-                each(this.proxies, function (proxy) {
-                    if (typeof object[proxy].restore == "function") {
-                        object[proxy].restore();
-                    }
-                });
-            },
-
-            verify: function verify() {
-                var expectations = this.expectations || {};
-                var messages = [], met = [];
-
-                each(this.proxies, function (proxy) {
-                    each(expectations[proxy], function (expectation) {
-                        if (!expectation.met()) {
-                            push.call(messages, expectation.toString());
-                        } else {
-                            push.call(met, expectation.toString());
-                        }
-                    });
-                });
-
-                this.restore();
-
-                if (messages.length > 0) {
-                    sinon.expectation.fail(messages.concat(met).join("\n"));
-                } else {
-                    sinon.expectation.pass(messages.concat(met).join("\n"));
-                }
-
-                return true;
-            },
-
-            invokeMethod: function invokeMethod(method, thisValue, args) {
-                var expectations = this.expectations && this.expectations[method];
-                var length = expectations && expectations.length || 0, i;
-
-                for (i = 0; i < length; i += 1) {
-                    if (!expectations[i].met() &&
-                        expectations[i].allowsCall(thisValue, args)) {
-                        return expectations[i].apply(thisValue, args);
-                    }
-                }
-
-                var messages = [], available, exhausted = 0;
-
-                for (i = 0; i < length; i += 1) {
-                    if (expectations[i].allowsCall(thisValue, args)) {
-                        available = available || expectations[i];
-                    } else {
-                        exhausted += 1;
-                    }
-                    push.call(messages, "    " + expectations[i].toString());
-                }
-
-                if (exhausted === 0) {
-                    return available.apply(thisValue, args);
-                }
-
-                messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
-                    proxy: method,
-                    args: args
-                }));
-
-                sinon.expectation.fail(messages.join("\n"));
-            }
-        };
-    }()));
-
-    var times = sinon.timesInWords;
-
-    sinon.expectation = (function () {
-        var slice = Array.prototype.slice;
-        var _invoke = sinon.spy.invoke;
-
-        function callCountInWords(callCount) {
-            if (callCount == 0) {
-                return "never called";
-            } else {
-                return "called " + times(callCount);
-            }
-        }
-
-        function expectedCallCountInWords(expectation) {
-            var min = expectation.minCalls;
-            var max = expectation.maxCalls;
-
-            if (typeof min == "number" && typeof max == "number") {
-                var str = times(min);
-
-                if (min != max) {
-                    str = "at least " + str + " and at most " + times(max);
-                }
-
-                return str;
-            }
-
-            if (typeof min == "number") {
-                return "at least " + times(min);
-            }
-
-            return "at most " + times(max);
-        }
-
-        function receivedMinCalls(expectation) {
-            var hasMinLimit = typeof expectation.minCalls == "number";
-            return !hasMinLimit || expectation.callCount >= expectation.minCalls;
-        }
-
-        function receivedMaxCalls(expectation) {
-            if (typeof expectation.maxCalls != "number") {
-                return false;
-            }
-
-            return expectation.callCount == expectation.maxCalls;
-        }
-
-        function verifyMatcher(possibleMatcher, arg){
-            if (match && match.isMatcher(possibleMatcher)) {
-                return possibleMatcher.test(arg);
-            } else {
-                return true;
-            }
-        }
-
-        return {
-            minCalls: 1,
-            maxCalls: 1,
-
-            create: function create(methodName) {
-                var expectation = sinon.extend(sinon.stub.create(), sinon.expectation);
-                delete expectation.create;
-                expectation.method = methodName;
-
-                return expectation;
-            },
-
-            invoke: function invoke(func, thisValue, args) {
-                this.verifyCallAllowed(thisValue, args);
-
-                return _invoke.apply(this, arguments);
-            },
-
-            atLeast: function atLeast(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not number");
-                }
-
-                if (!this.limitsSet) {
-                    this.maxCalls = null;
-                    this.limitsSet = true;
-                }
-
-                this.minCalls = num;
-
-                return this;
-            },
-
-            atMost: function atMost(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not number");
-                }
-
-                if (!this.limitsSet) {
-                    this.minCalls = null;
-                    this.limitsSet = true;
-                }
-
-                this.maxCalls = num;
-
-                return this;
-            },
-
-            never: function never() {
-                return this.exactly(0);
-            },
-
-            once: function once() {
-                return this.exactly(1);
-            },
-
-            twice: function twice() {
-                return this.exactly(2);
-            },
-
-            thrice: function thrice() {
-                return this.exactly(3);
-            },
-
-            exactly: function exactly(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not a number");
-                }
-
-                this.atLeast(num);
-                return this.atMost(num);
-            },
-
-            met: function met() {
-                return !this.failed && receivedMinCalls(this);
-            },
-
-            verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
-                if (receivedMaxCalls(this)) {
-                    this.failed = true;
-                    sinon.expectation.fail(this.method + " already called " + times(this.maxCalls));
-                }
-
-                if ("expectedThis" in this && this.expectedThis !== thisValue) {
-                    sinon.expectation.fail(this.method + " called with " + thisValue + " as thisValue, expected " +
-                        this.expectedThis);
-                }
-
-                if (!("expectedArguments" in this)) {
-                    return;
-                }
-
-                if (!args) {
-                    sinon.expectation.fail(this.method + " received no arguments, expected " +
-                        sinon.format(this.expectedArguments));
-                }
-
-                if (args.length < this.expectedArguments.length) {
-                    sinon.expectation.fail(this.method + " received too few arguments (" + sinon.format(args) +
-                        "), expected " + sinon.format(this.expectedArguments));
-                }
-
-                if (this.expectsExactArgCount &&
-                    args.length != this.expectedArguments.length) {
-                    sinon.expectation.fail(this.method + " received too many arguments (" + sinon.format(args) +
-                        "), expected " + sinon.format(this.expectedArguments));
-                }
-
-                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
-
-                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
-                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
-                            ", didn't match " + this.expectedArguments.toString());
-                    }
-
-                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
-                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
-                            ", expected " + sinon.format(this.expectedArguments));
-                    }
-                }
-            },
-
-            allowsCall: function allowsCall(thisValue, args) {
-                if (this.met() && receivedMaxCalls(this)) {
-                    return false;
-                }
-
-                if ("expectedThis" in this && this.expectedThis !== thisValue) {
-                    return false;
-                }
-
-                if (!("expectedArguments" in this)) {
-                    return true;
-                }
-
-                args = args || [];
-
-                if (args.length < this.expectedArguments.length) {
-                    return false;
-                }
-
-                if (this.expectsExactArgCount &&
-                    args.length != this.expectedArguments.length) {
-                    return false;
-                }
-
-                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
-                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
-                        return false;
-                    }
-
-                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-
-            withArgs: function withArgs() {
-                this.expectedArguments = slice.call(arguments);
-                return this;
-            },
-
-            withExactArgs: function withExactArgs() {
-                this.withArgs.apply(this, arguments);
-                this.expectsExactArgCount = true;
-                return this;
-            },
-
-            on: function on(thisValue) {
-                this.expectedThis = thisValue;
-                return this;
-            },
-
-            toString: function () {
-                var args = (this.expectedArguments || []).slice();
-
-                if (!this.expectsExactArgCount) {
-                    push.call(args, "[...]");
-                }
-
-                var callStr = sinon.spyCall.toString.call({
-                    proxy: this.method || "anonymous mock expectation",
-                    args: args
-                });
-
-                var message = callStr.replace(", [...", "[, ...") + " " +
-                    expectedCallCountInWords(this);
-
-                if (this.met()) {
-                    return "Expectation met: " + message;
-                }
-
-                return "Expected " + message + " (" +
-                    callCountInWords(this.callCount) + ")";
-            },
-
-            verify: function verify() {
-                if (!this.met()) {
-                    sinon.expectation.fail(this.toString());
-                } else {
-                    sinon.expectation.pass(this.toString());
-                }
-
-                return true;
-            },
-
-            pass: function(message) {
-              sinon.assert.pass(message);
-            },
-            fail: function (message) {
-                var exception = new Error(message);
-                exception.name = "ExpectationError";
-
-                throw exception;
-            }
-        };
-    }());
-
-    if (commonJSModule) {
-        module.exports = mock;
-    } else {
-        sinon.mock = mock;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- * @depend mock.js
- */
-/*jslint eqeqeq: false, onevar: false, forin: true*/
-/*global module, require, sinon*/
-/**
- * Collections of stubs, spies and mocks.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = [].push;
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function getFakes(fakeCollection) {
-        if (!fakeCollection.fakes) {
-            fakeCollection.fakes = [];
-        }
-
-        return fakeCollection.fakes;
-    }
-
-    function each(fakeCollection, method) {
-        var fakes = getFakes(fakeCollection);
-
-        for (var i = 0, l = fakes.length; i < l; i += 1) {
-            if (typeof fakes[i][method] == "function") {
-                fakes[i][method]();
-            }
-        }
-    }
-
-    function compact(fakeCollection) {
-        var fakes = getFakes(fakeCollection);
-        var i = 0;
-        while (i < fakes.length) {
-          fakes.splice(i, 1);
-        }
-    }
-
-    var collection = {
-        verify: function resolve() {
-            each(this, "verify");
-        },
-
-        restore: function restore() {
-            each(this, "restore");
-            compact(this);
-        },
-
-        verifyAndRestore: function verifyAndRestore() {
-            var exception;
-
-            try {
-                this.verify();
-            } catch (e) {
-                exception = e;
-            }
-
-            this.restore();
-
-            if (exception) {
-                throw exception;
-            }
-        },
-
-        add: function add(fake) {
-            push.call(getFakes(this), fake);
-            return fake;
-        },
-
-        spy: function spy() {
-            return this.add(sinon.spy.apply(sinon, arguments));
-        },
-
-        stub: function stub(object, property, value) {
-            if (property) {
-                var original = object[property];
-
-                if (typeof original != "function") {
-                    if (!hasOwnProperty.call(object, property)) {
-                        throw new TypeError("Cannot stub non-existent own property " + property);
-                    }
-
-                    object[property] = value;
-
-                    return this.add({
-                        restore: function () {
-                            object[property] = original;
-                        }
-                    });
-                }
-            }
-            if (!property && !!object && typeof object == "object") {
-                var stubbedObj = sinon.stub.apply(sinon, arguments);
-
-                for (var prop in stubbedObj) {
-                    if (typeof stubbedObj[prop] === "function") {
-                        this.add(stubbedObj[prop]);
-                    }
-                }
-
-                return stubbedObj;
-            }
-
-            return this.add(sinon.stub.apply(sinon, arguments));
-        },
-
-        mock: function mock() {
-            return this.add(sinon.mock.apply(sinon, arguments));
-        },
-
-        inject: function inject(obj) {
-            var col = this;
-
-            obj.spy = function () {
-                return col.spy.apply(col, arguments);
-            };
-
-            obj.stub = function () {
-                return col.stub.apply(col, arguments);
-            };
-
-            obj.mock = function () {
-                return col.mock.apply(col, arguments);
-            };
-
-            return obj;
-        }
-    };
-
-    if (commonJSModule) {
-        module.exports = collection;
-    } else {
-        sinon.collection = collection;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
-/*global module, require, window*/
-/**
- * Fake timer API
- * setTimeout
- * setInterval
- * clearTimeout
- * clearInterval
- * tick
- * reset
- * Date
- *
- * Inspired by jsUnitMockTimeOut from JsUnit
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-(function (global) {
-    var id = 1;
-
-    function addTimer(args, recurring) {
-        if (args.length === 0) {
-            throw new Error("Function requires at least 1 parameter");
-        }
-
-        if (typeof args[0] === "undefined") {
-            throw new Error("Callback must be provided to timer calls");
-        }
-
-        var toId = id++;
-        var delay = args[1] || 0;
-
-        if (!this.timeouts) {
-            this.timeouts = {};
-        }
-
-        this.timeouts[toId] = {
-            id: toId,
-            func: args[0],
-            callAt: this.now + delay,
-            invokeArgs: Array.prototype.slice.call(args, 2)
-        };
-
-        if (recurring === true) {
-            this.timeouts[toId].interval = delay;
-        }
-
-        return toId;
-    }
-
-    function parseTime(str) {
-        if (!str) {
-            return 0;
-        }
-
-        var strings = str.split(":");
-        var l = strings.length, i = l;
-        var ms = 0, parsed;
-
-        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
-            throw new Error("tick only understands numbers and 'h:m:s'");
-        }
-
-        while (i--) {
-            parsed = parseInt(strings[i], 10);
-
-            if (parsed >= 60) {
-                throw new Error("Invalid time " + str);
-            }
-
-            ms += parsed * Math.pow(60, (l - i - 1));
-        }
-
-        return ms * 1000;
-    }
-
-    function createObject(object) {
-        var newObject;
-
-        if (Object.create) {
-            newObject = Object.create(object);
-        } else {
-            var F = function () {};
-            F.prototype = object;
-            newObject = new F();
-        }
-
-        newObject.Date.clock = newObject;
-        return newObject;
-    }
-
-    sinon.clock = {
-        now: 0,
-
-        create: function create(now) {
-            var clock = createObject(this);
-
-            if (typeof now == "number") {
-                clock.now = now;
-            }
-
-            if (!!now && typeof now == "object") {
-                throw new TypeError("now should be milliseconds since UNIX epoch");
-            }
-
-            return clock;
-        },
-
-        setTimeout: function setTimeout(callback, timeout) {
-            return addTimer.call(this, arguments, false);
-        },
-
-        clearTimeout: function clearTimeout(timerId) {
-            if (!this.timeouts) {
-                this.timeouts = [];
-            }
-
-            if (timerId in this.timeouts) {
-                delete this.timeouts[timerId];
-            }
-        },
-
-        setInterval: function setInterval(callback, timeout) {
-            return addTimer.call(this, arguments, true);
-        },
-
-        clearInterval: function clearInterval(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        setImmediate: function setImmediate(callback) {
-            var passThruArgs = Array.prototype.slice.call(arguments, 1);
-
-            return addTimer.call(this, [callback, 0].concat(passThruArgs), false);
-        },
-
-        clearImmediate: function clearImmediate(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        tick: function tick(ms) {
-            ms = typeof ms == "number" ? ms : parseTime(ms);
-            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
-            var timer = this.firstTimerInRange(tickFrom, tickTo);
-
-            var firstException;
-            while (timer && tickFrom <= tickTo) {
-                if (this.timeouts[timer.id]) {
-                    tickFrom = this.now = timer.callAt;
-                    try {
-                      this.callTimer(timer);
-                    } catch (e) {
-                      firstException = firstException || e;
-                    }
-                }
-
-                timer = this.firstTimerInRange(previous, tickTo);
-                previous = tickFrom;
-            }
-
-            this.now = tickTo;
-
-            if (firstException) {
-              throw firstException;
-            }
-
-            return this.now;
-        },
-
-        firstTimerInRange: function (from, to) {
-            var timer, smallest = null, originalTimer;
-
-            for (var id in this.timeouts) {
-                if (this.timeouts.hasOwnProperty(id)) {
-                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
-                        continue;
-                    }
-
-                    if (smallest === null || this.timeouts[id].callAt < smallest) {
-                        originalTimer = this.timeouts[id];
-                        smallest = this.timeouts[id].callAt;
-
-                        timer = {
-                            func: this.timeouts[id].func,
-                            callAt: this.timeouts[id].callAt,
-                            interval: this.timeouts[id].interval,
-                            id: this.timeouts[id].id,
-                            invokeArgs: this.timeouts[id].invokeArgs
-                        };
-                    }
-                }
-            }
-
-            return timer || null;
-        },
-
-        callTimer: function (timer) {
-            if (typeof timer.interval == "number") {
-                this.timeouts[timer.id].callAt += timer.interval;
-            } else {
-                delete this.timeouts[timer.id];
-            }
-
-            try {
-                if (typeof timer.func == "function") {
-                    timer.func.apply(null, timer.invokeArgs);
-                } else {
-                    eval(timer.func);
-                }
-            } catch (e) {
-              var exception = e;
-            }
-
-            if (!this.timeouts[timer.id]) {
-                if (exception) {
-                  throw exception;
-                }
-                return;
-            }
-
-            if (exception) {
-              throw exception;
-            }
-        },
-
-        reset: function reset() {
-            this.timeouts = {};
-        },
-
-        Date: (function () {
-            var NativeDate = Date;
-
-            function ClockDate(year, month, date, hour, minute, second, ms) {
-                // Defensive and verbose to avoid potential harm in passing
-                // explicit undefined when user does not pass argument
-                switch (arguments.length) {
-                case 0:
-                    return new NativeDate(ClockDate.clock.now);
-                case 1:
-                    return new NativeDate(year);
-                case 2:
-                    return new NativeDate(year, month);
-                case 3:
-                    return new NativeDate(year, month, date);
-                case 4:
-                    return new NativeDate(year, month, date, hour);
-                case 5:
-                    return new NativeDate(year, month, date, hour, minute);
-                case 6:
-                    return new NativeDate(year, month, date, hour, minute, second);
-                default:
-                    return new NativeDate(year, month, date, hour, minute, second, ms);
-                }
-            }
-
-            return mirrorDateProperties(ClockDate, NativeDate);
-        }())
-    };
-
-    function mirrorDateProperties(target, source) {
-        if (source.now) {
-            target.now = function now() {
-                return target.clock.now;
-            };
-        } else {
-            delete target.now;
-        }
-
-        if (source.toSource) {
-            target.toSource = function toSource() {
-                return source.toSource();
-            };
-        } else {
-            delete target.toSource;
-        }
-
-        target.toString = function toString() {
-            return source.toString();
-        };
-
-        target.prototype = source.prototype;
-        target.parse = source.parse;
-        target.UTC = source.UTC;
-        target.prototype.toUTCString = source.prototype.toUTCString;
-
-        for (var prop in source) {
-            if (source.hasOwnProperty(prop)) {
-                target[prop] = source[prop];
-            }
-        }
-
-        return target;
-    }
-
-    var methods = ["Date", "setTimeout", "setInterval",
-                   "clearTimeout", "clearInterval"];
-
-    if (typeof global.setImmediate !== "undefined") {
-        methods.push("setImmediate");
-    }
-
-    if (typeof global.clearImmediate !== "undefined") {
-        methods.push("clearImmediate");
-    }
-
-    function restore() {
-        var method;
-
-        for (var i = 0, l = this.methods.length; i < l; i++) {
-            method = this.methods[i];
-
-            if (global[method].hadOwnProperty) {
-                global[method] = this["_" + method];
-            } else {
-                try {
-                    delete global[method];
-                } catch (e) {}
-            }
-        }
-
-        // Prevent multiple executions which will completely remove these props
-        this.methods = [];
-    }
-
-    function stubGlobal(method, clock) {
-        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
-        clock["_" + method] = global[method];
-
-        if (method == "Date") {
-            var date = mirrorDateProperties(clock[method], global[method]);
-            global[method] = date;
-        } else {
-            global[method] = function () {
-                return clock[method].apply(clock, arguments);
-            };
-
-            for (var prop in clock[method]) {
-                if (clock[method].hasOwnProperty(prop)) {
-                    global[method][prop] = clock[method][prop];
-                }
-            }
-        }
-
-        global[method].clock = clock;
-    }
-
-    sinon.useFakeTimers = function useFakeTimers(now) {
-        var clock = sinon.clock.create(now);
-        clock.restore = restore;
-        clock.methods = Array.prototype.slice.call(arguments,
-                                                   typeof now == "number" ? 1 : 0);
-
-        if (clock.methods.length === 0) {
-            clock.methods = methods;
-        }
-
-        for (var i = 0, l = clock.methods.length; i < l; i++) {
-            stubGlobal(clock.methods[i], clock);
-        }
-
-        return clock;
-    };
-}(typeof global != "undefined" && typeof global !== "function" ? global : this));
-
-sinon.timers = {
-    setTimeout: setTimeout,
-    clearTimeout: clearTimeout,
-    setImmediate: (typeof setImmediate !== "undefined" ? setImmediate : undefined),
-    clearImmediate: (typeof clearImmediate !== "undefined" ? clearImmediate: undefined),
-    setInterval: setInterval,
-    clearInterval: clearInterval,
-    Date: Date
-};
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Minimal Event interface implementation
- *
- * Original implementation by Sven Fuchs: https://gist.github.com/995028
- * Modifications and tests by Christian Johansen.
- *
- * @author Sven Fuchs (svenfuchs@artweb-design.de)
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2011 Sven Fuchs, Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    this.sinon = {};
-}
-
-(function () {
-    var push = [].push;
-
-    sinon.Event = function Event(type, bubbles, cancelable, target) {
-        this.initEvent(type, bubbles, cancelable, target);
-    };
-
-    sinon.Event.prototype = {
-        initEvent: function(type, bubbles, cancelable, target) {
-            this.type = type;
-            this.bubbles = bubbles;
-            this.cancelable = cancelable;
-            this.target = target;
-        },
-
-        stopPropagation: function () {},
-
-        preventDefault: function () {
-            this.defaultPrevented = true;
-        }
-    };
-
-    sinon.ProgressEvent = function ProgressEvent(type, progressEventRaw, target) {
-        this.initEvent(type, false, false, target);
-        this.loaded = progressEventRaw.loaded || null;
-        this.total = progressEventRaw.total || null;
-    };
-
-    sinon.ProgressEvent.prototype = new sinon.Event();
-
-    sinon.ProgressEvent.prototype.constructor =  sinon.ProgressEvent;
-
-    sinon.CustomEvent = function CustomEvent(type, customData, target) {
-        this.initEvent(type, false, false, target);
-        this.detail = customData.detail || null;
-    };
-
-    sinon.CustomEvent.prototype = new sinon.Event();
-
-    sinon.CustomEvent.prototype.constructor =  sinon.CustomEvent;
-
-    sinon.EventTarget = {
-        addEventListener: function addEventListener(event, listener) {
-            this.eventListeners = this.eventListeners || {};
-            this.eventListeners[event] = this.eventListeners[event] || [];
-            push.call(this.eventListeners[event], listener);
-        },
-
-        removeEventListener: function removeEventListener(event, listener) {
-            var listeners = this.eventListeners && this.eventListeners[event] || [];
-
-            for (var i = 0, l = listeners.length; i < l; ++i) {
-                if (listeners[i] == listener) {
-                    return listeners.splice(i, 1);
-                }
-            }
-        },
-
-        dispatchEvent: function dispatchEvent(event) {
-            var type = event.type;
-            var listeners = this.eventListeners && this.eventListeners[type] || [];
-
-            for (var i = 0; i < listeners.length; i++) {
-                if (typeof listeners[i] == "function") {
-                    listeners[i].call(this, event);
-                } else {
-                    listeners[i].handleEvent(event);
-                }
-            }
-
-            return !!event.defaultPrevented;
-        }
-    };
-}());
-
-/**
- * @depend ../../sinon.js
- * @depend event.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Fake XMLHttpRequest object
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-// wrapper for global
-(function(global) {
-    if (typeof sinon === "undefined") {
-        global.sinon = {};
-    }
-
-    var supportsProgress = typeof ProgressEvent !== "undefined";
-    var supportsCustomEvent = typeof CustomEvent !== "undefined";
-    sinon.xhr = { XMLHttpRequest: global.XMLHttpRequest };
-    var xhr = sinon.xhr;
-    xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
-    xhr.GlobalActiveXObject = global.ActiveXObject;
-    xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
-    xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
-    xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
-                                     ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
-    xhr.supportsCORS = 'withCredentials' in (new sinon.xhr.GlobalXMLHttpRequest());
-
-    /*jsl:ignore*/
-    var unsafeHeaders = {
-        "Accept-Charset": true,
-        "Accept-Encoding": true,
-        "Connection": true,
-        "Content-Length": true,
-        "Cookie": true,
-        "Cookie2": true,
-        "Content-Transfer-Encoding": true,
-        "Date": true,
-        "Expect": true,
-        "Host": true,
-        "Keep-Alive": true,
-        "Referer": true,
-        "TE": true,
-        "Trailer": true,
-        "Transfer-Encoding": true,
-        "Upgrade": true,
-        "User-Agent": true,
-        "Via": true
-    };
-    /*jsl:end*/
-
-    function FakeXMLHttpRequest() {
-        this.readyState = FakeXMLHttpRequest.UNSENT;
-        this.requestHeaders = {};
-        this.requestBody = null;
-        this.status = 0;
-        this.statusText = "";
-        this.upload = new UploadProgress();
-        if (sinon.xhr.supportsCORS) {
-            this.withCredentials = false;
-        }
-
-
-        var xhr = this;
-        var events = ["loadstart", "load", "abort", "loadend"];
-
-        function addEventListener(eventName) {
-            xhr.addEventListener(eventName, function (event) {
-                var listener = xhr["on" + eventName];
-
-                if (listener && typeof listener == "function") {
-                    listener.call(this, event);
-                }
-            });
-        }
-
-        for (var i = events.length - 1; i >= 0; i--) {
-            addEventListener(events[i]);
-        }
-
-        if (typeof FakeXMLHttpRequest.onCreate == "function") {
-            FakeXMLHttpRequest.onCreate(this);
-        }
-    }
-
-    // An upload object is created for each
-    // FakeXMLHttpRequest and allows upload
-    // events to be simulated using uploadProgress
-    // and uploadError.
-    function UploadProgress() {
-        this.eventListeners = {
-            "progress": [],
-            "load": [],
-            "abort": [],
-            "error": []
-        }
-    }
-
-    UploadProgress.prototype.addEventListener = function(event, listener) {
-        this.eventListeners[event].push(listener);
-    };
-
-    UploadProgress.prototype.removeEventListener = function(event, listener) {
-        var listeners = this.eventListeners[event] || [];
-
-        for (var i = 0, l = listeners.length; i < l; ++i) {
-            if (listeners[i] == listener) {
-                return listeners.splice(i, 1);
-            }
-        }
-    };
-
-    UploadProgress.prototype.dispatchEvent = function(event) {
-        var listeners = this.eventListeners[event.type] || [];
-
-        for (var i = 0, listener; (listener = listeners[i]) != null; i++) {
-            listener(event);
-        }
-    };
-
-    function verifyState(xhr) {
-        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-
-        if (xhr.sendFlag) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-    }
-
-    // filtering to enable a white-list version of Sinon FakeXhr,
-    // where whitelisted requests are passed through to real XHR
-    function each(collection, callback) {
-        if (!collection) return;
-        for (var i = 0, l = collection.length; i < l; i += 1) {
-            callback(collection[i]);
-        }
-    }
-    function some(collection, callback) {
-        for (var index = 0; index < collection.length; index++) {
-            if(callback(collection[index]) === true) return true;
-        }
-        return false;
-    }
-    // largest arity in XHR is 5 - XHR#open
-    var apply = function(obj,method,args) {
-        switch(args.length) {
-        case 0: return obj[method]();
-        case 1: return obj[method](args[0]);
-        case 2: return obj[method](args[0],args[1]);
-        case 3: return obj[method](args[0],args[1],args[2]);
-        case 4: return obj[method](args[0],args[1],args[2],args[3]);
-        case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
-        }
-    };
-
-    FakeXMLHttpRequest.filters = [];
-    FakeXMLHttpRequest.addFilter = function(fn) {
-        this.filters.push(fn)
-    };
-    var IE6Re = /MSIE 6/;
-    FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
-        var xhr = new sinon.xhr.workingXHR();
-        each(["open","setRequestHeader","send","abort","getResponseHeader",
-              "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
-             function(method) {
-                 fakeXhr[method] = function() {
-                   return apply(xhr,method,arguments);
-                 };
-             });
-
-        var copyAttrs = function(args) {
-            each(args, function(attr) {
-              try {
-                fakeXhr[attr] = xhr[attr]
-              } catch(e) {
-                if(!IE6Re.test(navigator.userAgent)) throw e;
-              }
-            });
-        };
-
-        var stateChange = function() {
-            fakeXhr.readyState = xhr.readyState;
-            if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                copyAttrs(["status","statusText"]);
-            }
-            if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
-                copyAttrs(["responseText"]);
-            }
-            if(xhr.readyState === FakeXMLHttpRequest.DONE) {
-                copyAttrs(["responseXML"]);
-            }
-            if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr, { target: fakeXhr });
-        };
-        if(xhr.addEventListener) {
-          for(var event in fakeXhr.eventListeners) {
-              if(fakeXhr.eventListeners.hasOwnProperty(event)) {
-                  each(fakeXhr.eventListeners[event],function(handler) {
-                      xhr.addEventListener(event, handler);
-                  });
-              }
-          }
-          xhr.addEventListener("readystatechange",stateChange);
-        } else {
-          xhr.onreadystatechange = stateChange;
-        }
-        apply(xhr,"open",xhrArgs);
-    };
-    FakeXMLHttpRequest.useFilters = false;
-
-    function verifyRequestOpened(xhr) {
-        if (xhr.readyState != FakeXMLHttpRequest.OPENED) {
-            throw new Error("INVALID_STATE_ERR - " + xhr.readyState);
-        }
-    }
-
-    function verifyRequestSent(xhr) {
-        if (xhr.readyState == FakeXMLHttpRequest.DONE) {
-            throw new Error("Request done");
-        }
-    }
-
-    function verifyHeadersReceived(xhr) {
-        if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
-            throw new Error("No headers received");
-        }
-    }
-
-    function verifyResponseBodyType(body) {
-        if (typeof body != "string") {
-            var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
-                                 body + ", which is not a string.");
-            error.name = "InvalidBodyException";
-            throw error;
-        }
-    }
-
-    sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
-        async: true,
-
-        open: function open(method, url, async, username, password) {
-            this.method = method;
-            this.url = url;
-            this.async = typeof async == "boolean" ? async : true;
-            this.username = username;
-            this.password = password;
-            this.responseText = null;
-            this.responseXML = null;
-            this.requestHeaders = {};
-            this.sendFlag = false;
-            if(sinon.FakeXMLHttpRequest.useFilters === true) {
-                var xhrArgs = arguments;
-                var defake = some(FakeXMLHttpRequest.filters,function(filter) {
-                    return filter.apply(this,xhrArgs)
-                });
-                if (defake) {
-                  return sinon.FakeXMLHttpRequest.defake(this,arguments);
-                }
-            }
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-        },
-
-        readyStateChange: function readyStateChange(state) {
-            this.readyState = state;
-
-            if (typeof this.onreadystatechange == "function") {
-                try {
-                    this.onreadystatechange();
-                } catch (e) {
-                    sinon.logError("Fake XHR onreadystatechange handler", e);
-                }
-            }
-
-            this.dispatchEvent(new sinon.Event("readystatechange"));
-
-            switch (this.readyState) {
-                case FakeXMLHttpRequest.DONE:
-                    this.dispatchEvent(new sinon.Event("load", false, false, this));
-                    this.dispatchEvent(new sinon.Event("loadend", false, false, this));
-                    this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
-                    if (supportsProgress) {
-                        this.upload.dispatchEvent(new sinon.ProgressEvent('progress', {loaded: 100, total: 100}));
-                    }
-                    break;
-            }
-        },
-
-        setRequestHeader: function setRequestHeader(header, value) {
-            verifyState(this);
-
-            if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
-                throw new Error("Refused to set unsafe header \"" + header + "\"");
-            }
-
-            if (this.requestHeaders[header]) {
-                this.requestHeaders[header] += "," + value;
-            } else {
-                this.requestHeaders[header] = value;
-            }
-        },
-
-        // Helps testing
-        setResponseHeaders: function setResponseHeaders(headers) {
-            verifyRequestOpened(this);
-            this.responseHeaders = {};
-
-            for (var header in headers) {
-                if (headers.hasOwnProperty(header)) {
-                    this.responseHeaders[header] = headers[header];
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
-            } else {
-                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
-            }
-        },
-
-        // Currently treats ALL data as a DOMString (i.e. no Document)
-        send: function send(data) {
-            verifyState(this);
-
-            if (!/^(get|head)$/i.test(this.method)) {
-                if (this.requestHeaders["Content-Type"]) {
-                    var value = this.requestHeaders["Content-Type"].split(";");
-                    this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
-                } else {
-                    this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
-                }
-
-                this.requestBody = data;
-            }
-
-            this.errorFlag = false;
-            this.sendFlag = this.async;
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-
-            if (typeof this.onSend == "function") {
-                this.onSend(this);
-            }
-
-            this.dispatchEvent(new sinon.Event("loadstart", false, false, this));
-        },
-
-        abort: function abort() {
-            this.aborted = true;
-            this.responseText = null;
-            this.errorFlag = true;
-            this.requestHeaders = {};
-
-            if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
-                this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
-                this.sendFlag = false;
-            }
-
-            this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
-
-            this.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            this.upload.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            if (typeof this.onerror === "function") {
-                this.onerror();
-            }
-        },
-
-        getResponseHeader: function getResponseHeader(header) {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return null;
-            }
-
-            if (/^Set-Cookie2?$/i.test(header)) {
-                return null;
-            }
-
-            header = header.toLowerCase();
-
-            for (var h in this.responseHeaders) {
-                if (h.toLowerCase() == header) {
-                    return this.responseHeaders[h];
-                }
-            }
-
-            return null;
-        },
-
-        getAllResponseHeaders: function getAllResponseHeaders() {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return "";
-            }
-
-            var headers = "";
-
-            for (var header in this.responseHeaders) {
-                if (this.responseHeaders.hasOwnProperty(header) &&
-                    !/^Set-Cookie2?$/i.test(header)) {
-                    headers += header + ": " + this.responseHeaders[header] + "\r\n";
-                }
-            }
-
-            return headers;
-        },
-
-        setResponseBody: function setResponseBody(body) {
-            verifyRequestSent(this);
-            verifyHeadersReceived(this);
-            verifyResponseBodyType(body);
-
-            var chunkSize = this.chunkSize || 10;
-            var index = 0;
-            this.responseText = "";
-
-            do {
-                if (this.async) {
-                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
-                }
-
-                this.responseText += body.substring(index, index + chunkSize);
-                index += chunkSize;
-            } while (index < body.length);
-
-            var type = this.getResponseHeader("Content-Type");
-
-            if (this.responseText &&
-                (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
-                try {
-                    this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
-                } catch (e) {
-                    // Unable to parse XML - no biggie
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.DONE);
-            } else {
-                this.readyState = FakeXMLHttpRequest.DONE;
-            }
-        },
-
-        respond: function respond(status, headers, body) {
-            this.status = typeof status == "number" ? status : 200;
-            this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
-            this.setResponseHeaders(headers || {});
-            this.setResponseBody(body || "");
-        },
-
-        uploadProgress: function uploadProgress(progressEventRaw) {
-            if (supportsProgress) {
-                this.upload.dispatchEvent(new sinon.ProgressEvent("progress", progressEventRaw));
-            }
-        },
-
-        uploadError: function uploadError(error) {
-            if (supportsCustomEvent) {
-                this.upload.dispatchEvent(new sinon.CustomEvent("error", {"detail": error}));
-            }
-        }
-    });
-
-    sinon.extend(FakeXMLHttpRequest, {
-        UNSENT: 0,
-        OPENED: 1,
-        HEADERS_RECEIVED: 2,
-        LOADING: 3,
-        DONE: 4
-    });
-
-    // Borrowed from JSpec
-    FakeXMLHttpRequest.parseXML = function parseXML(text) {
-        var xmlDoc;
-
-        if (typeof DOMParser != "undefined") {
-            var parser = new DOMParser();
-            xmlDoc = parser.parseFromString(text, "text/xml");
-        } else {
-            xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
-            xmlDoc.async = "false";
-            xmlDoc.loadXML(text);
-        }
-
-        return xmlDoc;
-    };
-
-    FakeXMLHttpRequest.statusCodes = {
-        100: "Continue",
-        101: "Switching Protocols",
-        200: "OK",
-        201: "Created",
-        202: "Accepted",
-        203: "Non-Authoritative Information",
-        204: "No Content",
-        205: "Reset Content",
-        206: "Partial Content",
-        300: "Multiple Choice",
-        301: "Moved Permanently",
-        302: "Found",
-        303: "See Other",
-        304: "Not Modified",
-        305: "Use Proxy",
-        307: "Temporary Redirect",
-        400: "Bad Request",
-        401: "Unauthorized",
-        402: "Payment Required",
-        403: "Forbidden",
-        404: "Not Found",
-        405: "Method Not Allowed",
-        406: "Not Acceptable",
-        407: "Proxy Authentication Required",
-        408: "Request Timeout",
-        409: "Conflict",
-        410: "Gone",
-        411: "Length Required",
-        412: "Precondition Failed",
-        413: "Request Entity Too Large",
-        414: "Request-URI Too Long",
-        415: "Unsupported Media Type",
-        416: "Requested Range Not Satisfiable",
-        417: "Expectation Failed",
-        422: "Unprocessable Entity",
-        500: "Internal Server Error",
-        501: "Not Implemented",
-        502: "Bad Gateway",
-        503: "Service Unavailable",
-        504: "Gateway Timeout",
-        505: "HTTP Version Not Supported"
-    };
-
-    sinon.useFakeXMLHttpRequest = function () {
-        sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
-            if (xhr.supportsXHR) {
-                global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
-            }
-
-            if (xhr.supportsActiveX) {
-                global.ActiveXObject = xhr.GlobalActiveXObject;
-            }
-
-            delete sinon.FakeXMLHttpRequest.restore;
-
-            if (keepOnCreate !== true) {
-                delete sinon.FakeXMLHttpRequest.onCreate;
-            }
-        };
-        if (xhr.supportsXHR) {
-            global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
-        }
-
-        if (xhr.supportsActiveX) {
-            global.ActiveXObject = function ActiveXObject(objId) {
-                if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
-
-                    return new sinon.FakeXMLHttpRequest();
-                }
-
-                return new xhr.GlobalActiveXObject(objId);
-            };
-        }
-
-        return sinon.FakeXMLHttpRequest;
-    };
-
-    sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
-
-})(typeof global === "object" ? global : this);
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_xml_http_request.js
- */
-/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
-/*global module, require, window*/
-/**
- * The Sinon "server" mimics a web server that receives requests from
- * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
- * both synchronously and asynchronously. To respond synchronuously, canned
- * answers have to be provided upfront.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-sinon.fakeServer = (function () {
-    var push = [].push;
-    function F() {}
-
-    function create(proto) {
-        F.prototype = proto;
-        return new F();
-    }
-
-    function responseArray(handler) {
-        var response = handler;
-
-        if (Object.prototype.toString.call(handler) != "[object Array]") {
-            response = [200, {}, handler];
-        }
-
-        if (typeof response[2] != "string") {
-            throw new TypeError("Fake server response body should be string, but was " +
-                                typeof response[2]);
-        }
-
-        return response;
-    }
-
-    var wloc = typeof window !== "undefined" ? window.location : {};
-    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
-
-    function matchOne(response, reqMethod, reqUrl) {
-        var rmeth = response.method;
-        var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
-        var url = response.url;
-        var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
-
-        return matchMethod && matchUrl;
-    }
-
-    function match(response, request) {
-        var requestUrl = request.url;
-
-        if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
-            requestUrl = requestUrl.replace(rCurrLoc, "");
-        }
-
-        if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
-            if (typeof response.response == "function") {
-                var ru = response.url;
-                var args = [request].concat(ru && typeof ru.exec == "function" ? ru.exec(requestUrl).slice(1) : []);
-                return response.response.apply(response, args);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    function log(response, request) {
-        var str;
-
-        str =  "Request:\n"  + sinon.format(request)  + "\n\n";
-        str += "Response:\n" + sinon.format(response) + "\n\n";
-
-        sinon.log(str);
-    }
-
-    return {
-        create: function () {
-            var server = create(this);
-            this.xhr = sinon.useFakeXMLHttpRequest();
-            server.requests = [];
-
-            this.xhr.onCreate = function (xhrObj) {
-                server.addRequest(xhrObj);
-            };
-
-            return server;
-        },
-
-        addRequest: function addRequest(xhrObj) {
-            var server = this;
-            push.call(this.requests, xhrObj);
-
-            xhrObj.onSend = function () {
-                server.handleRequest(this);
-
-                if (server.autoRespond && !server.responding) {
-                    setTimeout(function () {
-                        server.responding = false;
-                        server.respond();
-                    }, server.autoRespondAfter || 10);
-
-                    server.responding = true;
-                }
-            };
-        },
-
-        getHTTPMethod: function getHTTPMethod(request) {
-            if (this.fakeHTTPMethods && /post/i.test(request.method)) {
-                var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
-                return !!matches ? matches[1] : request.method;
-            }
-
-            return request.method;
-        },
-
-        handleRequest: function handleRequest(xhr) {
-            if (xhr.async) {
-                if (!this.queue) {
-                    this.queue = [];
-                }
-
-                push.call(this.queue, xhr);
-            } else {
-                this.processRequest(xhr);
-            }
-        },
-
-        respondWith: function respondWith(method, url, body) {
-            if (arguments.length == 1 && typeof method != "function") {
-                this.response = responseArray(method);
-                return;
-            }
-
-            if (!this.responses) { this.responses = []; }
-
-            if (arguments.length == 1) {
-                body = method;
-                url = method = null;
-            }
-
-            if (arguments.length == 2) {
-                body = url;
-                url = method;
-                method = null;
-            }
-
-            push.call(this.responses, {
-                method: method,
-                url: url,
-                response: typeof body == "function" ? body : responseArray(body)
-            });
-        },
-
-        respond: function respond() {
-            if (arguments.length > 0) this.respondWith.apply(this, arguments);
-            var queue = this.queue || [];
-            var requests = queue.splice(0);
-            var request;
-
-            while(request = requests.shift()) {
-                this.processRequest(request);
-            }
-        },
-
-        processRequest: function processRequest(request) {
-            try {
-                if (request.aborted) {
-                    return;
-                }
-
-                var response = this.response || [404, {}, ""];
-
-                if (this.responses) {
-                    for (var l = this.responses.length, i = l - 1; i >= 0; i--) {
-                        if (match.call(this, this.responses[i], request)) {
-                            response = this.responses[i].response;
-                            break;
-                        }
-                    }
-                }
-
-                if (request.readyState != 4) {
-                    log(response, request);
-
-                    request.respond(response[0], response[1], response[2]);
-                }
-            } catch (e) {
-                sinon.logError("Fake server request processing", e);
-            }
-        },
-
-        restore: function restore() {
-            return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
-        }
-    };
-}());
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_server.js
- * @depend fake_timers.js
- */
-/*jslint browser: true, eqeqeq: false, onevar: false*/
-/*global sinon*/
-/**
- * Add-on for sinon.fakeServer that automatically handles a fake timer along with
- * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
- * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
- * it polls the object for completion with setInterval. Dispite the direct
- * motivation, there is nothing jQuery-specific in this file, so it can be used
- * in any environment where the ajax implementation depends on setInterval or
- * setTimeout.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function () {
-    function Server() {}
-    Server.prototype = sinon.fakeServer;
-
-    sinon.fakeServerWithClock = new Server();
-
-    sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
-        if (xhr.async) {
-            if (typeof setTimeout.clock == "object") {
-                this.clock = setTimeout.clock;
-            } else {
-                this.clock = sinon.useFakeTimers();
-                this.resetClock = true;
-            }
-
-            if (!this.longestTimeout) {
-                var clockSetTimeout = this.clock.setTimeout;
-                var clockSetInterval = this.clock.setInterval;
-                var server = this;
-
-                this.clock.setTimeout = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetTimeout.apply(this, arguments);
-                };
-
-                this.clock.setInterval = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetInterval.apply(this, arguments);
-                };
-            }
-        }
-
-        return sinon.fakeServer.addRequest.call(this, xhr);
-    };
-
-    sinon.fakeServerWithClock.respond = function respond() {
-        var returnVal = sinon.fakeServer.respond.apply(this, arguments);
-
-        if (this.clock) {
-            this.clock.tick(this.longestTimeout || 0);
-            this.longestTimeout = 0;
-
-            if (this.resetClock) {
-                this.clock.restore();
-                this.resetClock = false;
-            }
-        }
-
-        return returnVal;
-    };
-
-    sinon.fakeServerWithClock.restore = function restore() {
-        if (this.clock) {
-            this.clock.restore();
-        }
-
-        return sinon.fakeServer.restore.apply(this, arguments);
-    };
-}());
-
-/**
- * @depend ../sinon.js
- * @depend collection.js
- * @depend util/fake_timers.js
- * @depend util/fake_server_with_clock.js
- */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global require, module*/
-/**
- * Manages fake collections as well as fake utilities such as Sinon's
- * timers and fake XHR implementation in one convenient object.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof module !== 'undefined' && module.exports) {
-    var sinon = require("../sinon");
-    sinon.extend(sinon, require("./util/fake_timers"));
-}
-
-(function () {
-    var push = [].push;
-
-    function exposeValue(sandbox, config, key, value) {
-        if (!value) {
-            return;
-        }
-
-        if (config.injectInto && !(key in config.injectInto)) {
-            config.injectInto[key] = value;
-            sandbox.injectedKeys.push(key);
-        } else {
-            push.call(sandbox.args, value);
-        }
-    }
-
-    function prepareSandboxFromConfig(config) {
-        var sandbox = sinon.create(sinon.sandbox);
-
-        if (config.useFakeServer) {
-            if (typeof config.useFakeServer == "object") {
-                sandbox.serverPrototype = config.useFakeServer;
-            }
-
-            sandbox.useFakeServer();
-        }
-
-        if (config.useFakeTimers) {
-            if (typeof config.useFakeTimers == "object") {
-                sandbox.useFakeTimers.apply(sandbox, config.useFakeTimers);
-            } else {
-                sandbox.useFakeTimers();
-            }
-        }
-
-        return sandbox;
-    }
-
-    sinon.sandbox = sinon.extend(sinon.create(sinon.collection), {
-        useFakeTimers: function useFakeTimers() {
-            this.clock = sinon.useFakeTimers.apply(sinon, arguments);
-
-            return this.add(this.clock);
-        },
-
-        serverPrototype: sinon.fakeServer,
-
-        useFakeServer: function useFakeServer() {
-            var proto = this.serverPrototype || sinon.fakeServer;
-
-            if (!proto || !proto.create) {
-                return null;
-            }
-
-            this.server = proto.create();
-            return this.add(this.server);
-        },
-
-        inject: function (obj) {
-            sinon.collection.inject.call(this, obj);
-
-            if (this.clock) {
-                obj.clock = this.clock;
-            }
-
-            if (this.server) {
-                obj.server = this.server;
-                obj.requests = this.server.requests;
-            }
-
-            return obj;
-        },
-
-        restore: function () {
-            sinon.collection.restore.apply(this, arguments);
-            this.restoreContext();
-        },
-
-        restoreContext: function () {
-            if (this.injectedKeys) {
-                for (var i = 0, j = this.injectedKeys.length; i < j; i++) {
-                    delete this.injectInto[this.injectedKeys[i]];
-                }
-                this.injectedKeys = [];
-            }
-        },
-
-        create: function (config) {
-            if (!config) {
-                return sinon.create(sinon.sandbox);
-            }
-
-            var sandbox = prepareSandboxFromConfig(config);
-            sandbox.args = sandbox.args || [];
-            sandbox.injectedKeys = [];
-            sandbox.injectInto = config.injectInto;
-            var prop, value, exposed = sandbox.inject({});
-
-            if (config.properties) {
-                for (var i = 0, l = config.properties.length; i < l; i++) {
-                    prop = config.properties[i];
-                    value = exposed[prop] || prop == "sandbox" && sandbox;
-                    exposeValue(sandbox, config, prop, value);
-                }
-            } else {
-                exposeValue(sandbox, config, "sandbox", value);
-            }
-
-            return sandbox;
-        }
-    });
-
-    sinon.sandbox.useFakeXMLHttpRequest = sinon.sandbox.useFakeServer;
-
-    if (typeof module !== 'undefined' && module.exports) {
-        module.exports = sinon.sandbox;
-    }
-}());
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- * @depend mock.js
- * @depend sandbox.js
- */
-/*jslint eqeqeq: false, onevar: false, forin: true, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Test function, sandboxes fakes
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function test(callback) {
-        var type = typeof callback;
-
-        if (type != "function") {
-            throw new TypeError("sinon.test needs to wrap a test function, got " + type);
-        }
-
-        return function () {
-            var config = sinon.getConfig(sinon.config);
-            config.injectInto = config.injectIntoThis && this || config.injectInto;
-            var sandbox = sinon.sandbox.create(config);
-            var exception, result;
-            var args = Array.prototype.slice.call(arguments).concat(sandbox.args);
-
-            try {
-                result = callback.apply(this, args);
-            } catch (e) {
-                exception = e;
-            }
-
-            if (typeof exception !== "undefined") {
-                sandbox.restore();
-                throw exception;
-            }
-            else {
-                sandbox.verifyAndRestore();
-            }
-
-            return result;
-        };
-    }
-
-    test.config = {
-        injectIntoThis: true,
-        injectInto: null,
-        properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-        useFakeTimers: true,
-        useFakeServer: true
-    };
-
-    if (commonJSModule) {
-        module.exports = test;
-    } else {
-        sinon.test = test;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend test.js
- */
-/*jslint eqeqeq: false, onevar: false, eqeqeq: false*/
-/*global module, require, sinon*/
-/**
- * Test case, sandboxes all test functions
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon || !Object.prototype.hasOwnProperty) {
-        return;
-    }
-
-    function createTest(property, setUp, tearDown) {
-        return function () {
-            if (setUp) {
-                setUp.apply(this, arguments);
-            }
-
-            var exception, result;
-
-            try {
-                result = property.apply(this, arguments);
-            } catch (e) {
-                exception = e;
-            }
-
-            if (tearDown) {
-                tearDown.apply(this, arguments);
-            }
-
-            if (exception) {
-                throw exception;
-            }
-
-            return result;
-        };
-    }
-
-    function testCase(tests, prefix) {
-        /*jsl:ignore*/
-        if (!tests || typeof tests != "object") {
-            throw new TypeError("sinon.testCase needs an object with test functions");
-        }
-        /*jsl:end*/
-
-        prefix = prefix || "test";
-        var rPrefix = new RegExp("^" + prefix);
-        var methods = {}, testName, property, method;
-        var setUp = tests.setUp;
-        var tearDown = tests.tearDown;
-
-        for (testName in tests) {
-            if (tests.hasOwnProperty(testName)) {
-                property = tests[testName];
-
-                if (/^(setUp|tearDown)$/.test(testName)) {
-                    continue;
-                }
-
-                if (typeof property == "function" && rPrefix.test(testName)) {
-                    method = property;
-
-                    if (setUp || tearDown) {
-                        method = createTest(property, setUp, tearDown);
-                    }
-
-                    methods[testName] = sinon.test(method);
-                } else {
-                    methods[testName] = tests[testName];
-                }
-            }
-        }
-
-        return methods;
-    }
-
-    if (commonJSModule) {
-        module.exports = testCase;
-    } else {
-        sinon.testCase = testCase;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- */
-/*jslint eqeqeq: false, onevar: false, nomen: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Assertions matching the test spy retrieval interface.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon, global) {
-    var commonJSModule = typeof module !== "undefined" && module.exports;
-    var slice = Array.prototype.slice;
-    var assert;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function verifyIsStub() {
-        var method;
-
-        for (var i = 0, l = arguments.length; i < l; ++i) {
-            method = arguments[i];
-
-            if (!method) {
-                assert.fail("fake is not a spy");
-            }
-
-            if (typeof method != "function") {
-                assert.fail(method + " is not a function");
-            }
-
-            if (typeof method.getCall != "function") {
-                assert.fail(method + " is not stubbed");
-            }
-        }
-    }
-
-    function failAssertion(object, msg) {
-        object = object || global;
-        var failMethod = object.fail || assert.fail;
-        failMethod.call(object, msg);
-    }
-
-    function mirrorPropAsAssertion(name, method, message) {
-        if (arguments.length == 2) {
-            message = method;
-            method = name;
-        }
-
-        assert[name] = function (fake) {
-            verifyIsStub(fake);
-
-            var args = slice.call(arguments, 1);
-            var failed = false;
-
-            if (typeof method == "function") {
-                failed = !method(fake);
-            } else {
-                failed = typeof fake[method] == "function" ?
-                    !fake[method].apply(fake, args) : !fake[method];
-            }
-
-            if (failed) {
-                failAssertion(this, fake.printf.apply(fake, [message].concat(args)));
-            } else {
-                assert.pass(name);
-            }
-        };
-    }
-
-    function exposedName(prefix, prop) {
-        return !prefix || /^fail/.test(prop) ? prop :
-            prefix + prop.slice(0, 1).toUpperCase() + prop.slice(1);
-    }
-
-    assert = {
-        failException: "AssertError",
-
-        fail: function fail(message) {
-            var error = new Error(message);
-            error.name = this.failException || assert.failException;
-
-            throw error;
-        },
-
-        pass: function pass(assertion) {},
-
-        callOrder: function assertCallOrder() {
-            verifyIsStub.apply(null, arguments);
-            var expected = "", actual = "";
-
-            if (!sinon.calledInOrder(arguments)) {
-                try {
-                    expected = [].join.call(arguments, ", ");
-                    var calls = slice.call(arguments);
-                    var i = calls.length;
-                    while (i) {
-                        if (!calls[--i].called) {
-                            calls.splice(i, 1);
-                        }
-                    }
-                    actual = sinon.orderByFirstCall(calls).join(", ");
-                } catch (e) {
-                    // If this fails, we'll just fall back to the blank string
-                }
-
-                failAssertion(this, "expected " + expected + " to be " +
-                              "called in order but were called as " + actual);
-            } else {
-                assert.pass("callOrder");
-            }
-        },
-
-        callCount: function assertCallCount(method, count) {
-            verifyIsStub(method);
-
-            if (method.callCount != count) {
-                var msg = "expected %n to be called " + sinon.timesInWords(count) +
-                    " but was called %c%C";
-                failAssertion(this, method.printf(msg));
-            } else {
-                assert.pass("callCount");
-            }
-        },
-
-        expose: function expose(target, options) {
-            if (!target) {
-                throw new TypeError("target is null or undefined");
-            }
-
-            var o = options || {};
-            var prefix = typeof o.prefix == "undefined" && "assert" || o.prefix;
-            var includeFail = typeof o.includeFail == "undefined" || !!o.includeFail;
-
-            for (var method in this) {
-                if (method != "export" && (includeFail || !/^(fail)/.test(method))) {
-                    target[exposedName(prefix, method)] = this[method];
-                }
-            }
-
-            return target;
-        },
-
-        match: function match(actual, expectation) {
-            var matcher = sinon.match(expectation);
-            if (matcher.test(actual)) {
-                assert.pass("match");
-            } else {
-                var formatted = [
-                    "expected value to match",
-                    "    expected = " + sinon.format(expectation),
-                    "    actual = " + sinon.format(actual)
-                ]
-                failAssertion(this, formatted.join("\n"));
-            }
-        }
-    };
-
-    mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
-    mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
-                          "expected %n to not have been called but was called %c%C");
-    mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
-    mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
-    mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
-    mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
-    mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
-    mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
-    mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
-    mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
-    mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
-    mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
-    mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
-    mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
-    mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
-    mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
-    mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
-    mirrorPropAsAssertion("threw", "%n did not throw exception%C");
-    mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
-
-    if (commonJSModule) {
-        module.exports = assert;
-    } else {
-        sinon.assert = assert;
-    }
-}(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : (typeof self != "undefined") ? self : global));
-
-return sinon;}.call(typeof window != 'undefined' && window || {}));

From c862bcfd183ecbeb0d6e2aa9c90a71023368d2f5 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:43 +0100
Subject: [PATCH 010/117] Bug 985596 Set up initial desktop conversation
 window. r=dmose

---
 .../components/loop/content/conversation.html |  16 +-
 browser/components/loop/content/js/client.js  | 113 --------------
 .../loop/content/js/conversation.js           | 132 ++++++++++++++---
 browser/components/loop/content/js/panel.js   |   8 +-
 browser/components/loop/content/panel.html    |   2 +-
 browser/components/loop/jar.mn                |   6 +-
 .../loop/test/desktop-local/client_test.js    | 112 --------------
 .../test/desktop-local/conversation_test.js   | 140 ++++++++++++++++++
 .../loop/test/desktop-local/index.html        |  17 ++-
 .../loop/test/desktop-local/panel_test.js     |   2 +-
 10 files changed, 293 insertions(+), 255 deletions(-)
 delete mode 100644 browser/components/loop/content/js/client.js
 delete mode 100644 browser/components/loop/test/desktop-local/client_test.js
 create mode 100644 browser/components/loop/test/desktop-local/conversation_test.js

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index 778bfadfb98f..44019346c06d 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -10,10 +10,24 @@
     <link rel="stylesheet" type="text/css" href="shared/css/conversation.css">
  </head>
   <body onload="loop.conversation.init();">
+    <div id="conversation" class="conversation">
+      <div class="media nested">
+        <div class="remote">
+          <div id="incoming"></div>
+        </div>
+        <div class="local">
+          <div id="outgoing"></div>
+        </div>
+      </div>
+    </div>
+    <script type="text/javascript" src="shared/libs/sdk.js"></script>
     <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
     <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
-    <script type="text/javascript" src="js/client.js"></script>
+    <script type="text/javascript" src="shared/js/client.js"></script>
+    <script type="text/javascript" src="shared/js/models.js"></script>
+    <script type="text/javascript" src="shared/js/router.js"></script>
+    <script type="text/javascript" src="shared/js/views.js"></script>
     <script type="text/javascript" src="js/conversation.js"></script>
   </body>
 </html>
diff --git a/browser/components/loop/content/js/client.js b/browser/components/loop/content/js/client.js
deleted file mode 100644
index f0d76a7f1e2d..000000000000
--- a/browser/components/loop/content/js/client.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*global loop*/
-
-var loop = loop || {};
-loop.Client = (function($) {
-  "use strict";
-
-  /**
-   * Loop server client.
-   *
-   * @param {Object} settings Settings object.
-   */
-  function Client(settings) {
-    settings = settings || {};
-    if (!settings.hasOwnProperty("baseApiUrl")) {
-      throw new Error("missing required baseApiUrl");
-    }
-    this.settings = settings;
-  }
-
-  Client.prototype = {
-    /**
-     * Requests a call URL to the Loop server.
-     *
-     * @param  {String} simplepushUrl a registered Simple Push URL
-     * @param  {string} nickname the nickname of the future caller
-     * @param  {Function} cb Callback(err, callUrl)
-     */
-    requestCallUrl: function(nickname, cb) {
-      var endpoint = this.settings.baseApiUrl + "/call-url/",
-          reqData  = {callerId: nickname};
-
-      function validate(callUrlData) {
-        if (typeof callUrlData !== "object" ||
-            !callUrlData.hasOwnProperty("call_url")) {
-          var message = "Invalid call url data received";
-          console.error(message, callUrlData);
-          throw new Error(message);
-        }
-        return callUrlData.call_url;
-      }
-
-      var req = $.post(endpoint, reqData, function(callUrlData) {
-        try {
-          cb(null, validate(callUrlData));
-        } catch (err) {
-          cb(err);
-        }
-      }, "json");
-
-      req.fail(function(jqXHR, testStatus, errorThrown) {
-        var error = "Unknown error.";
-        if (jqXHR && jqXHR.responseJSON && jqXHR.responseJSON.error) {
-          error = jqXHR.responseJSON.error;
-        }
-        var message = "HTTP error " + jqXHR.status + ": " +
-          errorThrown + "; " + error;
-        console.error(message);
-        cb(new Error(message));
-      });
-    },
-
-    /**
-     * Requests call information from the server
-     *
-     * @param  {Function} cb Callback(err, calls)
-     */
-    requestCallsInfo: function(cb) {
-      var endpoint = this.settings.baseApiUrl + "/calls";
-
-      // We do a basic validation here that we have an object,
-      // and pass the full information back.
-      function validate(callsData) {
-        if (typeof callsData !== "object" ||
-            !callsData.hasOwnProperty("calls")) {
-          var message = "Invalid calls data received";
-          console.error(message, callsData);
-          throw new Error(message);
-        }
-        return callsData.calls;
-      }
-
-      // XXX We'll want to figure out a way to store the version from each
-      // request here. As this is typically the date, we just need to store the
-      // time last requested.
-      // XXX It is likely that we'll want to move some of this to whatever
-      // opens the chat window.
-      var req = $.get(endpoint + "?version=0", function(callsData) {
-        try {
-          cb(null, validate(callsData));
-        } catch (err) {
-          cb(err);
-        }
-      }, "json");
-
-      req.fail(function(jqXHR, testStatus, errorThrown) {
-        var error = "Unknown error.";
-        if (jqXHR && jqXHR.responseJSON && jqXHR.responseJSON.error) {
-          error = jqXHR.responseJSON.error;
-        }
-        var message = "HTTP error " + jqXHR.status + ": " +
-          errorThrown + "; " + error;
-        console.error(message);
-        cb(new Error(message));
-      });
-    }
-  };
-
-  return Client;
-})(jQuery);
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index ff3c5dc3199c..64331a3bc2ef 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -3,36 +3,130 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*global loop*/
-// XXX This file needs unit testing
+
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
-loop.conversation = (function(_, __) {
+loop.conversation = (function(TB) {
   "use strict";
 
-  // XXX: baseApiUrl should be configurable (browser pref)
-  var baseApiUrl = "http://localhost:5000";
+  var baseServerUrl = Services.prefs.getCharPref("loop.server");
+
+  /**
+   * App router.
+   * @type {loop.webapp.Router}
+   */
+  var router;
+
+  /**
+   * Current conversation model instance.
+   * @type {loop.webapp.ConversationModel}
+   */
+  var conversation;
+
+  var ConversationRouter = loop.shared.router.BaseRouter.extend({
+    _conversation: undefined,
+    activeView: undefined,
+
+    routes: {
+      "start/:version": "start",
+      "call/ongoing": "conversation",
+      "call/ended": "ended"
+    },
+
+    /**
+     * Loads and render current active view.
+     *
+     * @param {loop.shared.BaseView} view View.
+     */
+    loadView : function(view) {
+      if (this.activeView) {
+        this.activeView.hide();
+      }
+      this.activeView = view.render().show();
+    },
+
+    initialize: function(options) {
+      options = options || {};
+      if (!options.conversation) {
+        throw new Error("missing required conversation");
+      }
+      this._conversation = options.conversation;
+
+      this.listenTo(this._conversation, "session:ready", this._onSessionReady);
+      this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
+    },
+
+    /**
+     * Navigates to conversation when the call session is ready.
+     */
+    _onSessionReady: function() {
+      this.navigate("call/ongoing", {trigger: true});
+    },
+
+    /**
+     * Navigates to ended state when the call has ended
+     */
+    _onSessionEnded: function() {
+      this.navigate("call/ended", {trigger: true});
+    },
+
+    /**
+     * start is the initial route that does any necessary prompting and set
+     * up for the call.
+     *
+     * @param {String} loopVersion The version from the push notification, set
+     *                             by the router from the URL.
+     */
+    start: function(loopVersion) {
+      // XXX For now, we just kick the conversation straight away, bug 990678
+      // will implement the follow-ups.
+      this._conversation.set({loopVersion: loopVersion});
+      this._conversation.initiate({
+        baseServerUrl: baseServerUrl,
+        outgoing: false
+      });
+    },
+
+    /**
+     * conversation is the route when the conversation is active. The start
+     * route should be navigated to first.
+     */
+    conversation: function() {
+      if (!this._conversation.isSessionReady()) {
+        // XXX: notify user that something has gone wrong.
+        console.error("Error: navigated to conversation route without " +
+          "the start route to initialise the call first");
+        return;
+      }
+
+      this.loadView(
+        new loop.shared.views.ConversationView({
+          sdk: TB,
+          model: this._conversation
+      }));
+    },
+
+    /**
+     * ended does any necessary work to end the call.
+     */
+    ended: function() {
+      // XXX Later we implement the end-of call here (bug 974873)
+      window.close();
+    }
+  });
 
   /**
    * Panel initialisation.
    */
   function init() {
-    // Send a message to the server to get the call info
-    this.client = new loop.Client({
-      baseApiUrl: baseApiUrl
-    });
-
-    // Get the call information
-    this.client.requestCallsInfo(function(err, calls) {
-      if (err) {
-        console.error("Error getting call data: ", err);
-        return;
-      }
-
-      console.log("Received Calls Data: ", calls);
-    });
+    conversation = new loop.shared.models.ConversationModel();
+    router = new ConversationRouter({conversation: conversation});
+    Backbone.history.start();
   }
 
   return {
+    ConversationRouter: ConversationRouter,
     init: init
   };
-})(_);
+})(window.TB);
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index a8d65e487966..dc9353007ec6 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -3,13 +3,13 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*global loop*/
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
 loop.panel = (function(_, __) {
   "use strict";
 
-  // XXX: baseApiUrl should be configurable (browser pref)
-  var baseApiUrl = "http://localhost:5000",
+  var baseServerUrl = Services.prefs.getCharPref("loop.server"),
       panelView;
 
   /**
@@ -98,8 +98,8 @@ loop.panel = (function(_, __) {
     },
 
     initialize: function() {
-      this.client = new loop.Client({
-        baseApiUrl: baseApiUrl
+      this.client = new loop.shared.Client({
+        baseServerUrl: baseServerUrl
       });
       this.notificationCollection = new NotificationCollection();
       this.notificationListView = new NotificationListView({
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index c9acb6ac9811..5401f9aaf747 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -44,7 +44,7 @@
     <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
     <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
-    <script type="text/javascript" src="js/client.js"></script>
+    <script type="text/javascript" src="shared/js/client.js"></script>
     <script type="text/javascript" src="js/panel.js"></script>
   </body>
 </html>
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 9bed7eb30c1c..5af98f7e69ab 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -10,11 +10,15 @@ browser.jar:
   content/browser/loop/shared/css/conversation.css   (content/shared/css/conversation.css)
   content/browser/loop/shared/img/icon_32.png        (content/shared/img/icon_32.png)
   content/browser/loop/shared/img/icon_64.png        (content/shared/img/icon_64.png)
+  content/browser/loop/shared/js/client.js           (content/shared/js/client.js)
+  content/browser/loop/shared/js/models.js           (content/shared/js/models.js)
+  content/browser/loop/shared/js/router.js           (content/shared/js/router.js)
+  content/browser/loop/shared/js/views.js            (content/shared/js/views.js)
+  content/browser/loop/shared/libs/sdk.js            (content/shared/libs/sdk.js)
   content/browser/loop/shared/libs/lodash-2.4.1.js   (content/shared/libs/lodash-2.4.1.js)
   content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
   content/browser/loop/libs/l10n.js                  (content/libs/l10n.js)
   content/browser/loop/js/fxcom.js                   (content/js/fxcom.js)
   content/browser/loop/js/conversation.js            (content/js/conversation.js)
-  content/browser/loop/js/client.js                  (content/js/client.js)
   content/browser/loop/js/panel.js                   (content/js/panel.js)
diff --git a/browser/components/loop/test/desktop-local/client_test.js b/browser/components/loop/test/desktop-local/client_test.js
deleted file mode 100644
index d1610dc4b83c..000000000000
--- a/browser/components/loop/test/desktop-local/client_test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* global loop, sinon */
-
-var expect = chai.expect;
-
-describe("loop.Client", function() {
-  "use strict";
-
-  var sandbox, fakeXHR, requests = [];
-
-  beforeEach(function() {
-    sandbox = sinon.sandbox.create();
-    fakeXHR = sandbox.useFakeXMLHttpRequest();
-    requests = [];
-    // https://github.com/cjohansen/Sinon.JS/issues/393
-    fakeXHR.xhr.onCreate = function (xhr) {
-      requests.push(xhr);
-    };
-  });
-
-  afterEach(function() {
-    sandbox.restore();
-  });
-
-  describe("loop.Client", function() {
-    describe("#constructor", function() {
-      it("should require a baseApiUrl setting", function() {
-        expect(function() {
-          new loop.Client();
-        }).to.Throw(Error, /required/);
-      });
-    });
-
-    describe("#requestCallUrl", function() {
-      var client;
-
-      beforeEach(function() {
-        client = new loop.Client({baseApiUrl: "http://fake.api"});
-      });
-
-      it("should request for a call url", function() {
-        var callback = sinon.spy();
-        client.requestCallUrl("foo", callback);
-
-        expect(requests).to.have.length.of(1);
-
-        requests[0].respond(200, {"Content-Type": "application/json"},
-                                 '{"call_url": "fakeCallUrl"}');
-        sinon.assert.calledWithExactly(callback, null, "fakeCallUrl");
-      });
-
-      it("should send an error when the request fails", function() {
-        var callback = sinon.spy();
-        client.requestCallUrl("foo", callback);
-
-        expect(requests).to.have.length.of(1);
-
-        requests[0].respond(400, {"Content-Type": "application/json"},
-                                 '{"error": "my error"}');
-        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
-          return /HTTP error 400: Bad Request; my error/.test(err.message);
-        }));
-      });
-    });
-
-    describe("#requestCallsInfo", function() {
-      var client;
-
-      beforeEach(function() {
-        client = new loop.Client({baseApiUrl: "http://fake.api"});
-      });
-
-      it("should request data for all calls", function() {
-        var callback = sinon.spy();
-        client.requestCallsInfo(callback);
-
-        expect(requests).to.have.length.of(1);
-        expect(requests[0].url).to.be.equal("http://fake.api/calls?version=0");
-        expect(requests[0].method).to.be.equal("GET");
-
-        requests[0].respond(200, {"Content-Type": "application/json"},
-                                 '{"calls": [{"apiKey": "fake"}]}');
-        sinon.assert.calledWithExactly(callback, null, [{apiKey: "fake"}]);
-      });
-
-      it("should send an error when the request fails", function() {
-        var callback = sinon.spy();
-        client.requestCallsInfo(callback);
-
-        requests[0].respond(400, {"Content-Type": "application/json"},
-                                 '{"error": "my error"}');
-        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
-          return /HTTP error 400: Bad Request; my error/.test(err.message);
-        }));
-      });
-
-      it("should send an error if the data is not valid", function() {
-        var callback = sinon.spy();
-        client.requestCallsInfo(callback);
-
-        requests[0].respond(200, {"Content-Type": "application/json"},
-                                 '{"bad": {}}');
-        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
-          return /Invalid calls data received/.test(err.message);
-        }));
-      });
-    });
-  });
-});
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
new file mode 100644
index 000000000000..317792b15feb
--- /dev/null
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -0,0 +1,140 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop, sinon */
+
+var expect = chai.expect;
+
+describe("loop.conversation", function() {
+  "use strict";
+
+  var ConversationRouter = loop.conversation.ConversationRouter,
+      sandbox;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("ConversationRouter", function() {
+    var conversation;
+
+    beforeEach(function() {
+      conversation = new loop.shared.models.ConversationModel();
+    });
+
+    describe("#constructor", function() {
+      it("should require a ConversationModel instance", function() {
+        expect(function() {
+          new ConversationRouter();
+        }).to.Throw(Error, /missing required conversation/);
+      });
+    });
+
+    describe("Routes", function() {
+      var router;
+
+      beforeEach(function() {
+        router = new ConversationRouter({conversation: conversation});
+        sandbox.stub(router, "loadView");
+      });
+
+      describe("#start", function() {
+        it("should set the loopVersion on the conversation model", function() {
+          router.start("fakeVersion");
+
+          expect(conversation.get("loopVersion")).to.equal("fakeVersion");
+        });
+
+        it("should initiate the conversation", function() {
+          sandbox.stub(conversation, "initiate");
+
+          router.start("fakeVersion");
+
+          sinon.assert.calledOnce(conversation.initiate);
+          sinon.assert.calledWithExactly(conversation.initiate, {
+            baseServerUrl: "http://example.com",
+            outgoing: false
+          });
+        });
+      });
+
+      describe("#conversation", function() {
+        it("should load the ConversationView if session is set", function() {
+          sandbox.stub(loop.shared.views.ConversationView.prototype,
+            "initialize");
+          conversation.set("sessionId", "fakeSessionId");
+
+          router.conversation();
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWithMatch(router.loadView, {
+            $el: {selector: "#conversation"}
+          });
+        });
+
+        it("should not load the ConversationView if session is not set",
+          function() {
+            router.conversation();
+
+            sinon.assert.notCalled(router.loadView);
+        });
+      });
+
+      describe("#ended", function() {
+        // XXX When the call is ended gracefully, we should check that we
+        // close connections nicely
+        it("should close the window", function() {
+          sandbox.stub(window, "close");
+
+          router.ended();
+
+          sinon.assert.calledOnce(window.close);
+        });
+      });
+    });
+
+    describe("Events", function() {
+      var fakeSessionData;
+
+      beforeEach(function() {
+        fakeSessionData = {
+          sessionId:    "sessionId",
+          sessionToken: "sessionToken",
+          apiKey:       "apiKey"
+        };
+      });
+
+      it("should navigate to call/ongoing once the call session is ready",
+        function() {
+          sandbox.stub(ConversationRouter.prototype, "navigate");
+          var router = new ConversationRouter({
+            conversation: conversation
+          });
+
+          conversation.setReady(fakeSessionData);
+
+          sinon.assert.calledOnce(router.navigate);
+          sinon.assert.calledWith(router.navigate, "call/ongoing");
+        });
+
+      it("should navigate to call/ended when the call session ends",
+        function() {
+          sandbox.stub(ConversationRouter.prototype, "navigate");
+          var router = new ConversationRouter({
+            conversation: conversation
+          });
+
+          conversation.trigger("session:ended");
+
+          sinon.assert.calledOnce(router.navigate);
+          sinon.assert.calledWith(router.navigate, "call/ended");
+        });
+    });
+
+  });
+});
diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index 3db49a20a2b0..61a8d6962cb3 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -32,11 +32,16 @@
       return [];
     },
   };
+  window.Components = {fake: true, utils: {import: function(){}}};
+  window.Services = {fake: true, prefs: {getCharPref: function() {
+    return "http://example.com";
+  }}};
   </script>
   <script src="../../content/libs/l10n.js"></script>
   <script src="../../content/shared/libs/jquery-2.1.0.js"></script>
   <script src="../../content/shared/libs/lodash-2.4.1.js"></script>
   <script src="../../content/shared/libs/backbone-1.1.2.js"></script>
+
   <!-- test dependencies -->
   <script src="../shared/vendor/mocha-1.17.1.js"></script>
   <script src="../shared/vendor/chai-1.9.0.js"></script>
@@ -45,16 +50,22 @@
     chai.Assertion.includeStack = true;
     mocha.setup('bdd');
   </script>
+
   <!-- App scripts -->
-  <script src="../../content/js/client.js"></script>
+  <script src="../../content/shared/js/client.js"></script>
+  <script src="../../content/shared/js/models.js"></script>
+  <script src="../../content/shared/js/router.js"></script>
+  <script src="../../content/shared/js/views.js"></script>
+  <script src="../../content/js/conversation.js"></script>
   <script src="../../content/js/panel.js"></script>
+
   <!-- Test scripts -->
+  <script src="conversation_test.js"></script>
   <script src="panel_test.js"></script>
-  <script src="client_test.js"></script>
   <script>
     mocha.run(function () {
       $("#mocha").append("<p>Complete.</p>");
     });
-</script>
+  </script>
 </body>
 </html>
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 288befd64cde..52b85bc2be50 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -106,7 +106,7 @@ describe("loop.panel", function() {
 
     describe("#getCallurl", function() {
       it("should request a call url to the server", function() {
-        var requestCallUrl = sandbox.stub(loop.Client.prototype,
+        var requestCallUrl = sandbox.stub(loop.shared.Client.prototype,
                                           "requestCallUrl");
         var view = new loop.panel.PanelView();
 

From e2fe4521c191950ac0ad5c60e3760a8971d7d4aa Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:13:43 +0100
Subject: [PATCH 011/117] Bug 976127 - Get marionette to drive desktop-local &
 shared unit tests, r=Standard8

---
 .../components/loop/test/desktop-local/README.md | 14 ++++++++++----
 .../loop/test/desktop-local/index.html           |  5 +++--
 .../loop/test/desktop-local/panel_test.js        |  2 +-
 .../loop/test/desktop-local/test_desktop_all.py  | 16 ++++++++++++++++
 browser/components/loop/test/manifest.ini        |  7 +++++++
 5 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 browser/components/loop/test/desktop-local/test_desktop_all.py
 create mode 100644 browser/components/loop/test/manifest.ini

diff --git a/browser/components/loop/test/desktop-local/README.md b/browser/components/loop/test/desktop-local/README.md
index a306e28646ea..5f459e32fc4a 100644
--- a/browser/components/loop/test/desktop-local/README.md
+++ b/browser/components/loop/test/desktop-local/README.md
@@ -6,10 +6,16 @@ and the Chai Assertion Library's [BDD interface][2].
 [1]: http://visionmedia.github.io/mocha/
 [2]: http://chaijs.com/api/bdd/
 
-Aim your browser at the index.html in this directory on your localhost using a file: or HTTP URL to run the tests.
+Aim your browser at the index.html in this directory on your localhost using
+a file: or HTTP URL to run the tests.  Alternately, from the top-level of your
+Gecko source directory, execute:
+
+```
+./mach marionette-test browser/components/loop/test/manifest.ini
+```
 
 Next steps:
-* hook up to Marionette test suite so that they can be run by Tbpl
-* run via mach command-line
-* run using JS http server so the property security context for DOM elements is used
+
+* run using JS http server so the property security context for DOM elements
+is used
 
diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index 61a8d6962cb3..401b92ab4fac 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -30,7 +30,7 @@
     },
     getStrings: function() {
       return [];
-    },
+    }
   };
   window.Components = {fake: true, utils: {import: function(){}}};
   window.Services = {fake: true, prefs: {getCharPref: function() {
@@ -47,6 +47,7 @@
   <script src="../shared/vendor/chai-1.9.0.js"></script>
   <script src="../shared/vendor/sinon-1.9.0.js"></script>
   <script>
+    /*global chai,mocha */
     chai.Assertion.includeStack = true;
     mocha.setup('bdd');
   </script>
@@ -64,7 +65,7 @@
   <script src="panel_test.js"></script>
   <script>
     mocha.run(function () {
-      $("#mocha").append("<p>Complete.</p>");
+      $("#mocha").append("<p id='complete'>Complete.</p>");
     });
   </script>
 </body>
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 52b85bc2be50..5e09b3e6a706 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* global loop, sinon */
+/*global loop, sinon */
 
 var expect = chai.expect;
 
diff --git a/browser/components/loop/test/desktop-local/test_desktop_all.py b/browser/components/loop/test/desktop-local/test_desktop_all.py
new file mode 100644
index 000000000000..877844d58ca0
--- /dev/null
+++ b/browser/components/loop/test/desktop-local/test_desktop_all.py
@@ -0,0 +1,16 @@
+# need to get this dir in the path so that we make the import work
+import os
+import sys
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'shared'))
+
+from frontend_tester import BaseTestFrontendUnits
+
+
+class TestDesktopUnits(BaseTestFrontendUnits):
+
+    def setUp(self):
+        super(TestDesktopUnits, self).setUp()
+        self.set_server_prefix("browser/components/loop/test/desktop-local/")
+
+    def test_units(self):
+        self.check_page("index.html")
diff --git a/browser/components/loop/test/manifest.ini b/browser/components/loop/test/manifest.ini
new file mode 100644
index 000000000000..041dc95cfb73
--- /dev/null
+++ b/browser/components/loop/test/manifest.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+b2g = false
+browser = true
+qemu = false
+
+[shared/test_shared_all.py]
+[desktop-local/test_desktop_all.py]

From 26720acc22ac95339a177726cb4434d6315688a7 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:43 +0100
Subject: [PATCH 012/117] Bug 987252 - Using new shared notification system.
 r=Standard8

---
 .../components/loop/content/conversation.html |   5 +
 .../loop/content/js/conversation.js           |  33 ++++-
 browser/components/loop/content/js/panel.js   | 121 ++++--------------
 browser/components/loop/content/panel.html    |   2 +
 .../test/desktop-local/conversation_test.js   |  28 +++-
 .../loop/test/desktop-local/panel_test.js     |  80 ++++--------
 .../en-US/chrome/browser/loop/loop.properties |   1 +
 7 files changed, 108 insertions(+), 162 deletions(-)

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index 44019346c06d..7c4d525282aa 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -10,6 +10,9 @@
     <link rel="stylesheet" type="text/css" href="shared/css/conversation.css">
  </head>
   <body onload="loop.conversation.init();">
+
+    <div id="messages"></div>
+
     <div id="conversation" class="conversation">
       <div class="media nested">
         <div class="remote">
@@ -20,6 +23,8 @@
         </div>
       </div>
     </div>
+
+    <script type="text/javascript" src="libs/l10n.js"></script>
     <script type="text/javascript" src="shared/libs/sdk.js"></script>
     <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index 64331a3bc2ef..decf6ea1232f 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -2,15 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/*global loop*/
+/* global loop:true */
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
-loop.conversation = (function(TB) {
+loop.conversation = (function(TB, mozl10n) {
   "use strict";
 
-  var baseServerUrl = Services.prefs.getCharPref("loop.server");
+  var baseServerUrl = Services.prefs.getCharPref("loop.server"),
+      // aliasing translation function as __ for concision
+      __ = mozl10n.get;
 
   /**
    * App router.
@@ -24,9 +26,17 @@ loop.conversation = (function(TB) {
    */
   var conversation;
 
+  /**
+   * Conversation router.
+   *
+   * Required options:
+   * - {loop.shared.models.ConversationModel} conversation Conversation model.
+   * - {loop.shared.components.Notifier}      notifier     Notifier component.
+   */
   var ConversationRouter = loop.shared.router.BaseRouter.extend({
     _conversation: undefined,
-    activeView: undefined,
+    _notifier:     undefined,
+    activeView:    undefined,
 
     routes: {
       "start/:version": "start",
@@ -53,6 +63,11 @@ loop.conversation = (function(TB) {
       }
       this._conversation = options.conversation;
 
+      if (!options.notifier) {
+        throw new Error("missing required notifier");
+      }
+      this._notifier = options.notifier;
+
       this.listenTo(this._conversation, "session:ready", this._onSessionReady);
       this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
     },
@@ -97,6 +112,7 @@ loop.conversation = (function(TB) {
         // XXX: notify user that something has gone wrong.
         console.error("Error: navigated to conversation route without " +
           "the start route to initialise the call first");
+        this._notifier.notify(__("cannot_start_call_session_not_ready"));
         return;
       }
 
@@ -121,7 +137,12 @@ loop.conversation = (function(TB) {
    */
   function init() {
     conversation = new loop.shared.models.ConversationModel();
-    router = new ConversationRouter({conversation: conversation});
+    router = new ConversationRouter({
+      conversation: conversation,
+      notifier: new loop.shared.views.NotificationListView({
+        el: "#messages"
+      })
+    });
     Backbone.history.start();
   }
 
@@ -129,4 +150,4 @@ loop.conversation = (function(TB) {
     ConversationRouter: ConversationRouter,
     init: init
   };
-})(window.TB);
+})(window.TB, document.mozL10n);
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index dc9353007ec6..9f8654035f2a 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -2,91 +2,23 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/*global loop*/
+/* global loop:true */
+
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
-loop.panel = (function(_, __) {
+loop.panel = (function(TB, mozl10n) {
   "use strict";
 
   var baseServerUrl = Services.prefs.getCharPref("loop.server"),
-      panelView;
-
-  /**
-   * Panel initialisation.
-   */
-  function init() {
-    panelView = new PanelView();
-    panelView.render();
-  }
-
-  /**
-   * Notification model.
-   */
-  var NotificationModel = Backbone.Model.extend({
-    defaults: {
-      level: "info",
-      message: ""
-    }
-  });
-
-  /**
-   * Notification collection
-   */
-  var NotificationCollection = Backbone.Collection.extend({
-    model: NotificationModel
-  });
-
-  /**
-   * Notification view.
-   */
-  var NotificationView = Backbone.View.extend({
-    template: _.template([
-      '<div class="alert alert-<%- level %>">',
-      '  <button class="close"></button>',
-      '  <p class="message"><%- message %></p>',
-      '</div>'
-    ].join("")),
-
-    events: {
-      "click .close": "dismiss"
-    },
-
-    dismiss: function() {
-      this.$el.addClass("fade-out");
-      setTimeout(function() {
-        this.collection.remove(this.model);
-        this.remove();
-      }.bind(this), 500);
-    },
-
-    render: function() {
-      this.$el.html(this.template(this.model.toJSON()));
-      return this;
-    }
-  });
-
-  /**
-   * Notification list view.
-   */
-  var NotificationListView = Backbone.View.extend({
-    initialize: function() {
-      this.listenTo(this.collection, "reset add remove", this.render);
-    },
-
-    render: function() {
-      this.$el.html(this.collection.map(function(notification) {
-        return new NotificationView({
-          model: notification,
-          collection: this.collection
-        }).render().$el;
-      }.bind(this)));
-      return this;
-    }
-  });
+      panelView,
+      // aliasing translation function as __ for concision
+      __ = mozl10n.get;
 
   /**
    * Panel view.
+   *
+   * XXX view layout changes should be handled by a router really.
    */
   var PanelView = Backbone.View.extend({
     el: "#default-view",
@@ -101,19 +33,9 @@ loop.panel = (function(_, __) {
       this.client = new loop.shared.Client({
         baseServerUrl: baseServerUrl
       });
-      this.notificationCollection = new NotificationCollection();
-      this.notificationListView = new NotificationListView({
-        el: this.$(".messages"),
-        collection: this.notificationCollection
-      });
-      this.notificationListView.render();
-    },
-
-    notify: function(message, level) {
-      this.notificationCollection.add({
-        level: level || "info",
-        message: message
-      });
+      this.notifier = new loop.shared.views.NotificationListView({
+        el: this.$(".messages")
+      }).render();
     },
 
     getCallUrl: function(event) {
@@ -121,7 +43,10 @@ loop.panel = (function(_, __) {
       var nickname = this.$("input[name=caller]").val();
       var callback = function(err, callUrl) {
         if (err) {
-          this.notify(__("unable_retrieve_url"), "error");
+          this.notifier.notify({
+            message: __("unable_retrieve_url"),
+            level: "error"
+          });
           return;
         }
         this.onCallUrlReceived(callUrl);
@@ -137,7 +62,7 @@ loop.panel = (function(_, __) {
     },
 
     onCallUrlReceived: function(callUrl) {
-      this.notificationCollection.reset();
+      this.notifier.clear();
       this.$(".action .invite").hide();
       this.$(".action .invite input").val("");
       this.$(".action .result input").val(callUrl);
@@ -154,12 +79,16 @@ loop.panel = (function(_, __) {
     }
   });
 
+  /**
+   * Panel initialisation.
+   */
+  function init() {
+    panelView = new PanelView();
+    panelView.render();
+  }
+
   return {
     init: init,
-    NotificationModel: NotificationModel,
-    NotificationCollection: NotificationCollection,
-    NotificationView: NotificationView,
-    NotificationListView: NotificationListView,
     PanelView: PanelView
   };
-})(_, document.mozL10n.get);
+})(_, document.mozL10n);
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index 5401f9aaf747..99dd6a3cbc72 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -45,6 +45,8 @@
     <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
     <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
     <script type="text/javascript" src="shared/js/client.js"></script>
+    <script type="text/javascript" src="shared/js/models.js"></script>
+    <script type="text/javascript" src="shared/js/views.js"></script>
     <script type="text/javascript" src="js/panel.js"></script>
   </body>
 </html>
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 317792b15feb..52033e0d741a 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -10,10 +10,12 @@ describe("loop.conversation", function() {
   "use strict";
 
   var ConversationRouter = loop.conversation.ConversationRouter,
-      sandbox;
+      sandbox,
+      notifier;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
+    notifier = {notify: sandbox.spy()};
   });
 
   afterEach(function() {
@@ -33,13 +35,22 @@ describe("loop.conversation", function() {
           new ConversationRouter();
         }).to.Throw(Error, /missing required conversation/);
       });
+
+      it("should require a notifier", function() {
+        expect(function() {
+          new ConversationRouter({conversation: conversation});
+        }).to.Throw(Error, /missing required notifier/);
+      });
     });
 
     describe("Routes", function() {
       var router;
 
       beforeEach(function() {
-        router = new ConversationRouter({conversation: conversation});
+        router = new ConversationRouter({
+          conversation: conversation,
+          notifier: notifier
+        });
         sandbox.stub(router, "loadView");
       });
 
@@ -83,6 +94,13 @@ describe("loop.conversation", function() {
 
             sinon.assert.notCalled(router.loadView);
         });
+
+        it("should notify the user when session is not set",
+          function() {
+            router.conversation();
+
+            sinon.assert.calledOnce(router._notifier.notify);
+        });
       });
 
       describe("#ended", function() {
@@ -113,7 +131,8 @@ describe("loop.conversation", function() {
         function() {
           sandbox.stub(ConversationRouter.prototype, "navigate");
           var router = new ConversationRouter({
-            conversation: conversation
+            conversation: conversation,
+            notifier: notifier
           });
 
           conversation.setReady(fakeSessionData);
@@ -126,7 +145,8 @@ describe("loop.conversation", function() {
         function() {
           sandbox.stub(ConversationRouter.prototype, "navigate");
           var router = new ConversationRouter({
-            conversation: conversation
+            conversation: conversation,
+            notifier: notifier
           });
 
           conversation.trigger("session:ended");
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 5e09b3e6a706..4f0d79ed0733 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -26,61 +26,6 @@ describe("loop.panel", function() {
     sandbox.restore();
   });
 
-  describe("loop.panel.NotificationView", function() {
-    describe("#render", function() {
-      it("should render template with model attribute values", function() {
-        var view = new loop.panel.NotificationView({
-          el: $("#fixtures"),
-          model: new loop.panel.NotificationModel({
-            level: "error",
-            message: "plop"
-          })
-        });
-
-        view.render();
-
-        expect(view.$(".message").text()).eql("plop");
-      });
-    });
-  });
-
-  describe("loop.panel.NotificationListView", function() {
-    describe("Collection events", function() {
-      var coll, testNotif, view;
-
-      beforeEach(function() {
-        sandbox.stub(loop.panel.NotificationListView.prototype, "render");
-        testNotif = new loop.panel.NotificationModel({
-          level: "error",
-          message: "plop"
-        });
-        coll = new loop.panel.NotificationCollection();
-        view = new loop.panel.NotificationListView({collection: coll});
-      });
-
-      it("should render on notification added to the collection", function() {
-        coll.add(testNotif);
-
-        sinon.assert.calledOnce(view.render);
-      });
-
-      it("should render on notification removed from the collection",
-        function() {
-          coll.add(testNotif);
-          coll.remove(testNotif);
-
-          sinon.assert.calledTwice(view.render);
-        });
-
-      it("should render on collection reset",
-        function() {
-          coll.reset();
-
-          sinon.assert.calledOnce(view.render);
-        });
-    });
-  });
-
   describe("loop.panel.PanelView", function() {
     beforeEach(function() {
       $("#fixtures").append([
@@ -104,7 +49,7 @@ describe("loop.panel", function() {
       ].join(""));
     });
 
-    describe("#getCallurl", function() {
+    describe("#getCallUrl", function() {
       it("should request a call url to the server", function() {
         var requestCallUrl = sandbox.stub(loop.shared.Client.prototype,
                                           "requestCallUrl");
@@ -115,6 +60,20 @@ describe("loop.panel", function() {
         sinon.assert.calledOnce(requestCallUrl);
         sinon.assert.calledWith(requestCallUrl, "foo");
       });
+
+      it("should notify the user when the operation failed", function() {
+        var requestCallUrl = sandbox.stub(
+          loop.shared.Client.prototype, "requestCallUrl", function(_, cb) {
+            cb("fake error");
+          });
+        var view = new loop.panel.PanelView();
+        sandbox.stub(view.notifier, "notify");
+
+        view.getCallUrl({preventDefault: sandbox.spy()});
+
+        sinon.assert.calledOnce(view.notifier.notify);
+        sinon.assert.calledWithMatch(view.notifier.notify, {level: "error"});
+      });
     });
 
     describe("#onCallUrlReceived", function() {
@@ -126,6 +85,15 @@ describe("loop.panel", function() {
 
         expect(view.$("#call-url").val()).eql("http://call.me/");
       });
+
+      it("should reset all pending notifications", function() {
+        var view = new loop.panel.PanelView().render();
+        sandbox.stub(view.notifier, "clear");
+
+        view.onCallUrlReceived("http://call.me/");
+
+        sinon.assert.calledOnce(view.notifier.clear, "clear");
+      });
     });
   });
 });
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 091d3625fdab..0f4b1f732189 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -4,3 +4,4 @@ new_url=New url
 unable_retrieve_url=Sorry, we were unable to retrieve a call url.
 share_link_url=Share the link below with your friend to start your call!
 caller.placeholder=Identify this call
+cannot_start_call_session_not_ready=Can't start call, session is not ready.

From 1f2077974af92689d6314132da01aa2594062251 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Thu, 29 May 2014 21:13:43 +0100
Subject: [PATCH 013/117] Bug 972019: Terminate a call. r=Standard8

---
 .../components/loop/content/conversation.html |  4 ++
 .../loop/content/js/conversation.js           | 66 ++++++++++++-------
 browser/components/loop/content/js/panel.js   |  6 +-
 .../test/desktop-local/conversation_test.js   | 56 +++++++++++-----
 .../loop/test/desktop-local/index.html        |  2 +-
 .../en-US/chrome/browser/loop/loop.properties |  3 +
 6 files changed, 95 insertions(+), 42 deletions(-)

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index 7c4d525282aa..a380036b8ec3 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -14,6 +14,9 @@
     <div id="messages"></div>
 
     <div id="conversation" class="conversation">
+      <nav class="controls">
+        <button class="btn stop" data-l10n-id="stop"></button>
+      </nav>
       <div class="media nested">
         <div class="remote">
           <div id="incoming"></div>
@@ -24,6 +27,7 @@
       </div>
     </div>
 
+    <script type="text/javascript" src="js/fxcom.js"></script>
     <script type="text/javascript" src="libs/l10n.js"></script>
     <script type="text/javascript" src="shared/libs/sdk.js"></script>
     <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index decf6ea1232f..a7848dffe644 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -7,12 +7,13 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
-loop.conversation = (function(TB, mozl10n) {
+loop.conversation = (function(TB, mozL10n) {
   "use strict";
 
-  var baseServerUrl = Services.prefs.getCharPref("loop.server"),
+  var sharedViews = loop.shared.views,
+      baseServerUrl = Services.prefs.getCharPref("loop.server"),
       // aliasing translation function as __ for concision
-      __ = mozl10n.get;
+      __ = mozL10n.get;
 
   /**
    * App router.
@@ -34,9 +35,17 @@ loop.conversation = (function(TB, mozl10n) {
    * - {loop.shared.components.Notifier}      notifier     Notifier component.
    */
   var ConversationRouter = loop.shared.router.BaseRouter.extend({
+    /**
+     * Current conversation.
+     * @type {loop.shared.models.ConversationModel}
+     */
     _conversation: undefined,
-    _notifier:     undefined,
-    activeView:    undefined,
+
+    /**
+     * Notifications dispatcher.
+     * @type {loop.shared.views.NotificationListView}
+     */
+    _notifier: undefined,
 
     routes: {
       "start/:version": "start",
@@ -44,18 +53,6 @@ loop.conversation = (function(TB, mozl10n) {
       "call/ended": "ended"
     },
 
-    /**
-     * Loads and render current active view.
-     *
-     * @param {loop.shared.BaseView} view View.
-     */
-    loadView : function(view) {
-      if (this.activeView) {
-        this.activeView.hide();
-      }
-      this.activeView = view.render().show();
-    },
-
     initialize: function(options) {
       options = options || {};
       if (!options.conversation) {
@@ -70,6 +67,9 @@ loop.conversation = (function(TB, mozl10n) {
 
       this.listenTo(this._conversation, "session:ready", this._onSessionReady);
       this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
+      this.listenTo(this._conversation, "session:peer-hung", this._onPeerHung);
+      this.listenTo(this._conversation, "session:network-disconnected",
+                                        this._onNetworkDisconnected);
     },
 
     /**
@@ -80,12 +80,35 @@ loop.conversation = (function(TB, mozl10n) {
     },
 
     /**
-     * Navigates to ended state when the call has ended
+     * Navigates to ended state when the call has ended.
      */
     _onSessionEnded: function() {
       this.navigate("call/ended", {trigger: true});
     },
 
+    /**
+     * Peer hung up. Navigates back to call initiation so the user can start
+     * calling again.
+     *
+     * Event properties:
+     * - {String} connectionId: OT session id
+     *
+     * @param {Object} event
+     */
+    _onPeerHung: function(event) {
+      this._notifier.warn(__("peer_ended_conversation"));
+      this.navigate("call/ended", {trigger: true});
+    },
+
+    /**
+     * Network disconnected. Navigates back to call initiation so the user can
+     * start calling again.
+     */
+    _onNetworkDisconnected: function() {
+      this._notifier.warn(__("network_disconnected"));
+      this.navigate("call/ended", {trigger: true});
+    },
+
     /**
      * start is the initial route that does any necessary prompting and set
      * up for the call.
@@ -109,10 +132,9 @@ loop.conversation = (function(TB, mozl10n) {
      */
     conversation: function() {
       if (!this._conversation.isSessionReady()) {
-        // XXX: notify user that something has gone wrong.
         console.error("Error: navigated to conversation route without " +
           "the start route to initialise the call first");
-        this._notifier.notify(__("cannot_start_call_session_not_ready"));
+        this._notifier.error(__("cannot_start_call_session_not_ready"));
         return;
       }
 
@@ -139,9 +161,7 @@ loop.conversation = (function(TB, mozl10n) {
     conversation = new loop.shared.models.ConversationModel();
     router = new ConversationRouter({
       conversation: conversation,
-      notifier: new loop.shared.views.NotificationListView({
-        el: "#messages"
-      })
+      notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
   }
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 9f8654035f2a..1e46caf09461 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -7,13 +7,13 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
-loop.panel = (function(TB, mozl10n) {
+loop.panel = (function(mozL10n) {
   "use strict";
 
   var baseServerUrl = Services.prefs.getCharPref("loop.server"),
       panelView,
       // aliasing translation function as __ for concision
-      __ = mozl10n.get;
+      __ = mozL10n.get;
 
   /**
    * Panel view.
@@ -91,4 +91,4 @@ loop.panel = (function(TB, mozl10n) {
     init: init,
     PanelView: PanelView
   };
-})(_, document.mozL10n);
+})(document.mozL10n);
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 52033e0d741a..42c97df96227 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -15,7 +15,11 @@ describe("loop.conversation", function() {
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
-    notifier = {notify: sandbox.spy()};
+    notifier = {
+      notify: sandbox.spy(),
+      warn: sandbox.spy(),
+      error: sandbox.spy()
+    };
   });
 
   afterEach(function() {
@@ -99,7 +103,7 @@ describe("loop.conversation", function() {
           function() {
             router.conversation();
 
-            sinon.assert.calledOnce(router._notifier.notify);
+            sinon.assert.calledOnce(router._notifier.error);
         });
       });
 
@@ -117,7 +121,7 @@ describe("loop.conversation", function() {
     });
 
     describe("Events", function() {
-      var fakeSessionData;
+      var router, fakeSessionData;
 
       beforeEach(function() {
         fakeSessionData = {
@@ -125,16 +129,17 @@ describe("loop.conversation", function() {
           sessionToken: "sessionToken",
           apiKey:       "apiKey"
         };
+        sandbox.stub(loop.conversation.ConversationRouter.prototype,
+                     "navigate");
+        conversation.set("loopToken", "fakeToken");
+        router = new loop.conversation.ConversationRouter({
+          conversation: conversation,
+          notifier: notifier
+        });
       });
 
       it("should navigate to call/ongoing once the call session is ready",
         function() {
-          sandbox.stub(ConversationRouter.prototype, "navigate");
-          var router = new ConversationRouter({
-            conversation: conversation,
-            notifier: notifier
-          });
-
           conversation.setReady(fakeSessionData);
 
           sinon.assert.calledOnce(router.navigate);
@@ -143,14 +148,35 @@ describe("loop.conversation", function() {
 
       it("should navigate to call/ended when the call session ends",
         function() {
-          sandbox.stub(ConversationRouter.prototype, "navigate");
-          var router = new ConversationRouter({
-            conversation: conversation,
-            notifier: notifier
-          });
-
           conversation.trigger("session:ended");
 
+          sinon.assert.calledOnce(router.navigate);
+          sinon.assert.calledWith(router.navigate, "call/ended");
+        });
+
+      it("should warn the user when peer hangs up", function() {
+        conversation.trigger("session:peer-hung");
+
+        sinon.assert.calledOnce(notifier.warn);
+      });
+
+      it("should navigate to call/ended when peer hangs up", function() {
+        conversation.trigger("session:peer-hung");
+
+        sinon.assert.calledOnce(router.navigate);
+        sinon.assert.calledWith(router.navigate, "call/ended");
+      });
+
+      it("should warn the user when network disconnects", function() {
+        conversation.trigger("session:network-disconnected");
+
+        sinon.assert.calledOnce(notifier.warn);
+      });
+
+      it("should navigate to call/{token} when network disconnects",
+        function() {
+          conversation.trigger("session:network-disconnected");
+
           sinon.assert.calledOnce(router.navigate);
           sinon.assert.calledWith(router.navigate, "call/ended");
         });
diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index 401b92ab4fac..718fd74e8b44 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -10,7 +10,7 @@
 </head>
 <body>
   <div id="mocha">
-    <p><a href=".">Index</a></p>
+    <p><a href="../">Index</a></p>
   </div>
   <div id="messages"></div>
   <div id="fixtures"></div>
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 0f4b1f732189..15a4bf673dcf 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -5,3 +5,6 @@ unable_retrieve_url=Sorry, we were unable to retrieve a call url.
 share_link_url=Share the link below with your friend to start your call!
 caller.placeholder=Identify this call
 cannot_start_call_session_not_ready=Can't start call, session is not ready.
+network_disconnected=The network connection terminated abruptly.
+peer_ended_conversation=Your peer ended the conversation.
+stop=Stop

From 7ea875c3f642fd9a1ac8470a4807300cfd1f56cd Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:44 +0100
Subject: [PATCH 014/117] Bug 972019 - Shared conversation router logic.
 r=dmose

---
 .../components/loop/content/conversation.html |  4 +
 .../loop/content/js/conversation.js           | 99 ++++++-------------
 .../test/desktop-local/conversation_test.js   | 48 +++------
 .../en-US/chrome/browser/loop/loop.properties |  2 +
 4 files changed, 49 insertions(+), 104 deletions(-)

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index a380036b8ec3..6b9ee672012d 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -27,6 +27,10 @@
       </div>
     </div>
 
+    <div id="call-ended" class="call-ended hide">
+      <p><button class="btn btn-info" data-l10n-id="close_window"></button></p>
+    </div>
+
     <script type="text/javascript" src="js/fxcom.js"></script>
     <script type="text/javascript" src="libs/l10n.js"></script>
     <script type="text/javascript" src="shared/libs/sdk.js"></script>
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index a7848dffe644..0eb8094ea6d7 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -7,7 +7,7 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
-loop.conversation = (function(TB, mozL10n) {
+loop.conversation = (function(OT, mozL10n) {
   "use strict";
 
   var sharedViews = loop.shared.views,
@@ -22,10 +22,22 @@ loop.conversation = (function(TB, mozL10n) {
   var router;
 
   /**
-   * Current conversation model instance.
-   * @type {loop.webapp.ConversationModel}
+   * Call ended view.
+   * @type {loop.shared.views.BaseView}
    */
-  var conversation;
+  var EndedCallView = sharedViews.BaseView.extend({
+    el: "#call-ended",
+
+    events: {
+      "click button": "closeWindow"
+    },
+
+    closeWindow: function(event) {
+      event.preventDefault();
+      // XXX For now, we just close the window.
+      window.close();
+    }
+  });
 
   /**
    * Conversation router.
@@ -33,79 +45,27 @@ loop.conversation = (function(TB, mozL10n) {
    * Required options:
    * - {loop.shared.models.ConversationModel} conversation Conversation model.
    * - {loop.shared.components.Notifier}      notifier     Notifier component.
+   *
+   * @type {loop.shared.router.BaseConversationRouter}
    */
-  var ConversationRouter = loop.shared.router.BaseRouter.extend({
-    /**
-     * Current conversation.
-     * @type {loop.shared.models.ConversationModel}
-     */
-    _conversation: undefined,
-
-    /**
-     * Notifications dispatcher.
-     * @type {loop.shared.views.NotificationListView}
-     */
-    _notifier: undefined,
-
+  var ConversationRouter = loop.shared.router.BaseConversationRouter.extend({
     routes: {
       "start/:version": "start",
       "call/ongoing": "conversation",
       "call/ended": "ended"
     },
 
-    initialize: function(options) {
-      options = options || {};
-      if (!options.conversation) {
-        throw new Error("missing required conversation");
-      }
-      this._conversation = options.conversation;
-
-      if (!options.notifier) {
-        throw new Error("missing required notifier");
-      }
-      this._notifier = options.notifier;
-
-      this.listenTo(this._conversation, "session:ready", this._onSessionReady);
-      this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
-      this.listenTo(this._conversation, "session:peer-hung", this._onPeerHung);
-      this.listenTo(this._conversation, "session:network-disconnected",
-                                        this._onNetworkDisconnected);
-    },
-
     /**
-     * Navigates to conversation when the call session is ready.
+     * @override {loop.shared.router.BaseConversationRouter.startCall}
      */
-    _onSessionReady: function() {
+    startCall: function() {
       this.navigate("call/ongoing", {trigger: true});
     },
 
     /**
-     * Navigates to ended state when the call has ended.
+     * @override {loop.shared.router.BaseConversationRouter.endCall}
      */
-    _onSessionEnded: function() {
-      this.navigate("call/ended", {trigger: true});
-    },
-
-    /**
-     * Peer hung up. Navigates back to call initiation so the user can start
-     * calling again.
-     *
-     * Event properties:
-     * - {String} connectionId: OT session id
-     *
-     * @param {Object} event
-     */
-    _onPeerHung: function(event) {
-      this._notifier.warn(__("peer_ended_conversation"));
-      this.navigate("call/ended", {trigger: true});
-    },
-
-    /**
-     * Network disconnected. Navigates back to call initiation so the user can
-     * start calling again.
-     */
-    _onNetworkDisconnected: function() {
-      this._notifier.warn(__("network_disconnected"));
+    endCall: function() {
       this.navigate("call/ended", {trigger: true});
     },
 
@@ -140,17 +100,16 @@ loop.conversation = (function(TB, mozL10n) {
 
       this.loadView(
         new loop.shared.views.ConversationView({
-          sdk: TB,
+          sdk: OT,
           model: this._conversation
       }));
     },
 
     /**
-     * ended does any necessary work to end the call.
+     * XXX: load a view with a close button for now?
      */
     ended: function() {
-      // XXX Later we implement the end-of call here (bug 974873)
-      window.close();
+      this.loadView(new EndedCallView());
     }
   });
 
@@ -158,9 +117,8 @@ loop.conversation = (function(TB, mozL10n) {
    * Panel initialisation.
    */
   function init() {
-    conversation = new loop.shared.models.ConversationModel();
     router = new ConversationRouter({
-      conversation: conversation,
+      conversation: new loop.shared.models.ConversationModel(),
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
@@ -168,6 +126,7 @@ loop.conversation = (function(TB, mozL10n) {
 
   return {
     ConversationRouter: ConversationRouter,
+    EndedCallView: EndedCallView,
     init: init
   };
-})(window.TB, document.mozL10n);
+})(window.OT, document.mozL10n);
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 42c97df96227..025d58f1aa83 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -33,20 +33,6 @@ describe("loop.conversation", function() {
       conversation = new loop.shared.models.ConversationModel();
     });
 
-    describe("#constructor", function() {
-      it("should require a ConversationModel instance", function() {
-        expect(function() {
-          new ConversationRouter();
-        }).to.Throw(Error, /missing required conversation/);
-      });
-
-      it("should require a notifier", function() {
-        expect(function() {
-          new ConversationRouter({conversation: conversation});
-        }).to.Throw(Error, /missing required notifier/);
-      });
-    });
-
     describe("Routes", function() {
       var router;
 
@@ -110,13 +96,7 @@ describe("loop.conversation", function() {
       describe("#ended", function() {
         // XXX When the call is ended gracefully, we should check that we
         // close connections nicely
-        it("should close the window", function() {
-          sandbox.stub(window, "close");
-
-          router.ended();
-
-          sinon.assert.calledOnce(window.close);
-        });
+        it("should close the window");
       });
     });
 
@@ -154,25 +134,13 @@ describe("loop.conversation", function() {
           sinon.assert.calledWith(router.navigate, "call/ended");
         });
 
-      it("should warn the user when peer hangs up", function() {
-        conversation.trigger("session:peer-hung");
-
-        sinon.assert.calledOnce(notifier.warn);
-      });
-
       it("should navigate to call/ended when peer hangs up", function() {
-        conversation.trigger("session:peer-hung");
+        conversation.trigger("session:peer-hungup");
 
         sinon.assert.calledOnce(router.navigate);
         sinon.assert.calledWith(router.navigate, "call/ended");
       });
 
-      it("should warn the user when network disconnects", function() {
-        conversation.trigger("session:network-disconnected");
-
-        sinon.assert.calledOnce(notifier.warn);
-      });
-
       it("should navigate to call/{token} when network disconnects",
         function() {
           conversation.trigger("session:network-disconnected");
@@ -181,6 +149,18 @@ describe("loop.conversation", function() {
           sinon.assert.calledWith(router.navigate, "call/ended");
         });
     });
+  });
 
+  describe("EndedCallView", function() {
+    describe("#closeWindow", function() {
+      it("should close the conversation window", function() {
+        sandbox.stub(window, "close");
+        var view = new loop.conversation.EndedCallView();
+
+        view.closeWindow({preventDefault: sandbox.spy()});
+
+        sinon.assert.calledOnce(window.close);
+      });
+    });
   });
 });
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 15a4bf673dcf..947bfb1b40df 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -8,3 +8,5 @@ cannot_start_call_session_not_ready=Can't start call, session is not ready.
 network_disconnected=The network connection terminated abruptly.
 peer_ended_conversation=Your peer ended the conversation.
 stop=Stop
+call_has_ended=Your call has ended.
+close_window=Close this window

From a5bfc7fd746600d8b5bf1d5bcf9854bd6a707eb5 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:44 +0100
Subject: [PATCH 015/117] Bug 996526 - Backbone views to carry their own
 templates. r=dmose

---
 .../components/loop/content/conversation.html  | 18 +-----------------
 .../components/loop/content/js/conversation.js |  8 +++++++-
 .../test/desktop-local/conversation_test.js    |  6 +++---
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index 6b9ee672012d..d6abd8510f0b 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -13,23 +13,7 @@
 
     <div id="messages"></div>
 
-    <div id="conversation" class="conversation">
-      <nav class="controls">
-        <button class="btn stop" data-l10n-id="stop"></button>
-      </nav>
-      <div class="media nested">
-        <div class="remote">
-          <div id="incoming"></div>
-        </div>
-        <div class="local">
-          <div id="outgoing"></div>
-        </div>
-      </div>
-    </div>
-
-    <div id="call-ended" class="call-ended hide">
-      <p><button class="btn btn-info" data-l10n-id="close_window"></button></p>
-    </div>
+    <div id="main"></div>
 
     <script type="text/javascript" src="js/fxcom.js"></script>
     <script type="text/javascript" src="libs/l10n.js"></script>
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index 0eb8094ea6d7..ab9cd8bc8644 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -26,7 +26,13 @@ loop.conversation = (function(OT, mozL10n) {
    * @type {loop.shared.views.BaseView}
    */
   var EndedCallView = sharedViews.BaseView.extend({
-    el: "#call-ended",
+    template: _.template([
+      '<p>',
+      '  <button class="btn btn-info" data-l10n-id="close_window"></button>',
+      '</p>'
+    ].join("")),
+
+    className: "call-ended",
 
     events: {
       "click button": "closeWindow"
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 025d58f1aa83..8f1c7e4ed3cb 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -73,9 +73,9 @@ describe("loop.conversation", function() {
           router.conversation();
 
           sinon.assert.calledOnce(router.loadView);
-          sinon.assert.calledWithMatch(router.loadView, {
-            $el: {selector: "#conversation"}
-          });
+          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
+            return obj instanceof loop.shared.views.ConversationView;
+          }));
         });
 
         it("should not load the ConversationView if session is not set",

From c72772c6cf8fe5e19b311d34a5abfb0cb2862288 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:44 +0100
Subject: [PATCH 016/117] Bug 991118 - Going back should terminate call
 session, r=dmose

---
 browser/components/loop/content/js/conversation.js              | 2 +-
 browser/components/loop/test/desktop-local/conversation_test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index ab9cd8bc8644..195cae29cf6f 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -124,7 +124,7 @@ loop.conversation = (function(OT, mozL10n) {
    */
   function init() {
     router = new ConversationRouter({
-      conversation: new loop.shared.models.ConversationModel(),
+      conversation: new loop.shared.models.ConversationModel({}, {sdk: OT}),
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 8f1c7e4ed3cb..9f5c6d347fd4 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -30,7 +30,7 @@ describe("loop.conversation", function() {
     var conversation;
 
     beforeEach(function() {
-      conversation = new loop.shared.models.ConversationModel();
+      conversation = new loop.shared.models.ConversationModel({}, {sdk: {}});
     });
 
     describe("Routes", function() {

From c5b2043d0d7f8525d448b896b4b4e77541723a40 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:44 +0100
Subject: [PATCH 017/117] Bug 998271 - L10n notifications, r=dmose

---
 browser/components/loop/content/js/conversation.js  |  2 +-
 browser/components/loop/content/js/panel.js         |  5 +----
 .../loop/test/desktop-local/conversation_test.js    | 13 ++++++++-----
 .../loop/test/desktop-local/panel_test.js           |  7 ++++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index 195cae29cf6f..bd7bb36eeadf 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -100,7 +100,7 @@ loop.conversation = (function(OT, mozL10n) {
       if (!this._conversation.isSessionReady()) {
         console.error("Error: navigated to conversation route without " +
           "the start route to initialise the call first");
-        this._notifier.error(__("cannot_start_call_session_not_ready"));
+        this._notifier.errorL10n("cannot_start_call_session_not_ready");
         return;
       }
 
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 1e46caf09461..e536a8d3215f 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -43,10 +43,7 @@ loop.panel = (function(mozL10n) {
       var nickname = this.$("input[name=caller]").val();
       var callback = function(err, callUrl) {
         if (err) {
-          this.notifier.notify({
-            message: __("unable_retrieve_url"),
-            level: "error"
-          });
+          this.notifier.errorL10n("unable_retrieve_url");
           return;
         }
         this.onCallUrlReceived(callUrl);
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 9f5c6d347fd4..8bcca0bcb76c 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -18,7 +18,9 @@ describe("loop.conversation", function() {
     notifier = {
       notify: sandbox.spy(),
       warn: sandbox.spy(),
-      error: sandbox.spy()
+      warnL10n: sandbox.spy(),
+      error: sandbox.spy(),
+      errorL10n: sandbox.spy()
     };
   });
 
@@ -73,9 +75,8 @@ describe("loop.conversation", function() {
           router.conversation();
 
           sinon.assert.calledOnce(router.loadView);
-          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
-            return obj instanceof loop.shared.views.ConversationView;
-          }));
+          sinon.assert.calledWith(router.loadView,
+            sinon.match.instanceOf(loop.shared.views.ConversationView));
         });
 
         it("should not load the ConversationView if session is not set",
@@ -89,7 +90,9 @@ describe("loop.conversation", function() {
           function() {
             router.conversation();
 
-            sinon.assert.calledOnce(router._notifier.error);
+            sinon.assert.calledOnce(router._notifier.errorL10n);
+            sinon.assert.calledWithExactly(router._notifier.errorL10n,
+              "cannot_start_call_session_not_ready");
         });
       });
 
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 4f0d79ed0733..b2310f0c820f 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -67,12 +67,13 @@ describe("loop.panel", function() {
             cb("fake error");
           });
         var view = new loop.panel.PanelView();
-        sandbox.stub(view.notifier, "notify");
+        sandbox.stub(view.notifier, "errorL10n");
 
         view.getCallUrl({preventDefault: sandbox.spy()});
 
-        sinon.assert.calledOnce(view.notifier.notify);
-        sinon.assert.calledWithMatch(view.notifier.notify, {level: "error"});
+        sinon.assert.calledOnce(view.notifier.errorL10n);
+        sinon.assert.calledWithExactly(view.notifier.errorL10n,
+                                       "unable_retrieve_url");
       });
     });
 

From 3ff57ae89e03024705ff8d9d9d7abf4e95253f13 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:45 +0100
Subject: [PATCH 018/117] Bug 999480 - Panel to use a router & templated views,
 r=Standard8

---
 browser/components/loop/content/js/panel.js   | 73 ++++++++++++++-----
 browser/components/loop/content/panel.html    | 29 ++------
 .../loop/test/desktop-local/panel_test.js     | 70 +++++++++++-------
 3 files changed, 106 insertions(+), 66 deletions(-)

diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index e536a8d3215f..e441c5df9863 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -7,21 +7,42 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 var loop = loop || {};
-loop.panel = (function(mozL10n) {
+loop.panel = (function(_, mozL10n) {
   "use strict";
 
   var baseServerUrl = Services.prefs.getCharPref("loop.server"),
-      panelView,
+      sharedViews = loop.shared.views,
       // aliasing translation function as __ for concision
       __ = mozL10n.get;
 
   /**
-   * Panel view.
-   *
-   * XXX view layout changes should be handled by a router really.
+   * Panel router.
+   * @type {loop.shared.router.BaseRouter}
    */
-  var PanelView = Backbone.View.extend({
-    el: "#default-view",
+  var router;
+
+  /**
+   * Panel view.
+   */
+  var PanelView = sharedViews.BaseView.extend({
+    template: _.template([
+      '<div class="description">',
+      '  <p data-l10n-id="get_link_to_share"></p>',
+      '</div>',
+      '<div class="action">',
+      '  <p class="invite">',
+      '    <input type="text" name="caller" data-l10n-id="caller">',
+      '    <a class="get-url btn btn-success disabled" href=""',
+      '       data-l10n-id="get_a_call_url"></a>',
+      '  </p>',
+      '  <p class="result hide">',
+      '    <input id="call-url" type="url" readonly>',
+      '    <a class="go-back btn btn-info" href="" data-l10n-id="new_url"></a>',
+      '  </p>',
+      '</div>',
+    ].join("")),
+
+    className: "share generate-url",
 
     events: {
       "keyup input[name=caller]": "changeButtonState",
@@ -29,18 +50,23 @@ loop.panel = (function(mozL10n) {
       "click a.go-back": "goBack"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+      options = options || {};
+      if (!options.notifier) {
+        throw new Error("missing required notifier");
+      }
+      this.notifier = options.notifier;
       this.client = new loop.shared.Client({
         baseServerUrl: baseServerUrl
       });
-      this.notifier = new loop.shared.views.NotificationListView({
-        el: this.$(".messages")
-      }).render();
+    },
+
+    getNickname: function() {
+      return this.$("input[name=caller]").val();
     },
 
     getCallUrl: function(event) {
       event.preventDefault();
-      var nickname = this.$("input[name=caller]").val();
       var callback = function(err, callUrl) {
         if (err) {
           this.notifier.errorL10n("unable_retrieve_url");
@@ -49,7 +75,7 @@ loop.panel = (function(mozL10n) {
         this.onCallUrlReceived(callUrl);
       }.bind(this);
 
-      this.client.requestCallUrl(nickname, callback);
+      this.client.requestCallUrl(this.getNickname(), callback);
     },
 
     goBack: function(event) {
@@ -76,16 +102,29 @@ loop.panel = (function(mozL10n) {
     }
   });
 
+  var PanelRouter = loop.shared.router.BaseRouter.extend({
+    routes: {
+      "": "home"
+    },
+
+    home: function() {
+      this.loadView(new PanelView({notifier: this._notifier}));
+    }
+  });
+
   /**
    * Panel initialisation.
    */
   function init() {
-    panelView = new PanelView();
-    panelView.render();
+    router = new PanelRouter({
+      notifier: new sharedViews.NotificationListView({el: "#messages"})
+    });
+    Backbone.history.start();
   }
 
   return {
     init: init,
-    PanelView: PanelView
+    PanelView: PanelView,
+    PanelRouter: PanelRouter
   };
-})(document.mozL10n);
+})(_, document.mozL10n);
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index 99dd6a3cbc72..42a23b91ec39 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -9,29 +9,11 @@
     <link rel="stylesheet" type="text/css" href="shared/css/common.css">
     <link rel="stylesheet" type="text/css" href="shared/css/panel.css">
   </head>
-  <body onload="loop.panel.init();">
-    <!-- XXX (n1k0): i10n tbd later as these are temporary texts. -->
-    <div id="default-view" class="share generate-url">
-      <div class="description">
-        <p data-l10n-id="get_link_to_share">
-          Get a link to share with a friend to Video Chat.
-        </p>
-      </div>
-      <div class="action">
-        <div class="messages"></div>
-        <p class="invite">
-          <input type="text" name="caller" data-l10n-id="caller">
-          <a class="get-url btn btn-success disabled" href=""
-             data-l10n-id="get_a_call_url">Get a call url</a>
-        </p>
-        <p class="result hide">
-          <input id="call-url" type="url" readonly>
-          <a class="go-back btn btn-info" href="" data-l10n-id="new_url">
-            New url
-          </a>
-        </p>
-      </div>
-    </div>
+  <body class="panel" onload="loop.panel.init();">
+
+    <div id="messages"></div>
+
+    <div id="main"></div>
 
     <!-- XXX (adam): Should we import our own version of Webl10n?
          What we have here is a copy of the version from pdf.js
@@ -46,6 +28,7 @@
     <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
     <script type="text/javascript" src="shared/js/client.js"></script>
     <script type="text/javascript" src="shared/js/models.js"></script>
+    <script type="text/javascript" src="shared/js/router.js"></script>
     <script type="text/javascript" src="shared/js/views.js"></script>
     <script type="text/javascript" src="js/panel.js"></script>
   </body>
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index b2310f0c820f..8082d393945c 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -9,7 +9,7 @@ var expect = chai.expect;
 describe("loop.panel", function() {
   "use strict";
 
-  var sandbox, fakeXHR, requests = [];
+  var sandbox, notifier, fakeXHR, requests = [];
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -19,6 +19,14 @@ describe("loop.panel", function() {
     fakeXHR.xhr.onCreate = function (xhr) {
       requests.push(xhr);
     };
+    notifier = {
+      clear: sandbox.spy(),
+      notify: sandbox.spy(),
+      warn: sandbox.spy(),
+      warnL10n: sandbox.spy(),
+      error: sandbox.spy(),
+      errorL10n: sandbox.spy()
+    };
   });
 
   afterEach(function() {
@@ -26,34 +34,46 @@ describe("loop.panel", function() {
     sandbox.restore();
   });
 
+  describe("loop.panel.PanelRouter", function() {
+    describe("#constructor", function() {
+      it("should require a notifier", function() {
+        expect(function() {
+          new loop.panel.PanelRouter();
+        }).to.Throw(Error, /missing required notifier/);
+      });
+    });
+
+    describe("constructed", function() {
+      var router;
+
+      beforeEach(function() {
+        router = new loop.panel.PanelRouter({notifier: notifier});
+        sandbox.stub(router, "loadView");
+      });
+
+      describe("#home", function() {
+        it("should load the PanelView", function() {
+          router.home();
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWithExactly(router.loadView,
+            sinon.match.instanceOf(loop.panel.PanelView));
+        });
+      });
+    });
+  });
+
   describe("loop.panel.PanelView", function() {
     beforeEach(function() {
-      $("#fixtures").append([
-        '<div id="default-view" class="share generate-url">',
-        '  <div class="description">',
-        '    <p>Get a link to share with a friend to Video Chat.</p>',
-        '  </div>',
-        '  <div class="action">',
-        '    <div class="messages"></div>',
-        '    <p class="invite">',
-        '      <input type="text" placeholder="Nickname of the future caller"',
-        '             name="caller" value="foo"/>',
-        '      <a class="get-url" href="">Get a call url</a>',
-        '    </p>',
-        '    <p class="result hide">',
-        '      <input id="call-url" type="url" readonly>',
-        '      <a class="get-url" href="">Renew</a>',
-        '    </p>',
-        '  </div>',
-        '</div>'
-      ].join(""));
+      $("#fixtures").append('<div id="messages"></div><div id="main"></div>');
     });
 
     describe("#getCallUrl", function() {
       it("should request a call url to the server", function() {
         var requestCallUrl = sandbox.stub(loop.shared.Client.prototype,
                                           "requestCallUrl");
-        var view = new loop.panel.PanelView();
+        var view = new loop.panel.PanelView({notifier: notifier});
+        sandbox.stub(view, "getNickname").returns("foo");
 
         view.getCallUrl({preventDefault: sandbox.spy()});
 
@@ -66,8 +86,7 @@ describe("loop.panel", function() {
           loop.shared.Client.prototype, "requestCallUrl", function(_, cb) {
             cb("fake error");
           });
-        var view = new loop.panel.PanelView();
-        sandbox.stub(view.notifier, "errorL10n");
+        var view = new loop.panel.PanelView({notifier: notifier});
 
         view.getCallUrl({preventDefault: sandbox.spy()});
 
@@ -79,7 +98,7 @@ describe("loop.panel", function() {
 
     describe("#onCallUrlReceived", function() {
       it("should update the text field with the call url", function() {
-        var view = new loop.panel.PanelView();
+        var view = new loop.panel.PanelView({notifier: notifier});
         view.render();
 
         view.onCallUrlReceived("http://call.me/");
@@ -88,8 +107,7 @@ describe("loop.panel", function() {
       });
 
       it("should reset all pending notifications", function() {
-        var view = new loop.panel.PanelView().render();
-        sandbox.stub(view.notifier, "clear");
+        var view = new loop.panel.PanelView({notifier: notifier}).render();
 
         view.onCallUrlReceived("http://call.me/");
 

From 49aba128a73d5d2285b0aa5dbb711743d59de5fb Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:45 +0100
Subject: [PATCH 019/117] Bug 994146: panel should be reset when closed,
 r=dmose

---
 browser/components/loop/content/js/panel.js   | 48 +++++++++++
 .../loop/test/desktop-local/panel_test.js     | 83 ++++++++++++++++++-
 2 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index e441c5df9863..6e1859bed37a 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -103,11 +103,58 @@ loop.panel = (function(_, mozL10n) {
   });
 
   var PanelRouter = loop.shared.router.BaseRouter.extend({
+    /**
+     * DOM document object.
+     * @type {HTMLDocument}
+     */
+    document: undefined,
+
     routes: {
       "": "home"
     },
 
+    initialize: function(options) {
+      options = options || {};
+      if (!options.document) {
+        throw new Error("missing required document");
+      }
+      this.document = options.document;
+
+      this._registerVisibilityChangeEvent();
+
+      this.on("panel:open panel:closed", this.reset, this);
+    },
+
+    /**
+     * Register the DOM visibility API event for the whole document, and trigger
+     * appropriate events accordingly:
+     *
+     * - `panel:opened` when the panel is open
+     * - `panel:closed` when the panel is closed
+     *
+     * @link  http://www.w3.org/TR/page-visibility/
+     */
+    _registerVisibilityChangeEvent: function() {
+      this.document.addEventListener("visibilitychange", function(event) {
+        this.trigger(event.currentTarget.hidden ? "panel:closed"
+                                                : "panel:open");
+      }.bind(this));
+    },
+
+    /**
+     * Default entry point.
+     */
     home: function() {
+      this.reset();
+    },
+
+    /**
+     * Resets this router to its initial state.
+     */
+    reset: function() {
+      // purge pending notifications
+      this._notifier.clear();
+      // reset home view
       this.loadView(new PanelView({notifier: this._notifier}));
     }
   });
@@ -117,6 +164,7 @@ loop.panel = (function(_, mozL10n) {
    */
   function init() {
     router = new PanelRouter({
+      document: document,
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 8082d393945c..2c27f626c128 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -11,6 +11,13 @@ describe("loop.panel", function() {
 
   var sandbox, notifier, fakeXHR, requests = [];
 
+  function createTestRouter(fakeDocument) {
+    return new loop.panel.PanelRouter({
+      notifier: notifier,
+      document: fakeDocument
+    });
+  }
+
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
     fakeXHR = sandbox.useFakeXMLHttpRequest();
@@ -41,25 +48,97 @@ describe("loop.panel", function() {
           new loop.panel.PanelRouter();
         }).to.Throw(Error, /missing required notifier/);
       });
+
+      it("should require a document", function() {
+        expect(function() {
+          new loop.panel.PanelRouter({notifier: notifier});
+        }).to.Throw(Error, /missing required document/);
+      });
     });
 
     describe("constructed", function() {
       var router;
 
       beforeEach(function() {
-        router = new loop.panel.PanelRouter({notifier: notifier});
+        router = createTestRouter({
+          hidden: true,
+          addEventListener: sandbox.spy()
+        });
         sandbox.stub(router, "loadView");
       });
 
       describe("#home", function() {
-        it("should load the PanelView", function() {
+        it("should reset the PanelView", function() {
+          sandbox.stub(router, "reset");
+
           router.home();
 
+          sinon.assert.calledOnce(router.reset);
+        });
+      });
+
+      describe("#reset", function() {
+        it("should clear all pending notifications", function() {
+          router.reset();
+
+          sinon.assert.calledOnce(notifier.clear);
+        });
+
+        it("should load the home view", function() {
+          router.reset();
+
           sinon.assert.calledOnce(router.loadView);
           sinon.assert.calledWithExactly(router.loadView,
             sinon.match.instanceOf(loop.panel.PanelView));
         });
       });
+
+      describe("Events", function() {
+        it("should listen to document visibility changes", function() {
+          var fakeDocument = {
+            hidden: true,
+            addEventListener: sandbox.spy()
+          };
+
+          var router = createTestRouter(fakeDocument);
+
+          sinon.assert.calledOnce(fakeDocument.addEventListener);
+          sinon.assert.calledWith(fakeDocument.addEventListener,
+                                  "visibilitychange");
+        });
+
+        it("should trigger panel:open when the panel document is visible",
+          function(done) {
+            var router = createTestRouter({
+              hidden: false,
+              addEventListener: function(name, cb) {
+                setTimeout(function() {
+                  cb({currentTarget: {hidden: false}});
+                }, 0);
+              }
+            });
+
+            router.once("panel:open", function() {
+              done();
+            });
+          });
+
+        it("should trigger panel:closed when the panel document is hidden",
+          function(done) {
+            var router = createTestRouter({
+              addEventListener: function(name, cb) {
+                hidden: true,
+                setTimeout(function() {
+                  cb({currentTarget: {hidden: true}});
+                }, 0);
+              }
+            });
+
+            router.once("panel:closed", function() {
+              done();
+            });
+          });
+      });
     });
   });
 

From 26ef1a08f82a49477a0e56c8403d6399ae0a203b Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:13:45 +0100
Subject: [PATCH 020/117] Bug 1005041: In progress feedback when getting a call
 url, r=dmose

---
 browser/components/loop/content/js/panel.js   | 21 ++++++++++++-------
 browser/components/loop/jar.mn                |  1 +
 .../loop/test/desktop-local/panel_test.js     | 12 +++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 6e1859bed37a..3e495bbc6aec 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -32,8 +32,8 @@ loop.panel = (function(_, mozL10n) {
       '<div class="action">',
       '  <p class="invite">',
       '    <input type="text" name="caller" data-l10n-id="caller">',
-      '    <a class="get-url btn btn-success disabled" href=""',
-      '       data-l10n-id="get_a_call_url"></a>',
+      '    <button class="get-url btn btn-success disabled" href=""',
+      '       data-l10n-id="get_a_call_url"></button>',
       '  </p>',
       '  <p class="result hide">',
       '    <input id="call-url" type="url" readonly>',
@@ -46,7 +46,7 @@ loop.panel = (function(_, mozL10n) {
 
     events: {
       "keyup input[name=caller]": "changeButtonState",
-      "click a.get-url": "getCallUrl",
+      "click .get-url": "getCallUrl",
       "click a.go-back": "goBack"
     },
 
@@ -76,6 +76,7 @@ loop.panel = (function(_, mozL10n) {
       }.bind(this);
 
       this.client.requestCallUrl(this.getNickname(), callback);
+      this.setPending();
     },
 
     goBack: function(event) {
@@ -93,12 +94,18 @@ loop.panel = (function(_, mozL10n) {
       this.$(".description p").text(__("share_link_url"));
     },
 
+    setPending: function() {
+      this.$("[name=caller]").addClass("pending");
+      this.$(".get-url").addClass("disabled").attr("disabled", "disabled");
+    },
+
     changeButtonState: function() {
       var enabled = !!this.$("input[name=caller]").val();
-      if (enabled)
-        this.$("a.get-url").removeClass("disabled");
-      else
-        this.$("a.get-url").addClass("disabled");
+      if (enabled) {
+        this.$(".get-url").removeClass("disabled");
+      } else {
+        this.$(".get-url").addClass("disabled");
+      }
     }
   });
 
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 5af98f7e69ab..e508179bda80 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -10,6 +10,7 @@ browser.jar:
   content/browser/loop/shared/css/conversation.css   (content/shared/css/conversation.css)
   content/browser/loop/shared/img/icon_32.png        (content/shared/img/icon_32.png)
   content/browser/loop/shared/img/icon_64.png        (content/shared/img/icon_64.png)
+  content/browser/loop/shared/img/loading-icon.gif   (content/shared/img/loading-icon.gif)
   content/browser/loop/shared/js/client.js           (content/shared/js/client.js)
   content/browser/loop/shared/js/models.js           (content/shared/js/models.js)
   content/browser/loop/shared/js/router.js           (content/shared/js/router.js)
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 2c27f626c128..08d1abf34ded 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -160,6 +160,18 @@ describe("loop.panel", function() {
         sinon.assert.calledWith(requestCallUrl, "foo");
       });
 
+      it("should set the call url form in a pending state", function() {
+        var requestCallUrl = sandbox.stub(loop.shared.Client.prototype,
+                                          "requestCallUrl");
+        var setPending = sandbox.stub(loop.panel.PanelView.prototype,
+                                      "setPending");
+        var view = new loop.panel.PanelView({notifier: notifier});
+
+        view.getCallUrl({preventDefault: sandbox.spy()});
+
+        sinon.assert.calledOnce(view.setPending);
+      });
+
       it("should notify the user when the operation failed", function() {
         var requestCallUrl = sandbox.stub(
           loop.shared.Client.prototype, "requestCallUrl", function(_, cb) {

From 6a569f76d9115fbdc3322a7c0e58db64f1742175 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:46 +0100
Subject: [PATCH 021/117] Bug 1000007 Separate out loop from the social api,
 and add a loop specific service and API injection. r=mhammond

---
 browser/app/profile/firefox.js                |   9 +
 browser/base/content/browser-loop.js          |  66 ++++
 browser/base/content/browser.js               |   3 +
 browser/base/content/browser.xul              |  29 +-
 browser/components/loop/MozLoopAPI.jsm        |  90 +++++
 browser/components/loop/MozLoopService.jsm    | 343 ++++++++++++++++++
 browser/components/loop/moz.build             |   9 +
 .../test/xpcshell/test_loopservice_locales.js |  36 ++
 .../loop/test/xpcshell/xpcshell.ini           |   6 +
 browser/themes/linux/browser.css              |   6 +
 browser/themes/osx/browser.css                |   8 +
 browser/themes/windows/browser.css            |   7 +
 toolkit/components/social/MozSocialAPI.jsm    |   9 +-
 toolkit/themes/linux/global/jar.mn            |   1 +
 .../themes/linux/global/loop/loop-call.png    | Bin 0 -> 1420 bytes
 toolkit/themes/osx/global/jar.mn              |   1 +
 toolkit/themes/osx/global/loop/loop-call.png  | Bin 0 -> 1420 bytes
 toolkit/themes/windows/global/jar.mn          |   2 +
 .../themes/windows/global/loop/loop-call.png  | Bin 0 -> 1420 bytes
 19 files changed, 621 insertions(+), 4 deletions(-)
 create mode 100644 browser/base/content/browser-loop.js
 create mode 100644 browser/components/loop/MozLoopAPI.jsm
 create mode 100644 browser/components/loop/MozLoopService.jsm
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_locales.js
 create mode 100644 browser/components/loop/test/xpcshell/xpcshell.ini
 create mode 100644 toolkit/themes/linux/global/loop/loop-call.png
 create mode 100644 toolkit/themes/osx/global/loop/loop-call.png
 create mode 100644 toolkit/themes/windows/global/loop/loop-call.png

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 39bb89bfa434..49da008e7479 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1501,6 +1501,15 @@ pref("shumway.disabled", true);
 // (This is intentionally on the high side; see bug 746055.)
 pref("image.mem.max_decoded_image_kb", 256000);
 
+#ifdef MOZ_LOOP
+// XXX This is a temporary development server. The production one will be
+// coming soon.
+pref("loop.server", "http://loop.dev.mozaws.net");
+#endif
+
+// serverURL to be assigned by services team
+pref("services.push.serverURL", "wss://push.services.mozilla.com/");
+
 // Default social providers
 pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Share\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,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\", \"description\":\"Easily share the web to your Facebook friends.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com\",\"builtin\":\"true\",\"version\":1}");
 
diff --git a/browser/base/content/browser-loop.js b/browser/base/content/browser-loop.js
new file mode 100644
index 000000000000..205269f588d8
--- /dev/null
+++ b/browser/base/content/browser-loop.js
@@ -0,0 +1,66 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// the "exported" symbols
+let LoopUI;
+
+XPCOMUtils.defineLazyModuleGetter(this, "injectLoopAPI", "resource:///modules/loop/MozLoopAPI.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService", "resource:///modules/loop/MozLoopService.jsm");
+
+
+(function() {
+
+  LoopUI = {
+    /**
+     * Opens the panel for Loop and sizes it appropriately.
+     *
+     * @param {event} event The event opening the panel, used to anchor
+     *                      the panel to the button which triggers it.
+     */
+    openCallPanel: function(event) {
+      let panel = document.getElementById("loop-panel");
+      let anchor = event.target;
+      let iframe = document.getElementById("loop-panel-frame");
+
+      // We inject in DOMContentLoaded as that is before any scripts have tun.
+      iframe.addEventListener("DOMContentLoaded", function documentDOMLoaded() {
+        iframe.removeEventListener("DOMContentLoaded", documentDOMLoaded, true);
+        injectLoopAPI(iframe.contentWindow);
+
+        // We use loopPanelInitialized so that we know we've finished localising before
+        // sizing the panel.
+        iframe.contentWindow.addEventListener("loopPanelInitialized",
+          function documentLoaded() {
+            iframe.contentWindow.removeEventListener("loopPanelInitialized",
+                                                     documentLoaded, true);
+            // XXX We end up with the wrong size here, so this
+            // needs investigation (bug 1007601).
+            sizeSocialPanelToContent(panel, iframe);
+          }, true);
+
+      }, true);
+
+      iframe.setAttribute("src", "about:looppanel");
+      panel.hidden = false;
+      panel.openPopup(anchor, "bottomcenter topright", 0, 0, false, false);
+    },
+
+    /**
+     * Triggers the initialization of the loop service after startup has finished.
+     */
+    initialize: function() {
+      var observer = function observer(sbject, topic, data) {
+        if (topic == "browser-delayed-startup-finished") {
+          Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
+          MozLoopService.initialize();
+        }
+      };
+      Services.obs.addObserver(observer,
+                               "browser-delayed-startup-finished", false);
+    }
+
+  };
+
+  LoopUI.initialize();
+})();
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8906f3c1b297..2c78d2e37a76 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -172,6 +172,9 @@ let gInitialPages = [
 #include browser-feeds.js
 #include browser-fullScreen.js
 #include browser-fullZoom.js
+#ifdef MOZ_LOOP
+#include browser-loop.js
+#endif
 #include browser-places.js
 #include browser-plugins.js
 #include browser-safebrowsing.js
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 8d082add6e11..42d222e0cf08 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -226,7 +226,7 @@
       <hbox id="UITourTooltipButtons" flex="1" align="center"/>
      </vbox>
     </panel>
-    <!-- type="default" forces frames to be created so that the panel's size can be determined --> 
+    <!-- type="default" forces frames to be created so that the panel's size can be determined -->
     <panel id="UITourHighlightContainer"
            type="default"
            hidden="true"
@@ -267,6 +267,18 @@
            noautofocus="true"
            position="topcenter topright"/>
 
+#ifdef MOZ_LOOP
+    <panel id="loop-panel"
+           class="loop-panel"
+           type="arrow"
+           orient="horizontal"
+           hidden="true">
+      <iframe id="loop-panel-frame"
+              type="content"
+      />
+    </panel>
+#endif
+
     <menupopup id="toolbar-context-menu"
                onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
       <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
@@ -768,6 +780,21 @@
                      oncommand="WebrtcIndicator.menuCommand(event.target);"/>
         </toolbarbutton>
 
+#ifdef MOZ_LOOP
+        <!-- XXX Bug 1008116 will do the initial L10n for these -->
+        <toolbarbutton id="loop-call-button"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       persist="class"
+                       removable="true"
+                       label="Loop"
+                       tooltiptext="Start a conversation"
+                       oncommand="LoopUI.openCallPanel(event);"
+                       cui-areatype="toolbar"
+                       overflows="false"
+                       >
+        </toolbarbutton>
+#endif
+
         <toolbarbutton id="bookmarks-menu-button"
                        class="toolbarbutton-1 chromeclass-toolbar-additional"
                        persist="class"
diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
new file mode 100644
index 000000000000..e419872c312f
--- /dev/null
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -0,0 +1,90 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/loop/MozLoopService.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "hookWindowCloseForPanelClose",
+  "resource://gre/modules/MozSocialAPI.jsm");
+
+this.EXPORTED_SYMBOLS = ["injectLoopAPI"];
+
+/**
+ * Inject the loop API into the given window.  The caller must be sure the
+ * window is a loop content window (eg, a panel, chatwindow, or similar).
+ *
+ * See the documentation on the individual functions for details of the API.
+ *
+ * @param {nsIDOMWindow} targetWindow The content window to attach the API.
+ */
+function injectLoopAPI(targetWindow) {
+  let api = {
+    /**
+     * Returns the uri for the Loop server from preferences.
+     *
+     * @return {String} The Loop server uri
+     */
+    loopServer: {
+      enumerable: true,
+      configurable: true,
+      writable: false,
+      value: function() {
+        return Services.prefs.getCharPref("loop.server");
+      }
+    },
+
+    /**
+     * Returns the current locale of the browser.
+     *
+     * @returns {String} The locale string
+     */
+    getLocale: {
+      enumerable: true,
+      configurable: true,
+      writable: false,
+      value: function() {
+        return MozLoopService.locale;
+      }
+    },
+
+    /**
+     * Returns translated strings associated with an element. Designed
+     * for use with l10n.js
+     *
+     * @param {String} key The element id
+     * @returns {Object} A JSON string containing the localized
+     *                   attribute/value pairs for the element.
+     */
+    getStrings: {
+      enumerable: true,
+      configurable: true,
+      writable: false,
+      value: function(key) {
+        return MozLoopService.getStrings(key);
+      }
+    }
+
+  };
+
+  let contentObj = Cu.createObjectIn(targetWindow);
+  Object.defineProperties(contentObj, api);
+  Cu.makeObjectPropsNormal(contentObj);
+
+  targetWindow.navigator.wrappedJSObject.__defineGetter__("mozLoop", function() {
+    // We do this in a getter, so that we create these objects
+    // only on demand (this is a potential concern, since
+    // otherwise we might add one per iframe, and keep them
+    // alive for as long as the window is alive).
+    delete targetWindow.navigator.wrappedJSObject.mozLoop;
+    return targetWindow.navigator.wrappedJSObject.mozLoop = contentObj;
+  });
+
+  // Handle window.close correctly on the panel and chatbox.
+  hookWindowCloseForPanelClose(targetWindow);
+}
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
new file mode 100644
index 000000000000..869e38836093
--- /dev/null
+++ b/browser/components/loop/MozLoopService.jsm
@@ -0,0 +1,343 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+this.EXPORTED_SYMBOLS = ["MozLoopService"];
+
+XPCOMUtils.defineLazyModuleGetter(this, "injectLoopAPI",
+  "resource:///modules/loop/MozLoopAPI.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "Chat", "resource:///modules/Chat.jsm");
+
+/**
+ * We don't have push notifications on desktop currently, so this is a
+ * workaround to get them going for us.
+ */
+let PushHandlerHack = {
+  // This is the uri of the push server.
+  pushServerUri: Services.prefs.getCharPref("services.push.serverURL"),
+  // This is the channel id we're using for notifications
+  channelID: "8b1081ce-9b35-42b5-b8f5-3ff8cb813a50",
+  // Stores the push url if we're registered and we have one.
+  pushUrl: undefined,
+
+  /**
+   * Call to start the connection to the push socket server. On
+   * connection, it will automatically say hello and register the channel
+   * id with the server.
+   *
+   * @param {Function} registerCallback Callback to be called once we are
+   *                     registered.
+   * @param {Function} notificationCallback Callback to be called when a
+   *                     push notification is received.
+   */
+  initialize: function(registerCallback, notificationCallback) {
+    this.registerCallback = registerCallback;
+    this.notificationCallback = notificationCallback;
+
+    this.websocket = Cc["@mozilla.org/network/protocol;1?name=wss"]
+                       .createInstance(Ci.nsIWebSocketChannel);
+
+    this.websocket.protocol = "push-notification";
+
+    var pushURI = Services.io.newURI(this.pushServerUri, null, null);
+    this.websocket.asyncOpen(pushURI, this.pushServerUri, this, null);
+  },
+
+  /**
+   * Listener method, handles the start of the websocket stream.
+   * Sends a hello message to the server.
+   *
+   * @param {nsISupports} aContext Not used
+   */
+  onStart: function() {
+    var helloMsg = { messageType: "hello", uaid: "", channelIDs: [] };
+    this.websocket.sendMsg(JSON.stringify(helloMsg));
+  },
+
+  /**
+   * Listener method, called when the websocket is closed.
+   *
+   * @param {nsISupports} aContext Not used
+   * @param {nsresult} aStatusCode Reason for stopping (NS_OK = successful)
+   */
+  onStop: function(aContext, aStatusCode) {
+    // XXX We really should be handling auto-reconnect here, this will be
+    // implemented in bug 994151. For now, just log a warning, so that a
+    // developer can find out it has happened and not get too confused.
+    Cu.reportError("Loop Push server web socket closed! Code: " + aStatusCode);
+    this.pushUrl = undefined;
+  },
+
+  /**
+   * Listener method, called when the websocket is closed by the server.
+   * If there are errors, onStop may be called without ever calling this
+   * method.
+   *
+   * @param {nsISupports} aContext Not used
+   * @param {integer} aCode the websocket closing handshake close code
+   * @param {String} aReason the websocket closing handshake close reason
+   */
+  onServerClose: function(aContext, aCode) {
+    // XXX We really should be handling auto-reconnect here, this will be
+    // implemented in bug 994151. For now, just log a warning, so that a
+    // developer can find out it has happened and not get too confused.
+    Cu.reportError("Loop Push server web socket closed (server)! Code: " + aCode);
+    this.pushUrl = undefined;
+  },
+
+  /**
+   * Listener method, called when the websocket receives a message.
+   *
+   * @param {nsISupports} aContext Not used
+   * @param {String} aMsg The message data
+   */
+  onMessageAvailable: function(aContext, aMsg) {
+    var msg = JSON.parse(aMsg);
+
+    switch(msg.messageType) {
+      case "hello":
+        this._registerChannel();
+        break;
+      case "register":
+        this.pushUrl = msg.pushEndpoint;
+        this.registerCallback(this.pushUrl);
+        break;
+      case "notification":
+        msg.updates.forEach(function(update) {
+          if (update.channelID === this.channelID) {
+            this.notificationCallback(update.version);
+          }
+        }.bind(this));
+        break;
+    }
+  },
+
+  /**
+   * Handles registering a service
+   */
+  _registerChannel: function() {
+    this.websocket.sendMsg(JSON.stringify({
+      messageType: "register",
+      channelID: this.channelID
+    }));
+  }
+};
+
+/**
+ * Internal helper methods and state
+ */
+let MozLoopServiceInternal = {
+  // The uri of the Loop server.
+  loopServerUri: Services.prefs.getCharPref("loop.server"),
+
+  /**
+   * The initial delay for push registration.
+   *
+   * XXX We keep this short at the moment, as we don't handle delayed
+   * registrations from the user perspective. Bug 994151 will extend this.
+   */
+  pushRegistrationDelay: 100,
+
+  /**
+   * Starts the initialization of the service, which goes and registers
+   * with the push server and the loop server.
+   */
+  initialize: function() {
+    if (this.initialized)
+      return;
+
+    this.initialized = true;
+
+    // Kick off the push notification service into registering after a timeout
+    // this ensures we're not doing too much straight after the browser's finished
+    // starting up.
+    this.initializeTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    this.initializeTimer.initWithCallback(this.registerPushHandler.bind(this),
+      this.pushRegistrationDelay, Ci.nsITimer.TYPE_ONE_SHOT);
+  },
+
+  /**
+   * Starts registration of Loop with the push server.
+   */
+  registerPushHandler: function() {
+    PushHandlerHack.initialize(this.onPushRegistered.bind(this),
+                               this.onHandleNotification.bind(this));
+  },
+
+  /**
+   * Callback from PushHandlerHack - The push server has been registered
+   * and has given us a push url.
+   *
+   * @param {String} pushUrl The push url given by the push server.
+   */
+  onPushRegistered: function(pushUrl) {
+    this.registerXhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
+      .createInstance(Ci.nsIXMLHttpRequest);
+
+    this.registerXhr.open('POST', MozLoopServiceInternal.loopServerUri + "/registration",
+                          true);
+    this.registerXhr.setRequestHeader('Content-Type', 'application/json');
+
+    this.registerXhr.channel.loadFlags = Ci.nsIChannel.INHIBIT_CACHING
+      | Ci.nsIChannel.LOAD_BYPASS_CACHE
+      | Ci.nsIChannel.LOAD_EXPLICIT_CREDENTIALS;
+
+    this.registerXhr.onreadystatechange = this.onRegistrationResult.bind(this);
+
+    this.registerXhr.sendAsBinary(JSON.stringify({
+      simple_push_url: pushUrl
+    }));
+  },
+
+  /**
+   * Callback from PushHandlerHack - A push notification has been received from
+   * the server.
+   *
+   * @param {String} version The version information from the server.
+   */
+  onHandleNotification: function(version) {
+    this.openChatWindow(null, "LooP", "about:loopconversation#start/" + version);
+  },
+
+  /**
+   * Callback from the registation xhr. Checks the registration result.
+   */
+  onRegistrationResult: function() {
+    if (this.registerXhr.readyState != Ci.nsIXMLHttpRequest.DONE)
+      return;
+
+    if (this.registerXhr.status != 200) {
+      // XXX Bubble this up to the UI somehow, bug 994151 will handle some of this
+      Cu.reportError("Failed to register with push server. Code: " +
+        this.registerXhr.status + " Text: " + this.registerXhr.statusText);
+      return;
+    }
+
+    // Otherwise we registered just fine.
+    // XXX For now, we'll just save this fact, bug 994151 (again) will make use of
+    // this more.
+    this.registeredLoopServer = true;
+  },
+
+  /**
+   * A getter to obtain and store the strings for loop. This is structured
+   * for use by l10n.js.
+   *
+   * @returns {Object} a map of element ids with attributes to set.
+   */
+  get localizedStrings() {
+    if (this._localizedStrings)
+      return this._localizedStrings;
+
+    var stringBundle =
+      Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
+
+    var map = {};
+    var enumerator = stringBundle.getSimpleEnumeration();
+    while (enumerator.hasMoreElements()) {
+      var string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
+
+      // 'textContent' is the default attribute to set if none are specified.
+      var key = string.key, property = 'textContent';
+      var i = key.lastIndexOf('.');
+      if (i >= 0) {
+        property = key.substring(i + 1);
+        key = key.substring(0, i);
+      }
+      if (!(key in map))
+        map[key] = {};
+      map[key][property] = string.value;
+    }
+
+    return this._localizedStrings = map;
+  },
+
+  /**
+   * Opens the chat window
+   *
+   * @param {Object} contentWindow The window to open the chat window in, may
+   *                               be null.
+   * @param {String} title The title of the chat window.
+   * @param {String} url The page to load in the chat window.
+   * @param {String} mode May be "minimized" or undefined.
+   */
+  openChatWindow: function(contentWindow, title, url, mode) {
+    // So I guess the origin is the loop server!?
+    let origin = this.loopServerUri;
+    url = url.spec || url;
+
+    let callback = chatbox => {
+      // We need to use DOMContentLoaded as otherwise the injection will happen
+      // in about:blank and then get lost.
+      // Sadly we can't use chatbox.promiseChatLoaded() as promise chaining
+      // involves event loop spins, which means it might be too late.
+      // Have we already done it?
+      if (chatbox.contentWindow.navigator.mozLoop) {
+        return;
+      }
+
+      chatbox.addEventListener("DOMContentLoaded", function loaded(event) {
+        if (event.target != chatbox.contentDocument) {
+          return;
+        }
+        chatbox.removeEventListener("DOMContentLoaded", loaded, true);
+        injectLoopAPI(chatbox.contentWindow);
+      }, true);
+    };
+
+    Chat.open(contentWindow, origin, title, url, undefined, undefined, callback);
+  }
+};
+
+/**
+ * Public API
+ */
+this.MozLoopService = {
+  /**
+   * Initialized the loop service, and starts registration with the
+   * push and loop servers.
+   */
+  initialize: function() {
+    MozLoopServiceInternal.initialize();
+  },
+
+  /**
+   * Returns the strings for the specified element. Designed for use
+   * with l10n.js.
+   *
+   * @param {key} The element id to get strings for.
+   * @return {String} A JSON string containing the localized
+   *                  attribute/value pairs for the element.
+   */
+  getStrings: function(key) {
+      var stringData = MozLoopServiceInternal.localizedStrings;
+      if (!(key in stringData)) {
+        Cu.reportError('No string for key: ' + key + 'found');
+        return "";
+      }
+
+      return JSON.stringify(stringData[key]);
+  },
+
+  /**
+   * Returns the current locale
+   *
+   * @return {String} The code of the current locale.
+   */
+  get locale() {
+    try {
+      return Services.prefs.getComplexValue("general.useragent.locale",
+        Ci.nsISupportsString).data;
+    } catch (ex) {
+      return "en-US";
+    }
+  }
+};
diff --git a/browser/components/loop/moz.build b/browser/components/loop/moz.build
index 3bbe6729759c..0d2933fbc1bf 100644
--- a/browser/components/loop/moz.build
+++ b/browser/components/loop/moz.build
@@ -5,3 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_MODULES_PATH = 'modules/loop'
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
+
+EXTRA_JS_MODULES += [
+    'MozLoopAPI.jsm',
+    'MozLoopService.jsm',
+]
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_locales.js b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
new file mode 100644
index 000000000000..0c860aff76b6
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
@@ -0,0 +1,36 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+                                  "resource:///modules/loop/MozLoopService.jsm");
+
+
+function test_locale() {
+  // Set the pref to something controlled.
+  Services.prefs.setCharPref("general.useragent.locale", "ab-CD");
+
+  Assert.equal(MozLoopService.locale, "ab-CD");
+
+  Services.prefs.clearUserPref("general.useragent.locale");
+}
+
+function test_getStrings() {
+  // Try an invalid string
+  Assert.equal(MozLoopService.getStrings("invalid_not_found_string"), "");
+
+  // Get a string that has sub-items to test the function more fully.
+  // XXX This depends on the L10n values, which I'd prefer not to do, but is the
+  // simplest way for now.
+  Assert.equal(MozLoopService.getStrings("caller"), '{"placeholder":"Identify this call"}');
+}
+
+function run_test()
+{
+  test_locale();
+  test_getStrings();
+}
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
new file mode 100644
index 000000000000..4671e79b67d0
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -0,0 +1,6 @@
+[DEFAULT]
+head =
+tail =
+firefox-appdir = browser
+
+[test_loopservice_locales.js]
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index ff17b6f3e6f9..361dc9f066e6 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1557,6 +1557,12 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/Info.png");
 }
 
+%ifdef MOZ_LOOP
+/* Loop */
+#loop-call-button {
+  list-style-image: url("chrome://global/skin/loop/loop-call.png");
+}
+%endif
 
 /* social share panel */
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 63a1bc659d3c..61ce1821837a 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2200,6 +2200,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   }
 }
 
+%ifdef MOZ_LOOP
+/* Loop */
+/* XXX - probably need retina images here */
+#loop-call-button {
+  list-style-image: url("chrome://global/skin/loop/loop-call.png");
+}
+%endif
+
 /* social share panel */
 .social-share-frame {
   background: linear-gradient(to bottom, rgba(242,242,242,.99), rgba(242,242,242,.95));
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 9a18d3926ff4..d74f697211a2 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1515,6 +1515,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 
+%ifdef MOZ_LOOP
+/* Loop */
+#loop-call-button {
+  list-style-image: url("chrome://global/skin/loop/loop-call.png");
+}
+%endif
+
 /* social share panel */
 
 #social-share-panel > iframe {
diff --git a/toolkit/components/social/MozSocialAPI.jsm b/toolkit/components/social/MozSocialAPI.jsm
index 3b5d61074871..daa0604588e1 100644
--- a/toolkit/components/social/MozSocialAPI.jsm
+++ b/toolkit/components/social/MozSocialAPI.jsm
@@ -12,7 +12,10 @@ XPCOMUtils.defineLazyModuleGetter(this, "Social", "resource:///modules/Social.js
 XPCOMUtils.defineLazyModuleGetter(this, "Chat", "resource:///modules/Chat.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-this.EXPORTED_SYMBOLS = ["MozSocialAPI", "openChatWindow", "findChromeWindowForChats", "closeAllChatWindows"];
+this.EXPORTED_SYMBOLS = [
+  "MozSocialAPI", "openChatWindow", "findChromeWindowForChats", "closeAllChatWindows",
+  "hookWindowCloseForPanelClose"
+];
 
 this.MozSocialAPI = {
   _enabled: false,
@@ -71,7 +74,7 @@ function injectController(doc, topic, data) {
     // we always handle window.close on social content, even if they are not
     // "enabled".  "enabled" is about the worker state and a provider may
     // still be in e.g. the share panel without having their worker enabled.
-    handleWindowClose(window);
+    hookWindowCloseForPanelClose(window);
 
     SocialService.getProvider(doc.nodePrincipal.origin, function(provider) {
       if (provider && provider.enabled) {
@@ -223,7 +226,7 @@ function attachToWindow(provider, targetWindow) {
   }
 }
 
-function handleWindowClose(targetWindow) {
+function hookWindowCloseForPanelClose(targetWindow) {
   // We allow window.close() to close the panel, so add an event handler for
   // this, then cancel the event (so the window itself doesn't die) and
   // close the panel instead.
diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn
index b0c9d32e5671..c9a32d8b8ba5 100644
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -53,5 +53,6 @@ toolkit.jar:
 +  skin/classic/global/icons/wrap.png                          (icons/wrap.png)
 +  skin/classic/global/icons/webapps-16.png                    (icons/webapps-16.png)
 +  skin/classic/global/icons/webapps-64.png                    (icons/webapps-64.png)
+   skin/classic/global/loop/loop-call.png                      (loop/loop-call.png)
    skin/classic/global/menu/shared-menu-check.png              (../../shared/menu-check.png)
 +  skin/classic/global/toolbar/spring.png                      (toolbar/spring.png)
diff --git a/toolkit/themes/linux/global/loop/loop-call.png b/toolkit/themes/linux/global/loop/loop-call.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d58d951903116fc39cc1d1e59f60aba70a38c7d
GIT binary patch
literal 1420
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOQ$<*1=$jsEt&BD;o)!4$w!otnf$;i>o
z*~Hk<(gmj1B|o_|H#M&WrZ)wl*Bqx_P+G_>0NU)5T9jFqn&MWJpQ`}&vsES*w>TQP
zm{>ZxxdF{H$L<!0-V`iu0qb=#Fu<u-ALtl;P|PC5G)xGXd_YWix&?CJDL*w2nB0qi
z={kjrRf2(m@xP~wV@SoVDZ%@*r4l9f$=|Dd-v2rLjKb2bxf)WOXCEZB>hb;K<&w18
zDi$^2($aukB3!X092PrMdpIOFsa&%RK2p3vMDgIkgunnl|Mz=#+r@h+dMtR(&0itE
z{`~hn??2aUNsSEA5vzV(Vio^#*T2gqXTRUgEBCpnqbAp1|Ka!F_f88Z7|Zb4ms`l>
zui!oPuxMx8?;5+Kk3Z^2wi#B=^M5>txg?s)qA$8)?>*L#6$cXnL|qG4$E|;VTaIyu
zAd92&0lN)Mmz!2C$ZfisRhl}{H)zUMmsF#fi*w9&A2HAGcDTHSyTOd7`OY1EvF^Fn
zum1Troc2%KEa`rEi{(t8d1g|){O3{=61yFyJ-sjCtfr;n88yvoDf66uvq&XY@qN9=
zlNl2)F*i0$@msz>$0cC()pd?Vc60qKBUZX7O%y+w^6B#3V=hV`1uFLVIs7+$u&pIV
zue>9Gbpmg)frQ83y8qW}?EZJnV-fo!t7)1L!fgQzhvTnVmdHK*{PTRkV|S(Aiy2Rt
zTr7@Eo}-Xbp=Y&Nqsu~uPyg22Z^uiSf~s4c9y)|xl@-d@nSL~%Z~N@L?a|4R*P60x
z)?dG!XEs~^{pYB4AzJP$LtcsW8VeXa>6h?r_2%v=`kl7u;tSQP^7p|X)|WM~U(NdJ
vx%z4q+s$Z+qr4j`w%#q;`KQ_BuV4bhqudXZq|RDQ29=MVu6{1-oD!M<e24?>

literal 0
HcmV?d00001

diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn
index 3b09c2c4b130..d4dd2d5d520e 100644
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -141,6 +141,7 @@ toolkit.jar:
   skin/classic/global/icons/webapps-16@2x.png                        (icons/webapps-16@2x.png)
   skin/classic/global/icons/webapps-64.png                           (icons/webapps-64.png)
   skin/classic/global/inContentUI/background-texture.png            (inContentUI/background-texture.png)
+  skin/classic/global/loop/loop-call.png                             (loop/loop-call.png)
   skin/classic/global/notification/close.png                         (notification/close.png)
   skin/classic/global/notification/critical-bar-background.png       (notification/critical-bar-background.png)
   skin/classic/global/notification/error-icon.png                    (notification/error-icon.png)
diff --git a/toolkit/themes/osx/global/loop/loop-call.png b/toolkit/themes/osx/global/loop/loop-call.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d58d951903116fc39cc1d1e59f60aba70a38c7d
GIT binary patch
literal 1420
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOQ$<*1=$jsEt&BD;o)!4$w!otnf$;i>o
z*~Hk<(gmj1B|o_|H#M&WrZ)wl*Bqx_P+G_>0NU)5T9jFqn&MWJpQ`}&vsES*w>TQP
zm{>ZxxdF{H$L<!0-V`iu0qb=#Fu<u-ALtl;P|PC5G)xGXd_YWix&?CJDL*w2nB0qi
z={kjrRf2(m@xP~wV@SoVDZ%@*r4l9f$=|Dd-v2rLjKb2bxf)WOXCEZB>hb;K<&w18
zDi$^2($aukB3!X092PrMdpIOFsa&%RK2p3vMDgIkgunnl|Mz=#+r@h+dMtR(&0itE
z{`~hn??2aUNsSEA5vzV(Vio^#*T2gqXTRUgEBCpnqbAp1|Ka!F_f88Z7|Zb4ms`l>
zui!oPuxMx8?;5+Kk3Z^2wi#B=^M5>txg?s)qA$8)?>*L#6$cXnL|qG4$E|;VTaIyu
zAd92&0lN)Mmz!2C$ZfisRhl}{H)zUMmsF#fi*w9&A2HAGcDTHSyTOd7`OY1EvF^Fn
zum1Troc2%KEa`rEi{(t8d1g|){O3{=61yFyJ-sjCtfr;n88yvoDf66uvq&XY@qN9=
zlNl2)F*i0$@msz>$0cC()pd?Vc60qKBUZX7O%y+w^6B#3V=hV`1uFLVIs7+$u&pIV
zue>9Gbpmg)frQ83y8qW}?EZJnV-fo!t7)1L!fgQzhvTnVmdHK*{PTRkV|S(Aiy2Rt
zTr7@Eo}-Xbp=Y&Nqsu~uPyg22Z^uiSf~s4c9y)|xl@-d@nSL~%Z~N@L?a|4R*P60x
z)?dG!XEs~^{pYB4AzJP$LtcsW8VeXa>6h?r_2%v=`kl7u;tSQP^7p|X)|WM~U(NdJ
vx%z4q+s$Z+qr4j`w%#q;`KQ_BuV4bhqudXZq|RDQ29=MVu6{1-oD!M<e24?>

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 7b54126ed0ea..7331183bb31e 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -148,6 +148,7 @@ toolkit.jar:
         skin/classic/global/icons/webapps-16.png                 (icons/webapps-16.png)
         skin/classic/global/icons/webapps-64.png                 (icons/webapps-64.png)
         skin/classic/global/inContentUI/background-texture.png   (inContentUI/background-texture.png)
+        skin/classic/global/loop/loop-call.png                   (loop/loop-call.png)
         skin/classic/global/media/TopLevelImageDocument.css      (media/TopLevelImageDocument.css)
         skin/classic/global/media/TopLevelVideoDocument.css      (media/TopLevelVideoDocument.css)
         skin/classic/global/media/imagedoc-lightnoise.png        (media/imagedoc-lightnoise.png)
@@ -331,6 +332,7 @@ toolkit.jar:
         skin/classic/aero/global/icons/webapps-16.png                    (icons/webapps-16.png)
         skin/classic/aero/global/icons/webapps-64.png                    (icons/webapps-64.png)
         skin/classic/aero/global/inContentUI/background-texture.png      (inContentUI/background-texture.png)
+        skin/classic/aero/global/loop/loop-call.png                      (loop/loop-call.png)
         skin/classic/aero/global/media/TopLevelImageDocument.css         (media/TopLevelImageDocument.css)
         skin/classic/aero/global/media/TopLevelVideoDocument.css         (media/TopLevelVideoDocument.css)
         skin/classic/aero/global/media/imagedoc-lightnoise.png           (media/imagedoc-lightnoise.png)
diff --git a/toolkit/themes/windows/global/loop/loop-call.png b/toolkit/themes/windows/global/loop/loop-call.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d58d951903116fc39cc1d1e59f60aba70a38c7d
GIT binary patch
literal 1420
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOQ$<*1=$jsEt&BD;o)!4$w!otnf$;i>o
z*~Hk<(gmj1B|o_|H#M&WrZ)wl*Bqx_P+G_>0NU)5T9jFqn&MWJpQ`}&vsES*w>TQP
zm{>ZxxdF{H$L<!0-V`iu0qb=#Fu<u-ALtl;P|PC5G)xGXd_YWix&?CJDL*w2nB0qi
z={kjrRf2(m@xP~wV@SoVDZ%@*r4l9f$=|Dd-v2rLjKb2bxf)WOXCEZB>hb;K<&w18
zDi$^2($aukB3!X092PrMdpIOFsa&%RK2p3vMDgIkgunnl|Mz=#+r@h+dMtR(&0itE
z{`~hn??2aUNsSEA5vzV(Vio^#*T2gqXTRUgEBCpnqbAp1|Ka!F_f88Z7|Zb4ms`l>
zui!oPuxMx8?;5+Kk3Z^2wi#B=^M5>txg?s)qA$8)?>*L#6$cXnL|qG4$E|;VTaIyu
zAd92&0lN)Mmz!2C$ZfisRhl}{H)zUMmsF#fi*w9&A2HAGcDTHSyTOd7`OY1EvF^Fn
zum1Troc2%KEa`rEi{(t8d1g|){O3{=61yFyJ-sjCtfr;n88yvoDf66uvq&XY@qN9=
zlNl2)F*i0$@msz>$0cC()pd?Vc60qKBUZX7O%y+w^6B#3V=hV`1uFLVIs7+$u&pIV
zue>9Gbpmg)frQ83y8qW}?EZJnV-fo!t7)1L!fgQzhvTnVmdHK*{PTRkV|S(Aiy2Rt
zTr7@Eo}-Xbp=Y&Nqsu~uPyg22Z^uiSf~s4c9y)|xl@-d@nSL~%Z~N@L?a|4R*P60x
z)?dG!XEs~^{pYB4AzJP$LtcsW8VeXa>6h?r_2%v=`kl7u;tSQP^7p|X)|WM~U(NdJ
vx%z4q+s$Z+qr4j`w%#q;`KQ_BuV4bhqudXZq|RDQ29=MVu6{1-oD!M<e24?>

literal 0
HcmV?d00001


From c2461d5e72bbd21d5164a7125b434d1d5ee430e8 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:46 +0100
Subject: [PATCH 022/117] Part of Bug 976109 - Add Loop pages to the about:
 redirector. r=mhammond

---
 browser/components/about/AboutRedirector.cpp | 12 +++++++++++-
 browser/components/build/nsModule.cpp        |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
index 645022c18395..f1f65e8a25ad 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -97,6 +97,16 @@ static RedirEntry kRedirMap[] = {
     nsIAboutModule::ALLOW_SCRIPT },
   { "customizing", "chrome://browser/content/customizableui/aboutCustomizing.xul",
     nsIAboutModule::ALLOW_SCRIPT },
+#ifdef MOZ_LOOP
+  { "loopconversation", "chrome://browser/content/loop/conversation.html",
+    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+    nsIAboutModule::ALLOW_SCRIPT |
+    nsIAboutModule::HIDE_FROM_ABOUTABOUT },
+  { "looppanel", "chrome://browser/content/loop/panel.html",
+    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+    nsIAboutModule::ALLOW_SCRIPT |
+    nsIAboutModule::HIDE_FROM_ABOUTABOUT },
+#endif
 };
 static const int kRedirTotal = ArrayLength(kRedirMap);
 
@@ -119,7 +129,7 @@ GetAboutModuleName(nsIURI *aURI)
 }
 
 NS_IMETHODIMP
-AboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) 
+AboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result)
 {
   NS_ENSURE_ARG_POINTER(aURI);
   NS_ASSERTION(result, "must not be null");
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index f1432b8d1c12..df6d36e427c7 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -112,6 +112,10 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
 #endif
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "app-manager", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "customizing", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
+#ifdef MOZ_LOOP
+    { NS_ABOUT_MODULE_CONTRACTID_PREFIX "looppanel", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
+    { NS_ABOUT_MODULE_CONTRACTID_PREFIX "loopconversation", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
+#endif
 #if defined(XP_WIN)
     { NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID },
 #elif defined(XP_MACOSX)

From 1b9e04b6585836205c67c72d463139d8990fec4d Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:46 +0100
Subject: [PATCH 023/117] Bug 1008122 Loop content changes for the separation
 of Loop from Social. r=nperriault

---
 browser/components/loop/MozLoopAPI.jsm        | 16 ++---
 browser/components/loop/MozLoopService.jsm    |  2 +-
 .../components/loop/content/conversation.html | 26 +++----
 .../loop/content/js/conversation.js           | 13 ++--
 .../loop/content/js/desktopRouter.js          | 34 +++++++++
 browser/components/loop/content/js/fxcom.js   | 70 -------------------
 browser/components/loop/content/js/panel.js   | 20 ++++--
 browser/components/loop/content/libs/l10n.js  | 37 +++++-----
 browser/components/loop/content/panel.html    | 32 ++++-----
 browser/components/loop/jar.mn                |  2 +-
 .../test/desktop-local/conversation_test.js   | 10 ++-
 .../loop/test/desktop-local/index.html        |  3 +-
 .../loop/test/desktop-local/panel_test.js     | 17 ++++-
 13 files changed, 136 insertions(+), 146 deletions(-)
 create mode 100644 browser/components/loop/content/js/desktopRouter.js
 delete mode 100644 browser/components/loop/content/js/fxcom.js

diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index e419872c312f..4f74e9e3b3af 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -26,15 +26,14 @@ this.EXPORTED_SYMBOLS = ["injectLoopAPI"];
 function injectLoopAPI(targetWindow) {
   let api = {
     /**
-     * Returns the uri for the Loop server from preferences.
+     * Returns the url for the Loop server from preferences.
      *
-     * @return {String} The Loop server uri
+     * @return {String} The Loop server url
      */
-    loopServer: {
+    serverUrl: {
       enumerable: true,
       configurable: true,
-      writable: false,
-      value: function() {
+      get: function() {
         return Services.prefs.getCharPref("loop.server");
       }
     },
@@ -44,11 +43,10 @@ function injectLoopAPI(targetWindow) {
      *
      * @returns {String} The locale string
      */
-    getLocale: {
+    locale: {
       enumerable: true,
       configurable: true,
-      writable: false,
-      value: function() {
+      get: function() {
         return MozLoopService.locale;
       }
     },
@@ -64,7 +62,7 @@ function injectLoopAPI(targetWindow) {
     getStrings: {
       enumerable: true,
       configurable: true,
-      writable: false,
+      writable: true,
       value: function(key) {
         return MozLoopService.getStrings(key);
       }
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 869e38836093..69f5bf3b453b 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -216,7 +216,7 @@ let MozLoopServiceInternal = {
 
     if (this.registerXhr.status != 200) {
       // XXX Bubble this up to the UI somehow, bug 994151 will handle some of this
-      Cu.reportError("Failed to register with push server. Code: " +
+      Cu.reportError("Failed to register with the loop server. Code: " +
         this.registerXhr.status + " Text: " + this.registerXhr.statusText);
       return;
     }
diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index d6abd8510f0b..5ca5217ba8c3 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -6,8 +6,8 @@
   <head>
     <meta charset="utf-8">
     <title>Conversation</title>
-    <link rel="stylesheet" type="text/css" href="shared/css/common.css">
-    <link rel="stylesheet" type="text/css" href="shared/css/conversation.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/common.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/conversation.css">
  </head>
   <body onload="loop.conversation.init();">
 
@@ -15,16 +15,16 @@
 
     <div id="main"></div>
 
-    <script type="text/javascript" src="js/fxcom.js"></script>
-    <script type="text/javascript" src="libs/l10n.js"></script>
-    <script type="text/javascript" src="shared/libs/sdk.js"></script>
-    <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
-    <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
-    <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
-    <script type="text/javascript" src="shared/js/client.js"></script>
-    <script type="text/javascript" src="shared/js/models.js"></script>
-    <script type="text/javascript" src="shared/js/router.js"></script>
-    <script type="text/javascript" src="shared/js/views.js"></script>
-    <script type="text/javascript" src="js/conversation.js"></script>
+    <script type="text/javascript" src="loop/libs/l10n.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/sdk.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/jquery-2.1.0.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/lodash-2.4.1.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/backbone-1.1.2.js"></script>
+    <script type="text/javascript" src="loop/shared/js/client.js"></script>
+    <script type="text/javascript" src="loop/shared/js/models.js"></script>
+    <script type="text/javascript" src="loop/shared/js/router.js"></script>
+    <script type="text/javascript" src="loop/shared/js/views.js"></script>
+    <script type="text/javascript" src="loop/js/desktopRouter.js"></script>
+    <script type="text/javascript" src="loop/js/conversation.js"></script>
   </body>
 </html>
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index bd7bb36eeadf..a5d857e50252 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -4,20 +4,17 @@
 
 /* global loop:true */
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-
 var loop = loop || {};
 loop.conversation = (function(OT, mozL10n) {
   "use strict";
 
   var sharedViews = loop.shared.views,
-      baseServerUrl = Services.prefs.getCharPref("loop.server"),
       // aliasing translation function as __ for concision
       __ = mozL10n.get;
 
   /**
    * App router.
-   * @type {loop.webapp.Router}
+   * @type {loop.desktopRouter.DesktopConversationRouter}
    */
   var router;
 
@@ -54,7 +51,7 @@ loop.conversation = (function(OT, mozL10n) {
    *
    * @type {loop.shared.router.BaseConversationRouter}
    */
-  var ConversationRouter = loop.shared.router.BaseConversationRouter.extend({
+  var ConversationRouter = loop.desktopRouter.DesktopConversationRouter.extend({
     routes: {
       "start/:version": "start",
       "call/ongoing": "conversation",
@@ -87,7 +84,7 @@ loop.conversation = (function(OT, mozL10n) {
       // will implement the follow-ups.
       this._conversation.set({loopVersion: loopVersion});
       this._conversation.initiate({
-        baseServerUrl: baseServerUrl,
+        baseServerUrl: window.navigator.mozLoop.serverUrl,
         outgoing: false
       });
     },
@@ -123,6 +120,10 @@ loop.conversation = (function(OT, mozL10n) {
    * Panel initialisation.
    */
   function init() {
+    // Do the initial L10n setup, we do this before anything
+    // else to ensure the L10n environment is setup correctly.
+    mozL10n.initialize(window.navigator.mozLoop);
+
     router = new ConversationRouter({
       conversation: new loop.shared.models.ConversationModel({}, {sdk: OT}),
       notifier: new sharedViews.NotificationListView({el: "#messages"})
diff --git a/browser/components/loop/content/js/desktopRouter.js b/browser/components/loop/content/js/desktopRouter.js
new file mode 100644
index 000000000000..294418685d5a
--- /dev/null
+++ b/browser/components/loop/content/js/desktopRouter.js
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+var loop = loop || {};
+loop.desktopRouter = (function() {
+  "use strict";
+
+  /**
+   * On the desktop app, the use of about: uris prevents us from changing the
+   * url of the location. As a result, we change the navigate function to simply
+   * activate the new routes, and not try changing the url.
+   *
+   * XXX It is conceivable we might be able to remove this in future, if we
+   * can either swap to resource uris or remove the limitation on the about uris.
+   */
+  var extendedRouter = {
+    navigate: function(to) {
+      this[this.routes[to]]();
+    }
+  };
+
+  var DesktopRouter = loop.shared.router.BaseRouter.extend(extendedRouter);
+
+  var DesktopConversationRouter =
+    loop.shared.router.BaseConversationRouter.extend(extendedRouter);
+
+  return {
+    DesktopRouter: DesktopRouter,
+    DesktopConversationRouter: DesktopConversationRouter
+  };
+})();
diff --git a/browser/components/loop/content/js/fxcom.js b/browser/components/loop/content/js/fxcom.js
deleted file mode 100644
index 0d70b4c706b5..000000000000
--- a/browser/components/loop/content/js/fxcom.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-const Ci = Components.interfaces;
-
-/**
- * Data accessor for chrome resources. This is used to provide an
- * interface for l10n.js to use.
- *
- * XXX currently this file accesses chrome direct, and hence is a big
- * simplification on what it could be. When we implement
- * bug 976109 we'll likely need to do a proxy to the chrome space.
- */
-var FirefoxCom = (function FirefoxComClosure() {
-  return {
-    /**
-     * Handles requests for data synchronously.
-     */
-    requestSync: function(action, data) {
-      if (action === 'getLocale')
-        return this.getLocale();
-
-      if (action === 'getStrings')
-        return this.getStrings(data);
-
-      console.error('[fxcom] Action' + action + ' is unknown');
-      return null;
-    },
-
-    getLocale: function() {
-      try {
-        return Services.prefs.getCharPref('general.useragent.locale');
-      } catch (x) {
-        return 'en-US';
-      }
-    },
-
-    getStrings: function(data) {
-      try {
-        return JSON.stringify(this.localizedStrings[data] || null);
-      } catch (e) {
-        console.error('[fxcom] Unable to retrive localized strings: ' + e);
-      }
-    },
-
-    get localizedStrings() {
-      var stringBundle =
-        Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
-
-      var map = {};
-      var enumerator = stringBundle.getSimpleEnumeration();
-      while (enumerator.hasMoreElements()) {
-        var string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
-        var key = string.key, property = 'textContent';
-        var i = key.lastIndexOf('.');
-        if (i >= 0) {
-          property = key.substring(i + 1);
-          key = key.substring(0, i);
-        }
-        if (!(key in map))
-          map[key] = {};
-        map[key][property] = string.value;
-      }
-      delete this.localizedStrings;
-      return this.localizedStrings = map;
-    }
-  };
-})();
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 3e495bbc6aec..6c2c7e1bc7ac 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -4,20 +4,17 @@
 
 /* global loop:true */
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-
 var loop = loop || {};
 loop.panel = (function(_, mozL10n) {
   "use strict";
 
-  var baseServerUrl = Services.prefs.getCharPref("loop.server"),
-      sharedViews = loop.shared.views,
+  var sharedViews = loop.shared.views,
       // aliasing translation function as __ for concision
       __ = mozL10n.get;
 
   /**
    * Panel router.
-   * @type {loop.shared.router.BaseRouter}
+   * @type {loop.desktopRouter.DesktopRouter}
    */
   var router;
 
@@ -57,7 +54,7 @@ loop.panel = (function(_, mozL10n) {
       }
       this.notifier = options.notifier;
       this.client = new loop.shared.Client({
-        baseServerUrl: baseServerUrl
+        baseServerUrl: window.navigator.mozLoop.serverUrl
       });
     },
 
@@ -109,7 +106,7 @@ loop.panel = (function(_, mozL10n) {
     }
   });
 
-  var PanelRouter = loop.shared.router.BaseRouter.extend({
+  var PanelRouter = loop.desktopRouter.DesktopRouter.extend({
     /**
      * DOM document object.
      * @type {HTMLDocument}
@@ -170,11 +167,20 @@ loop.panel = (function(_, mozL10n) {
    * Panel initialisation.
    */
   function init() {
+    // Do the initial L10n setup, we do this before anything
+    // else to ensure the L10n environment is setup correctly.
+    mozL10n.initialize(window.navigator.mozLoop);
+
     router = new PanelRouter({
       document: document,
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
+
+    // Notify the window that we've finished initalization and initial layout
+    var evtObject = document.createEvent('Event');
+    evtObject.initEvent('loopPanelInitialized', true, false);
+    window.dispatchEvent(evtObject);
   }
 
   return {
diff --git a/browser/components/loop/content/libs/l10n.js b/browser/components/loop/content/libs/l10n.js
index ff9192ba0f46..287b148cda93 100644
--- a/browser/components/loop/content/libs/l10n.js
+++ b/browser/components/loop/content/libs/l10n.js
@@ -1,16 +1,20 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-/* globals FirefoxCom */
 
 'use strict';
 
-// Small subset of the webL10n API by Fabien Cazenave for pdf.js extension.
+// This is a modified version of l10n.js that the pdf.js extension uses.
+// It uses an explicitly passed object for the strings/locale functionality,
+// and does not automatically translate on DOMContentLoaded, but requires
+// initialize to be called. This improves testability and helps to avoid race
+// conditions.
 (function(window) {
+  var gL10nDetails;
   var gLanguage = '';
 
   // fetch an l10n objects
   function getL10nData(key) {
-    var response = FirefoxCom.requestSync('getStrings', key);
+    var response = gL10nDetails.getStrings(key);
     var data = JSON.parse(response);
     if (!data)
       console.warn('[l10n] #' + key + ' missing for [' + gLanguage + ']');
@@ -79,20 +83,22 @@
       translateElement(element);
   }
 
-  window.addEventListener('DOMContentLoaded', function() {
-    gLanguage = FirefoxCom.requestSync('getLocale', null);
-
-    translateFragment();
-
-    // fire a 'localized' DOM event
-    var evtObject = document.createEvent('Event');
-    evtObject.initEvent('localized', false, false);
-    evtObject.language = gLanguage;
-    window.dispatchEvent(evtObject);
-  });
-
   // Public API
   document.mozL10n = {
+    /**
+     * Called to do the initial translation, this should be called
+     * when DOMContentLoaded is fired, or the equivalent time.
+     *
+     * @param {Object} l10nDetails An object implementing the locale attribute
+     *                             and getStrings(key) function.
+     */
+    initialize: function(l10nDetails) {
+      gL10nDetails = l10nDetails;
+      gLanguage = gL10nDetails.locale;
+
+      translateFragment();
+    },
+
     // get a localized string
     get: translateString,
 
@@ -111,4 +117,3 @@
     translate: translateFragment
   };
 })(this);
-
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index 42a23b91ec39..b57cfb3b421f 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -6,8 +6,8 @@
   <head>
     <meta charset="utf-8">
     <title>Loop Panel</title>
-    <link rel="stylesheet" type="text/css" href="shared/css/common.css">
-    <link rel="stylesheet" type="text/css" href="shared/css/panel.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/common.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/panel.css">
   </head>
   <body class="panel" onload="loop.panel.init();">
 
@@ -15,21 +15,15 @@
 
     <div id="main"></div>
 
-    <!-- XXX (adam): Should we import our own version of Webl10n?
-         What we have here is a copy of the version from pdf.js
-         (which I can't seem to reference directly, so we've copied
-         it here). At the very least, if we're using the same
-         library as pdf.js, we should be referring to the same
-         file. -->
-    <script type="text/javascript" src="js/fxcom.js"></script>
-    <script type="text/javascript" src="libs/l10n.js"></script>
-    <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
-    <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
-    <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
-    <script type="text/javascript" src="shared/js/client.js"></script>
-    <script type="text/javascript" src="shared/js/models.js"></script>
-    <script type="text/javascript" src="shared/js/router.js"></script>
-    <script type="text/javascript" src="shared/js/views.js"></script>
-    <script type="text/javascript" src="js/panel.js"></script>
-  </body>
+    <script type="text/javascript" src="loop/libs/l10n.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/jquery-2.1.0.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/lodash-2.4.1.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/backbone-1.1.2.js"></script>
+    <script type="text/javascript" src="loop/shared/js/client.js"></script>
+    <script type="text/javascript" src="loop/shared/js/models.js"></script>
+    <script type="text/javascript" src="loop/shared/js/router.js"></script>
+    <script type="text/javascript" src="loop/shared/js/views.js"></script>
+    <script type="text/javascript" src="loop/js/desktopRouter.js"></script>
+    <script type="text/javascript" src="loop/js/panel.js"></script>
+ </body>
 </html>
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index e508179bda80..775026072d18 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -20,6 +20,6 @@ browser.jar:
   content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
   content/browser/loop/libs/l10n.js                  (content/libs/l10n.js)
-  content/browser/loop/js/fxcom.js                   (content/js/fxcom.js)
+  content/browser/loop/js/desktopRouter.js           (content/js/desktopRouter.js)
   content/browser/loop/js/conversation.js            (content/js/conversation.js)
   content/browser/loop/js/panel.js                   (content/js/panel.js)
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 8bcca0bcb76c..a7f04e7c9c70 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -22,9 +22,16 @@ describe("loop.conversation", function() {
       error: sandbox.spy(),
       errorL10n: sandbox.spy()
     };
+
+    window.navigator.mozLoop = {
+      get serverUrl() {
+        return "http://example.com";
+      }
+    };
   });
 
   afterEach(function() {
+    delete window.navigator.mozLoop;
     sandbox.restore();
   });
 
@@ -33,6 +40,7 @@ describe("loop.conversation", function() {
 
     beforeEach(function() {
       conversation = new loop.shared.models.ConversationModel({}, {sdk: {}});
+      sandbox.stub(conversation, "initiate");
     });
 
     describe("Routes", function() {
@@ -54,8 +62,6 @@ describe("loop.conversation", function() {
         });
 
         it("should initiate the conversation", function() {
-          sandbox.stub(conversation, "initiate");
-
           router.start("fakeVersion");
 
           sinon.assert.calledOnce(conversation.initiate);
diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index 718fd74e8b44..c2574d02cf4a 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -5,7 +5,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Loop mocha tests</title>
+  <title>Loop desktop-local mocha tests</title>
   <link rel="stylesheet" media="all" href="../shared/vendor/mocha-1.17.1.css">
 </head>
 <body>
@@ -57,6 +57,7 @@
   <script src="../../content/shared/js/models.js"></script>
   <script src="../../content/shared/js/router.js"></script>
   <script src="../../content/shared/js/views.js"></script>
+  <script src="../../content/js/desktopRouter.js"></script>
   <script src="../../content/js/conversation.js"></script>
   <script src="../../content/js/panel.js"></script>
 
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 08d1abf34ded..a644dccb2483 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -9,7 +9,7 @@ var expect = chai.expect;
 describe("loop.panel", function() {
   "use strict";
 
-  var sandbox, notifier, fakeXHR, requests = [];
+  var sandbox, notifier, fakeXHR, requests = [], savedMozLoop;
 
   function createTestRouter(fakeDocument) {
     return new loop.panel.PanelRouter({
@@ -34,9 +34,23 @@ describe("loop.panel", function() {
       error: sandbox.spy(),
       errorL10n: sandbox.spy()
     };
+
+    window.navigator.mozLoop = {
+      get serverUrl() {
+        return "http://example.com";
+      },
+      getStrings: function() {
+        return "{}";
+      },
+      get locale() {
+        return "en-US";
+      }
+    };
+    document.mozL10n.initialize(window.navigator.mozLoop);
   });
 
   afterEach(function() {
+    delete window.navigator.mozLoop;
     $("#fixtures").empty();
     sandbox.restore();
   });
@@ -64,6 +78,7 @@ describe("loop.panel", function() {
           hidden: true,
           addEventListener: sandbox.spy()
         });
+
         sandbox.stub(router, "loadView");
       });
 

From 4367fa8b0cfa0043292b843090786353729a49ba Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:47 +0100
Subject: [PATCH 024/117] Bug 1005245 Remove now redundant test harness code.
 r=nperriault

---
 .../loop/test/desktop-local/index.html        | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index c2574d02cf4a..1905715f0e66 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -15,28 +15,6 @@
   <div id="messages"></div>
   <div id="fixtures"></div>
   <!-- libs -->
-  <script>
-  // Components won't load in unprivileged space, faking this one.
-  var FirefoxCom = {
-    requestSync: function(action) {
-      if (action === 'getLocale')
-        return "en-US";
-
-      if (action === 'getStrings')
-        return '{}';
-    },
-    getLocale: function() {
-      return "en-US";
-    },
-    getStrings: function() {
-      return [];
-    }
-  };
-  window.Components = {fake: true, utils: {import: function(){}}};
-  window.Services = {fake: true, prefs: {getCharPref: function() {
-    return "http://example.com";
-  }}};
-  </script>
   <script src="../../content/libs/l10n.js"></script>
   <script src="../../content/shared/libs/jquery-2.1.0.js"></script>
   <script src="../../content/shared/libs/lodash-2.4.1.js"></script>

From 13f832447c59d211cdc03474341f6cce876b8980 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:47 +0100
Subject: [PATCH 025/117] Bug 1007601 Fix styling of the loop panel so it is
 laid out properly and without a white border. Also make the iframe creation
 dynamic, to avoid an iframe in the DOM when we don't need one. r=mhammond

---
 browser/base/content/browser-loop.js | 12 +++++++++++-
 browser/base/content/browser.xul     |  8 ++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/browser-loop.js b/browser/base/content/browser-loop.js
index 205269f588d8..42d43893a617 100644
--- a/browser/base/content/browser-loop.js
+++ b/browser/base/content/browser-loop.js
@@ -23,6 +23,16 @@ XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService", "resource:///modules/l
       let anchor = event.target;
       let iframe = document.getElementById("loop-panel-frame");
 
+      if (!iframe) {
+        // XXX This should be using SharedFrame (bug 1011392 may do this).
+        iframe = document.createElement("iframe");
+        iframe.setAttribute("id", "loop-panel-frame");
+        iframe.setAttribute("type", "content");
+        iframe.setAttribute("class", "loop-frame social-panel-frame");
+        iframe.setAttribute("flex", "1");
+        panel.appendChild(iframe);
+      }
+
       // We inject in DOMContentLoaded as that is before any scripts have tun.
       iframe.addEventListener("DOMContentLoaded", function documentDOMLoaded() {
         iframe.removeEventListener("DOMContentLoaded", documentDOMLoaded, true);
@@ -35,7 +45,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService", "resource:///modules/l
             iframe.contentWindow.removeEventListener("loopPanelInitialized",
                                                      documentLoaded, true);
             // XXX We end up with the wrong size here, so this
-            // needs investigation (bug 1007601).
+            // needs further investigation (bug 1011394).
             sizeSocialPanelToContent(panel, iframe);
           }, true);
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 42d222e0cf08..4e66d06808e9 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -269,14 +269,10 @@
 
 #ifdef MOZ_LOOP
     <panel id="loop-panel"
-           class="loop-panel"
+           class="loop-panel social-panel"
            type="arrow"
            orient="horizontal"
-           hidden="true">
-      <iframe id="loop-panel-frame"
-              type="content"
-      />
-    </panel>
+           hidden="true"/>
 #endif
 
     <menupopup id="toolbar-context-menu"

From adf026d0e26e48c6539f6ae86dfdfcd67a691dc1 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:47 +0100
Subject: [PATCH 026/117] Bug 1010325 Work around for uri.host being undefined
 in webrtc prompts for Loop. Special-case handling of about:loop uris for now.
 Bug 1000146 will replace this. r=florian.

---
 browser/modules/moz.build    |  2 +-
 browser/modules/webrtcUI.jsm | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index a2572cb0145b..798cd261c7d8 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -23,7 +23,6 @@ EXTRA_JS_MODULES += [
     'Social.jsm',
     'TabCrashReporter.jsm',
     'WebappManager.jsm',
-    'webrtcUI.jsm',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
@@ -42,6 +41,7 @@ EXTRA_PP_JS_MODULES += [
     'AboutHome.jsm',
     'RecentWindow.jsm',
     'UITour.jsm',
+    'webrtcUI.jsm',
 ]
 
 if CONFIG['MOZILLA_OFFICIAL']:
diff --git a/browser/modules/webrtcUI.jsm b/browser/modules/webrtcUI.jsm
index c4a00378b5da..f1eceece2282 100644
--- a/browser/modules/webrtcUI.jsm
+++ b/browser/modules/webrtcUI.jsm
@@ -128,8 +128,28 @@ function prompt(aContentWindow, aCallID, aAudioRequested, aVideoRequested, aDevi
   let chromeDoc = browser.ownerDocument;
   let chromeWin = chromeDoc.defaultView;
   let stringBundle = chromeWin.gNavigatorBundle;
+#ifdef MOZ_LOOP
+  let host;
+  // For Loop protocols that start with about:, use brandShortName instead of the host for now.
+  // Bug 990678 will implement improvements/replacements for the permissions dialog, so this
+  // should become unnecessary.
+  if (uri.spec.startsWith("about:loop")) {
+    let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
+
+    host = brandBundle.GetStringFromName("brandShortName");
+  }
+  else {
+    // uri.host throws for about: protocols, so we have to do this once we know
+    // it isn't about:loop.
+    host = uri.host;
+  }
+
+  let message = stringBundle.getFormattedString("getUserMedia.share" + requestType + ".message",
+                                                [ host ]);
+#else
   let message = stringBundle.getFormattedString("getUserMedia.share" + requestType + ".message",
                                                 [ uri.host ]);
+#endif
 
   let mainAction = {
     label: PluralForm.get(requestType == "CameraAndMicrophone" ? 2 : 1,

From 336221533f4fb1a044392f010eaa6b24f05eb163 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:47 +0100
Subject: [PATCH 027/117] Bug 994151 Part 1. Handle registration errors better,
 with simple notifications to the user, and handle subsequent attempts to
 register with the server. r=dmose

---
 browser/components/loop/MozLoopAPI.jsm        |  21 ++-
 browser/components/loop/MozLoopService.jsm    | 131 ++++++++++++++----
 browser/components/loop/content/js/panel.js   |  16 ++-
 .../loop/test/desktop-local/panel_test.js     |  42 +++++-
 browser/components/loop/test/xpcshell/head.js | 129 +++++++++++++++++
 .../test/xpcshell/test_loopservice_locales.js |   5 -
 .../xpcshell/test_loopservice_registration.js |  92 ++++++++++++
 .../loop/test/xpcshell/xpcshell.ini           |   3 +-
 8 files changed, 399 insertions(+), 40 deletions(-)
 create mode 100644 browser/components/loop/test/xpcshell/head.js
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_registration.js

diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index 4f74e9e3b3af..d790164389ad 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -66,8 +66,27 @@ function injectLoopAPI(targetWindow) {
       value: function(key) {
         return MozLoopService.getStrings(key);
       }
-    }
+    },
 
+    /**
+     * Call to ensure that any necessary registrations for the Loop Service
+     * have taken place.
+     *
+     * Callback parameters:
+     * - err null on successful registration, non-null otherwise.
+     *
+     * @param {Function} callback Will be called once registration is complete,
+     *                            or straight away if registration has already
+     *                            happened.
+     */
+    ensureRegistered: {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: function(callback) {
+        return MozLoopService.register(callback);
+      }
+    }
   };
 
   let contentObj = Cu.createObjectIn(targetWindow);
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 69f5bf3b453b..4cdfd7354617 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -19,6 +19,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "Chat", "resource:///modules/Chat.jsm");
 /**
  * We don't have push notifications on desktop currently, so this is a
  * workaround to get them going for us.
+ *
+ * XXX Handle auto-reconnections if connection fails for whatever reason
+ * (bug 1013248).
  */
 let PushHandlerHack = {
   // This is the uri of the push server.
@@ -33,14 +36,23 @@ let PushHandlerHack = {
    * connection, it will automatically say hello and register the channel
    * id with the server.
    *
+   * Register callback parameters:
+   * - {String|null} err: Encountered error, if any
+   * - {String} url: The push url obtained from the server
+   *
    * @param {Function} registerCallback Callback to be called once we are
    *                     registered.
    * @param {Function} notificationCallback Callback to be called when a
    *                     push notification is received.
    */
   initialize: function(registerCallback, notificationCallback) {
-    this.registerCallback = registerCallback;
-    this.notificationCallback = notificationCallback;
+    if (Services.io.offline) {
+      registerCallback("offline");
+      return;
+    }
+
+    this._registerCallback = registerCallback;
+    this._notificationCallback = notificationCallback;
 
     this.websocket = Cc["@mozilla.org/network/protocol;1?name=wss"]
                        .createInstance(Ci.nsIWebSocketChannel);
@@ -108,12 +120,12 @@ let PushHandlerHack = {
         break;
       case "register":
         this.pushUrl = msg.pushEndpoint;
-        this.registerCallback(this.pushUrl);
+        this._registerCallback(null, this.pushUrl);
         break;
       case "notification":
         msg.updates.forEach(function(update) {
           if (update.channelID === this.channelID) {
-            this.notificationCallback(update.version);
+            this._notificationCallback(update.version);
           }
         }.bind(this));
         break;
@@ -133,18 +145,22 @@ let PushHandlerHack = {
 
 /**
  * Internal helper methods and state
+ *
+ * The registration is a two-part process. First we need to connect to
+ * and register with the push server. Then we need to take the result of that
+ * and register with the Loop server.
  */
 let MozLoopServiceInternal = {
   // The uri of the Loop server.
   loopServerUri: Services.prefs.getCharPref("loop.server"),
 
   /**
-   * The initial delay for push registration.
+   * The initial delay for registration.
    *
    * XXX We keep this short at the moment, as we don't handle delayed
    * registrations from the user perspective. Bug 994151 will extend this.
    */
-  pushRegistrationDelay: 100,
+  initialRegistrationDelay: 100,
 
   /**
    * Starts the initialization of the service, which goes and registers
@@ -160,39 +176,85 @@ let MozLoopServiceInternal = {
     // this ensures we're not doing too much straight after the browser's finished
     // starting up.
     this.initializeTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-    this.initializeTimer.initWithCallback(this.registerPushHandler.bind(this),
-      this.pushRegistrationDelay, Ci.nsITimer.TYPE_ONE_SHOT);
+    this.initializeTimer.initWithCallback(function() {
+        this.registerWithServers();
+      }.bind(this),
+      this.initialRegistrationDelay, Ci.nsITimer.TYPE_ONE_SHOT);
   },
 
   /**
-   * Starts registration of Loop with the push server.
+   * Starts registration of Loop with the push server, and then will register
+   * with the Loop server. It will return early if already registered.
+   *
+   * Callback parameters:
+   * - err null on successful registration, non-null otherwise.
+   *
+   * @param {Function} callback Called when the registration process finishes.
    */
-  registerPushHandler: function() {
+  registerWithServers: function(callback) {
+    // If we've already registered, return straight away, but save the callback
+    // so we can let the caller know.
+    if (this.registeredLoopServer) {
+      callback(null);
+      return;
+    }
+
+    // We need to register, so save the callback.
+    this.registrationCompleteCallback = callback;
+
+    // If we're already in progress, just return straight away.
+    if (this.registrationInProgress) {
+      return;
+    }
+
+    this.registrationInProgress = true;
+
     PushHandlerHack.initialize(this.onPushRegistered.bind(this),
                                this.onHandleNotification.bind(this));
   },
 
+  /**
+   * Handles the end of the registration process.
+   *
+   * @param {Object|null} err null on success, non-null otherwise.
+   */
+  endRegistration: function(err) {
+    // Reset the in progress flag
+    this.registrationInProgress = false;
+
+    // Call the callback if there is one, and then release it.
+    if (this.registrationCompleteCallback) {
+      this.registrationCompleteCallback(err);
+      this.registrationCompleteCallback = null;
+    }
+  },
+
   /**
    * Callback from PushHandlerHack - The push server has been registered
    * and has given us a push url.
    *
    * @param {String} pushUrl The push url given by the push server.
    */
-  onPushRegistered: function(pushUrl) {
-    this.registerXhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
+  onPushRegistered: function(err, pushUrl) {
+    if (err) {
+      this.endRegistration(err);
+      return;
+    }
+
+    this.loopXhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
       .createInstance(Ci.nsIXMLHttpRequest);
 
-    this.registerXhr.open('POST', MozLoopServiceInternal.loopServerUri + "/registration",
+    this.loopXhr.open('POST', MozLoopServiceInternal.loopServerUri + "/registration",
                           true);
-    this.registerXhr.setRequestHeader('Content-Type', 'application/json');
+    this.loopXhr.setRequestHeader('Content-Type', 'application/json');
 
-    this.registerXhr.channel.loadFlags = Ci.nsIChannel.INHIBIT_CACHING
+    this.loopXhr.channel.loadFlags = Ci.nsIChannel.INHIBIT_CACHING
       | Ci.nsIChannel.LOAD_BYPASS_CACHE
       | Ci.nsIChannel.LOAD_EXPLICIT_CREDENTIALS;
 
-    this.registerXhr.onreadystatechange = this.onRegistrationResult.bind(this);
+    this.loopXhr.onreadystatechange = this.onLoopRegistered.bind(this);
 
-    this.registerXhr.sendAsBinary(JSON.stringify({
+    this.loopXhr.sendAsBinary(JSON.stringify({
       simple_push_url: pushUrl
     }));
   },
@@ -210,21 +272,23 @@ let MozLoopServiceInternal = {
   /**
    * Callback from the registation xhr. Checks the registration result.
    */
-  onRegistrationResult: function() {
-    if (this.registerXhr.readyState != Ci.nsIXMLHttpRequest.DONE)
+  onLoopRegistered: function() {
+    if (this.loopXhr.readyState != Ci.nsIXMLHttpRequest.DONE)
       return;
 
-    if (this.registerXhr.status != 200) {
-      // XXX Bubble this up to the UI somehow, bug 994151 will handle some of this
+    let status = this.loopXhr.status;
+
+    if (status != 200) {
+      // XXX Bubble the precise details up to the UI somehow (bug 1013248).
       Cu.reportError("Failed to register with the loop server. Code: " +
-        this.registerXhr.status + " Text: " + this.registerXhr.statusText);
-      return;
+        status + " Text: " + this.loopXhr.statusText);
+    }
+    else {
+      // Otherwise we registered just fine.
+      this.registeredLoopServer = true;
     }
 
-    // Otherwise we registered just fine.
-    // XXX For now, we'll just save this fact, bug 994151 (again) will make use of
-    // this more.
-    this.registeredLoopServer = true;
+    this.endRegistration(status == 200 ? null : status);
   },
 
   /**
@@ -309,6 +373,19 @@ this.MozLoopService = {
     MozLoopServiceInternal.initialize();
   },
 
+  /**
+   * Starts registration of Loop with the push server, and then will register
+   * with the Loop server. It will return early if already registered.
+   *
+   * Callback parameters:
+   * - err null on successful registration, non-null otherwise.
+   *
+   * @param {Function} callback Called when the registration process finishes.
+   */
+  register: function(callback) {
+    MozLoopServiceInternal.registerWithServers(callback);
+  },
+
   /**
    * Returns the strings for the specified element. Designed for use
    * with l10n.js.
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 6c2c7e1bc7ac..e08c7f7f7bb8 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -63,8 +63,10 @@ loop.panel = (function(_, mozL10n) {
     },
 
     getCallUrl: function(event) {
+      this.notifier.clear();
       event.preventDefault();
       var callback = function(err, callUrl) {
+        this.clearPending();
         if (err) {
           this.notifier.errorL10n("unable_retrieve_url");
           return;
@@ -72,14 +74,16 @@ loop.panel = (function(_, mozL10n) {
         this.onCallUrlReceived(callUrl);
       }.bind(this);
 
-      this.client.requestCallUrl(this.getNickname(), callback);
       this.setPending();
+      this.client.requestCallUrl(this.getNickname(), callback);
     },
 
     goBack: function(event) {
+      event.preventDefault();
       this.$(".action .result").hide();
       this.$(".action .invite").show();
       this.$(".description p").text(__("get_link_to_share"));
+      this.changeButtonState();
     },
 
     onCallUrlReceived: function(callUrl) {
@@ -96,12 +100,18 @@ loop.panel = (function(_, mozL10n) {
       this.$(".get-url").addClass("disabled").attr("disabled", "disabled");
     },
 
+    clearPending: function() {
+      this.$("[name=caller]").removeClass("pending");
+      this.changeButtonState();
+    },
+
     changeButtonState: function() {
       var enabled = !!this.$("input[name=caller]").val();
       if (enabled) {
-        this.$(".get-url").removeClass("disabled");
+        this.$(".get-url").removeClass("disabled")
+            .removeAttr("disabled", "disabled");
       } else {
-        this.$(".get-url").addClass("disabled");
+        this.$(".get-url").addClass("disabled").attr("disabled", "disabled");
       }
     }
   });
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index a644dccb2483..b060e463abd9 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -163,6 +163,16 @@ describe("loop.panel", function() {
     });
 
     describe("#getCallUrl", function() {
+      it("should reset all pending notifications", function() {
+        var requestCallUrl = sandbox.stub(loop.shared.Client.prototype,
+                                          "requestCallUrl");
+        var view = new loop.panel.PanelView({notifier: notifier}).render();
+
+        view.getCallUrl({preventDefault: sandbox.spy()});
+
+        sinon.assert.calledOnce(view.notifier.clear, "clear");
+      });
+
       it("should request a call url to the server", function() {
         var requestCallUrl = sandbox.stub(loop.shared.Client.prototype,
                                           "requestCallUrl");
@@ -178,8 +188,8 @@ describe("loop.panel", function() {
       it("should set the call url form in a pending state", function() {
         var requestCallUrl = sandbox.stub(loop.shared.Client.prototype,
                                           "requestCallUrl");
-        var setPending = sandbox.stub(loop.panel.PanelView.prototype,
-                                      "setPending");
+        sandbox.stub(loop.panel.PanelView.prototype, "setPending");
+
         var view = new loop.panel.PanelView({notifier: notifier});
 
         view.getCallUrl({preventDefault: sandbox.spy()});
@@ -187,6 +197,21 @@ describe("loop.panel", function() {
         sinon.assert.calledOnce(view.setPending);
       });
 
+      it("should clear the pending state when a response is received",
+        function() {
+          sandbox.stub(loop.panel.PanelView.prototype,
+                       "clearPending");
+          var requestCallUrl = sandbox.stub(
+            loop.shared.Client.prototype, "requestCallUrl", function(_, cb) {
+              cb("fake error");
+            });
+          var view = new loop.panel.PanelView({notifier: notifier});
+
+          view.getCallUrl({preventDefault: sandbox.spy()});
+
+          sinon.assert.calledOnce(view.clearPending);
+        });
+
       it("should notify the user when the operation failed", function() {
         var requestCallUrl = sandbox.stub(
           loop.shared.Client.prototype, "requestCallUrl", function(_, cb) {
@@ -217,7 +242,18 @@ describe("loop.panel", function() {
 
         view.onCallUrlReceived("http://call.me/");
 
-        sinon.assert.calledOnce(view.notifier.clear, "clear");
+        sinon.assert.calledOnce(view.notifier.clear);
+      });
+    });
+
+    describe("events", function() {
+      describe("goBack", function() {
+        it("should update the button state");
+      });
+
+      describe("changeButtonState", function() {
+         it("should do set the disabled state if there is no text");
+         it("should do set the enabled state if there is text");
       });
     });
   });
diff --git a/browser/components/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
new file mode 100644
index 000000000000..e35f114bb344
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -0,0 +1,129 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Http.jsm");
+Cu.import("resource://testing-common/httpd.js");
+
+const kMockWebSocketChannelName = "Mock WebSocket Channel";
+const kWebSocketChannelContractID = "@mozilla.org/network/protocol;1?name=wss";
+
+/**
+ * Mock nsIWebSocketChannel for tests. This mocks the WebSocketChannel, and
+ * enables us to check parameters and return messages similar to the push
+ * server.
+ */
+let MockWebSocketChannel = function() {
+};
+
+MockWebSocketChannel.prototype = {
+  QueryInterface: XPCOMUtils.generateQI(Ci.nsIWebSocketChannel),
+
+  /**
+   * nsIWebSocketChannel implementations.
+   * See nsIWebSocketChannel.idl for API details.
+   */
+  asyncOpen: function(aURI, aOrigin, aListener, aContext) {
+    this.uri = aURI;
+    this.origin = aOrigin;
+    this.listener = aListener;
+    this.context = aContext;
+
+    this.listener.onStart(this.context);
+  },
+
+  sendMsg: function(aMsg) {
+    var message = JSON.parse(aMsg);
+
+    switch(message.messageType) {
+      case "hello":
+        this.listener.onMessageAvailable(this.context,
+          JSON.stringify({messageType: "hello"}));
+        break;
+      case "register":
+        this.listener.onMessageAvailable(this.context,
+          JSON.stringify({messageType: "register", pushEndpoint: "http://example.com/fake"}));
+        break;
+    }
+  }
+};
+
+/**
+ * The XPCOM factory for registering and creating the mock.
+ */
+let gMockWebSocketChannelFactory = {
+  _registered: false,
+
+  // We keep a list of instances so that we can access them outside of the service
+  // that creates them.
+  createdInstances: [],
+
+  resetInstances: function() {
+    this.createdInstances = [];
+  },
+
+  get CID() {
+    let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+    return registrar.contractIDToCID(kWebSocketChannelContractID);
+  },
+
+  /**
+   * Registers the MockWebSocketChannel, and stores the original.
+   */
+  register: function() {
+    if (this._registered)
+      return;
+
+    let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+
+    this._origFactory = Components.manager
+                                  .getClassObject(Cc[kWebSocketChannelContractID],
+                                                  Ci.nsIFactory);
+
+    registrar.unregisterFactory(Components.ID(this.CID),
+                                this._origFactory);
+
+    registrar.registerFactory(Components.ID(this.CID),
+                              kMockWebSocketChannelName,
+                              kWebSocketChannelContractID,
+                              gMockWebSocketChannelFactory);
+
+    this._registered = true;
+  },
+
+  /* Unregisters the MockWebSocketChannel, and re-registers the original
+   * Prompt Service.
+   */
+  unregister: function() {
+    if (!this._registered)
+      return;
+
+    let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+
+    registrar.unregisterFactory(Components.ID(this.CID),
+                                gMockWebSocketChannelFactory);
+    registrar.registerFactory(Components.ID(this.CID),
+                              kMockWebSocketChannelName,
+                              kWebSocketChannelContractID,
+                              this._origFactory);
+
+    delete this._origFactory;
+
+    this._registered = false;
+  },
+
+  createInstance: function(outer, iid) {
+    if (outer != null) {
+      throw Cr.NS_ERROR_NO_AGGREGATION;
+    }
+
+    let newChannel = new MockWebSocketChannel()
+
+    this.createdInstances.push(newChannel);
+
+    return newChannel;
+  }
+};
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_locales.js b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
index 0c860aff76b6..727ca86089c8 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_locales.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
@@ -1,11 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
 XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
                                   "resource:///modules/loop/MozLoopService.jsm");
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
new file mode 100644
index 000000000000..5a58be5c516d
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
@@ -0,0 +1,92 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+                                  "resource:///modules/loop/MozLoopService.jsm");
+
+var server;
+
+const kServerPushUrl = "http://localhost:3456";
+
+/**
+ * Tests reported failures when we're in offline mode.
+ */
+add_test(function test_register_offline() {
+  // It should callback with failure if in offline mode
+  Services.io.offline = true;
+
+  MozLoopService.register(function(err) {
+    Assert.equal(err, "offline", "Expected error of 'offline' to be returned");
+
+    Services.io.offline = false;
+    run_next_test();
+  });
+});
+
+/**
+ * Test that the websocket can be fully registered, and that a Loop server
+ * failure is reported.
+ */
+add_test(function test_register_websocket_success_loop_server_fail() {
+  MozLoopService.register(function(err) {
+    // 404 is an expected failure indicated by the lack of route being set
+    // up on the Loop server mock. This is added in the next test.
+    Assert.equal(err, 404, "Expected no errors in websocket registration");
+
+    let instances = gMockWebSocketChannelFactory.createdInstances;
+    Assert.equal(instances.length, 1,
+                 "Should create only one instance of websocket");
+    Assert.equal(instances[0].uri.prePath, kServerPushUrl,
+                 "Should have the url from preferences");
+    Assert.equal(instances[0].origin, kServerPushUrl,
+                 "Should have the origin url from preferences");
+    Assert.equal(instances[0].protocol, "push-notification",
+                 "Should have the protocol set to push-notifications");
+
+    gMockWebSocketChannelFactory.resetInstances();
+
+    run_next_test();
+  });
+});
+
+/**
+ * Tests that we get a success response when both websocket and Loop server
+ * registration are complete.
+ */
+add_test(function test_register_success() {
+  server.registerPathHandler("/registration", (request, response) => {
+    response.setStatusLine(null, 200, "OK");
+    response.processAsync();
+    response.finish();
+  });
+
+  MozLoopService.register(function(err) {
+    Assert.equal(err, null, "Expected no errors in websocket registration");
+
+    let instances = gMockWebSocketChannelFactory.createdInstances;
+    Assert.equal(instances.length, 1,
+                 "Should create only one instance of websocket");
+
+    run_next_test();
+  });
+});
+
+function run_test()
+{
+  server = new HttpServer();
+  server.start(-1);
+
+  // Registrations and pref settings.
+  gMockWebSocketChannelFactory.register();
+  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
+
+  Services.prefs.setCharPref("loop.server", "http://localhost:" + server.identity.primaryPort);
+
+  do_register_cleanup(function() {
+    gMockWebSocketChannelFactory.unregister();
+    server.stop(function() {});
+  });
+
+  run_next_test();
+
+}
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index 4671e79b67d0..8d595a25d5d5 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
-head =
+head = head.js
 tail =
 firefox-appdir = browser
 
 [test_loopservice_locales.js]
+[test_loopservice_registration.js]

From a9a116b3b4c29ec202e58938c6f72ab70cf40cdd Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:48 +0100
Subject: [PATCH 028/117] Bug 994151 Part 2. Only register with the servers if
 the user has obtained call urls that haven't expired yet. r=dmose

---
 browser/components/loop/MozLoopAPI.jsm        |  21 +++
 browser/components/loop/MozLoopService.jsm    | 128 ++++++++++++++----
 browser/components/loop/content/js/panel.js   |   8 +-
 .../loop/test/desktop-local/panel_test.js     |  13 +-
 .../test/xpcshell/test_loopservice_expiry.js  |  26 ++++
 .../xpcshell/test_loopservice_initialize.js   |  82 +++++++++++
 .../loop/test/xpcshell/xpcshell.ini           |   2 +
 7 files changed, 251 insertions(+), 29 deletions(-)
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_expiry.js
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_initialize.js

diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index d790164389ad..9be4f42f6f3d 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -86,6 +86,27 @@ function injectLoopAPI(targetWindow) {
       value: function(callback) {
         return MozLoopService.register(callback);
       }
+    },
+
+    /**
+     * Used to note a call url expiry time. If the time is later than the current
+     * latest expiry time, then the stored expiry time is increased. For times
+     * sooner, this function is a no-op; this ensures we always have the latest
+     * expiry time for a url.
+     *
+     * This is used to deterimine whether or not we should be registering with the
+     * push server on start.
+     *
+     * @param {Integer} expiryTimeSeconds The seconds since epoch of the expiry time
+     *                                    of the url.
+     */
+    noteCallUrlExpiry: {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: function(expiryTimeSeconds) {
+        MozLoopService.noteCallUrlExpiry(expiryTimeSeconds);
+      }
     }
   };
 
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 4cdfd7354617..791ecb07d59f 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -154,32 +154,90 @@ let MozLoopServiceInternal = {
   // The uri of the Loop server.
   loopServerUri: Services.prefs.getCharPref("loop.server"),
 
+  // Any callbacks needed when the registration process completes.
+  registrationCallbacks: [],
+
   /**
-   * The initial delay for registration.
-   *
-   * XXX We keep this short at the moment, as we don't handle delayed
-   * registrations from the user perspective. Bug 994151 will extend this.
+   * The initial delay for push registration. This ensures we don't start
+   * kicking off straight after browser startup, just a few seconds later.
    */
-  initialRegistrationDelay: 100,
+  get initialRegistrationDelayMilliseconds() {
+    // Default to 5 seconds
+    let initialDelay = 5000;
+    try {
+      // Let a pref override this for developer & testing use.
+      initialDelay = Services.prefs.getIntPref("loop.initialDelay");
+    } catch (x) {
+      // It is ok for the pref not to exist.
+    }
+    return initialDelay;
+  },
+
+  /**
+   * Gets the current latest expiry time for urls.
+   *
+   * In seconds since epoch.
+   */
+  get expiryTimeSeconds() {
+    let expiryTimeSeconds = 0;
+    try {
+      expiryTimeSeconds = Services.prefs.getIntPref("loop.urlsExpiryTimeSeconds");
+    } catch (x) {
+      // It is ok for the pref not to exist.
+    }
+
+    return expiryTimeSeconds;
+  },
+
+  /**
+   * Sets the expiry time to either the specified time, or keeps it the same
+   * depending on which is latest.
+   */
+  set expiryTimeSeconds(time) {
+    if (time > this.expiryTimeSeconds) {
+      Services.prefs.setIntPref("loop.urlsExpiryTimeSeconds", time);
+    }
+  },
 
   /**
    * Starts the initialization of the service, which goes and registers
    * with the push server and the loop server.
+   *
+   * Callback parameters:
+   * - err null on successful initialization and registration,
+   *       false if initialization is complete, but registration has not taken
+   *             place,
+   *       <other> anything else if registration has failed.
+   *
+   * @param {Function} callback Optional, called when initialization finishes.
    */
-  initialize: function() {
-    if (this.initialized)
+  initialize: function(callback) {
+    if (this.registeredPushServer || this.initalizeTimer || this.registrationInProgress) {
+      if (callback)
+        callback(this.registeredPushServer ? null : false);
       return;
+    }
 
-    this.initialized = true;
+    function secondsToMilli(value) {
+      return value * 1000;
+    }
 
-    // Kick off the push notification service into registering after a timeout
-    // this ensures we're not doing too much straight after the browser's finished
-    // starting up.
-    this.initializeTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-    this.initializeTimer.initWithCallback(function() {
-        this.registerWithServers();
+    // If expiresTime is in the future then kick-off registration.
+    if (secondsToMilli(this.expiryTimeSeconds) > Date.now()) {
+      // Kick off the push notification service into registering after a timeout
+      // this ensures we're not doing too much straight after the browser's finished
+      // starting up.
+      this.initializeTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+      this.initializeTimer.initWithCallback(function() {
+        this.registerWithServers(callback);
+        this.initializeTimer = null;
       }.bind(this),
-      this.initialRegistrationDelay, Ci.nsITimer.TYPE_ONE_SHOT);
+      this.initialRegistrationDelayMilliseconds, Ci.nsITimer.TYPE_ONE_SHOT);
+    }
+    else if (callback) {
+      // Callback with false as we haven't needed to do registration.
+      callback(false);
+    }
   },
 
   /**
@@ -200,7 +258,7 @@ let MozLoopServiceInternal = {
     }
 
     // We need to register, so save the callback.
-    this.registrationCompleteCallback = callback;
+    this.registrationCallbacks.push(callback);
 
     // If we're already in progress, just return straight away.
     if (this.registrationInProgress) {
@@ -222,11 +280,11 @@ let MozLoopServiceInternal = {
     // Reset the in progress flag
     this.registrationInProgress = false;
 
-    // Call the callback if there is one, and then release it.
-    if (this.registrationCompleteCallback) {
-      this.registrationCompleteCallback(err);
-      this.registrationCompleteCallback = null;
-    }
+    // Call any callbacks, then release them.
+    this.registrationCallbacks.forEach(function(callback) {
+      callback(err);
+    });
+    this.registrationCallbacks.length = 0;
   },
 
   /**
@@ -368,9 +426,17 @@ this.MozLoopService = {
   /**
    * Initialized the loop service, and starts registration with the
    * push and loop servers.
+   *
+   * Callback parameters:
+   * - err null on successful initialization and registration,
+   *       false if initialization is complete, but registration has not taken
+   *             place,
+   *       <other> anything else if registration has failed.
+   *
+   * @param {Function} callback Optional, called when initialization finishes.
    */
-  initialize: function() {
-    MozLoopServiceInternal.initialize();
+  initialize: function(callback) {
+    MozLoopServiceInternal.initialize(callback);
   },
 
   /**
@@ -386,6 +452,22 @@ this.MozLoopService = {
     MozLoopServiceInternal.registerWithServers(callback);
   },
 
+  /**
+   * Used to note a call url expiry time. If the time is later than the current
+   * latest expiry time, then the stored expiry time is increased. For times
+   * sooner, this function is a no-op; this ensures we always have the latest
+   * expiry time for a url.
+   *
+   * This is used to deterimine whether or not we should be registering with the
+   * push server on start.
+   *
+   * @param {Integer} expiryTimeSeconds The seconds since epoch of the expiry time
+   *                                    of the url.
+   */
+  noteCallUrlExpiry: function(expiryTimeSeconds) {
+    MozLoopServiceInternal.expiryTimeSeconds = expiryTimeSeconds;
+  },
+
   /**
    * Returns the strings for the specified element. Designed for use
    * with l10n.js.
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index e08c7f7f7bb8..6ddc69a454ee 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -65,13 +65,13 @@ loop.panel = (function(_, mozL10n) {
     getCallUrl: function(event) {
       this.notifier.clear();
       event.preventDefault();
-      var callback = function(err, callUrl) {
+      var callback = function(err, callUrlData) {
         this.clearPending();
         if (err) {
           this.notifier.errorL10n("unable_retrieve_url");
           return;
         }
-        this.onCallUrlReceived(callUrl);
+        this.onCallUrlReceived(callUrlData);
       }.bind(this);
 
       this.setPending();
@@ -86,11 +86,11 @@ loop.panel = (function(_, mozL10n) {
       this.changeButtonState();
     },
 
-    onCallUrlReceived: function(callUrl) {
+    onCallUrlReceived: function(callUrlData) {
       this.notifier.clear();
       this.$(".action .invite").hide();
       this.$(".action .invite input").val("");
-      this.$(".action .result input").val(callUrl);
+      this.$(".action .result input").val(callUrlData.call_url);
       this.$(".action .result").show();
       this.$(".description p").text(__("share_link_url"));
     },
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index b060e463abd9..ccba5a729cfd 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -228,11 +228,20 @@ describe("loop.panel", function() {
     });
 
     describe("#onCallUrlReceived", function() {
+      var callUrlData;
+
+      beforeEach(function() {
+        callUrlData = {
+          call_url: "http://call.me/",
+          expiresAt: 1000
+        };
+      });
+
       it("should update the text field with the call url", function() {
         var view = new loop.panel.PanelView({notifier: notifier});
         view.render();
 
-        view.onCallUrlReceived("http://call.me/");
+        view.onCallUrlReceived(callUrlData);
 
         expect(view.$("#call-url").val()).eql("http://call.me/");
       });
@@ -240,7 +249,7 @@ describe("loop.panel", function() {
       it("should reset all pending notifications", function() {
         var view = new loop.panel.PanelView({notifier: notifier}).render();
 
-        view.onCallUrlReceived("http://call.me/");
+        view.onCallUrlReceived(callUrlData);
 
         sinon.assert.calledOnce(view.notifier.clear);
       });
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_expiry.js b/browser/components/loop/test/xpcshell/test_loopservice_expiry.js
new file mode 100644
index 000000000000..8b1adbd08f20
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_expiry.js
@@ -0,0 +1,26 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+                                  "resource:///modules/loop/MozLoopService.jsm");
+
+function expiryTimePref() {
+  return Services.prefs.getIntPref("loop.urlsExpiryTimeSeconds");
+}
+
+function run_test()
+{
+  Services.prefs.setIntPref("loop.urlsExpiryTimeSeconds", 0);
+
+  MozLoopService.noteCallUrlExpiry(1000);
+
+  Assert.equal(expiryTimePref(), 1000, "should be equal to set value");
+
+  MozLoopService.noteCallUrlExpiry(900);
+
+  Assert.equal(expiryTimePref(), 1000, "should remain the same value");
+
+  MozLoopService.noteCallUrlExpiry(1500);
+
+  Assert.equal(expiryTimePref(), 1500, "should be the increased value");
+}
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
new file mode 100644
index 000000000000..3eaed019921d
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
@@ -0,0 +1,82 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+                                  "resource:///modules/loop/MozLoopService.jsm");
+
+var server;
+
+const kServerPushUrl = "http://localhost:3456";
+
+/**
+ * Tests that registration doesn't happen when the expiry time is
+ * not set.
+ */
+add_test(function test_initialize_no_expiry() {
+  MozLoopService.initialize(function(err) {
+    Assert.equal(err, false,
+      "should not register when no expiry time is set");
+
+    run_next_test();
+  });
+});
+
+/**
+ * Tests that registration doesn't happen when the expiry time is
+ * in the past.
+ */
+add_test(function test_initialize_expiry_past() {
+  // Set time to be 2 seconds in the past.
+  var nowSeconds = Date.now() / 1000;
+  Services.prefs.setIntPref("loop.urlsExpiryTimeSeconds", nowSeconds - 2);
+
+  MozLoopService.initialize(function(err) {
+    Assert.equal(err, false,
+      "should not register when expiry time is in past");
+
+    run_next_test();
+  });
+});
+
+/**
+ * Tests that registration happens when the expiry time is in
+ * the future.
+ */
+add_test(function test_initialize_and_register() {
+  // Set time to be 1 minute in the future
+  var nowSeconds = Date.now() / 1000;
+  Services.prefs.setIntPref("loop.urlsExpiryTimeSeconds", nowSeconds + 60);
+
+  MozLoopService.initialize(function(err) {
+    Assert.equal(err, null,
+      "should not register when expiry time is in past");
+
+    run_next_test();
+  });
+});
+
+function run_test()
+{
+  server = new HttpServer();
+  server.start(-1);
+  server.registerPathHandler("/registration", (request, response) => {
+    response.setStatusLine(null, 200, "OK");
+    response.processAsync();
+    response.finish();
+  });
+
+  // Registrations and pref settings.
+  gMockWebSocketChannelFactory.register();
+  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
+  Services.prefs.setCharPref("loop.server", "http://localhost:" + server.identity.primaryPort);
+
+  // Set the initial registration delay to a short value for fast run tests.
+  Services.prefs.setIntPref("loop.initialDelay", 10);
+
+  do_register_cleanup(function() {
+    gMockWebSocketChannelFactory.unregister();
+    server.stop(function() {});
+  });
+
+  run_next_test();
+}
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index 8d595a25d5d5..04fda5a5b52c 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -3,5 +3,7 @@ head = head.js
 tail =
 firefox-appdir = browser
 
+[test_loopservice_expiry.js]
+[test_loopservice_initialize.js]
 [test_loopservice_locales.js]
 [test_loopservice_registration.js]

From 0afb00226234d491d48a0f498bcc061248520678 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:13:48 +0100
Subject: [PATCH 029/117] Bug 1008116 Show the Loop button by default and
 update the tooltip and panel text. r=mhammond

---
 browser/base/content/browser.xul                         | 9 ++++++---
 browser/components/customizableui/src/CustomizableUI.jsm | 3 +++
 browser/locales/en-US/chrome/browser/browser.dtd         | 2 ++
 .../locales/en-US/chrome/browser/loop/loop.properties    | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 4e66d06808e9..8dd62fe1a460 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -643,7 +643,11 @@
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="small"
+#ifdef MOZ_LOOP
+             defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item"
+#else
              defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
+#endif
              customizationtarget="nav-bar-customization-target"
              overflowable="true"
              overflowbutton="nav-bar-overflow-button"
@@ -777,13 +781,12 @@
         </toolbarbutton>
 
 #ifdef MOZ_LOOP
-        <!-- XXX Bug 1008116 will do the initial L10n for these -->
+        <!-- XXX Bug 1013989 will provide a label for the button -->
         <toolbarbutton id="loop-call-button"
                        class="toolbarbutton-1 chromeclass-toolbar-additional"
                        persist="class"
                        removable="true"
-                       label="Loop"
-                       tooltiptext="Start a conversation"
+                       tooltiptext="&loopCallButton.tooltip;"
                        oncommand="LoopUI.openCallPanel(event);"
                        cui-areatype="toolbar"
                        overflows="false"
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index c3e712391ee2..8c9c888d0bf8 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -200,6 +200,9 @@ let CustomizableUIInternal = {
         "bookmarks-menu-button",
         "downloads-button",
         "home-button",
+#ifdef MOZ_LOOP
+        "loop-call-button",
+#endif
         "social-share-button",
       ],
       defaultCollapsed: false,
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 3808c29be56f..92338c3053e9 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -706,6 +706,8 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY webrtcIndicatorButton.label "Camera / Microphone Access">
 <!ENTITY webrtcIndicatorButton.tooltip "Display sites you are currently sharing your camera or microphone with">
 
+<!ENTITY loopCallButton.tooltip "Invite someone to talk">
+
 <!ENTITY mixedContentBlocked.moreinfo "Most websites will still work properly even when this content is blocked.">
 
 <!ENTITY pointerLock.notification.message "Press ESC at any time to show it again.">
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 947bfb1b40df..4aaf7fbe2858 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -1,4 +1,4 @@
-get_link_to_share=Get a link to share with a friend to Video Chat.
+get_link_to_share=Get a link and invite someone to talk
 get_a_call_url=Get a call url
 new_url=New url
 unable_retrieve_url=Sorry, we were unable to retrieve a call url.

From 3d3f6f9dd4578e0ae79e3f6012db0117a3309ca4 Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:13:48 +0100
Subject: [PATCH 030/117] Bug 976109: Save hawk-session-token to prefs at reg
 time for later use; r=mhammond

---
 browser/components/loop/MozLoopService.jsm    | 29 ++++++---
 .../xpcshell/test_loopservice_registration.js | 41 +++++++++++++
 .../test_loopservice_token_validation.js      | 60 +++++++++++++++++++
 .../loop/test/xpcshell/xpcshell.ini           |  1 +
 4 files changed, 124 insertions(+), 7 deletions(-)
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_token_validation.js

diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 791ecb07d59f..dd314139d994 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -8,6 +8,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+let console = (Cu.import("resource://gre/modules/devtools/Console.jsm", {})).console;
 
 this.EXPORTED_SYMBOLS = ["MozLoopService"];
 
@@ -328,25 +329,39 @@ let MozLoopServiceInternal = {
   },
 
   /**
-   * Callback from the registation xhr. Checks the registration result.
+   * Callback from the registration xhr. Checks the registration result.
    */
   onLoopRegistered: function() {
     if (this.loopXhr.readyState != Ci.nsIXMLHttpRequest.DONE)
       return;
 
     let status = this.loopXhr.status;
-
     if (status != 200) {
       // XXX Bubble the precise details up to the UI somehow (bug 1013248).
       Cu.reportError("Failed to register with the loop server. Code: " +
         status + " Text: " + this.loopXhr.statusText);
-    }
-    else {
-      // Otherwise we registered just fine.
-      this.registeredLoopServer = true;
+      this.endRegistration(status);
+      return;
     }
 
-    this.endRegistration(status == 200 ? null : status);
+    let sessionToken = this.loopXhr.getResponseHeader("Hawk-Session-Token");
+    if (sessionToken !== null) {
+
+      // XXX should do more validation here
+      if (sessionToken.length === 64) {
+
+        Services.prefs.setCharPref("loop.hawk-session-token", sessionToken);
+      } else {
+        // XXX Bubble the precise details up to the UI somehow (bug 1013248).
+        console.warn("Loop server sent an invalid session token");
+        this.endRegistration("session-token-wrong-size");
+        return;
+      }
+    }
+
+    // if we made it this far, we registered just fine.
+    this.registeredLoopServer = true;
+    this.endRegistration(null);
   },
 
   /**
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
index 5a58be5c516d..e0850919b020 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
@@ -49,6 +49,46 @@ add_test(function test_register_websocket_success_loop_server_fail() {
   });
 });
 
+/**
+ * Test that things behave reasonably when a reasonable Hawk-Session-Token
+ * header is returned with the registration response.
+ */
+add_test(function test_registration_returns_hawk_session_token() {
+  var fakeSessionToken = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750";
+  Services.prefs.clearUserPref("loop.hawk-session-token");
+
+  server.registerPathHandler("/registration", (request, response) => {
+    response.setStatusLine(null, 200, "OK");
+    response.setHeader("Hawk-Session-Token", fakeSessionToken, false);
+    response.processAsync();
+    response.finish();
+  });
+
+  MozLoopService.register(function(err) {
+
+    Assert.equal(err, null, "Should not cause an error to be called back on" +
+      " an otherwise valid request");
+
+    var hawkSessionPref;
+    try {
+      hawkSessionPref = Services.prefs.getCharPref("loop.hawk-session-token");
+    } catch (ex) {
+      // avoid slowing/hanging the tests if the pref isn't there
+      dump("unexpected exception: " + ex + "\n");
+    }
+    Assert.equal(hawkSessionPref, fakeSessionToken, "Should store" +
+      " Hawk-Session-Token header contents in loop.hawk-session-token pref");
+
+    run_next_test();
+  });
+});
+
+
+// XXX should send existing token pref if already set
+
+// XXX should call back the error string "no-hawk-token" and when
+// Hawk-Session-Token is unset if we're waiting for one
+
 /**
  * Tests that we get a success response when both websocket and Loop server
  * registration are complete.
@@ -84,6 +124,7 @@ function run_test()
 
   do_register_cleanup(function() {
     gMockWebSocketChannelFactory.unregister();
+    Services.prefs.clearUserPref("loop.hawk-session-token");
     server.stop(function() {});
   });
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
new file mode 100644
index 000000000000..d89411ee3e06
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
@@ -0,0 +1,60 @@
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+  "resource:///modules/loop/MozLoopService.jsm");
+
+var server;
+
+const kServerPushUrl = "http://localhost:3456";
+
+// XXX should report error if Hawk-Session-Token is lexically invalid
+// (not a string of 64 hex digits) to help resist other possible injection
+// attacks.  For now, however, we're just checking if it's the right length.
+add_test(function test_registration_handles_bogus_hawk_token() {
+
+  var wrongSizeToken = "jdkasjkasjdlaksj";
+  Services.prefs.clearUserPref("loop.hawk-session-token");
+
+  server.registerPathHandler("/registration", (request, response) => {
+    response.setStatusLine(null, 200, "OK");
+    response.setHeader("Hawk-Session-Token", wrongSizeToken, false);
+    response.processAsync();
+    response.finish();
+  });
+
+  MozLoopService.register(function(err) {
+
+    Assert.equal(err, "session-token-wrong-size", "Should cause an error to be" +
+      " called back if the session-token is not 64 characters long");
+
+    // for some reason, Assert.throw is misbehaving, so....
+    var ex;
+    try {
+      Services.prefs.getCharPref("loop.hawk-session-token");
+    } catch (e) {
+      ex = e;
+    }
+    Assert.notEqual(ex, undefined, "Should not set a loop.hawk-session-token pref");
+
+    run_next_test();
+  });
+});
+
+function run_test()
+{
+  server = new HttpServer();
+  server.start(-1);
+
+  // Registrations and pref settings.
+  gMockWebSocketChannelFactory.register();
+  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
+
+  Services.prefs.setCharPref("loop.server", "http://localhost:" + server.identity.primaryPort);
+
+  do_register_cleanup(function() {
+    gMockWebSocketChannelFactory.unregister();
+    Services.prefs.clearUserPref("loop.hawk-session-token");
+    server.stop(function() {});
+  });
+
+  run_next_test();
+
+}
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index 04fda5a5b52c..d45deb4994d6 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -7,3 +7,4 @@ firefox-appdir = browser
 [test_loopservice_initialize.js]
 [test_loopservice_locales.js]
 [test_loopservice_registration.js]
+[test_loopservice_token_validation.js]

From ff614af1dd7571264977736cea4837896f9c2708 Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:13:48 +0100
Subject: [PATCH 031/117] Bug 976109 - Implement mozLoop.getLoopCharPref,
 r=mhammond

---
 browser/components/loop/MozLoopAPI.jsm        | 24 ++++++++-
 browser/components/loop/MozLoopService.jsm    | 27 +++++++++-
 .../test_loopservice_get_loop_char_pref.js    | 50 +++++++++++++++++++
 .../xpcshell/test_loopservice_registration.js |  2 +-
 .../loop/test/xpcshell/xpcshell.ini           |  1 +
 5 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js

diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index 9be4f42f6f3d..ad317ff6191c 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -94,7 +94,7 @@ function injectLoopAPI(targetWindow) {
      * sooner, this function is a no-op; this ensures we always have the latest
      * expiry time for a url.
      *
-     * This is used to deterimine whether or not we should be registering with the
+     * This is used to determine whether or not we should be registering with the
      * push server on start.
      *
      * @param {Integer} expiryTimeSeconds The seconds since epoch of the expiry time
@@ -107,6 +107,28 @@ function injectLoopAPI(targetWindow) {
       value: function(expiryTimeSeconds) {
         MozLoopService.noteCallUrlExpiry(expiryTimeSeconds);
       }
+    },
+
+    /**
+     * Return any preference under "loop." that's coercible to a character
+     * preference.
+     *
+     * @param {String} prefName The name of the pref without the preceding
+     * "loop."
+     *
+     * Any errors thrown by the Mozilla pref API are logged to the console
+     * and cause null to be returned. This includes the case of the preference
+     * not being found.
+     *
+     * @return {String} on success, null on error
+     */
+    getLoopCharPref: {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: function(prefName) {
+        return MozLoopService.getLoopCharPref(prefName);
+      }
     }
   };
 
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index dd314139d994..1655acaac3d0 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -329,7 +329,7 @@ let MozLoopServiceInternal = {
   },
 
   /**
-   * Callback from the registration xhr. Checks the registration result.
+   * Callback from the loopXhr. Checks the registration result.
    */
   onLoopRegistered: function() {
     if (this.loopXhr.readyState != Ci.nsIXMLHttpRequest.DONE)
@@ -359,7 +359,7 @@ let MozLoopServiceInternal = {
       }
     }
 
-    // if we made it this far, we registered just fine.
+    // If we made it this far, we registered just fine.
     this.registeredLoopServer = true;
     this.endRegistration(null);
   },
@@ -513,5 +513,28 @@ this.MozLoopService = {
     } catch (ex) {
       return "en-US";
     }
+  },
+
+  /**
+   * Return any preference under "loop." that's coercible to a character
+   * preference.
+   *
+   * @param {String} prefName The name of the pref without the preceding
+   * "loop."
+   *
+   * Any errors thrown by the Mozilla pref API are logged to the console
+   * and cause null to be returned. This includes the case of the preference
+   * not being found.
+   *
+   * @return {String} on success, null on error
+   */
+  getLoopCharPref: function(prefName) {
+    try {
+      return Services.prefs.getCharPref("loop." + prefName);
+    } catch (ex) {
+      console.log("getLoopCharPref had trouble getting " + prefName +
+        "; exception: " + ex);
+      return null;
+    }
   }
 };
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js b/browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js
new file mode 100644
index 000000000000..2f7fe342b61e
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js
@@ -0,0 +1,50 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+/*global XPCOMUtils, Services, Assert */
+
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+  "resource:///modules/loop/MozLoopService.jsm");
+
+var fakePrefName = "color";
+var fakePrefValue = "green";
+
+function test_getLoopCharPref()
+{
+  Services.prefs.setCharPref("loop." + fakePrefName, fakePrefValue);
+
+  var returnedPref = MozLoopService.getLoopCharPref(fakePrefName);
+
+  Assert.equal(returnedPref, fakePrefValue,
+    "Should return a char pref under the loop. branch");
+  Services.prefs.clearUserPref("loop." + fakePrefName);
+}
+
+function test_getLoopCharPref_not_found()
+{
+  var returnedPref = MozLoopService.getLoopCharPref(fakePrefName);
+
+  Assert.equal(returnedPref, null,
+    "Should return null if a preference is not found");
+}
+
+function test_getLoopCharPref_non_coercible_type()
+{
+  Services.prefs.setBoolPref("loop." + fakePrefName, false );
+
+  var returnedPref = MozLoopService.getLoopCharPref(fakePrefName);
+
+  Assert.equal(returnedPref, null,
+    "Should return null if the preference exists & is of a non-coercible type");
+}
+
+
+function run_test()
+{
+  test_getLoopCharPref();
+  test_getLoopCharPref_not_found();
+  test_getLoopCharPref_non_coercible_type();
+
+  do_register_cleanup(function() {
+    Services.prefs.clearUserPref("loop." + fakePrefName);
+  });
+}
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
index e0850919b020..30b77c83c7cf 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
@@ -54,6 +54,7 @@ add_test(function test_register_websocket_success_loop_server_fail() {
  * header is returned with the registration response.
  */
 add_test(function test_registration_returns_hawk_session_token() {
+
   var fakeSessionToken = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750";
   Services.prefs.clearUserPref("loop.hawk-session-token");
 
@@ -83,7 +84,6 @@ add_test(function test_registration_returns_hawk_session_token() {
   });
 });
 
-
 // XXX should send existing token pref if already set
 
 // XXX should call back the error string "no-hawk-token" and when
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index d45deb4994d6..d784e770ad88 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -8,3 +8,4 @@ firefox-appdir = browser
 [test_loopservice_locales.js]
 [test_loopservice_registration.js]
 [test_loopservice_token_validation.js]
+[test_loopservice_get_loop_char_pref.js]

From 1cb2fa0cf55f51ee2236a5d33a5c4f07171909b6 Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:13:49 +0100
Subject: [PATCH 032/117] No bug - Bandaid to make registration work right;
 real fix coming in bug 1017394, rs=Standard8

---
 browser/components/loop/MozLoopService.jsm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 1655acaac3d0..9783f8dda2ac 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -259,7 +259,9 @@ let MozLoopServiceInternal = {
     }
 
     // We need to register, so save the callback.
-    this.registrationCallbacks.push(callback);
+    if (callback) {
+      this.registrationCallbacks.push(callback);
+    }
 
     // If we're already in progress, just return straight away.
     if (this.registrationInProgress) {

From 38eac2392c3afdbf19bf4493ecfe4b476940bac9 Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:13:49 +0100
Subject: [PATCH 033/117] Bug 976109 - Load and package Hawk libraries, r=NiKo`

---
 browser/components/loop/content/conversation.html | 4 ++++
 browser/components/loop/content/panel.html        | 4 ++++
 browser/components/loop/jar.mn                    | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index 5ca5217ba8c3..104f03b4d380 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -20,6 +20,10 @@
     <script type="text/javascript" src="loop/shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="loop/shared/libs/lodash-2.4.1.js"></script>
     <script type="text/javascript" src="loop/shared/libs/backbone-1.1.2.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/sjcl.min.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/token.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/hawk-browser-2.2.1.js"></script>
+
     <script type="text/javascript" src="loop/shared/js/client.js"></script>
     <script type="text/javascript" src="loop/shared/js/models.js"></script>
     <script type="text/javascript" src="loop/shared/js/router.js"></script>
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index b57cfb3b421f..5aedec510e52 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -19,6 +19,10 @@
     <script type="text/javascript" src="loop/shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="loop/shared/libs/lodash-2.4.1.js"></script>
     <script type="text/javascript" src="loop/shared/libs/backbone-1.1.2.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/sjcl.min.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/token.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/hawk-browser-2.2.1.js"></script>
+
     <script type="text/javascript" src="loop/shared/js/client.js"></script>
     <script type="text/javascript" src="loop/shared/js/models.js"></script>
     <script type="text/javascript" src="loop/shared/js/router.js"></script>
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 775026072d18..b67887b2eaf1 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -19,6 +19,9 @@ browser.jar:
   content/browser/loop/shared/libs/lodash-2.4.1.js   (content/shared/libs/lodash-2.4.1.js)
   content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
+  content/browser/loop/shared/libs/sjcl.min.js       (content/shared/libs/sjcl.min.js)
+  content/browser/loop/shared/libs/token.js          (content/shared/libs/token.js)
+  content/browser/loop/shared/libs/hawk-browser-2.2.1.js      (content/shared/libs/hawk-browser-2.2.1.js)
   content/browser/loop/libs/l10n.js                  (content/libs/l10n.js)
   content/browser/loop/js/desktopRouter.js           (content/js/desktopRouter.js)
   content/browser/loop/js/conversation.js            (content/js/conversation.js)

From 7921706444f84075748da5396cc9e9dbfdfadc7e Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 034/117] Bug 983697 - Fill loop-client repository with basic
 server & readme. r=dmose

--HG--
extra : transplant_source : Z%1E%08.%D8%87%A3%E7%A7%E7d%CD%AF%EA%D0wp%E4d%D8
---
 browser/components/loop/standalone/.gitignore |    1 +
 .../components/loop/standalone/.jshintignore  |    4 +
 browser/components/loop/standalone/.jshintrc  |   43 +
 browser/components/loop/standalone/Makefile   |   20 +
 browser/components/loop/standalone/README.md  |   39 +
 .../components/loop/standalone/package.json   |   19 +
 browser/components/loop/standalone/server.js  |   14 +
 readme.html                                   |    0
 static/css/webapp.css                         |   11 +
 static/index.html                             |   52 +
 static/js/webapp.js                           |   18 +
 static/l10n/data.ini                          |    3 +
 static/shared/README.md                       |   12 +
 static/shared/css/common.css                  |  138 +
 static/shared/css/conversation.css            |   43 +
 static/shared/css/panel.css                   |   60 +
 static/shared/css/readme.html                 |  173 +
 static/shared/img/icon_32.png                 |  Bin 0 -> 2351 bytes
 static/shared/img/icon_64.png                 |  Bin 0 -> 4081 bytes
 static/shared/libs/backbone-1.1.2.js          |    9 +
 static/shared/libs/jquery-2.1.0.js            |    4 +
 static/shared/libs/lodash-2.4.1.js            |   56 +
 static/shared/libs/webl10n-20130617.js        | 1157 ++++
 test/vendor/chai-1.9.0.js                     | 4696 +++++++++++++
 test/vendor/mocha-1.17.1.css                  |  270 +
 test/vendor/mocha-1.17.1.js                   | 5812 +++++++++++++++++
 test/vendor/sinon-1.9.0.js                    | 4794 ++++++++++++++
 test/webapp_test.js                           |   13 +
 28 files changed, 17461 insertions(+)
 create mode 100644 browser/components/loop/standalone/.gitignore
 create mode 100644 browser/components/loop/standalone/.jshintignore
 create mode 100644 browser/components/loop/standalone/.jshintrc
 create mode 100644 browser/components/loop/standalone/Makefile
 create mode 100644 browser/components/loop/standalone/README.md
 create mode 100644 browser/components/loop/standalone/package.json
 create mode 100644 browser/components/loop/standalone/server.js
 create mode 100644 readme.html
 create mode 100644 static/css/webapp.css
 create mode 100644 static/index.html
 create mode 100644 static/js/webapp.js
 create mode 100644 static/l10n/data.ini
 create mode 100644 static/shared/README.md
 create mode 100644 static/shared/css/common.css
 create mode 100644 static/shared/css/conversation.css
 create mode 100644 static/shared/css/panel.css
 create mode 100644 static/shared/css/readme.html
 create mode 100644 static/shared/img/icon_32.png
 create mode 100644 static/shared/img/icon_64.png
 create mode 100644 static/shared/libs/backbone-1.1.2.js
 create mode 100644 static/shared/libs/jquery-2.1.0.js
 create mode 100644 static/shared/libs/lodash-2.4.1.js
 create mode 100644 static/shared/libs/webl10n-20130617.js
 create mode 100644 test/vendor/chai-1.9.0.js
 create mode 100644 test/vendor/mocha-1.17.1.css
 create mode 100644 test/vendor/mocha-1.17.1.js
 create mode 100644 test/vendor/sinon-1.9.0.js
 create mode 100644 test/webapp_test.js

diff --git a/browser/components/loop/standalone/.gitignore b/browser/components/loop/standalone/.gitignore
new file mode 100644
index 000000000000..3c3629e647f5
--- /dev/null
+++ b/browser/components/loop/standalone/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/browser/components/loop/standalone/.jshintignore b/browser/components/loop/standalone/.jshintignore
new file mode 100644
index 000000000000..1adfbf46b9b3
--- /dev/null
+++ b/browser/components/loop/standalone/.jshintignore
@@ -0,0 +1,4 @@
+node_modules
+static/libs
+test/vendor
+
diff --git a/browser/components/loop/standalone/.jshintrc b/browser/components/loop/standalone/.jshintrc
new file mode 100644
index 000000000000..26f9de1d0feb
--- /dev/null
+++ b/browser/components/loop/standalone/.jshintrc
@@ -0,0 +1,43 @@
+{
+  "browser" : true,   // Web Browser (window, document, etc)
+  "eqeqeq" : true,    // true: Require triple equals (===) for comparison
+  "devel" : true,     // Development/debugging (alert, confirm, etc)
+  "immed" : false,    // true: Require immediate invocations to be wrapped
+                      // in parens e.g. `(function () { } ());`
+  "indent" : 2,
+  "jquery": true,
+  "latedef" : true,   // true: Require variables to be defined before use
+                      // (helps avoid hoisting bugs)
+
+  "maxlen" : 80,      // {int} Max number of characters per line
+  "node" : true,      // Node.js
+  "strict": true,     // Strict mode
+  "trailing" : false, // true: Prohibit trailing whitespaces
+  "undef" : true,     // true: Require all non-global variables to be
+                      // declared (prevents global leaks)
+  "unused" : "vars",  // vars: Require all defined variables be used, but not
+                      //       function parameters
+
+  "globals": {
+    // chai global
+    "chai": false,
+
+    // mocha globals
+    "after": false,
+    "afterEach": false,
+    "before": false,
+    "beforeEach": false,
+    "describe": false,
+    "it": false,
+
+    // firefox stuff not covered by "browser" option
+    "indexedDB": true,
+    "mozRTCIceCandidate": false,
+    "mozRTCPeerConnection": false,
+    "mozRTCSessionDescription": false,
+
+    "Backbone": false,
+
+    "_": false
+  }
+}
diff --git a/browser/components/loop/standalone/Makefile b/browser/components/loop/standalone/Makefile
new file mode 100644
index 000000000000..306eb4c48644
--- /dev/null
+++ b/browser/components/loop/standalone/Makefile
@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+NODE_LOCAL_BIN=./node_modules/.bin
+
+install:
+	@npm install
+
+test:
+	@echo "Not implemented yet."
+
+lint:
+	@$(NODE_LOCAL_BIN)/jshint *.js static test
+
+runserver:
+	@node server.js
+
+frontend:
+	@echo "Not implemented yet."
diff --git a/browser/components/loop/standalone/README.md b/browser/components/loop/standalone/README.md
new file mode 100644
index 000000000000..e4eccab2c6c0
--- /dev/null
+++ b/browser/components/loop/standalone/README.md
@@ -0,0 +1,39 @@
+Loop Client
+===========
+
+Prerequisites
+-------------
+
+NodeJS and npm installed.
+
+Installation
+------------
+
+    $ make install
+
+Usage
+-----
+
+For development, run a local static file server:
+
+    $ make runserver
+
+Then point your browser at:
+
+- `http://localhost:3000/static/` for public web contents,
+- `http://localhost:3000/test/` for tests.
+
+**Note:** the provided static file server is **not** intended for production
+use.
+
+Code linting
+------------
+
+    $ make lint
+
+License
+-------
+
+The Loop server code is released under the terms of the
+[Mozilla Public License v2.0](http://www.mozilla.org/MPL/2.0/). See the
+`LICENSE` file at the root of the repository.
diff --git a/browser/components/loop/standalone/package.json b/browser/components/loop/standalone/package.json
new file mode 100644
index 000000000000..364ffab9549e
--- /dev/null
+++ b/browser/components/loop/standalone/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "Loop-client",
+  "description": "Video conferencing app powered by WebRTC.",
+  "version": "0.0.1",
+  "engines": {
+    "node": "0.10.x",
+    "npm":"1.3.x"
+  },
+  "dependencies": {
+    "express": "3.x"
+  },
+  "devDependencies": {
+    "jshint": "2.x"
+  },
+  "scripts": {
+    "test": "make test",
+    "start": "make runserver"
+  }
+}
diff --git a/browser/components/loop/standalone/server.js b/browser/components/loop/standalone/server.js
new file mode 100644
index 000000000000..6a917d9eeb54
--- /dev/null
+++ b/browser/components/loop/standalone/server.js
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var express = require('express');
+var app = express();
+
+app.use(express.static(__dirname + '/'));
+
+app.listen(3000);
+console.log("Serving repository root over HTTP at http://localhost:3000/");
+console.log("Static contents are available at http://localhost:3000/static/");
+console.log("Tests are viewable at http://localhost:3000/test/");
+console.log("Use this for development only.");
diff --git a/readme.html b/readme.html
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/static/css/webapp.css b/static/css/webapp.css
new file mode 100644
index 000000000000..3b2b630d6f61
--- /dev/null
+++ b/static/css/webapp.css
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+body {
+  width: 100%;
+  /* prevent the video convsersation elements to occupy the whole available
+     width hence the height while keeping aspect ratio */
+  max-width: 730px;
+  margin: 0 auto;
+}
diff --git a/static/index.html b/static/index.html
new file mode 100644
index 000000000000..2679f7021f42
--- /dev/null
+++ b/static/index.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Loop</title>
+    <link rel="stylesheet" type="text/css" href="shared/css/common.css">
+    <link rel="stylesheet" type="text/css" href="shared/css/conversation.css">
+    <link rel="stylesheet" type="text/css" href="css/webapp.css">
+    <link rel="prefetch" type="application/l10n" href="l10n/data.ini">
+  </head>
+  <body onload="loop.webapp.init();">
+
+    <header>
+      <h1>Loop</h1>
+    </header>
+
+    <div id="call-launcher">
+      <p><button class="btn">Call</button></p>
+    </div>
+
+    <div id="call" class="conversation">
+      <nav class="controls">
+        <button class="btn" data-l10n-id="start">Start</button>
+        <button class="btn" data-l10n-id="stop">Stop</button>
+      </nav>
+      <div class="media nested">
+        <video class="remote" src="http://v2v.cc/~j/theora_testsuite/320x240.ogg"></video>
+        <video class="local" src="http://v2v.cc/~j/theora_testsuite/320x240.ogg"></video>
+      </div>
+    </div>
+
+    <!-- libs -->
+    <script type="text/javascript" src="shared/libs/webl10n-20130617.js"></script>
+    <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
+    <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
+    <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
+
+    <!-- app scripts -->
+    <script type="text/javascript" src="js/webapp.js"></script>
+
+    <script>
+    // Set the 'lang' and 'dir' attributes to <html> when the page is translated
+    window.addEventListener('localized', function() {
+      document.documentElement.lang = document.webL10n.getLanguage();
+      document.documentElement.dir = document.webL10n.getDirection();
+    }, false);
+    </script>
+  </body>
+</html>
diff --git a/static/js/webapp.js b/static/js/webapp.js
new file mode 100644
index 000000000000..5eb89386a0b1
--- /dev/null
+++ b/static/js/webapp.js
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*global loop:true*/
+
+var loop = loop || {};
+loop.webapp = (function() {
+  "use strict";
+
+  function init() {
+    console.log("Loop app started.");
+  }
+
+  return {
+    init: init
+  };
+})();
diff --git a/static/l10n/data.ini b/static/l10n/data.ini
new file mode 100644
index 000000000000..ecd38f8d181f
--- /dev/null
+++ b/static/l10n/data.ini
@@ -0,0 +1,3 @@
+[en-US]
+start=Start
+stop=Stop
diff --git a/static/shared/README.md b/static/shared/README.md
new file mode 100644
index 000000000000..8773432f4e32
--- /dev/null
+++ b/static/shared/README.md
@@ -0,0 +1,12 @@
+Loop Shared Web Assets
+======================
+
+This directory contains web assets shared across the Loop client webapp and the
+Loop Firefox Component.
+
+Warning
+-------
+
+Any modification in these files will have possible side effects on both the
+Firefox component and the webapp. The `css/readme.html` file uses all the shared
+styles, you should use it as a way of checking for visual regressions.
diff --git a/static/shared/css/common.css b/static/shared/css/common.css
new file mode 100644
index 000000000000..c4b969ec4f46
--- /dev/null
+++ b/static/shared/css/common.css
@@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Generic rules */
+
+/**
+ * "Fixes" the Box Model.
+ * @see http://www.paulirish.com/2012/box-sizing-border-box-ftw/
+ */
+*, *:before, *:after {
+  box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  padding: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans;
+  font-size: 14px;
+  background: #f2f2f2;
+}
+
+button {
+  font-size: .9em; /* for some reason, text is larger within <button> */
+}
+
+img {
+  border: none;
+}
+
+/* Helpers */
+
+/**
+ * Clearfix impl. for modern browsers
+ * 1. The space content is one way to avoid an Opera bug when the
+ *    contenteditable attribute is included anywhere else in the document.
+ *    Otherwise it causes space to appear at the top and bottom of elements
+ *    that are clearfixed.
+ * 2. The use of `table` rather than `block` is only necessary if using
+ *    `:before` to contain the top-margins of child elements.
+ */
+.cf:before,
+.cf:after {
+  content: " ";   /* 1 */
+  display: table; /* 2 */
+}
+
+.cf:after {
+  clear: both;
+}
+
+.hide {
+  display: none;
+}
+
+.tc {
+  text-align: center;
+}
+
+/* Buttons */
+
+.btn {
+  display: inline-block;
+  background: #aaa;
+  border: none;
+  color: #fff;
+  text-decoration: none;
+  padding: .25em .5em .3em;
+  border-radius: .2em;
+}
+
+.btn-info {
+  background: #428BCA;
+}
+
+.btn-success {
+  background: #5cb85c;
+}
+
+.btn-warning {
+  background: #f0ad4e;
+}
+
+.btn-error {
+  background: #d9534f;
+}
+
+/* Alerts */
+.alert {
+  background: #eee;
+  padding: .2em 1em;
+  margin-bottom: 1em;
+}
+
+.alert p.message {
+  padding: 0;
+  margin: 0;
+}
+
+.alert.alert-error {
+  background: #f99;
+  border: 1px solid #f77;
+}
+
+.alert .close {
+  position: relative;
+  top: 0;
+  right: -.8em;
+}
+
+/* Misc */
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 1em;
+  color: #000;
+  opacity: .2;
+}
+
+.close:before {
+  /* \2716 is unicode representation of the close button icon */
+  content: '\2716';
+}
+
+button.close {
+  background: none;
+  border: none;
+  padding: none;
+  cursor: pointer;
+}
+
+/* Transitions */
+.fade-out {
+  transition: opacity 0.5s ease-in;
+  opacity: 0;
+}
diff --git a/static/shared/css/conversation.css b/static/shared/css/conversation.css
new file mode 100644
index 000000000000..d65bdced5a03
--- /dev/null
+++ b/static/shared/css/conversation.css
@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Conversation window styles */
+
+.conversation .controls {
+  background: #f2f2f2;
+  padding: .5em;
+}
+
+.conversation .media video {
+  background: #eee;
+}
+
+/* Nested video elements */
+
+.conversation .media.nested {
+  position: relative;
+}
+
+.conversation .media.nested .remote {
+  width: 100%;
+}
+
+.conversation .media.nested .local {
+  position: absolute;
+  bottom: .8em;
+  right: .8em;
+  width: 30%;
+  max-width: 140px;
+}
+
+/* Side by side video elements */
+
+.conversation .media.side-by-side .remote {
+  width: 50%;
+  float: left;
+}
+
+.conversation .media.side-by-side .local {
+  width: 50%;
+}
diff --git a/static/shared/css/panel.css b/static/shared/css/panel.css
new file mode 100644
index 000000000000..d75b141b979f
--- /dev/null
+++ b/static/shared/css/panel.css
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Panel styles */
+
+.spacer {
+  margin-bottom: 1em;
+}
+
+.share {
+  background: #f2f2f2;
+}
+
+.share .description {
+  background: #f7f7f7 url("../img/icon_32.png") no-repeat 1em 1.5em;
+  border-bottom: 1px solid #c3c3c3;
+  padding: 1em 1em 0 4em;
+}
+
+.share .description .field {
+  padding-bottom: 1em;
+  border-bottom: 1px dotted #ddd;
+}
+
+.share .description select {
+  float: right;
+}
+
+.share .description .preview video {
+  background: #ccc;
+  float: right;
+  width: 180px;
+}
+
+.share .action {
+  clear: right;
+  padding: 1em;
+  border-top: 1px solid #fafafa;
+}
+
+.share .action p {
+  margin: 0 0 1em 0;
+}
+
+.share .action input {
+  font-size: .9em;
+  width: 60%;
+  padding: .4em;
+}
+
+/* Specific cases */
+
+.share.generate-url .action {
+  text-align: center;
+}
+
+.share .action .messages p {
+  margin: 0;
+}
diff --git a/static/shared/css/readme.html b/static/shared/css/readme.html
new file mode 100644
index 000000000000..0a714552c79d
--- /dev/null
+++ b/static/shared/css/readme.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<!-- This file is intended to help frontend developers to easily identify what
+     are the available styles for the Loop UI components. -->
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Loop UI shared CSS information/demo</title>
+  <link type="text/css" rel="stylesheet" href="common.css">
+  <link type="text/css" rel="stylesheet" href="panel.css">
+  <link type="text/css" rel="stylesheet" href="conversation.css">
+  <style>
+    body {
+      width: 600px;
+      margin: 1em auto;
+      background: #fff;
+      font-family: Helvetica, Arial, sans;
+    }
+  </style>
+</head>
+<body>
+  <h1>Loop UI toolkit</h1>
+
+  <h2>Logo icons</h2>
+
+  <p>
+    <img src="../img/icon_32.png"> 32x32 transparent PNG
+    <img src="../img/icon_64.png"> 64x64 transparent PNG
+  </p>
+
+  <p><em><strong>Note:</strong> these are temporary.</em></p>
+
+  <h2>Share panel</h2>
+
+  <h3>Simple</h3>
+
+  <div class="share">
+    <form class="description">
+      <p>This is a simple message.</p>
+    </form>
+    <div class="action">
+      <p><input type="url" value="http://loop.im/plop75"></p>
+      <p>Your name will appear as <a href="">Unnamed</a>.</p>
+    </div>
+  </div>
+
+  <h3>Featuring options</h3>
+
+  <div class="share">
+    <form class="description">
+      <p class="field">
+        <label>Share this link with a friend to
+          <select>
+            <option>browse together</option>
+            <option selected="selected">video chat</option>
+            <option>audio chat</option>
+            <option>text chat</option>
+          </select>
+        </label>
+      </p>
+      <p class="field">
+        <label>
+          Use webcam <select><option>Foo</option></select>
+        </label>
+      </p>
+      <p class="field">
+        <label>Use whatever
+          <select><option>Long foo is long indeed</option></select>
+        </label>
+      </p>
+      <p class="preview cf">
+        Preview <video></video>
+      </p>
+    </form>
+    <div class="action">
+      <p><input type="url" value="http://loop.im/plop75"></p>
+      <p>Your name will appear as <a href="">Unnamed</a>.</p>
+    </div>
+  </div>
+
+  <h2>Conversation window</h2>
+
+  <p><em>The conversation component adapts automatically to its container to
+    occupy all the available space.</em></p>
+
+  <h3>Large</h3>
+
+  <div class="conversation">
+    <div class="media nested">
+      <video class="remote"></video>
+      <video class="local"></video>
+    </div>
+  </div>
+
+  <h3>Large with controls</h3>
+
+  <div class="conversation">
+    <nav class="controls">
+      <button class="btn">Start</button>
+      <button class="btn">Stop</button>
+    </nav>
+    <div class="media nested">
+      <video class="remote"></video>
+      <video class="local"></video>
+    </div>
+  </div>
+
+  <h3>Small (think chat window)</h3>
+
+  <div style="width: 204px">
+    <div class="conversation">
+      <div class="media nested">
+        <video class="remote"></video>
+        <video class="local"></video>
+      </div>
+    </div>
+  </div>
+
+  <h3>Side by side</h3>
+
+  <div class="conversation">
+    <div class="media side-by-side">
+      <video class="remote"></video>
+      <video class="local"></video>
+    </div>
+  </div>
+
+  <h2>Buttons</h2>
+
+  <h3>Using <code>&lt;a&gt;</code></h3>
+
+  <p>
+    <a href="" class="btn">default</a>
+    <a href="" class="btn btn-info">info</a>
+    <a href="" class="btn btn-success">success</a>
+    <a href="" class="btn btn-warning">warning</a>
+    <a href="" class="btn btn-error">error</a>
+  </p>
+
+  <h3>Inline</h3>
+
+  <p>Click <a href="" class="btn btn-info">here</a>.</p>
+
+  <h3>Using <code>&lt;button&gt;</code></h3>
+
+  <p>
+    <button class="btn">default</button>
+    <button class="btn btn-info">info</button>
+    <button class="btn btn-success">success</button>
+    <button class="btn btn-warning">warning</button>
+    <button class="btn btn-error">error</button>
+  </p>
+
+  <h2>Alerts</h2>
+
+  <div class="alert alert-error">
+    <button class="close"
+            onclick="var el=this.parentNode;el.classList.add('fade-out');setTimeout(el.remove.bind(el), 500);"></button>
+    <p class="message">Oops! Something went really wrong.</p>
+  </div>
+
+  <script>
+  window.onload = function() {
+    [].forEach.call(document.querySelectorAll("video"), function(video) {
+      video.setAttribute("src", "http://v2v.cc/~j/theora_testsuite/320x240.ogg");
+    });
+  }
+  </script>
+</body>
+</html>
diff --git a/static/shared/img/icon_32.png b/static/shared/img/icon_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..03cc4d461f83d29d4c842d9cc2172f2c310197f7
GIT binary patch
literal 2351
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
IrAB4^2kB(P6951J

literal 0
HcmV?d00001

diff --git a/static/shared/img/icon_64.png b/static/shared/img/icon_64.png
new file mode 100644
index 0000000000000000000000000000000000000000..8368d7c5cd9818703ad4293c2e2f13441f452b4d
GIT binary patch
literal 4081
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

literal 0
HcmV?d00001

diff --git a/static/shared/libs/backbone-1.1.2.js b/static/shared/libs/backbone-1.1.2.js
new file mode 100644
index 000000000000..2c123e771579
--- /dev/null
+++ b/static/shared/libs/backbone-1.1.2.js
@@ -0,0 +1,9 @@
+//     Backbone.js 1.1.2
+
+//     (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://backbonejs.org
+
+(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r){var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this.id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this.isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChanged(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]=t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","className","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});
+//# sourceMappingURL=backbone-min.map
diff --git a/static/shared/libs/jquery-2.1.0.js b/static/shared/libs/jquery-2.1.0.js
new file mode 100644
index 000000000000..cbe6abe59a81
--- /dev/null
+++ b/static/shared/libs/jquery-2.1.0.js
@@ -0,0 +1,4 @@
+/*! jQuery v2.1.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m=a.document,n="2.1.0",o=function(a,b){return new o.fn.init(a,b)},p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};o.fn=o.prototype={jquery:n,constructor:o,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=o.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return o.each(this,a,b)},map:function(a){return this.pushStack(o.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},o.extend=o.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||o.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(o.isPlainObject(d)||(e=o.isArray(d)))?(e?(e=!1,f=c&&o.isArray(c)?c:[]):f=c&&o.isPlainObject(c)?c:{},g[b]=o.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},o.extend({expando:"jQuery"+(n+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===o.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isPlainObject:function(a){if("object"!==o.type(a)||a.nodeType||o.isWindow(a))return!1;try{if(a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(b){return!1}return!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=o.trim(a),a&&(1===a.indexOf("use strict")?(b=m.createElement("script"),b.text=a,m.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":k.call(a)},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?o.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),o.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||o.guid++,f):void 0},now:Date.now,support:l}),o.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=o.type(a);return"function"===c||o.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);o.find=t,o.expr=t.selectors,o.expr[":"]=o.expr.pseudos,o.unique=t.uniqueSort,o.text=t.getText,o.isXMLDoc=t.isXML,o.contains=t.contains;var u=o.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(o.isFunction(b))return o.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return o.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return o.filter(b,a,c);b=o.filter(b,a)}return o.grep(a,function(a){return g.call(b,a)>=0!==c})}o.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?o.find.matchesSelector(d,a)?[d]:[]:o.find.matches(a,o.grep(b,function(a){return 1===a.nodeType}))},o.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(o(a).filter(function(){for(b=0;c>b;b++)if(o.contains(e[b],this))return!0}));for(b=0;c>b;b++)o.find(a,e[b],d);return d=this.pushStack(c>1?o.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?o(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=o.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof o?b[0]:b,o.merge(this,o.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:m,!0)),v.test(c[1])&&o.isPlainObject(b))for(c in b)o.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=m.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=m,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):o.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(o):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),o.makeArray(a,this))};A.prototype=o.fn,y=o(m);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};o.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&o(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),o.fn.extend({has:function(a){var b=o(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(o.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?o(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&o.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?o.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(o(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(o.unique(o.merge(this.get(),o(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}o.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return o.dir(a,"parentNode")},parentsUntil:function(a,b,c){return o.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return o.dir(a,"nextSibling")},prevAll:function(a){return o.dir(a,"previousSibling")},nextUntil:function(a,b,c){return o.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return o.dir(a,"previousSibling",c)},siblings:function(a){return o.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return o.sibling(a.firstChild)},contents:function(a){return a.contentDocument||o.merge([],a.childNodes)}},function(a,b){o.fn[a]=function(c,d){var e=o.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=o.filter(d,e)),this.length>1&&(C[a]||o.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return o.each(a.match(E)||[],function(a,c){b[c]=!0}),b}o.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):o.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){o.each(b,function(b,c){var d=o.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&o.each(arguments,function(a,b){var c;while((c=o.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?o.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},o.extend({Deferred:function(a){var b=[["resolve","done",o.Callbacks("once memory"),"resolved"],["reject","fail",o.Callbacks("once memory"),"rejected"],["notify","progress",o.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return o.Deferred(function(c){o.each(b,function(b,f){var g=o.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&o.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?o.extend(a,d):d}},e={};return d.pipe=d.then,o.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&o.isFunction(a.promise)?e:0,g=1===f?a:o.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&o.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;o.fn.ready=function(a){return o.ready.promise().done(a),this},o.extend({isReady:!1,readyWait:1,holdReady:function(a){a?o.readyWait++:o.ready(!0)},ready:function(a){(a===!0?--o.readyWait:o.isReady)||(o.isReady=!0,a!==!0&&--o.readyWait>0||(H.resolveWith(m,[o]),o.fn.trigger&&o(m).trigger("ready").off("ready")))}});function I(){m.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),o.ready()}o.ready.promise=function(b){return H||(H=o.Deferred(),"complete"===m.readyState?setTimeout(o.ready):(m.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},o.ready.promise();var J=o.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===o.type(c)){e=!0;for(h in c)o.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,o.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(o(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};o.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=o.expando+Math.random()}K.uid=1,K.accepts=o.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,o.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(o.isEmptyObject(f))o.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,o.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{o.isArray(b)?d=b.concat(b.map(o.camelCase)):(e=o.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!o.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?o.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}o.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),o.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;
+while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=o.camelCase(d.slice(5)),P(f,d,e[d]));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=o.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),o.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||o.isArray(c)?d=L.access(a,b,o.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=o.queue(a,b),d=c.length,e=c.shift(),f=o._queueHooks(a,b),g=function(){o.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:o.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),o.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?o.queue(this[0],a):void 0===b?this:this.each(function(){var c=o.queue(this,a,b);o._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&o.dequeue(this,a)})},dequeue:function(a){return this.each(function(){o.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=o.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===o.css(a,"display")||!o.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=m.createDocumentFragment(),b=a.appendChild(m.createElement("div"));b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";l.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return m.activeElement}catch(a){}}o.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=o.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof o!==U&&o.event.triggered!==b.type?o.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],n=q=h[1],p=(h[2]||"").split(".").sort(),n&&(l=o.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=o.event.special[n]||{},k=o.extend({type:n,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&o.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(n,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),o.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],n=q=h[1],p=(h[2]||"").split(".").sort(),n){l=o.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||o.removeEvent(a,n,r.handle),delete i[n])}else for(n in i)o.event.remove(a,n+b[j],c,d,!0);o.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,p=[d||m],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||m,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+o.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[o.expando]?b:new o.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:o.makeArray(c,[b]),n=o.event.special[q]||{},e||!n.trigger||n.trigger.apply(d,c)!==!1)){if(!e&&!n.noBubble&&!o.isWindow(d)){for(i=n.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||m)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:n.bindType||q,l=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),l&&l.apply(g,c),l=k&&g[k],l&&l.apply&&o.acceptData(g)&&(b.result=l.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||n._default&&n._default.apply(p.pop(),c)!==!1||!o.acceptData(d)||k&&o.isFunction(d[q])&&!o.isWindow(d)&&(h=d[k],h&&(d[k]=null),o.event.triggered=q,d[q](),o.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=o.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=o.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=o.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((o.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?o(e,this).index(i)>=0:o.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||m,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[o.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new o.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=m),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&o.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return o.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=o.extend(new o.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?o.event.trigger(e,null,b):o.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},o.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},o.Event=function(a,b){return this instanceof o.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.getPreventDefault&&a.getPreventDefault()?Z:$):this.type=a,b&&o.extend(this,b),this.timeStamp=a&&a.timeStamp||o.now(),void(this[o.expando]=!0)):new o.Event(a,b)},o.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z,this.stopPropagation()}},o.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){o.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!o.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.focusinBubbles||o.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){o.event.simulate(b,a.target,o.event.fix(a),!0)};o.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),o.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return o().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=o.guid++)),this.each(function(){o.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,o(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){o.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){o.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?o.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return o.nodeName(a,"table")&&o.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)o.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=o.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&o.nodeName(a,b)?o.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}o.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=o.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||o.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,n=a.length;n>m;m++)if(e=a[m],e||0===e)if("object"===o.type(e))o.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;o.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===o.inArray(e,d))&&(i=o.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f,g,h=o.event.special,i=0;void 0!==(c=a[i]);i++){if(o.acceptData(c)&&(f=c[L.expando],f&&(b=L.cache[f]))){if(d=Object.keys(b.events||{}),d.length)for(g=0;void 0!==(e=d[g]);g++)h[e]?o.event.remove(c,e):o.removeEvent(c,e,b.handle);L.cache[f]&&delete L.cache[f]}delete M.cache[c[M.expando]]}}}),o.fn.extend({text:function(a){return J(this,function(a){return void 0===a?o.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?o.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||o.cleanData(ob(c)),c.parentNode&&(b&&o.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(o.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return o.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(o.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,o.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,n=k-1,p=a[0],q=o.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(c=o.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=o.map(ob(c,"script"),kb),g=f.length;k>j;j++)h=c,j!==n&&(h=o.clone(h,!0,!0),g&&o.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,o.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&o.contains(i,h)&&(h.src?o._evalUrl&&o._evalUrl(h.src):o.globalEval(h.textContent.replace(hb,"")))}return this}}),o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){o.fn[a]=function(a){for(var c,d=[],e=o(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),o(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d=o(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:o.css(d[0],"display");return d.detach(),e}function tb(a){var b=m,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||o("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||o.contains(a.ownerDocument,a)||(g=o.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",e=m.documentElement,f=m.createElement("div"),g=m.createElement("div");g.style.backgroundClip="content-box",g.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===g.style.backgroundClip,f.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",f.appendChild(g);function h(){g.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",e.appendChild(f);var d=a.getComputedStyle(g,null);b="1%"!==d.top,c="4px"===d.width,e.removeChild(f)}a.getComputedStyle&&o.extend(l,{pixelPosition:function(){return h(),b},boxSizingReliable:function(){return null==c&&h(),c},reliableMarginRight:function(){var b,c=g.appendChild(m.createElement("div"));return c.style.cssText=g.style.cssText=d,c.style.marginRight=c.style.width="0",g.style.width="1px",e.appendChild(f),b=!parseFloat(a.getComputedStyle(c,null).marginRight),e.removeChild(f),g.innerHTML="",b}})}(),o.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:0,fontWeight:400},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=o.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=o.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=o.css(a,"border"+R[f]+"Width",!0,e))):(g+=o.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=o.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===o.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):f[g]||(e=S(d),(c&&"none"!==c||!e)&&L.set(d,"olddisplay",e?c:o.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}o.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=o.camelCase(b),i=a.style;return b=o.cssProps[h]||(o.cssProps[h]=Fb(i,h)),g=o.cssHooks[b]||o.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(o.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||o.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]="",i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=o.camelCase(b);return b=o.cssProps[h]||(o.cssProps[h]=Fb(a.style,h)),g=o.cssHooks[b]||o.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||o.isNumeric(f)?f||0:e):e}}),o.each(["height","width"],function(a,b){o.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&zb.test(o.css(a,"display"))?o.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===o.css(a,"boxSizing",!1,e),e):0)}}}),o.cssHooks.marginRight=yb(l.reliableMarginRight,function(a,b){return b?o.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),o.each({margin:"",padding:"",border:"Width"},function(a,b){o.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(o.cssHooks[a+b].set=Gb)}),o.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(o.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=o.css(a,b[g],!1,d);return f}return void 0!==c?o.style(a,b,c):o.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?o(this).show():o(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}o.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(o.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?o.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=o.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){o.fx.step[a.prop]?o.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[o.cssProps[a.prop]]||o.cssHooks[a.prop])?o.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},o.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},o.fx=Kb.prototype.init,o.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(o.cssNumber[a]?"":"px"),g=(o.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(o.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,o.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=o.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k=this,l={},m=a.style,n=a.nodeType&&S(a),p=L.get(a,"fxshow");c.queue||(h=o._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,k.always(function(){k.always(function(){h.unqueued--,o.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],j=o.css(a,"display"),"none"===j&&(j=tb(a.nodeName)),"inline"===j&&"none"===o.css(a,"float")&&(m.display="inline-block")),c.overflow&&(m.overflow="hidden",k.always(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(n?"hide":"show")){if("show"!==e||!p||void 0===p[d])continue;n=!0}l[d]=p&&p[d]||o.style(a,d)}if(!o.isEmptyObject(l)){p?"hidden"in p&&(n=p.hidden):p=L.access(a,"fxshow",{}),f&&(p.hidden=!n),n?o(a).show():k.done(function(){o(a).hide()}),k.done(function(){var b;L.remove(a,"fxshow");for(b in l)o.style(a,b,l[b])});for(d in l)g=Ub(n?p[d]:0,d,k),d in p||(p[d]=g.start,n&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=o.camelCase(c),e=b[d],f=a[c],o.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=o.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=o.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:o.extend({},b),opts:o.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=o.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return o.map(k,Ub,j),o.isFunction(j.opts.start)&&j.opts.start.call(a,j),o.fx.timer(o.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}o.Animation=o.extend(Xb,{tweener:function(a,b){o.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),o.speed=function(a,b,c){var d=a&&"object"==typeof a?o.extend({},a):{complete:c||!c&&b||o.isFunction(a)&&a,duration:a,easing:c&&b||b&&!o.isFunction(b)&&b};return d.duration=o.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in o.fx.speeds?o.fx.speeds[d.duration]:o.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){o.isFunction(d.old)&&d.old.call(this),d.queue&&o.dequeue(this,d.queue)},d},o.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=o.isEmptyObject(a),f=o.speed(b,c,d),g=function(){var b=Xb(this,o.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=o.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&o.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=o.timers,g=d?d.length:0;for(c.finish=!0,o.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),o.each(["toggle","show","hide"],function(a,b){var c=o.fn[b];o.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),o.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){o.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),o.timers=[],o.fx.tick=function(){var a,b=0,c=o.timers;for(Lb=o.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||o.fx.stop(),Lb=void 0},o.fx.timer=function(a){o.timers.push(a),a()?o.fx.start():o.timers.pop()},o.fx.interval=13,o.fx.start=function(){Mb||(Mb=setInterval(o.fx.tick,o.fx.interval))},o.fx.stop=function(){clearInterval(Mb),Mb=null},o.fx.speeds={slow:600,fast:200,_default:400},o.fn.delay=function(a,b){return a=o.fx?o.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=m.createElement("input"),b=m.createElement("select"),c=b.appendChild(m.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=m.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var Yb,Zb,$b=o.expr.attrHandle;o.fn.extend({attr:function(a,b){return J(this,o.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){o.removeAttr(this,a)})}}),o.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?o.prop(a,b,c):(1===f&&o.isXMLDoc(a)||(b=b.toLowerCase(),d=o.attrHooks[b]||(o.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=o.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void o.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=o.propFix[c]||c,o.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&o.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?o.removeAttr(a,c):a.setAttribute(c,c),c}},o.each(o.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||o.find.attr;$b[b]=function(a,b,d){var e,f;
+return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;o.fn.extend({prop:function(a,b){return J(this,o.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[o.propFix[a]||a]})}}),o.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!o.isXMLDoc(a),f&&(b=o.propFix[b]||b,e=o.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),l.optSelected||(o.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),o.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){o.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;o.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(o.isFunction(a))return this.each(function(b){o(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=o.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(o.isFunction(a))return this.each(function(b){o(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?o.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(o.isFunction(a)?function(c){o(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=o(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;o.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=o.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,o(this).val()):a,null==e?e="":"number"==typeof e?e+="":o.isArray(e)&&(e=o.map(e,function(a){return null==a?"":a+""})),b=o.valHooks[this.type]||o.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=o.valHooks[e.type]||o.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),o.extend({valHooks:{select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&o.nodeName(c.parentNode,"optgroup"))){if(b=o(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=o.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=o.inArray(o(d).val(),f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),o.each(["radio","checkbox"],function(){o.valHooks[this]={set:function(a,b){return o.isArray(b)?a.checked=o.inArray(o(a).val(),b)>=0:void 0}},l.checkOn||(o.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),o.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){o.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),o.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=o.now(),dc=/\?/;o.parseJSON=function(a){return JSON.parse(a+"")},o.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&o.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=m.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(o.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,o.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=o.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&o.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}o.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":o.parseJSON,"text xml":o.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,o.ajaxSettings),b):tc(o.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=o.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?o(l):o.event,n=o.Deferred(),p=o.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(n.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=o.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=o.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===o.active++&&o.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(o.lastModified[d]&&v.setRequestHeader("If-Modified-Since",o.lastModified[d]),o.etag[d]&&v.setRequestHeader("If-None-Match",o.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(o.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(o.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?n.resolveWith(l,[r,x,v]):n.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--o.active||o.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return o.get(a,b,c,"json")},getScript:function(a,b){return o.get(a,void 0,b,"script")}}),o.each(["get","post"],function(a,b){o[b]=function(a,c,d,e){return o.isFunction(c)&&(e=e||d,d=c,c=void 0),o.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),o.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){o.fn[b]=function(a){return this.on(b,a)}}),o._evalUrl=function(a){return o.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},o.fn.extend({wrapAll:function(a){var b;return o.isFunction(a)?this.each(function(b){o(this).wrapAll(a.call(this,b))}):(this[0]&&(b=o(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(o.isFunction(a)?function(b){o(this).wrapInner(a.call(this,b))}:function(){var b=o(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=o.isFunction(a);return this.each(function(c){o(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){o.nodeName(this,"body")||o(this).replaceWith(this.childNodes)}).end()}}),o.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},o.expr.filters.visible=function(a){return!o.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(o.isArray(b))o.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==o.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}o.param=function(a,b){var c,d=[],e=function(a,b){b=o.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=o.ajaxSettings&&o.ajaxSettings.traditional),o.isArray(a)||a.jquery&&!o.isPlainObject(a))o.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},o.fn.extend({serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=o.prop(this,"elements");return a?o.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!o(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=o(this).val();return null==c?null:o.isArray(c)?o.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),o.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=o.ajaxSettings.xhr();a.ActiveXObject&&o(a).on("unload",function(){for(var a in Dc)Dc[a]()}),l.cors=!!Fc&&"withCredentials"in Fc,l.ajax=Fc=!!Fc,o.ajaxTransport(function(a){var b;return l.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort"),f.send(a.hasContent&&a.data||null)},abort:function(){b&&b()}}:void 0}),o.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return o.globalEval(a),a}}}),o.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),o.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=o("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),m.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Gc=[],Hc=/(=)\?(?=&|$)|\?\?/;o.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Gc.pop()||o.expando+"_"+cc++;return this[a]=!0,a}}),o.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Hc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Hc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=o.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Hc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||o.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Gc.push(e)),g&&o.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),o.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||m;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=o.buildFragment([a],b,e),e&&e.length&&o(e).remove(),o.merge([],d.childNodes))};var Ic=o.fn.load;o.fn.load=function(a,b,c){if("string"!=typeof a&&Ic)return Ic.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h),a=a.slice(0,h)),o.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&o.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?o("<div>").append(o.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},o.expr.filters.animated=function(a){return o.grep(o.timers,function(b){return a===b.elem}).length};var Jc=a.document.documentElement;function Kc(a){return o.isWindow(a)?a:9===a.nodeType&&a.defaultView}o.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=o.css(a,"position"),l=o(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=o.css(a,"top"),i=o.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),o.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},o.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){o.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,o.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Kc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===o.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),o.nodeName(a[0],"html")||(d=a.offset()),d.top+=o.css(a[0],"borderTopWidth",!0),d.left+=o.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-o.css(c,"marginTop",!0),left:b.left-d.left-o.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Jc;while(a&&!o.nodeName(a,"html")&&"static"===o.css(a,"position"))a=a.offsetParent;return a||Jc})}}),o.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;o.fn[b]=function(e){return J(this,function(b,e,f){var g=Kc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),o.each(["top","left"],function(a,b){o.cssHooks[b]=yb(l.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?o(a).position()[b]+"px":c):void 0})}),o.each({Height:"height",Width:"width"},function(a,b){o.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){o.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return o.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?o.css(b,c,g):o.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),o.fn.size=function(){return this.length},o.fn.andSelf=o.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return o});var Lc=a.jQuery,Mc=a.$;return o.noConflict=function(b){return a.$===o&&(a.$=Mc),b&&a.jQuery===o&&(a.jQuery=Lc),o},typeof b===U&&(a.jQuery=a.$=o),o});
diff --git a/static/shared/libs/lodash-2.4.1.js b/static/shared/libs/lodash-2.4.1.js
new file mode 100644
index 000000000000..85a9626340c7
--- /dev/null
+++ b/static/shared/libs/lodash-2.4.1.js
@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Lo-Dash 2.4.1 (Custom Build) lodash.com/license | Underscore.js 1.5.2 underscorejs.org/LICENSE
+ * Build: `lodash modern -o ./dist/lodash.js`
+ */
+;(function(){function n(n,t,e){e=(e||0)-1;for(var r=n?n.length:0;++e<r;)if(n[e]===t)return e;return-1}function t(t,e){var r=typeof e;if(t=t.l,"boolean"==r||null==e)return t[e]?0:-1;"number"!=r&&"string"!=r&&(r="object");var u="number"==r?e:m+e;return t=(t=t[r])&&t[u],"object"==r?t&&-1<n(t,e)?0:-1:t?0:-1}function e(n){var t=this.l,e=typeof n;if("boolean"==e||null==n)t[n]=true;else{"number"!=e&&"string"!=e&&(e="object");var r="number"==e?n:m+n,t=t[e]||(t[e]={});"object"==e?(t[r]||(t[r]=[])).push(n):t[r]=true
+}}function r(n){return n.charCodeAt(0)}function u(n,t){for(var e=n.m,r=t.m,u=-1,o=e.length;++u<o;){var i=e[u],a=r[u];if(i!==a){if(i>a||typeof i=="undefined")return 1;if(i<a||typeof a=="undefined")return-1}}return n.n-t.n}function o(n){var t=-1,r=n.length,u=n[0],o=n[r/2|0],i=n[r-1];if(u&&typeof u=="object"&&o&&typeof o=="object"&&i&&typeof i=="object")return false;for(u=f(),u["false"]=u["null"]=u["true"]=u.undefined=false,o=f(),o.k=n,o.l=u,o.push=e;++t<r;)o.push(n[t]);return o}function i(n){return"\\"+U[n]
+}function a(){return h.pop()||[]}function f(){return g.pop()||{k:null,l:null,m:null,"false":false,n:0,"null":false,number:null,object:null,push:null,string:null,"true":false,undefined:false,o:null}}function l(n){n.length=0,h.length<_&&h.push(n)}function c(n){var t=n.l;t&&c(t),n.k=n.l=n.m=n.object=n.number=n.string=n.o=null,g.length<_&&g.push(n)}function p(n,t,e){t||(t=0),typeof e=="undefined"&&(e=n?n.length:0);var r=-1;e=e-t||0;for(var u=Array(0>e?0:e);++r<e;)u[r]=n[t+r];return u}function s(e){function h(n,t,e){if(!n||!V[typeof n])return n;
+t=t&&typeof e=="undefined"?t:tt(t,e,3);for(var r=-1,u=V[typeof n]&&Fe(n),o=u?u.length:0;++r<o&&(e=u[r],false!==t(n[e],e,n)););return n}function g(n,t,e){var r;if(!n||!V[typeof n])return n;t=t&&typeof e=="undefined"?t:tt(t,e,3);for(r in n)if(false===t(n[r],r,n))break;return n}function _(n,t,e){var r,u=n,o=u;if(!u)return o;for(var i=arguments,a=0,f=typeof e=="number"?2:i.length;++a<f;)if((u=i[a])&&V[typeof u])for(var l=-1,c=V[typeof u]&&Fe(u),p=c?c.length:0;++l<p;)r=c[l],"undefined"==typeof o[r]&&(o[r]=u[r]);
+return o}function U(n,t,e){var r,u=n,o=u;if(!u)return o;var i=arguments,a=0,f=typeof e=="number"?2:i.length;if(3<f&&"function"==typeof i[f-2])var l=tt(i[--f-1],i[f--],2);else 2<f&&"function"==typeof i[f-1]&&(l=i[--f]);for(;++a<f;)if((u=i[a])&&V[typeof u])for(var c=-1,p=V[typeof u]&&Fe(u),s=p?p.length:0;++c<s;)r=p[c],o[r]=l?l(o[r],u[r]):u[r];return o}function H(n){var t,e=[];if(!n||!V[typeof n])return e;for(t in n)me.call(n,t)&&e.push(t);return e}function J(n){return n&&typeof n=="object"&&!Te(n)&&me.call(n,"__wrapped__")?n:new Q(n)
+}function Q(n,t){this.__chain__=!!t,this.__wrapped__=n}function X(n){function t(){if(r){var n=p(r);be.apply(n,arguments)}if(this instanceof t){var o=nt(e.prototype),n=e.apply(o,n||arguments);return wt(n)?n:o}return e.apply(u,n||arguments)}var e=n[0],r=n[2],u=n[4];return $e(t,n),t}function Z(n,t,e,r,u){if(e){var o=e(n);if(typeof o!="undefined")return o}if(!wt(n))return n;var i=ce.call(n);if(!K[i])return n;var f=Ae[i];switch(i){case T:case F:return new f(+n);case W:case P:return new f(n);case z:return o=f(n.source,C.exec(n)),o.lastIndex=n.lastIndex,o
+}if(i=Te(n),t){var c=!r;r||(r=a()),u||(u=a());for(var s=r.length;s--;)if(r[s]==n)return u[s];o=i?f(n.length):{}}else o=i?p(n):U({},n);return i&&(me.call(n,"index")&&(o.index=n.index),me.call(n,"input")&&(o.input=n.input)),t?(r.push(n),u.push(o),(i?St:h)(n,function(n,i){o[i]=Z(n,t,e,r,u)}),c&&(l(r),l(u)),o):o}function nt(n){return wt(n)?ke(n):{}}function tt(n,t,e){if(typeof n!="function")return Ut;if(typeof t=="undefined"||!("prototype"in n))return n;var r=n.__bindData__;if(typeof r=="undefined"&&(De.funcNames&&(r=!n.name),r=r||!De.funcDecomp,!r)){var u=ge.call(n);
+De.funcNames||(r=!O.test(u)),r||(r=E.test(u),$e(n,r))}if(false===r||true!==r&&1&r[1])return n;switch(e){case 1:return function(e){return n.call(t,e)};case 2:return function(e,r){return n.call(t,e,r)};case 3:return function(e,r,u){return n.call(t,e,r,u)};case 4:return function(e,r,u,o){return n.call(t,e,r,u,o)}}return Mt(n,t)}function et(n){function t(){var n=f?i:this;if(u){var h=p(u);be.apply(h,arguments)}return(o||c)&&(h||(h=p(arguments)),o&&be.apply(h,o),c&&h.length<a)?(r|=16,et([e,s?r:-4&r,h,null,i,a])):(h||(h=arguments),l&&(e=n[v]),this instanceof t?(n=nt(e.prototype),h=e.apply(n,h),wt(h)?h:n):e.apply(n,h))
+}var e=n[0],r=n[1],u=n[2],o=n[3],i=n[4],a=n[5],f=1&r,l=2&r,c=4&r,s=8&r,v=e;return $e(t,n),t}function rt(e,r){var u=-1,i=st(),a=e?e.length:0,f=a>=b&&i===n,l=[];if(f){var p=o(r);p?(i=t,r=p):f=false}for(;++u<a;)p=e[u],0>i(r,p)&&l.push(p);return f&&c(r),l}function ut(n,t,e,r){r=(r||0)-1;for(var u=n?n.length:0,o=[];++r<u;){var i=n[r];if(i&&typeof i=="object"&&typeof i.length=="number"&&(Te(i)||yt(i))){t||(i=ut(i,t,e));var a=-1,f=i.length,l=o.length;for(o.length+=f;++a<f;)o[l++]=i[a]}else e||o.push(i)}return o
+}function ot(n,t,e,r,u,o){if(e){var i=e(n,t);if(typeof i!="undefined")return!!i}if(n===t)return 0!==n||1/n==1/t;if(n===n&&!(n&&V[typeof n]||t&&V[typeof t]))return false;if(null==n||null==t)return n===t;var f=ce.call(n),c=ce.call(t);if(f==D&&(f=q),c==D&&(c=q),f!=c)return false;switch(f){case T:case F:return+n==+t;case W:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case z:case P:return n==oe(t)}if(c=f==$,!c){var p=me.call(n,"__wrapped__"),s=me.call(t,"__wrapped__");if(p||s)return ot(p?n.__wrapped__:n,s?t.__wrapped__:t,e,r,u,o);
+if(f!=q)return false;if(f=n.constructor,p=t.constructor,f!=p&&!(dt(f)&&f instanceof f&&dt(p)&&p instanceof p)&&"constructor"in n&&"constructor"in t)return false}for(f=!u,u||(u=a()),o||(o=a()),p=u.length;p--;)if(u[p]==n)return o[p]==t;var v=0,i=true;if(u.push(n),o.push(t),c){if(p=n.length,v=t.length,(i=v==p)||r)for(;v--;)if(c=p,s=t[v],r)for(;c--&&!(i=ot(n[c],s,e,r,u,o)););else if(!(i=ot(n[v],s,e,r,u,o)))break}else g(t,function(t,a,f){return me.call(f,a)?(v++,i=me.call(n,a)&&ot(n[a],t,e,r,u,o)):void 0}),i&&!r&&g(n,function(n,t,e){return me.call(e,t)?i=-1<--v:void 0
+});return u.pop(),o.pop(),f&&(l(u),l(o)),i}function it(n,t,e,r,u){(Te(t)?St:h)(t,function(t,o){var i,a,f=t,l=n[o];if(t&&((a=Te(t))||Pe(t))){for(f=r.length;f--;)if(i=r[f]==t){l=u[f];break}if(!i){var c;e&&(f=e(l,t),c=typeof f!="undefined")&&(l=f),c||(l=a?Te(l)?l:[]:Pe(l)?l:{}),r.push(t),u.push(l),c||it(l,t,e,r,u)}}else e&&(f=e(l,t),typeof f=="undefined"&&(f=t)),typeof f!="undefined"&&(l=f);n[o]=l})}function at(n,t){return n+he(Re()*(t-n+1))}function ft(e,r,u){var i=-1,f=st(),p=e?e.length:0,s=[],v=!r&&p>=b&&f===n,h=u||v?a():s;
+for(v&&(h=o(h),f=t);++i<p;){var g=e[i],y=u?u(g,i,e):g;(r?!i||h[h.length-1]!==y:0>f(h,y))&&((u||v)&&h.push(y),s.push(g))}return v?(l(h.k),c(h)):u&&l(h),s}function lt(n){return function(t,e,r){var u={};e=J.createCallback(e,r,3),r=-1;var o=t?t.length:0;if(typeof o=="number")for(;++r<o;){var i=t[r];n(u,i,e(i,r,t),t)}else h(t,function(t,r,o){n(u,t,e(t,r,o),o)});return u}}function ct(n,t,e,r,u,o){var i=1&t,a=4&t,f=16&t,l=32&t;if(!(2&t||dt(n)))throw new ie;f&&!e.length&&(t&=-17,f=e=false),l&&!r.length&&(t&=-33,l=r=false);
+var c=n&&n.__bindData__;return c&&true!==c?(c=p(c),c[2]&&(c[2]=p(c[2])),c[3]&&(c[3]=p(c[3])),!i||1&c[1]||(c[4]=u),!i&&1&c[1]&&(t|=8),!a||4&c[1]||(c[5]=o),f&&be.apply(c[2]||(c[2]=[]),e),l&&we.apply(c[3]||(c[3]=[]),r),c[1]|=t,ct.apply(null,c)):(1==t||17===t?X:et)([n,t,e,r,u,o])}function pt(n){return Be[n]}function st(){var t=(t=J.indexOf)===Wt?n:t;return t}function vt(n){return typeof n=="function"&&pe.test(n)}function ht(n){var t,e;return n&&ce.call(n)==q&&(t=n.constructor,!dt(t)||t instanceof t)?(g(n,function(n,t){e=t
+}),typeof e=="undefined"||me.call(n,e)):false}function gt(n){return We[n]}function yt(n){return n&&typeof n=="object"&&typeof n.length=="number"&&ce.call(n)==D||false}function mt(n,t,e){var r=Fe(n),u=r.length;for(t=tt(t,e,3);u--&&(e=r[u],false!==t(n[e],e,n)););return n}function bt(n){var t=[];return g(n,function(n,e){dt(n)&&t.push(e)}),t.sort()}function _t(n){for(var t=-1,e=Fe(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function dt(n){return typeof n=="function"}function wt(n){return!(!n||!V[typeof n])
+}function jt(n){return typeof n=="number"||n&&typeof n=="object"&&ce.call(n)==W||false}function kt(n){return typeof n=="string"||n&&typeof n=="object"&&ce.call(n)==P||false}function xt(n){for(var t=-1,e=Fe(n),r=e.length,u=Xt(r);++t<r;)u[t]=n[e[t]];return u}function Ct(n,t,e){var r=-1,u=st(),o=n?n.length:0,i=false;return e=(0>e?Ie(0,o+e):e)||0,Te(n)?i=-1<u(n,t,e):typeof o=="number"?i=-1<(kt(n)?n.indexOf(t,e):u(n,t,e)):h(n,function(n){return++r<e?void 0:!(i=n===t)}),i}function Ot(n,t,e){var r=true;t=J.createCallback(t,e,3),e=-1;
+var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&(r=!!t(n[e],e,n)););else h(n,function(n,e,u){return r=!!t(n,e,u)});return r}function Nt(n,t,e){var r=[];t=J.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u;){var o=n[e];t(o,e,n)&&r.push(o)}else h(n,function(n,e,u){t(n,e,u)&&r.push(n)});return r}function It(n,t,e){t=J.createCallback(t,e,3),e=-1;var r=n?n.length:0;if(typeof r!="number"){var u;return h(n,function(n,e,r){return t(n,e,r)?(u=n,false):void 0}),u}for(;++e<r;){var o=n[e];
+if(t(o,e,n))return o}}function St(n,t,e){var r=-1,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:tt(t,e,3),typeof u=="number")for(;++r<u&&false!==t(n[r],r,n););else h(n,t);return n}function Et(n,t,e){var r=n?n.length:0;if(t=t&&typeof e=="undefined"?t:tt(t,e,3),typeof r=="number")for(;r--&&false!==t(n[r],r,n););else{var u=Fe(n),r=u.length;h(n,function(n,e,o){return e=u?u[--r]:--r,t(o[e],e,o)})}return n}function Rt(n,t,e){var r=-1,u=n?n.length:0;if(t=J.createCallback(t,e,3),typeof u=="number")for(var o=Xt(u);++r<u;)o[r]=t(n[r],r,n);
+else o=[],h(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function At(n,t,e){var u=-1/0,o=u;if(typeof t!="function"&&e&&e[t]===n&&(t=null),null==t&&Te(n)){e=-1;for(var i=n.length;++e<i;){var a=n[e];a>o&&(o=a)}}else t=null==t&&kt(n)?r:J.createCallback(t,e,3),St(n,function(n,e,r){e=t(n,e,r),e>u&&(u=e,o=n)});return o}function Dt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=J.createCallback(t,r,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(e=n[++o]);++o<i;)e=t(e,n[o],o,n);else h(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)
+});return e}function $t(n,t,e,r){var u=3>arguments.length;return t=J.createCallback(t,r,4),Et(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)}),e}function Tt(n){var t=-1,e=n?n.length:0,r=Xt(typeof e=="number"?e:0);return St(n,function(n){var e=at(0,++t);r[t]=r[e],r[e]=n}),r}function Ft(n,t,e){var r;t=J.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&!(r=t(n[e],e,n)););else h(n,function(n,e,u){return!(r=t(n,e,u))});return!!r}function Bt(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=-1;
+for(t=J.createCallback(t,e,3);++o<u&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[0]:v;return p(n,0,Se(Ie(0,r),u))}function Wt(t,e,r){if(typeof r=="number"){var u=t?t.length:0;r=0>r?Ie(0,u+r):r||0}else if(r)return r=zt(t,e),t[r]===e?r:-1;return n(t,e,r)}function qt(n,t,e){if(typeof t!="number"&&null!=t){var r=0,u=-1,o=n?n.length:0;for(t=J.createCallback(t,e,3);++u<o&&t(n[u],u,n);)r++}else r=null==t||e?1:Ie(0,t);return p(n,r)}function zt(n,t,e,r){var u=0,o=n?n.length:u;for(e=e?J.createCallback(e,r,1):Ut,t=e(t);u<o;)r=u+o>>>1,e(n[r])<t?u=r+1:o=r;
+return u}function Pt(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=typeof t!="function"&&r&&r[t]===n?null:t,t=false),null!=e&&(e=J.createCallback(e,r,3)),ft(n,t,e)}function Kt(){for(var n=1<arguments.length?arguments:arguments[0],t=-1,e=n?At(Ve(n,"length")):0,r=Xt(0>e?0:e);++t<e;)r[t]=Ve(n,t);return r}function Lt(n,t){var e=-1,r=n?n.length:0,u={};for(t||!r||Te(n[0])||(t=[]);++e<r;){var o=n[e];t?u[o]=t[e]:o&&(u[o[0]]=o[1])}return u}function Mt(n,t){return 2<arguments.length?ct(n,17,p(arguments,2),null,t):ct(n,1,null,null,t)
+}function Vt(n,t,e){function r(){c&&ve(c),i=c=p=v,(g||h!==t)&&(s=Ue(),a=n.apply(l,o),c||i||(o=l=null))}function u(){var e=t-(Ue()-f);0<e?c=_e(u,e):(i&&ve(i),e=p,i=c=p=v,e&&(s=Ue(),a=n.apply(l,o),c||i||(o=l=null)))}var o,i,a,f,l,c,p,s=0,h=false,g=true;if(!dt(n))throw new ie;if(t=Ie(0,t)||0,true===e)var y=true,g=false;else wt(e)&&(y=e.leading,h="maxWait"in e&&(Ie(t,e.maxWait)||0),g="trailing"in e?e.trailing:g);return function(){if(o=arguments,f=Ue(),l=this,p=g&&(c||!y),false===h)var e=y&&!c;else{i||y||(s=f);var v=h-(f-s),m=0>=v;
+m?(i&&(i=ve(i)),s=f,a=n.apply(l,o)):i||(i=_e(r,v))}return m&&c?c=ve(c):c||t===h||(c=_e(u,t)),e&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a}}function Ut(n){return n}function Gt(n,t,e){var r=true,u=t&&bt(t);t&&(e||u.length)||(null==e&&(e=t),o=Q,t=n,n=J,u=bt(t)),false===e?r=false:wt(e)&&"chain"in e&&(r=e.chain);var o=n,i=dt(o);St(u,function(e){var u=n[e]=t[e];i&&(o.prototype[e]=function(){var t=this.__chain__,e=this.__wrapped__,i=[e];if(be.apply(i,arguments),i=u.apply(n,i),r||t){if(e===i&&wt(i))return this;
+i=new o(i),i.__chain__=t}return i})})}function Ht(){}function Jt(n){return function(t){return t[n]}}function Qt(){return this.__wrapped__}e=e?Y.defaults(G.Object(),e,Y.pick(G,A)):G;var Xt=e.Array,Yt=e.Boolean,Zt=e.Date,ne=e.Function,te=e.Math,ee=e.Number,re=e.Object,ue=e.RegExp,oe=e.String,ie=e.TypeError,ae=[],fe=re.prototype,le=e._,ce=fe.toString,pe=ue("^"+oe(ce).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$"),se=te.ceil,ve=e.clearTimeout,he=te.floor,ge=ne.prototype.toString,ye=vt(ye=re.getPrototypeOf)&&ye,me=fe.hasOwnProperty,be=ae.push,_e=e.setTimeout,de=ae.splice,we=ae.unshift,je=function(){try{var n={},t=vt(t=re.defineProperty)&&t,e=t(n,n,n)&&t
+}catch(r){}return e}(),ke=vt(ke=re.create)&&ke,xe=vt(xe=Xt.isArray)&&xe,Ce=e.isFinite,Oe=e.isNaN,Ne=vt(Ne=re.keys)&&Ne,Ie=te.max,Se=te.min,Ee=e.parseInt,Re=te.random,Ae={};Ae[$]=Xt,Ae[T]=Yt,Ae[F]=Zt,Ae[B]=ne,Ae[q]=re,Ae[W]=ee,Ae[z]=ue,Ae[P]=oe,Q.prototype=J.prototype;var De=J.support={};De.funcDecomp=!vt(e.a)&&E.test(s),De.funcNames=typeof ne.name=="string",J.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:N,variable:"",imports:{_:J}},ke||(nt=function(){function n(){}return function(t){if(wt(t)){n.prototype=t;
+var r=new n;n.prototype=null}return r||e.Object()}}());var $e=je?function(n,t){M.value=t,je(n,"__bindData__",M)}:Ht,Te=xe||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&ce.call(n)==$||false},Fe=Ne?function(n){return wt(n)?Ne(n):[]}:H,Be={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},We=_t(Be),qe=ue("("+Fe(We).join("|")+")","g"),ze=ue("["+Fe(Be).join("")+"]","g"),Pe=ye?function(n){if(!n||ce.call(n)!=q)return false;var t=n.valueOf,e=vt(t)&&(e=ye(t))&&ye(e);return e?n==e||ye(n)==e:ht(n)
+}:ht,Ke=lt(function(n,t,e){me.call(n,e)?n[e]++:n[e]=1}),Le=lt(function(n,t,e){(me.call(n,e)?n[e]:n[e]=[]).push(t)}),Me=lt(function(n,t,e){n[e]=t}),Ve=Rt,Ue=vt(Ue=Zt.now)&&Ue||function(){return(new Zt).getTime()},Ge=8==Ee(d+"08")?Ee:function(n,t){return Ee(kt(n)?n.replace(I,""):n,t||0)};return J.after=function(n,t){if(!dt(t))throw new ie;return function(){return 1>--n?t.apply(this,arguments):void 0}},J.assign=U,J.at=function(n){for(var t=arguments,e=-1,r=ut(t,true,false,1),t=t[2]&&t[2][t[1]]===n?1:r.length,u=Xt(t);++e<t;)u[e]=n[r[e]];
+return u},J.bind=Mt,J.bindAll=function(n){for(var t=1<arguments.length?ut(arguments,true,false,1):bt(n),e=-1,r=t.length;++e<r;){var u=t[e];n[u]=ct(n[u],1,null,null,n)}return n},J.bindKey=function(n,t){return 2<arguments.length?ct(t,19,p(arguments,2),null,n):ct(t,3,null,null,n)},J.chain=function(n){return n=new Q(n),n.__chain__=true,n},J.compact=function(n){for(var t=-1,e=n?n.length:0,r=[];++t<e;){var u=n[t];u&&r.push(u)}return r},J.compose=function(){for(var n=arguments,t=n.length;t--;)if(!dt(n[t]))throw new ie;
+return function(){for(var t=arguments,e=n.length;e--;)t=[n[e].apply(this,t)];return t[0]}},J.constant=function(n){return function(){return n}},J.countBy=Ke,J.create=function(n,t){var e=nt(n);return t?U(e,t):e},J.createCallback=function(n,t,e){var r=typeof n;if(null==n||"function"==r)return tt(n,t,e);if("object"!=r)return Jt(n);var u=Fe(n),o=u[0],i=n[o];return 1!=u.length||i!==i||wt(i)?function(t){for(var e=u.length,r=false;e--&&(r=ot(t[u[e]],n[u[e]],null,true)););return r}:function(n){return n=n[o],i===n&&(0!==i||1/i==1/n)
+}},J.curry=function(n,t){return t=typeof t=="number"?t:+t||n.length,ct(n,4,null,null,null,t)},J.debounce=Vt,J.defaults=_,J.defer=function(n){if(!dt(n))throw new ie;var t=p(arguments,1);return _e(function(){n.apply(v,t)},1)},J.delay=function(n,t){if(!dt(n))throw new ie;var e=p(arguments,2);return _e(function(){n.apply(v,e)},t)},J.difference=function(n){return rt(n,ut(arguments,true,true,1))},J.filter=Nt,J.flatten=function(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=typeof t!="function"&&r&&r[t]===n?null:t,t=false),null!=e&&(n=Rt(n,e,r)),ut(n,t)
+},J.forEach=St,J.forEachRight=Et,J.forIn=g,J.forInRight=function(n,t,e){var r=[];g(n,function(n,t){r.push(t,n)});var u=r.length;for(t=tt(t,e,3);u--&&false!==t(r[u--],r[u],n););return n},J.forOwn=h,J.forOwnRight=mt,J.functions=bt,J.groupBy=Le,J.indexBy=Me,J.initial=function(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=J.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else r=null==t||e?1:t||r;return p(n,0,Se(Ie(0,u-r),u))},J.intersection=function(){for(var e=[],r=-1,u=arguments.length,i=a(),f=st(),p=f===n,s=a();++r<u;){var v=arguments[r];
+(Te(v)||yt(v))&&(e.push(v),i.push(p&&v.length>=b&&o(r?e[r]:s)))}var p=e[0],h=-1,g=p?p.length:0,y=[];n:for(;++h<g;){var m=i[0],v=p[h];if(0>(m?t(m,v):f(s,v))){for(r=u,(m||s).push(v);--r;)if(m=i[r],0>(m?t(m,v):f(e[r],v)))continue n;y.push(v)}}for(;u--;)(m=i[u])&&c(m);return l(i),l(s),y},J.invert=_t,J.invoke=function(n,t){var e=p(arguments,2),r=-1,u=typeof t=="function",o=n?n.length:0,i=Xt(typeof o=="number"?o:0);return St(n,function(n){i[++r]=(u?t:n[t]).apply(n,e)}),i},J.keys=Fe,J.map=Rt,J.mapValues=function(n,t,e){var r={};
+return t=J.createCallback(t,e,3),h(n,function(n,e,u){r[e]=t(n,e,u)}),r},J.max=At,J.memoize=function(n,t){function e(){var r=e.cache,u=t?t.apply(this,arguments):m+arguments[0];return me.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}if(!dt(n))throw new ie;return e.cache={},e},J.merge=function(n){var t=arguments,e=2;if(!wt(n))return n;if("number"!=typeof t[2]&&(e=t.length),3<e&&"function"==typeof t[e-2])var r=tt(t[--e-1],t[e--],2);else 2<e&&"function"==typeof t[e-1]&&(r=t[--e]);for(var t=p(arguments,1,e),u=-1,o=a(),i=a();++u<e;)it(n,t[u],r,o,i);
+return l(o),l(i),n},J.min=function(n,t,e){var u=1/0,o=u;if(typeof t!="function"&&e&&e[t]===n&&(t=null),null==t&&Te(n)){e=-1;for(var i=n.length;++e<i;){var a=n[e];a<o&&(o=a)}}else t=null==t&&kt(n)?r:J.createCallback(t,e,3),St(n,function(n,e,r){e=t(n,e,r),e<u&&(u=e,o=n)});return o},J.omit=function(n,t,e){var r={};if(typeof t!="function"){var u=[];g(n,function(n,t){u.push(t)});for(var u=rt(u,ut(arguments,true,false,1)),o=-1,i=u.length;++o<i;){var a=u[o];r[a]=n[a]}}else t=J.createCallback(t,e,3),g(n,function(n,e,u){t(n,e,u)||(r[e]=n)
+});return r},J.once=function(n){var t,e;if(!dt(n))throw new ie;return function(){return t?e:(t=true,e=n.apply(this,arguments),n=null,e)}},J.pairs=function(n){for(var t=-1,e=Fe(n),r=e.length,u=Xt(r);++t<r;){var o=e[t];u[t]=[o,n[o]]}return u},J.partial=function(n){return ct(n,16,p(arguments,1))},J.partialRight=function(n){return ct(n,32,null,p(arguments,1))},J.pick=function(n,t,e){var r={};if(typeof t!="function")for(var u=-1,o=ut(arguments,true,false,1),i=wt(n)?o.length:0;++u<i;){var a=o[u];a in n&&(r[a]=n[a])
+}else t=J.createCallback(t,e,3),g(n,function(n,e,u){t(n,e,u)&&(r[e]=n)});return r},J.pluck=Ve,J.property=Jt,J.pull=function(n){for(var t=arguments,e=0,r=t.length,u=n?n.length:0;++e<r;)for(var o=-1,i=t[e];++o<u;)n[o]===i&&(de.call(n,o--,1),u--);return n},J.range=function(n,t,e){n=+n||0,e=typeof e=="number"?e:+e||1,null==t&&(t=n,n=0);var r=-1;t=Ie(0,se((t-n)/(e||1)));for(var u=Xt(t);++r<t;)u[r]=n,n+=e;return u},J.reject=function(n,t,e){return t=J.createCallback(t,e,3),Nt(n,function(n,e,r){return!t(n,e,r)
+})},J.remove=function(n,t,e){var r=-1,u=n?n.length:0,o=[];for(t=J.createCallback(t,e,3);++r<u;)e=n[r],t(e,r,n)&&(o.push(e),de.call(n,r--,1),u--);return o},J.rest=qt,J.shuffle=Tt,J.sortBy=function(n,t,e){var r=-1,o=Te(t),i=n?n.length:0,p=Xt(typeof i=="number"?i:0);for(o||(t=J.createCallback(t,e,3)),St(n,function(n,e,u){var i=p[++r]=f();o?i.m=Rt(t,function(t){return n[t]}):(i.m=a())[0]=t(n,e,u),i.n=r,i.o=n}),i=p.length,p.sort(u);i--;)n=p[i],p[i]=n.o,o||l(n.m),c(n);return p},J.tap=function(n,t){return t(n),n
+},J.throttle=function(n,t,e){var r=true,u=true;if(!dt(n))throw new ie;return false===e?r=false:wt(e)&&(r="leading"in e?e.leading:r,u="trailing"in e?e.trailing:u),L.leading=r,L.maxWait=t,L.trailing=u,Vt(n,t,L)},J.times=function(n,t,e){n=-1<(n=+n)?n:0;var r=-1,u=Xt(n);for(t=tt(t,e,1);++r<n;)u[r]=t(r);return u},J.toArray=function(n){return n&&typeof n.length=="number"?p(n):xt(n)},J.transform=function(n,t,e,r){var u=Te(n);if(null==e)if(u)e=[];else{var o=n&&n.constructor;e=nt(o&&o.prototype)}return t&&(t=J.createCallback(t,r,4),(u?St:h)(n,function(n,r,u){return t(e,n,r,u)
+})),e},J.union=function(){return ft(ut(arguments,true,true))},J.uniq=Pt,J.values=xt,J.where=Nt,J.without=function(n){return rt(n,p(arguments,1))},J.wrap=function(n,t){return ct(t,16,[n])},J.xor=function(){for(var n=-1,t=arguments.length;++n<t;){var e=arguments[n];if(Te(e)||yt(e))var r=r?ft(rt(r,e).concat(rt(e,r))):e}return r||[]},J.zip=Kt,J.zipObject=Lt,J.collect=Rt,J.drop=qt,J.each=St,J.eachRight=Et,J.extend=U,J.methods=bt,J.object=Lt,J.select=Nt,J.tail=qt,J.unique=Pt,J.unzip=Kt,Gt(J),J.clone=function(n,t,e,r){return typeof t!="boolean"&&null!=t&&(r=e,e=t,t=false),Z(n,t,typeof e=="function"&&tt(e,r,1))
+},J.cloneDeep=function(n,t,e){return Z(n,true,typeof t=="function"&&tt(t,e,1))},J.contains=Ct,J.escape=function(n){return null==n?"":oe(n).replace(ze,pt)},J.every=Ot,J.find=It,J.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=J.createCallback(t,e,3);++r<u;)if(t(n[r],r,n))return r;return-1},J.findKey=function(n,t,e){var r;return t=J.createCallback(t,e,3),h(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},J.findLast=function(n,t,e){var r;return t=J.createCallback(t,e,3),Et(n,function(n,e,u){return t(n,e,u)?(r=n,false):void 0
+}),r},J.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=J.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},J.findLastKey=function(n,t,e){var r;return t=J.createCallback(t,e,3),mt(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},J.has=function(n,t){return n?me.call(n,t):false},J.identity=Ut,J.indexOf=Wt,J.isArguments=yt,J.isArray=Te,J.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&ce.call(n)==T||false},J.isDate=function(n){return n&&typeof n=="object"&&ce.call(n)==F||false
+},J.isElement=function(n){return n&&1===n.nodeType||false},J.isEmpty=function(n){var t=true;if(!n)return t;var e=ce.call(n),r=n.length;return e==$||e==P||e==D||e==q&&typeof r=="number"&&dt(n.splice)?!r:(h(n,function(){return t=false}),t)},J.isEqual=function(n,t,e,r){return ot(n,t,typeof e=="function"&&tt(e,r,2))},J.isFinite=function(n){return Ce(n)&&!Oe(parseFloat(n))},J.isFunction=dt,J.isNaN=function(n){return jt(n)&&n!=+n},J.isNull=function(n){return null===n},J.isNumber=jt,J.isObject=wt,J.isPlainObject=Pe,J.isRegExp=function(n){return n&&typeof n=="object"&&ce.call(n)==z||false
+},J.isString=kt,J.isUndefined=function(n){return typeof n=="undefined"},J.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?Ie(0,r+e):Se(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},J.mixin=Gt,J.noConflict=function(){return e._=le,this},J.noop=Ht,J.now=Ue,J.parseInt=Ge,J.random=function(n,t,e){var r=null==n,u=null==t;return null==e&&(typeof n=="boolean"&&u?(e=n,n=1):u||typeof t!="boolean"||(e=t,u=true)),r&&u&&(t=1),n=+n||0,u?(t=n,n=0):t=+t||0,e||n%1||t%1?(e=Re(),Se(n+e*(t-n+parseFloat("1e-"+((e+"").length-1))),t)):at(n,t)
+},J.reduce=Dt,J.reduceRight=$t,J.result=function(n,t){if(n){var e=n[t];return dt(e)?n[t]():e}},J.runInContext=s,J.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Fe(n).length},J.some=Ft,J.sortedIndex=zt,J.template=function(n,t,e){var r=J.templateSettings;n=oe(n||""),e=_({},e,r);var u,o=_({},e.imports,r.imports),r=Fe(o),o=xt(o),a=0,f=e.interpolate||S,l="__p+='",f=ue((e.escape||S).source+"|"+f.source+"|"+(f===N?x:S).source+"|"+(e.evaluate||S).source+"|$","g");n.replace(f,function(t,e,r,o,f,c){return r||(r=o),l+=n.slice(a,c).replace(R,i),e&&(l+="'+__e("+e+")+'"),f&&(u=true,l+="';"+f+";\n__p+='"),r&&(l+="'+((__t=("+r+"))==null?'':__t)+'"),a=c+t.length,t
+}),l+="';",f=e=e.variable,f||(e="obj",l="with("+e+"){"+l+"}"),l=(u?l.replace(w,""):l).replace(j,"$1").replace(k,"$1;"),l="function("+e+"){"+(f?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var c=ne(r,"return "+l).apply(v,o)}catch(p){throw p.source=l,p}return t?c(t):(c.source=l,c)},J.unescape=function(n){return null==n?"":oe(n).replace(qe,gt)},J.uniqueId=function(n){var t=++y;return oe(null==n?"":n)+t
+},J.all=Ot,J.any=Ft,J.detect=It,J.findWhere=It,J.foldl=Dt,J.foldr=$t,J.include=Ct,J.inject=Dt,Gt(function(){var n={};return h(J,function(t,e){J.prototype[e]||(n[e]=t)}),n}(),false),J.first=Bt,J.last=function(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=J.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[u-1]:v;return p(n,Ie(0,u-r))},J.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=xt(n)),null==t||e?n?n[at(0,n.length-1)]:v:(n=Tt(n),n.length=Se(Ie(0,t),n.length),n)
+},J.take=Bt,J.head=Bt,h(J,function(n,t){var e="sample"!==t;J.prototype[t]||(J.prototype[t]=function(t,r){var u=this.__chain__,o=n(this.__wrapped__,t,r);return u||null!=t&&(!r||e&&typeof t=="function")?new Q(o,u):o})}),J.VERSION="2.4.1",J.prototype.chain=function(){return this.__chain__=true,this},J.prototype.toString=function(){return oe(this.__wrapped__)},J.prototype.value=Qt,J.prototype.valueOf=Qt,St(["join","pop","shift"],function(n){var t=ae[n];J.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);
+return n?new Q(e,n):e}}),St(["push","reverse","sort","unshift"],function(n){var t=ae[n];J.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),St(["concat","slice","splice"],function(n){var t=ae[n];J.prototype[n]=function(){return new Q(t.apply(this.__wrapped__,arguments),this.__chain__)}}),J}var v,h=[],g=[],y=0,m=+new Date+"",b=75,_=40,d=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",w=/\b__p\+='';/g,j=/\b(__p\+=)''\+/g,k=/(__e\(.*?\)|\b__t\))\+'';/g,x=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,C=/\w*$/,O=/^\s*function[ \n\r\t]+\w/,N=/<%=([\s\S]+?)%>/g,I=RegExp("^["+d+"]*0+(?=.$)"),S=/($^)/,E=/\bthis\b/,R=/['\n\r\t\u2028\u2029\\]/g,A="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setTimeout".split(" "),D="[object Arguments]",$="[object Array]",T="[object Boolean]",F="[object Date]",B="[object Function]",W="[object Number]",q="[object Object]",z="[object RegExp]",P="[object String]",K={};
+K[B]=false,K[D]=K[$]=K[T]=K[F]=K[W]=K[q]=K[z]=K[P]=true;var L={leading:false,maxWait:0,trailing:false},M={configurable:false,enumerable:false,value:null,writable:false},V={"boolean":false,"function":true,object:true,number:false,string:false,undefined:false},U={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},G=V[typeof window]&&window||this,H=V[typeof exports]&&exports&&!exports.nodeType&&exports,J=V[typeof module]&&module&&!module.nodeType&&module,Q=J&&J.exports===H&&H,X=V[typeof global]&&global;!X||X.global!==X&&X.window!==X||(G=X);
+var Y=s();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(G._=Y, define(function(){return Y})):H&&J?Q?(J.exports=Y)._=Y:H._=Y:G._=Y}).call(this);
\ No newline at end of file
diff --git a/static/shared/libs/webl10n-20130617.js b/static/shared/libs/webl10n-20130617.js
new file mode 100644
index 000000000000..9d99c6889150
--- /dev/null
+++ b/static/shared/libs/webl10n-20130617.js
@@ -0,0 +1,1157 @@
+/**
+ * Copyright (c) 2011-2013 Fabien Cazenave, Mozilla.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/*jshint browser: true, devel: true, es5: true, globalstrict: true */
+'use strict';
+
+document.webL10n = (function(window, document, undefined) {
+  var gL10nData = {};
+  var gTextData = '';
+  var gTextProp = 'textContent';
+  var gLanguage = '';
+  var gMacros = {};
+  var gReadyState = 'loading';
+
+
+  /**
+   * Synchronously loading l10n resources significantly minimizes flickering
+   * from displaying the app with non-localized strings and then updating the
+   * strings. Although this will block all script execution on this page, we
+   * expect that the l10n resources are available locally on flash-storage.
+   *
+   * As synchronous XHR is generally considered as a bad idea, we're still
+   * loading l10n resources asynchronously -- but we keep this in a setting,
+   * just in case... and applications using this library should hide their
+   * content until the `localized' event happens.
+   */
+
+  var gAsyncResourceLoading = true; // read-only
+
+
+  /**
+   * Debug helpers
+   *
+   *   gDEBUG == 0: don't display any console message
+   *   gDEBUG == 1: display only warnings, not logs
+   *   gDEBUG == 2: display all console messages
+   */
+
+  var gDEBUG = 1;
+
+  function consoleLog(message) {
+    if (gDEBUG >= 2) {
+      console.log('[l10n] ' + message);
+    }
+  };
+
+  function consoleWarn(message) {
+    if (gDEBUG) {
+      console.warn('[l10n] ' + message);
+    }
+  };
+
+
+  /**
+   * DOM helpers for the so-called "HTML API".
+   *
+   * These functions are written for modern browsers. For old versions of IE,
+   * they're overridden in the 'startup' section at the end of this file.
+   */
+
+  function getL10nResourceLinks() {
+    return document.querySelectorAll('link[type="application/l10n"]');
+  }
+
+  function getL10nDictionary() {
+    var script = document.querySelector('script[type="application/l10n"]');
+    // TODO: support multiple and external JSON dictionaries
+    return script ? JSON.parse(script.innerHTML) : null;
+  }
+
+  function getTranslatableChildren(element) {
+    return element ? element.querySelectorAll('*[data-l10n-id]') : [];
+  }
+
+  function getL10nAttributes(element) {
+    if (!element)
+      return {};
+
+    var l10nId = element.getAttribute('data-l10n-id');
+    var l10nArgs = element.getAttribute('data-l10n-args');
+    var args = {};
+    if (l10nArgs) {
+      try {
+        args = JSON.parse(l10nArgs);
+      } catch (e) {
+        consoleWarn('could not parse arguments for #' + l10nId);
+      }
+    }
+    return { id: l10nId, args: args };
+  }
+
+  function fireL10nReadyEvent(lang) {
+    var evtObject = document.createEvent('Event');
+    evtObject.initEvent('localized', true, false);
+    evtObject.language = lang;
+    document.dispatchEvent(evtObject);
+  }
+
+  function xhrLoadText(url, onSuccess, onFailure, asynchronous) {
+    onSuccess = onSuccess || function _onSuccess(data) {};
+    onFailure = onFailure || function _onFailure() {
+      consoleWarn(url + ' not found.');
+    };
+
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, asynchronous);
+    if (xhr.overrideMimeType) {
+      xhr.overrideMimeType('text/plain; charset=utf-8');
+    }
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState == 4) {
+        if (xhr.status == 200 || xhr.status === 0) {
+          onSuccess(xhr.responseText);
+        } else {
+          onFailure();
+        }
+      }
+    };
+    xhr.onerror = onFailure;
+    xhr.ontimeout = onFailure;
+
+    // in Firefox OS with the app:// protocol, trying to XHR a non-existing
+    // URL will raise an exception here -- hence this ugly try...catch.
+    try {
+      xhr.send(null);
+    } catch (e) {
+      onFailure();
+    }
+  }
+
+
+  /**
+   * l10n resource parser:
+   *  - reads (async XHR) the l10n resource matching `lang';
+   *  - imports linked resources (synchronously) when specified;
+   *  - parses the text data (fills `gL10nData' and `gTextData');
+   *  - triggers success/failure callbacks when done.
+   *
+   * @param {string} href
+   *    URL of the l10n resource to parse.
+   *
+   * @param {string} lang
+   *    locale (language) to parse.
+   *
+   * @param {Function} successCallback
+   *    triggered when the l10n resource has been successully parsed.
+   *
+   * @param {Function} failureCallback
+   *    triggered when the an error has occured.
+   *
+   * @return {void}
+   *    uses the following global variables: gL10nData, gTextData, gTextProp.
+   */
+
+  function parseResource(href, lang, successCallback, failureCallback) {
+    var baseURL = href.replace(/[^\/]*$/, '') || './';
+
+    // handle escaped characters (backslashes) in a string
+    function evalString(text) {
+      if (text.lastIndexOf('\\') < 0)
+        return text;
+      return text.replace(/\\\\/g, '\\')
+                 .replace(/\\n/g, '\n')
+                 .replace(/\\r/g, '\r')
+                 .replace(/\\t/g, '\t')
+                 .replace(/\\b/g, '\b')
+                 .replace(/\\f/g, '\f')
+                 .replace(/\\{/g, '{')
+                 .replace(/\\}/g, '}')
+                 .replace(/\\"/g, '"')
+                 .replace(/\\'/g, "'");
+    }
+
+    // parse *.properties text data into an l10n dictionary
+    function parseProperties(text) {
+      var dictionary = [];
+
+      // token expressions
+      var reBlank = /^\s*|\s*$/;
+      var reComment = /^\s*#|^\s*$/;
+      var reSection = /^\s*\[(.*)\]\s*$/;
+      var reImport = /^\s*@import\s+url\((.*)\)\s*$/i;
+      var reSplit = /^([^=\s]*)\s*=\s*(.+)$/; // TODO: escape EOLs with '\'
+
+      // parse the *.properties file into an associative array
+      function parseRawLines(rawText, extendedSyntax) {
+        var entries = rawText.replace(reBlank, '').split(/[\r\n]+/);
+        var currentLang = '*';
+        var genericLang = lang.replace(/-[a-z]+$/i, '');
+        var skipLang = false;
+        var match = '';
+
+        for (var i = 0; i < entries.length; i++) {
+          var line = entries[i];
+
+          // comment or blank line?
+          if (reComment.test(line))
+            continue;
+
+          // the extended syntax supports [lang] sections and @import rules
+          if (extendedSyntax) {
+            if (reSection.test(line)) { // section start?
+              match = reSection.exec(line);
+              currentLang = match[1];
+              skipLang = (currentLang !== '*') &&
+                  (currentLang !== lang) && (currentLang !== genericLang);
+              continue;
+            } else if (skipLang) {
+              continue;
+            }
+            if (reImport.test(line)) { // @import rule?
+              match = reImport.exec(line);
+              loadImport(baseURL + match[1]); // load the resource synchronously
+            }
+          }
+
+          // key-value pair
+          var tmp = line.match(reSplit);
+          if (tmp && tmp.length == 3) {
+            dictionary[tmp[1]] = evalString(tmp[2]);
+          }
+        }
+      }
+
+      // import another *.properties file
+      function loadImport(url) {
+        xhrLoadText(url, function(content) {
+          parseRawLines(content, false); // don't allow recursive imports
+        }, null, false); // load synchronously
+      }
+
+      // fill the dictionary
+      parseRawLines(text, true);
+      return dictionary;
+    }
+
+    // load and parse l10n data (warning: global variables are used here)
+    xhrLoadText(href, function(response) {
+      gTextData += response; // mostly for debug
+
+      // parse *.properties text data into an l10n dictionary
+      var data = parseProperties(response);
+
+      // find attribute descriptions, if any
+      for (var key in data) {
+        var id, prop, index = key.lastIndexOf('.');
+        if (index > 0) { // an attribute has been specified
+          id = key.substring(0, index);
+          prop = key.substr(index + 1);
+        } else { // no attribute: assuming text content by default
+          id = key;
+          prop = gTextProp;
+        }
+        if (!gL10nData[id]) {
+          gL10nData[id] = {};
+        }
+        gL10nData[id][prop] = data[key];
+      }
+
+      // trigger callback
+      if (successCallback) {
+        successCallback();
+      }
+    }, failureCallback, gAsyncResourceLoading);
+  };
+
+  // load and parse all resources for the specified locale
+  function loadLocale(lang, callback) {
+    callback = callback || function _callback() {};
+
+    clear();
+    gLanguage = lang;
+
+    // check all <link type="application/l10n" href="..." /> nodes
+    // and load the resource files
+    var langLinks = getL10nResourceLinks();
+    var langCount = langLinks.length;
+    if (langCount == 0) {
+      // we might have a pre-compiled dictionary instead
+      var dict = getL10nDictionary();
+      if (dict && dict.locales && dict.default_locale) {
+        consoleLog('using the embedded JSON directory, early way out');
+        gL10nData = dict.locales[lang] || dict.locales[dict.default_locale];
+        callback();
+      } else {
+        consoleLog('no resource to load, early way out');
+      }
+      // early way out
+      fireL10nReadyEvent(lang);
+      gReadyState = 'complete';
+      return;
+    }
+
+    // start the callback when all resources are loaded
+    var onResourceLoaded = null;
+    var gResourceCount = 0;
+    onResourceLoaded = function() {
+      gResourceCount++;
+      if (gResourceCount >= langCount) {
+        callback();
+        fireL10nReadyEvent(lang);
+        gReadyState = 'complete';
+      }
+    };
+
+    // load all resource files
+    function l10nResourceLink(link) {
+      var href = link.href;
+      var type = link.type;
+      this.load = function(lang, callback) {
+        var applied = lang;
+        parseResource(href, lang, callback, function() {
+          consoleWarn(href + ' not found.');
+          applied = '';
+        });
+        return applied; // return lang if found, an empty string if not found
+      };
+    }
+
+    for (var i = 0; i < langCount; i++) {
+      var resource = new l10nResourceLink(langLinks[i]);
+      var rv = resource.load(lang, onResourceLoaded);
+      if (rv != lang) { // lang not found, used default resource instead
+        consoleWarn('"' + lang + '" resource not found');
+        gLanguage = '';
+      }
+    }
+  }
+
+  // clear all l10n data
+  function clear() {
+    gL10nData = {};
+    gTextData = '';
+    gLanguage = '';
+    // TODO: clear all non predefined macros.
+    // There's no such macro /yet/ but we're planning to have some...
+  }
+
+
+  /**
+   * Get rules for plural forms (shared with JetPack), see:
+   * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+   * https://github.com/mozilla/addon-sdk/blob/master/python-lib/plural-rules-generator.p
+   *
+   * @param {string} lang
+   *    locale (language) used.
+   *
+   * @return {Function}
+   *    returns a function that gives the plural form name for a given integer:
+   *       var fun = getPluralRules('en');
+   *       fun(1)    -> 'one'
+   *       fun(0)    -> 'other'
+   *       fun(1000) -> 'other'.
+   */
+
+  function getPluralRules(lang) {
+    var locales2rules = {
+      'af': 3,
+      'ak': 4,
+      'am': 4,
+      'ar': 1,
+      'asa': 3,
+      'az': 0,
+      'be': 11,
+      'bem': 3,
+      'bez': 3,
+      'bg': 3,
+      'bh': 4,
+      'bm': 0,
+      'bn': 3,
+      'bo': 0,
+      'br': 20,
+      'brx': 3,
+      'bs': 11,
+      'ca': 3,
+      'cgg': 3,
+      'chr': 3,
+      'cs': 12,
+      'cy': 17,
+      'da': 3,
+      'de': 3,
+      'dv': 3,
+      'dz': 0,
+      'ee': 3,
+      'el': 3,
+      'en': 3,
+      'eo': 3,
+      'es': 3,
+      'et': 3,
+      'eu': 3,
+      'fa': 0,
+      'ff': 5,
+      'fi': 3,
+      'fil': 4,
+      'fo': 3,
+      'fr': 5,
+      'fur': 3,
+      'fy': 3,
+      'ga': 8,
+      'gd': 24,
+      'gl': 3,
+      'gsw': 3,
+      'gu': 3,
+      'guw': 4,
+      'gv': 23,
+      'ha': 3,
+      'haw': 3,
+      'he': 2,
+      'hi': 4,
+      'hr': 11,
+      'hu': 0,
+      'id': 0,
+      'ig': 0,
+      'ii': 0,
+      'is': 3,
+      'it': 3,
+      'iu': 7,
+      'ja': 0,
+      'jmc': 3,
+      'jv': 0,
+      'ka': 0,
+      'kab': 5,
+      'kaj': 3,
+      'kcg': 3,
+      'kde': 0,
+      'kea': 0,
+      'kk': 3,
+      'kl': 3,
+      'km': 0,
+      'kn': 0,
+      'ko': 0,
+      'ksb': 3,
+      'ksh': 21,
+      'ku': 3,
+      'kw': 7,
+      'lag': 18,
+      'lb': 3,
+      'lg': 3,
+      'ln': 4,
+      'lo': 0,
+      'lt': 10,
+      'lv': 6,
+      'mas': 3,
+      'mg': 4,
+      'mk': 16,
+      'ml': 3,
+      'mn': 3,
+      'mo': 9,
+      'mr': 3,
+      'ms': 0,
+      'mt': 15,
+      'my': 0,
+      'nah': 3,
+      'naq': 7,
+      'nb': 3,
+      'nd': 3,
+      'ne': 3,
+      'nl': 3,
+      'nn': 3,
+      'no': 3,
+      'nr': 3,
+      'nso': 4,
+      'ny': 3,
+      'nyn': 3,
+      'om': 3,
+      'or': 3,
+      'pa': 3,
+      'pap': 3,
+      'pl': 13,
+      'ps': 3,
+      'pt': 3,
+      'rm': 3,
+      'ro': 9,
+      'rof': 3,
+      'ru': 11,
+      'rwk': 3,
+      'sah': 0,
+      'saq': 3,
+      'se': 7,
+      'seh': 3,
+      'ses': 0,
+      'sg': 0,
+      'sh': 11,
+      'shi': 19,
+      'sk': 12,
+      'sl': 14,
+      'sma': 7,
+      'smi': 7,
+      'smj': 7,
+      'smn': 7,
+      'sms': 7,
+      'sn': 3,
+      'so': 3,
+      'sq': 3,
+      'sr': 11,
+      'ss': 3,
+      'ssy': 3,
+      'st': 3,
+      'sv': 3,
+      'sw': 3,
+      'syr': 3,
+      'ta': 3,
+      'te': 3,
+      'teo': 3,
+      'th': 0,
+      'ti': 4,
+      'tig': 3,
+      'tk': 3,
+      'tl': 4,
+      'tn': 3,
+      'to': 0,
+      'tr': 0,
+      'ts': 3,
+      'tzm': 22,
+      'uk': 11,
+      'ur': 3,
+      've': 3,
+      'vi': 0,
+      'vun': 3,
+      'wa': 4,
+      'wae': 3,
+      'wo': 0,
+      'xh': 3,
+      'xog': 3,
+      'yo': 0,
+      'zh': 0,
+      'zu': 3
+    };
+
+    // utility functions for plural rules methods
+    function isIn(n, list) {
+      return list.indexOf(n) !== -1;
+    }
+    function isBetween(n, start, end) {
+      return start <= n && n <= end;
+    }
+
+    // list of all plural rules methods:
+    // map an integer to the plural form name to use
+    var pluralRules = {
+      '0': function(n) {
+        return 'other';
+      },
+      '1': function(n) {
+        if ((isBetween((n % 100), 3, 10)))
+          return 'few';
+        if (n === 0)
+          return 'zero';
+        if ((isBetween((n % 100), 11, 99)))
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '2': function(n) {
+        if (n !== 0 && (n % 10) === 0)
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '3': function(n) {
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '4': function(n) {
+        if ((isBetween(n, 0, 1)))
+          return 'one';
+        return 'other';
+      },
+      '5': function(n) {
+        if ((isBetween(n, 0, 2)) && n != 2)
+          return 'one';
+        return 'other';
+      },
+      '6': function(n) {
+        if (n === 0)
+          return 'zero';
+        if ((n % 10) == 1 && (n % 100) != 11)
+          return 'one';
+        return 'other';
+      },
+      '7': function(n) {
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '8': function(n) {
+        if ((isBetween(n, 3, 6)))
+          return 'few';
+        if ((isBetween(n, 7, 10)))
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '9': function(n) {
+        if (n === 0 || n != 1 && (isBetween((n % 100), 1, 19)))
+          return 'few';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '10': function(n) {
+        if ((isBetween((n % 10), 2, 9)) && !(isBetween((n % 100), 11, 19)))
+          return 'few';
+        if ((n % 10) == 1 && !(isBetween((n % 100), 11, 19)))
+          return 'one';
+        return 'other';
+      },
+      '11': function(n) {
+        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+          return 'few';
+        if ((n % 10) === 0 ||
+            (isBetween((n % 10), 5, 9)) ||
+            (isBetween((n % 100), 11, 14)))
+          return 'many';
+        if ((n % 10) == 1 && (n % 100) != 11)
+          return 'one';
+        return 'other';
+      },
+      '12': function(n) {
+        if ((isBetween(n, 2, 4)))
+          return 'few';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '13': function(n) {
+        if ((isBetween((n % 10), 2, 4)) && !(isBetween((n % 100), 12, 14)))
+          return 'few';
+        if (n != 1 && (isBetween((n % 10), 0, 1)) ||
+            (isBetween((n % 10), 5, 9)) ||
+            (isBetween((n % 100), 12, 14)))
+          return 'many';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '14': function(n) {
+        if ((isBetween((n % 100), 3, 4)))
+          return 'few';
+        if ((n % 100) == 2)
+          return 'two';
+        if ((n % 100) == 1)
+          return 'one';
+        return 'other';
+      },
+      '15': function(n) {
+        if (n === 0 || (isBetween((n % 100), 2, 10)))
+          return 'few';
+        if ((isBetween((n % 100), 11, 19)))
+          return 'many';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '16': function(n) {
+        if ((n % 10) == 1 && n != 11)
+          return 'one';
+        return 'other';
+      },
+      '17': function(n) {
+        if (n == 3)
+          return 'few';
+        if (n === 0)
+          return 'zero';
+        if (n == 6)
+          return 'many';
+        if (n == 2)
+          return 'two';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '18': function(n) {
+        if (n === 0)
+          return 'zero';
+        if ((isBetween(n, 0, 2)) && n !== 0 && n != 2)
+          return 'one';
+        return 'other';
+      },
+      '19': function(n) {
+        if ((isBetween(n, 2, 10)))
+          return 'few';
+        if ((isBetween(n, 0, 1)))
+          return 'one';
+        return 'other';
+      },
+      '20': function(n) {
+        if ((isBetween((n % 10), 3, 4) || ((n % 10) == 9)) && !(
+            isBetween((n % 100), 10, 19) ||
+            isBetween((n % 100), 70, 79) ||
+            isBetween((n % 100), 90, 99)
+            ))
+          return 'few';
+        if ((n % 1000000) === 0 && n !== 0)
+          return 'many';
+        if ((n % 10) == 2 && !isIn((n % 100), [12, 72, 92]))
+          return 'two';
+        if ((n % 10) == 1 && !isIn((n % 100), [11, 71, 91]))
+          return 'one';
+        return 'other';
+      },
+      '21': function(n) {
+        if (n === 0)
+          return 'zero';
+        if (n == 1)
+          return 'one';
+        return 'other';
+      },
+      '22': function(n) {
+        if ((isBetween(n, 0, 1)) || (isBetween(n, 11, 99)))
+          return 'one';
+        return 'other';
+      },
+      '23': function(n) {
+        if ((isBetween((n % 10), 1, 2)) || (n % 20) === 0)
+          return 'one';
+        return 'other';
+      },
+      '24': function(n) {
+        if ((isBetween(n, 3, 10) || isBetween(n, 13, 19)))
+          return 'few';
+        if (isIn(n, [2, 12]))
+          return 'two';
+        if (isIn(n, [1, 11]))
+          return 'one';
+        return 'other';
+      }
+    };
+
+    // return a function that gives the plural form name for a given integer
+    var index = locales2rules[lang.replace(/-.*$/, '')];
+    if (!(index in pluralRules)) {
+      consoleWarn('plural form unknown for [' + lang + ']');
+      return function() { return 'other'; };
+    }
+    return pluralRules[index];
+  }
+
+  // pre-defined 'plural' macro
+  gMacros.plural = function(str, param, key, prop) {
+    var n = parseFloat(param);
+    if (isNaN(n))
+      return str;
+
+    // TODO: support other properties (l20n still doesn't...)
+    if (prop != gTextProp)
+      return str;
+
+    // initialize _pluralRules
+    if (!gMacros._pluralRules) {
+      gMacros._pluralRules = getPluralRules(gLanguage);
+    }
+    var index = '[' + gMacros._pluralRules(n) + ']';
+
+    // try to find a [zero|one|two] key if it's defined
+    if (n === 0 && (key + '[zero]') in gL10nData) {
+      str = gL10nData[key + '[zero]'][prop];
+    } else if (n == 1 && (key + '[one]') in gL10nData) {
+      str = gL10nData[key + '[one]'][prop];
+    } else if (n == 2 && (key + '[two]') in gL10nData) {
+      str = gL10nData[key + '[two]'][prop];
+    } else if ((key + index) in gL10nData) {
+      str = gL10nData[key + index][prop];
+    } else if ((key + '[other]') in gL10nData) {
+      str = gL10nData[key + '[other]'][prop];
+    }
+
+    return str;
+  };
+
+
+  /**
+   * l10n dictionary functions
+   */
+
+  // fetch an l10n object, warn if not found, apply `args' if possible
+  function getL10nData(key, args) {
+    var data = gL10nData[key];
+    if (!data) {
+      consoleWarn('#' + key + ' is undefined.');
+    }
+
+    /** This is where l10n expressions should be processed.
+      * The plan is to support C-style expressions from the l20n project;
+      * until then, only two kinds of simple expressions are supported:
+      *   {[ index ]} and {{ arguments }}.
+      */
+    var rv = {};
+    for (var prop in data) {
+      var str = data[prop];
+      str = substIndexes(str, args, key, prop);
+      str = substArguments(str, args, key);
+      rv[prop] = str;
+    }
+    return rv;
+  }
+
+  // replace {[macros]} with their values
+  function substIndexes(str, args, key, prop) {
+    var reIndex = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)\s*\]\}/;
+    var reMatch = reIndex.exec(str);
+    if (!reMatch || !reMatch.length)
+      return str;
+
+    // an index/macro has been found
+    // Note: at the moment, only one parameter is supported
+    var macroName = reMatch[1];
+    var paramName = reMatch[2];
+    var param;
+    if (args && paramName in args) {
+      param = args[paramName];
+    } else if (paramName in gL10nData) {
+      param = gL10nData[paramName];
+    }
+
+    // there's no macro parser yet: it has to be defined in gMacros
+    if (macroName in gMacros) {
+      var macro = gMacros[macroName];
+      str = macro(str, param, key, prop);
+    }
+    return str;
+  }
+
+  // replace {{arguments}} with their values
+  function substArguments(str, args, key) {
+    var reArgs = /\{\{\s*(.+?)\s*\}\}/;
+    var match = reArgs.exec(str);
+    while (match) {
+      if (!match || match.length < 2)
+        return str; // argument key not found
+
+      var arg = match[1];
+      var sub = '';
+      if (args && arg in args) {
+        sub = args[arg];
+      } else if (arg in gL10nData) {
+        sub = gL10nData[arg][gTextProp];
+      } else {
+        consoleLog('argument {{' + arg + '}} for #' + key + ' is undefined.');
+        return str;
+      }
+
+      str = str.substring(0, match.index) + sub +
+            str.substr(match.index + match[0].length);
+      match = reArgs.exec(str);
+    }
+    return str;
+  }
+
+  // translate an HTML element
+  function translateElement(element) {
+    var l10n = getL10nAttributes(element);
+    if (!l10n.id)
+      return;
+
+    // get the related l10n object
+    var data = getL10nData(l10n.id, l10n.args);
+    if (!data) {
+      consoleWarn('#' + l10n.id + ' is undefined.');
+      return;
+    }
+
+    // translate element (TODO: security checks?)
+    if (data[gTextProp]) { // XXX
+      if (getChildElementCount(element) === 0) {
+        element[gTextProp] = data[gTextProp];
+      } else {
+        // this element has element children: replace the content of the first
+        // (non-empty) child textNode and clear other child textNodes
+        var children = element.childNodes;
+        var found = false;
+        for (var i = 0, l = children.length; i < l; i++) {
+          if (children[i].nodeType === 3 && /\S/.test(children[i].nodeValue)) {
+            if (found) {
+              children[i].nodeValue = '';
+            } else {
+              children[i].nodeValue = data[gTextProp];
+              found = true;
+            }
+          }
+        }
+        // if no (non-empty) textNode is found, insert a textNode before the
+        // first element child.
+        if (!found) {
+          var textNode = document.createTextNode(data[gTextProp]);
+          element.insertBefore(textNode, element.firstChild);
+        }
+      }
+      delete data[gTextProp];
+    }
+
+    for (var k in data) {
+      element[k] = data[k];
+    }
+  }
+
+  // webkit browsers don't currently support 'children' on SVG elements...
+  function getChildElementCount(element) {
+    if (element.children) {
+      return element.children.length;
+    }
+    if (typeof element.childElementCount !== 'undefined') {
+      return element.childElementCount;
+    }
+    var count = 0;
+    for (var i = 0; i < element.childNodes.length; i++) {
+      count += element.nodeType === 1 ? 1 : 0;
+    }
+    return count;
+  }
+
+  // translate an HTML subtree
+  function translateFragment(element) {
+    element = element || document.documentElement;
+
+    // check all translatable children (= w/ a `data-l10n-id' attribute)
+    var children = getTranslatableChildren(element);
+    var elementCount = children.length;
+    for (var i = 0; i < elementCount; i++) {
+      translateElement(children[i]);
+    }
+
+    // translate element itself if necessary
+    translateElement(element);
+  }
+
+
+  /**
+   * Startup & Public API
+   *
+   * Warning: this part of the code contains browser-specific chunks --
+   * that's where obsolete browsers, namely IE8 and earlier, are handled.
+   *
+   * Unlike the rest of the lib, this section is not shared with FirefoxOS/Gaia.
+   */
+
+  // load the default locale on startup
+  function l10nStartup() {
+    gReadyState = 'interactive';
+
+    // most browsers expose the UI language as `navigator.language'
+    // but IE uses `navigator.userLanguage' instead
+    var userLocale = navigator.language || navigator.userLanguage;
+    consoleLog('loading [' + userLocale + '] resources, ' +
+        (gAsyncResourceLoading ? 'asynchronously.' : 'synchronously.'));
+
+    // load the default locale and translate the document if required
+    if (document.documentElement.lang === userLocale) {
+      loadLocale(userLocale);
+    } else {
+      loadLocale(userLocale, translateFragment);
+    }
+  }
+
+  // browser-specific startup
+  if (document.addEventListener) { // modern browsers and IE9+
+    if (document.readyState === 'loading') {
+      // the document is not fully loaded yet: wait for DOMContentLoaded.
+      document.addEventListener('DOMContentLoaded', l10nStartup);
+    } else {
+      // l10n.js is being loaded with <script defer> or <script async>,
+      // the DOM is ready for parsing.
+      window.setTimeout(l10nStartup);
+    }
+  } else if (window.attachEvent) { // IE8 and before (= oldIE)
+    // TODO: check if jQuery is loaded (CSS selector + JSON + events)
+
+    // dummy `console.log' and `console.warn' functions
+    if (!window.console) {
+      consoleLog = function(message) {}; // just ignore console.log calls
+      consoleWarn = function(message) {
+        if (gDEBUG) {
+          alert('[l10n] ' + message); // vintage debugging, baby!
+        }
+      };
+    }
+
+    // XMLHttpRequest for IE6
+    if (!window.XMLHttpRequest) {
+      xhrLoadText = function(url, onSuccess, onFailure, asynchronous) {
+        onSuccess = onSuccess || function _onSuccess(data) {};
+        onFailure = onFailure || function _onFailure() {
+          consoleWarn(url + ' not found.');
+        };
+        var xhr = new ActiveXObject('Microsoft.XMLHTTP');
+        xhr.open('GET', url, asynchronous);
+        xhr.onreadystatechange = function() {
+          if (xhr.readyState == 4) {
+            if (xhr.status == 200) {
+              onSuccess(xhr.responseText);
+            } else {
+              onFailure();
+            }
+          }
+        };
+        xhr.send(null);
+      }
+    }
+
+    // worst hack ever for IE6 and IE7
+    if (!window.JSON) {
+      getL10nAttributes = function(element) {
+        if (!element)
+          return {};
+        var l10nId = element.getAttribute('data-l10n-id'),
+            l10nArgs = element.getAttribute('data-l10n-args'),
+            args = {};
+        if (l10nArgs) try {
+          args = eval(l10nArgs); // XXX yeah, I know...
+        } catch (e) {
+          consoleWarn('could not parse arguments for #' + l10nId);
+        }
+        return { id: l10nId, args: args };
+      };
+    }
+
+    // override `getTranslatableChildren' and `getL10nResourceLinks'
+    if (!document.querySelectorAll) {
+      getTranslatableChildren = function(element) {
+        if (!element)
+          return [];
+        var nodes = element.getElementsByTagName('*'),
+            l10nElements = [],
+            n = nodes.length;
+        for (var i = 0; i < n; i++) {
+          if (nodes[i].getAttribute('data-l10n-id'))
+            l10nElements.push(nodes[i]);
+        }
+        return l10nElements;
+      };
+      getL10nResourceLinks = function() {
+        var links = document.getElementsByTagName('link'),
+            l10nLinks = [],
+            n = links.length;
+        for (var i = 0; i < n; i++) {
+          if (links[i].type == 'application/l10n')
+            l10nLinks.push(links[i]);
+        }
+        return l10nLinks;
+      };
+    }
+
+    // override `getL10nDictionary'
+    if (!window.JSON || !document.querySelectorAll) {
+      getL10nDictionary = function() {
+        var scripts = document.getElementsByName('script');
+        for (var i = 0; i < scripts.length; i++) {
+          if (scripts[i].type == 'application/l10n') {
+            return eval(scripts[i].innerHTML);
+          }
+        }
+        return null;
+      };
+    }
+
+    // fire non-standard `localized' DOM events
+    if (document.createEventObject && !document.createEvent) {
+      fireL10nReadyEvent = function(lang) {
+        // hack to simulate a custom event in IE:
+        // to catch this event, add an event handler to `onpropertychange'
+        document.documentElement.localized = 1;
+      };
+    }
+
+    // startup for IE<9
+    window.attachEvent('onload', function() {
+      gTextProp = document.body.textContent ? 'textContent' : 'innerText';
+      l10nStartup();
+    });
+  }
+
+  // cross-browser API (sorry, oldIE doesn't support getters & setters)
+  return {
+    // get a localized string
+    get: function(key, args, fallback) {
+      var data = getL10nData(key, args) || fallback;
+      if (data) { // XXX double-check this
+        return gTextProp in data ? data[gTextProp] : '';
+      }
+      return '{{' + key + '}}';
+    },
+
+    // debug
+    getData: function() { return gL10nData; },
+    getText: function() { return gTextData; },
+
+    // get|set the document language
+    getLanguage: function() { return gLanguage; },
+    setLanguage: function(lang) { loadLocale(lang, translateFragment); },
+
+    // get the direction (ltr|rtl) of the current language
+    getDirection: function() {
+      // http://www.w3.org/International/questions/qa-scripts
+      // Arabic, Hebrew, Farsi, Pashto, Urdu
+      var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
+      return (rtlList.indexOf(gLanguage) >= 0) ? 'rtl' : 'ltr';
+    },
+
+    // translate an element or document fragment
+    translate: translateFragment,
+
+    // this can be used to prevent race conditions
+    getReadyState: function() { return gReadyState; },
+    ready: function(callback) {
+      if (!callback) {
+        return;
+      } else if (gReadyState == 'complete' || gReadyState == 'interactive') {
+        window.setTimeout(callback);
+      } else if (document.addEventListener) {
+        document.addEventListener('localized', callback);
+      } else if (document.attachEvent) {
+        document.documentElement.attachEvent('onpropertychange', function(e) {
+          if (e.propertyName === 'localized') {
+            callback();
+          }
+        });
+      }
+    }
+  };
+}) (window, document);
+
+// gettext-like shortcut for document.webL10n.get
+if (window._ === undefined) {
+  var _ = document.webL10n.get;
+}
+
diff --git a/test/vendor/chai-1.9.0.js b/test/vendor/chai-1.9.0.js
new file mode 100644
index 000000000000..8a6339a1c734
--- /dev/null
+++ b/test/vendor/chai-1.9.0.js
@@ -0,0 +1,4696 @@
+;(function(){
+
+/**
+ * Require the given path.
+ *
+ * @param {String} path
+ * @return {Object} exports
+ * @api public
+ */
+
+function require(path, parent, orig) {
+  var resolved = require.resolve(path);
+
+  // lookup failed
+  if (null == resolved) {
+    orig = orig || path;
+    parent = parent || 'root';
+    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
+    err.path = orig;
+    err.parent = parent;
+    err.require = true;
+    throw err;
+  }
+
+  var module = require.modules[resolved];
+
+  // perform real require()
+  // by invoking the module's
+  // registered function
+  if (!module._resolving && !module.exports) {
+    var mod = {};
+    mod.exports = {};
+    mod.client = mod.component = true;
+    module._resolving = true;
+    module.call(this, mod.exports, require.relative(resolved), mod);
+    delete module._resolving;
+    module.exports = mod.exports;
+  }
+
+  return module.exports;
+}
+
+/**
+ * Registered modules.
+ */
+
+require.modules = {};
+
+/**
+ * Registered aliases.
+ */
+
+require.aliases = {};
+
+/**
+ * Resolve `path`.
+ *
+ * Lookup:
+ *
+ *   - PATH/index.js
+ *   - PATH.js
+ *   - PATH
+ *
+ * @param {String} path
+ * @return {String} path or null
+ * @api private
+ */
+
+require.resolve = function(path) {
+  if (path.charAt(0) === '/') path = path.slice(1);
+
+  var paths = [
+    path,
+    path + '.js',
+    path + '.json',
+    path + '/index.js',
+    path + '/index.json'
+  ];
+
+  for (var i = 0; i < paths.length; i++) {
+    var path = paths[i];
+    if (require.modules.hasOwnProperty(path)) return path;
+    if (require.aliases.hasOwnProperty(path)) return require.aliases[path];
+  }
+};
+
+/**
+ * Normalize `path` relative to the current path.
+ *
+ * @param {String} curr
+ * @param {String} path
+ * @return {String}
+ * @api private
+ */
+
+require.normalize = function(curr, path) {
+  var segs = [];
+
+  if ('.' != path.charAt(0)) return path;
+
+  curr = curr.split('/');
+  path = path.split('/');
+
+  for (var i = 0; i < path.length; ++i) {
+    if ('..' == path[i]) {
+      curr.pop();
+    } else if ('.' != path[i] && '' != path[i]) {
+      segs.push(path[i]);
+    }
+  }
+
+  return curr.concat(segs).join('/');
+};
+
+/**
+ * Register module at `path` with callback `definition`.
+ *
+ * @param {String} path
+ * @param {Function} definition
+ * @api private
+ */
+
+require.register = function(path, definition) {
+  require.modules[path] = definition;
+};
+
+/**
+ * Alias a module definition.
+ *
+ * @param {String} from
+ * @param {String} to
+ * @api private
+ */
+
+require.alias = function(from, to) {
+  if (!require.modules.hasOwnProperty(from)) {
+    throw new Error('Failed to alias "' + from + '", it does not exist');
+  }
+  require.aliases[to] = from;
+};
+
+/**
+ * Return a require function relative to the `parent` path.
+ *
+ * @param {String} parent
+ * @return {Function}
+ * @api private
+ */
+
+require.relative = function(parent) {
+  var p = require.normalize(parent, '..');
+
+  /**
+   * lastIndexOf helper.
+   */
+
+  function lastIndexOf(arr, obj) {
+    var i = arr.length;
+    while (i--) {
+      if (arr[i] === obj) return i;
+    }
+    return -1;
+  }
+
+  /**
+   * The relative require() itself.
+   */
+
+  function localRequire(path) {
+    var resolved = localRequire.resolve(path);
+    return require(resolved, parent, path);
+  }
+
+  /**
+   * Resolve relative to the parent.
+   */
+
+  localRequire.resolve = function(path) {
+    var c = path.charAt(0);
+    if ('/' == c) return path.slice(1);
+    if ('.' == c) return require.normalize(p, path);
+
+    // resolve deps by returning
+    // the dep in the nearest "deps"
+    // directory
+    var segs = parent.split('/');
+    var i = lastIndexOf(segs, 'deps') + 1;
+    if (!i) i = 0;
+    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
+    return path;
+  };
+
+  /**
+   * Check if module is defined at `path`.
+   */
+
+  localRequire.exists = function(path) {
+    return require.modules.hasOwnProperty(localRequire.resolve(path));
+  };
+
+  return localRequire;
+};
+require.register("chaijs-assertion-error/index.js", function(exports, require, module){
+/*!
+ * assertion-error
+ * Copyright(c) 2013 Jake Luer <jake@qualiancy.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Return a function that will copy properties from
+ * one object to another excluding any originally
+ * listed. Returned function will create a new `{}`.
+ *
+ * @param {String} excluded properties ...
+ * @return {Function}
+ */
+
+function exclude () {
+  var excludes = [].slice.call(arguments);
+
+  function excludeProps (res, obj) {
+    Object.keys(obj).forEach(function (key) {
+      if (!~excludes.indexOf(key)) res[key] = obj[key];
+    });
+  }
+
+  return function extendExclude () {
+    var args = [].slice.call(arguments)
+      , i = 0
+      , res = {};
+
+    for (; i < args.length; i++) {
+      excludeProps(res, args[i]);
+    }
+
+    return res;
+  };
+};
+
+/*!
+ * Primary Exports
+ */
+
+module.exports = AssertionError;
+
+/**
+ * ### AssertionError
+ *
+ * An extension of the JavaScript `Error` constructor for
+ * assertion and validation scenarios.
+ *
+ * @param {String} message
+ * @param {Object} properties to include (optional)
+ * @param {callee} start stack function (optional)
+ */
+
+function AssertionError (message, _props, ssf) {
+  var extend = exclude('name', 'message', 'stack', 'constructor', 'toJSON')
+    , props = extend(_props || {});
+
+  // default values
+  this.message = message || 'Unspecified AssertionError';
+  this.showDiff = false;
+
+  // copy from properties
+  for (var key in props) {
+    this[key] = props[key];
+  }
+
+  // capture stack trace
+  ssf = ssf || arguments.callee;
+  if (ssf && Error.captureStackTrace) {
+    Error.captureStackTrace(this, ssf);
+  }
+}
+
+/*!
+ * Inherit from Error.prototype
+ */
+
+AssertionError.prototype = Object.create(Error.prototype);
+
+/*!
+ * Statically set name
+ */
+
+AssertionError.prototype.name = 'AssertionError';
+
+/*!
+ * Ensure correct constructor
+ */
+
+AssertionError.prototype.constructor = AssertionError;
+
+/**
+ * Allow errors to be converted to JSON for static transfer.
+ *
+ * @param {Boolean} include stack (default: `true`)
+ * @return {Object} object that can be `JSON.stringify`
+ */
+
+AssertionError.prototype.toJSON = function (stack) {
+  var extend = exclude('constructor', 'toJSON', 'stack')
+    , props = extend({ name: this.name }, this);
+
+  // include stack if exists and not turned off
+  if (false !== stack && this.stack) {
+    props.stack = this.stack;
+  }
+
+  return props;
+};
+
+});
+require.register("chaijs-type-detect/lib/type.js", function(exports, require, module){
+/*!
+ * type-detect
+ * Copyright(c) 2013 jake luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Primary Exports
+ */
+
+var exports = module.exports = getType;
+
+/*!
+ * Detectable javascript natives
+ */
+
+var natives = {
+    '[object Array]': 'array'
+  , '[object RegExp]': 'regexp'
+  , '[object Function]': 'function'
+  , '[object Arguments]': 'arguments'
+  , '[object Date]': 'date'
+};
+
+/**
+ * ### typeOf (obj)
+ *
+ * Use several different techniques to determine
+ * the type of object being tested.
+ *
+ *
+ * @param {Mixed} object
+ * @return {String} object type
+ * @api public
+ */
+
+function getType (obj) {
+  var str = Object.prototype.toString.call(obj);
+  if (natives[str]) return natives[str];
+  if (obj === null) return 'null';
+  if (obj === undefined) return 'undefined';
+  if (obj === Object(obj)) return 'object';
+  return typeof obj;
+}
+
+exports.Library = Library;
+
+/**
+ * ### Library
+ *
+ * Create a repository for custom type detection.
+ *
+ * ```js
+ * var lib = new type.Library;
+ * ```
+ *
+ */
+
+function Library () {
+  this.tests = {};
+}
+
+/**
+ * #### .of (obj)
+ *
+ * Expose replacement `typeof` detection to the library.
+ *
+ * ```js
+ * if ('string' === lib.of('hello world')) {
+ *   // ...
+ * }
+ * ```
+ *
+ * @param {Mixed} object to test
+ * @return {String} type
+ */
+
+Library.prototype.of = getType;
+
+/**
+ * #### .define (type, test)
+ *
+ * Add a test to for the `.test()` assertion.
+ *
+ * Can be defined as a regular expression:
+ *
+ * ```js
+ * lib.define('int', /^[0-9]+$/);
+ * ```
+ *
+ * ... or as a function:
+ *
+ * ```js
+ * lib.define('bln', function (obj) {
+ *   if ('boolean' === lib.of(obj)) return true;
+ *   var blns = [ 'yes', 'no', 'true', 'false', 1, 0 ];
+ *   if ('string' === lib.of(obj)) obj = obj.toLowerCase();
+ *   return !! ~blns.indexOf(obj);
+ * });
+ * ```
+ *
+ * @param {String} type
+ * @param {RegExp|Function} test
+ * @api public
+ */
+
+Library.prototype.define = function (type, test) {
+  if (arguments.length === 1) return this.tests[type];
+  this.tests[type] = test;
+  return this;
+};
+
+/**
+ * #### .test (obj, test)
+ *
+ * Assert that an object is of type. Will first
+ * check natives, and if that does not pass it will
+ * use the user defined custom tests.
+ *
+ * ```js
+ * assert(lib.test('1', 'int'));
+ * assert(lib.test('yes', 'bln'));
+ * ```
+ *
+ * @param {Mixed} object
+ * @param {String} type
+ * @return {Boolean} result
+ * @api public
+ */
+
+Library.prototype.test = function (obj, type) {
+  if (type === getType(obj)) return true;
+  var test = this.tests[type];
+
+  if (test && 'regexp' === getType(test)) {
+    return test.test(obj);
+  } else if (test && 'function' === getType(test)) {
+    return test(obj);
+  } else {
+    throw new ReferenceError('Type test "' + type + '" not defined or invalid.');
+  }
+};
+
+});
+require.register("chaijs-deep-eql/lib/eql.js", function(exports, require, module){
+/*!
+ * deep-eql
+ * Copyright(c) 2013 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependencies
+ */
+
+var type = require('type-detect');
+
+/*!
+ * Buffer.isBuffer browser shim
+ */
+
+var Buffer;
+try { Buffer = require('buffer').Buffer; }
+catch(ex) {
+  Buffer = {};
+  Buffer.isBuffer = function() { return false; }
+}
+
+/*!
+ * Primary Export
+ */
+
+module.exports = deepEqual;
+
+/**
+ * Assert super-strict (egal) equality between
+ * two objects of any type.
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @param {Array} memoised (optional)
+ * @return {Boolean} equal match
+ */
+
+function deepEqual(a, b, m) {
+  if (sameValue(a, b)) {
+    return true;
+  } else if ('date' === type(a)) {
+    return dateEqual(a, b);
+  } else if ('regexp' === type(a)) {
+    return regexpEqual(a, b);
+  } else if (Buffer.isBuffer(a)) {
+    return bufferEqual(a, b);
+  } else if ('arguments' === type(a)) {
+    return argumentsEqual(a, b, m);
+  } else if (!typeEqual(a, b)) {
+    return false;
+  } else if (('object' !== type(a) && 'object' !== type(b))
+  && ('array' !== type(a) && 'array' !== type(b))) {
+    return sameValue(a, b);
+  } else {
+    return objectEqual(a, b, m);
+  }
+}
+
+/*!
+ * Strict (egal) equality test. Ensures that NaN always
+ * equals NaN and `-0` does not equal `+0`.
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @return {Boolean} equal match
+ */
+
+function sameValue(a, b) {
+  if (a === b) return a !== 0 || 1 / a === 1 / b;
+  return a !== a && b !== b;
+}
+
+/*!
+ * Compare the types of two given objects and
+ * return if they are equal. Note that an Array
+ * has a type of `array` (not `object`) and arguments
+ * have a type of `arguments` (not `array`/`object`).
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @return {Boolean} result
+ */
+
+function typeEqual(a, b) {
+  return type(a) === type(b);
+}
+
+/*!
+ * Compare two Date objects by asserting that
+ * the time values are equal using `saveValue`.
+ *
+ * @param {Date} a
+ * @param {Date} b
+ * @return {Boolean} result
+ */
+
+function dateEqual(a, b) {
+  if ('date' !== type(b)) return false;
+  return sameValue(a.getTime(), b.getTime());
+}
+
+/*!
+ * Compare two regular expressions by converting them
+ * to string and checking for `sameValue`.
+ *
+ * @param {RegExp} a
+ * @param {RegExp} b
+ * @return {Boolean} result
+ */
+
+function regexpEqual(a, b) {
+  if ('regexp' !== type(b)) return false;
+  return sameValue(a.toString(), b.toString());
+}
+
+/*!
+ * Assert deep equality of two `arguments` objects.
+ * Unfortunately, these must be sliced to arrays
+ * prior to test to ensure no bad behavior.
+ *
+ * @param {Arguments} a
+ * @param {Arguments} b
+ * @param {Array} memoize (optional)
+ * @return {Boolean} result
+ */
+
+function argumentsEqual(a, b, m) {
+  if ('arguments' !== type(b)) return false;
+  a = [].slice.call(a);
+  b = [].slice.call(b);
+  return deepEqual(a, b, m);
+}
+
+/*!
+ * Get enumerable properties of a given object.
+ *
+ * @param {Object} a
+ * @return {Array} property names
+ */
+
+function enumerable(a) {
+  var res = [];
+  for (var key in a) res.push(key);
+  return res;
+}
+
+/*!
+ * Simple equality for flat iterable objects
+ * such as Arrays or Node.js buffers.
+ *
+ * @param {Iterable} a
+ * @param {Iterable} b
+ * @return {Boolean} result
+ */
+
+function iterableEqual(a, b) {
+  if (a.length !==  b.length) return false;
+
+  var i = 0;
+  var match = true;
+
+  for (; i < a.length; i++) {
+    if (a[i] !== b[i]) {
+      match = false;
+      break;
+    }
+  }
+
+  return match;
+}
+
+/*!
+ * Extension to `iterableEqual` specifically
+ * for Node.js Buffers.
+ *
+ * @param {Buffer} a
+ * @param {Mixed} b
+ * @return {Boolean} result
+ */
+
+function bufferEqual(a, b) {
+  if (!Buffer.isBuffer(b)) return false;
+  return iterableEqual(a, b);
+}
+
+/*!
+ * Block for `objectEqual` ensuring non-existing
+ * values don't get in.
+ *
+ * @param {Mixed} object
+ * @return {Boolean} result
+ */
+
+function isValue(a) {
+  return a !== null && a !== undefined;
+}
+
+/*!
+ * Recursively check the equality of two objects.
+ * Once basic sameness has been established it will
+ * defer to `deepEqual` for each enumerable key
+ * in the object.
+ *
+ * @param {Mixed} a
+ * @param {Mixed} b
+ * @return {Boolean} result
+ */
+
+function objectEqual(a, b, m) {
+  if (!isValue(a) || !isValue(b)) {
+    return false;
+  }
+
+  if (a.prototype !== b.prototype) {
+    return false;
+  }
+
+  var i;
+  if (m) {
+    for (i = 0; i < m.length; i++) {
+      if ((m[i][0] === a && m[i][1] === b)
+      ||  (m[i][0] === b && m[i][1] === a)) {
+        return true;
+      }
+    }
+  } else {
+    m = [];
+  }
+
+  try {
+    var ka = enumerable(a);
+    var kb = enumerable(b);
+  } catch (ex) {
+    return false;
+  }
+
+  ka.sort();
+  kb.sort();
+
+  if (!iterableEqual(ka, kb)) {
+    return false;
+  }
+
+  m.push([ a, b ]);
+
+  var key;
+  for (i = ka.length - 1; i >= 0; i--) {
+    key = ka[i];
+    if (!deepEqual(a[key], b[key], m)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+});
+require.register("chai/index.js", function(exports, require, module){
+module.exports = require('./lib/chai');
+
+});
+require.register("chai/lib/chai.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+var used = []
+  , exports = module.exports = {};
+
+/*!
+ * Chai version
+ */
+
+exports.version = '1.8.1';
+
+/*!
+ * Assertion Error
+ */
+
+exports.AssertionError = require('assertion-error');
+
+/*!
+ * Utils for plugins (not exported)
+ */
+
+var util = require('./chai/utils');
+
+/**
+ * # .use(function)
+ *
+ * Provides a way to extend the internals of Chai
+ *
+ * @param {Function}
+ * @returns {this} for chaining
+ * @api public
+ */
+
+exports.use = function (fn) {
+  if (!~used.indexOf(fn)) {
+    fn(this, util);
+    used.push(fn);
+  }
+
+  return this;
+};
+
+/*!
+ * Primary `Assertion` prototype
+ */
+
+var assertion = require('./chai/assertion');
+exports.use(assertion);
+
+/*!
+ * Core Assertions
+ */
+
+var core = require('./chai/core/assertions');
+exports.use(core);
+
+/*!
+ * Expect interface
+ */
+
+var expect = require('./chai/interface/expect');
+exports.use(expect);
+
+/*!
+ * Should interface
+ */
+
+var should = require('./chai/interface/should');
+exports.use(should);
+
+/*!
+ * Assert interface
+ */
+
+var assert = require('./chai/interface/assert');
+exports.use(assert);
+
+});
+require.register("chai/lib/chai/assertion.js", function(exports, require, module){
+/*!
+ * chai
+ * http://chaijs.com
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (_chai, util) {
+  /*!
+   * Module dependencies.
+   */
+
+  var AssertionError = _chai.AssertionError
+    , flag = util.flag;
+
+  /*!
+   * Module export.
+   */
+
+  _chai.Assertion = Assertion;
+
+  /*!
+   * Assertion Constructor
+   *
+   * Creates object for chaining.
+   *
+   * @api private
+   */
+
+  function Assertion (obj, msg, stack) {
+    flag(this, 'ssfi', stack || arguments.callee);
+    flag(this, 'object', obj);
+    flag(this, 'message', msg);
+  }
+
+  /*!
+    * ### Assertion.includeStack
+    *
+    * User configurable property, influences whether stack trace
+    * is included in Assertion error message. Default of false
+    * suppresses stack trace in the error message
+    *
+    *     Assertion.includeStack = true;  // enable stack on error
+    *
+    * @api public
+    */
+
+  Assertion.includeStack = false;
+
+  /*!
+   * ### Assertion.showDiff
+   *
+   * User configurable property, influences whether or not
+   * the `showDiff` flag should be included in the thrown
+   * AssertionErrors. `false` will always be `false`; `true`
+   * will be true when the assertion has requested a diff
+   * be shown.
+   *
+   * @api public
+   */
+
+  Assertion.showDiff = true;
+
+  Assertion.addProperty = function (name, fn) {
+    util.addProperty(this.prototype, name, fn);
+  };
+
+  Assertion.addMethod = function (name, fn) {
+    util.addMethod(this.prototype, name, fn);
+  };
+
+  Assertion.addChainableMethod = function (name, fn, chainingBehavior) {
+    util.addChainableMethod(this.prototype, name, fn, chainingBehavior);
+  };
+
+  Assertion.overwriteProperty = function (name, fn) {
+    util.overwriteProperty(this.prototype, name, fn);
+  };
+
+  Assertion.overwriteMethod = function (name, fn) {
+    util.overwriteMethod(this.prototype, name, fn);
+  };
+
+  Assertion.overwriteChainableMethod = function (name, fn, chainingBehavior) {
+    util.overwriteChainableMethod(this.prototype, name, fn, chainingBehavior);
+  };
+
+  /*!
+   * ### .assert(expression, message, negateMessage, expected, actual)
+   *
+   * Executes an expression and check expectations. Throws AssertionError for reporting if test doesn't pass.
+   *
+   * @name assert
+   * @param {Philosophical} expression to be tested
+   * @param {String} message to display if fails
+   * @param {String} negatedMessage to display if negated expression fails
+   * @param {Mixed} expected value (remember to check for negation)
+   * @param {Mixed} actual (optional) will default to `this.obj`
+   * @api private
+   */
+
+  Assertion.prototype.assert = function (expr, msg, negateMsg, expected, _actual, showDiff) {
+    var ok = util.test(this, arguments);
+    if (true !== showDiff) showDiff = false;
+    if (true !== Assertion.showDiff) showDiff = false;
+
+    if (!ok) {
+      var msg = util.getMessage(this, arguments)
+        , actual = util.getActual(this, arguments);
+      throw new AssertionError(msg, {
+          actual: actual
+        , expected: expected
+        , showDiff: showDiff
+      }, (Assertion.includeStack) ? this.assert : flag(this, 'ssfi'));
+    }
+  };
+
+  /*!
+   * ### ._obj
+   *
+   * Quick reference to stored `actual` value for plugin developers.
+   *
+   * @api private
+   */
+
+  Object.defineProperty(Assertion.prototype, '_obj',
+    { get: function () {
+        return flag(this, 'object');
+      }
+    , set: function (val) {
+        flag(this, 'object', val);
+      }
+  });
+};
+
+});
+require.register("chai/lib/chai/core/assertions.js", function(exports, require, module){
+/*!
+ * chai
+ * http://chaijs.com
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (chai, _) {
+  var Assertion = chai.Assertion
+    , toString = Object.prototype.toString
+    , flag = _.flag;
+
+  /**
+   * ### Language Chains
+   *
+   * The following are provided as chainable getters to
+   * improve the readability of your assertions. They
+   * do not provide an testing capability unless they
+   * have been overwritten by a plugin.
+   *
+   * **Chains**
+   *
+   * - to
+   * - be
+   * - been
+   * - is
+   * - that
+   * - and
+   * - has
+   * - have
+   * - with
+   * - at
+   * - of
+   * - same
+   *
+   * @name language chains
+   * @api public
+   */
+
+  [ 'to', 'be', 'been'
+  , 'is', 'and', 'has', 'have'
+  , 'with', 'that', 'at'
+  , 'of', 'same' ].forEach(function (chain) {
+    Assertion.addProperty(chain, function () {
+      return this;
+    });
+  });
+
+  /**
+   * ### .not
+   *
+   * Negates any of assertions following in the chain.
+   *
+   *     expect(foo).to.not.equal('bar');
+   *     expect(goodFn).to.not.throw(Error);
+   *     expect({ foo: 'baz' }).to.have.property('foo')
+   *       .and.not.equal('bar');
+   *
+   * @name not
+   * @api public
+   */
+
+  Assertion.addProperty('not', function () {
+    flag(this, 'negate', true);
+  });
+
+  /**
+   * ### .deep
+   *
+   * Sets the `deep` flag, later used by the `equal` and
+   * `property` assertions.
+   *
+   *     expect(foo).to.deep.equal({ bar: 'baz' });
+   *     expect({ foo: { bar: { baz: 'quux' } } })
+   *       .to.have.deep.property('foo.bar.baz', 'quux');
+   *
+   * @name deep
+   * @api public
+   */
+
+  Assertion.addProperty('deep', function () {
+    flag(this, 'deep', true);
+  });
+
+  /**
+   * ### .a(type)
+   *
+   * The `a` and `an` assertions are aliases that can be
+   * used either as language chains or to assert a value's
+   * type.
+   *
+   *     // typeof
+   *     expect('test').to.be.a('string');
+   *     expect({ foo: 'bar' }).to.be.an('object');
+   *     expect(null).to.be.a('null');
+   *     expect(undefined).to.be.an('undefined');
+   *
+   *     // language chain
+   *     expect(foo).to.be.an.instanceof(Foo);
+   *
+   * @name a
+   * @alias an
+   * @param {String} type
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function an (type, msg) {
+    if (msg) flag(this, 'message', msg);
+    type = type.toLowerCase();
+    var obj = flag(this, 'object')
+      , article = ~[ 'a', 'e', 'i', 'o', 'u' ].indexOf(type.charAt(0)) ? 'an ' : 'a ';
+
+    this.assert(
+        type === _.type(obj)
+      , 'expected #{this} to be ' + article + type
+      , 'expected #{this} not to be ' + article + type
+    );
+  }
+
+  Assertion.addChainableMethod('an', an);
+  Assertion.addChainableMethod('a', an);
+
+  /**
+   * ### .include(value)
+   *
+   * The `include` and `contain` assertions can be used as either property
+   * based language chains or as methods to assert the inclusion of an object
+   * in an array or a substring in a string. When used as language chains,
+   * they toggle the `contain` flag for the `keys` assertion.
+   *
+   *     expect([1,2,3]).to.include(2);
+   *     expect('foobar').to.contain('foo');
+   *     expect({ foo: 'bar', hello: 'universe' }).to.include.keys('foo');
+   *
+   * @name include
+   * @alias contain
+   * @param {Object|String|Number} obj
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function includeChainingBehavior () {
+    flag(this, 'contains', true);
+  }
+
+  function include (val, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+
+    if (_.type(val) === 'object') {
+      if (!flag(this, 'negate')) {
+        for (var k in val) new Assertion(obj).property(k, val[k]);
+        return;
+      }
+      var subset = {}
+      for (var k in val) subset[k] = obj[k]
+      var expected = _.eql(subset, val);
+    } else {
+      var expected = obj && ~obj.indexOf(val)
+    }
+    this.assert(
+        expected
+      , 'expected #{this} to include ' + _.inspect(val)
+      , 'expected #{this} to not include ' + _.inspect(val));
+  }
+
+  Assertion.addChainableMethod('include', include, includeChainingBehavior);
+  Assertion.addChainableMethod('contain', include, includeChainingBehavior);
+
+  /**
+   * ### .ok
+   *
+   * Asserts that the target is truthy.
+   *
+   *     expect('everthing').to.be.ok;
+   *     expect(1).to.be.ok;
+   *     expect(false).to.not.be.ok;
+   *     expect(undefined).to.not.be.ok;
+   *     expect(null).to.not.be.ok;
+   *
+   * @name ok
+   * @api public
+   */
+
+  Assertion.addProperty('ok', function () {
+    this.assert(
+        flag(this, 'object')
+      , 'expected #{this} to be truthy'
+      , 'expected #{this} to be falsy');
+  });
+
+  /**
+   * ### .true
+   *
+   * Asserts that the target is `true`.
+   *
+   *     expect(true).to.be.true;
+   *     expect(1).to.not.be.true;
+   *
+   * @name true
+   * @api public
+   */
+
+  Assertion.addProperty('true', function () {
+    this.assert(
+        true === flag(this, 'object')
+      , 'expected #{this} to be true'
+      , 'expected #{this} to be false'
+      , this.negate ? false : true
+    );
+  });
+
+  /**
+   * ### .false
+   *
+   * Asserts that the target is `false`.
+   *
+   *     expect(false).to.be.false;
+   *     expect(0).to.not.be.false;
+   *
+   * @name false
+   * @api public
+   */
+
+  Assertion.addProperty('false', function () {
+    this.assert(
+        false === flag(this, 'object')
+      , 'expected #{this} to be false'
+      , 'expected #{this} to be true'
+      , this.negate ? true : false
+    );
+  });
+
+  /**
+   * ### .null
+   *
+   * Asserts that the target is `null`.
+   *
+   *     expect(null).to.be.null;
+   *     expect(undefined).not.to.be.null;
+   *
+   * @name null
+   * @api public
+   */
+
+  Assertion.addProperty('null', function () {
+    this.assert(
+        null === flag(this, 'object')
+      , 'expected #{this} to be null'
+      , 'expected #{this} not to be null'
+    );
+  });
+
+  /**
+   * ### .undefined
+   *
+   * Asserts that the target is `undefined`.
+   *
+   *     expect(undefined).to.be.undefined;
+   *     expect(null).to.not.be.undefined;
+   *
+   * @name undefined
+   * @api public
+   */
+
+  Assertion.addProperty('undefined', function () {
+    this.assert(
+        undefined === flag(this, 'object')
+      , 'expected #{this} to be undefined'
+      , 'expected #{this} not to be undefined'
+    );
+  });
+
+  /**
+   * ### .exist
+   *
+   * Asserts that the target is neither `null` nor `undefined`.
+   *
+   *     var foo = 'hi'
+   *       , bar = null
+   *       , baz;
+   *
+   *     expect(foo).to.exist;
+   *     expect(bar).to.not.exist;
+   *     expect(baz).to.not.exist;
+   *
+   * @name exist
+   * @api public
+   */
+
+  Assertion.addProperty('exist', function () {
+    this.assert(
+        null != flag(this, 'object')
+      , 'expected #{this} to exist'
+      , 'expected #{this} to not exist'
+    );
+  });
+
+
+  /**
+   * ### .empty
+   *
+   * Asserts that the target's length is `0`. For arrays, it checks
+   * the `length` property. For objects, it gets the count of
+   * enumerable keys.
+   *
+   *     expect([]).to.be.empty;
+   *     expect('').to.be.empty;
+   *     expect({}).to.be.empty;
+   *
+   * @name empty
+   * @api public
+   */
+
+  Assertion.addProperty('empty', function () {
+    var obj = flag(this, 'object')
+      , expected = obj;
+
+    if (Array.isArray(obj) || 'string' === typeof object) {
+      expected = obj.length;
+    } else if (typeof obj === 'object') {
+      expected = Object.keys(obj).length;
+    }
+
+    this.assert(
+        !expected
+      , 'expected #{this} to be empty'
+      , 'expected #{this} not to be empty'
+    );
+  });
+
+  /**
+   * ### .arguments
+   *
+   * Asserts that the target is an arguments object.
+   *
+   *     function test () {
+   *       expect(arguments).to.be.arguments;
+   *     }
+   *
+   * @name arguments
+   * @alias Arguments
+   * @api public
+   */
+
+  function checkArguments () {
+    var obj = flag(this, 'object')
+      , type = Object.prototype.toString.call(obj);
+    this.assert(
+        '[object Arguments]' === type
+      , 'expected #{this} to be arguments but got ' + type
+      , 'expected #{this} to not be arguments'
+    );
+  }
+
+  Assertion.addProperty('arguments', checkArguments);
+  Assertion.addProperty('Arguments', checkArguments);
+
+  /**
+   * ### .equal(value)
+   *
+   * Asserts that the target is strictly equal (`===`) to `value`.
+   * Alternately, if the `deep` flag is set, asserts that
+   * the target is deeply equal to `value`.
+   *
+   *     expect('hello').to.equal('hello');
+   *     expect(42).to.equal(42);
+   *     expect(1).to.not.equal(true);
+   *     expect({ foo: 'bar' }).to.not.equal({ foo: 'bar' });
+   *     expect({ foo: 'bar' }).to.deep.equal({ foo: 'bar' });
+   *
+   * @name equal
+   * @alias equals
+   * @alias eq
+   * @alias deep.equal
+   * @param {Mixed} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertEqual (val, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'deep')) {
+      return this.eql(val);
+    } else {
+      this.assert(
+          val === obj
+        , 'expected #{this} to equal #{exp}'
+        , 'expected #{this} to not equal #{exp}'
+        , val
+        , this._obj
+        , true
+      );
+    }
+  }
+
+  Assertion.addMethod('equal', assertEqual);
+  Assertion.addMethod('equals', assertEqual);
+  Assertion.addMethod('eq', assertEqual);
+
+  /**
+   * ### .eql(value)
+   *
+   * Asserts that the target is deeply equal to `value`.
+   *
+   *     expect({ foo: 'bar' }).to.eql({ foo: 'bar' });
+   *     expect([ 1, 2, 3 ]).to.eql([ 1, 2, 3 ]);
+   *
+   * @name eql
+   * @alias eqls
+   * @param {Mixed} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertEql(obj, msg) {
+    if (msg) flag(this, 'message', msg);
+    this.assert(
+        _.eql(obj, flag(this, 'object'))
+      , 'expected #{this} to deeply equal #{exp}'
+      , 'expected #{this} to not deeply equal #{exp}'
+      , obj
+      , this._obj
+      , true
+    );
+  }
+
+  Assertion.addMethod('eql', assertEql);
+  Assertion.addMethod('eqls', assertEql);
+
+  /**
+   * ### .above(value)
+   *
+   * Asserts that the target is greater than `value`.
+   *
+   *     expect(10).to.be.above(5);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a minimum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.above(2);
+   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
+   *
+   * @name above
+   * @alias gt
+   * @alias greaterThan
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertAbove (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len > n
+        , 'expected #{this} to have a length above #{exp} but got #{act}'
+        , 'expected #{this} to not have a length above #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj > n
+        , 'expected #{this} to be above ' + n
+        , 'expected #{this} to be at most ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('above', assertAbove);
+  Assertion.addMethod('gt', assertAbove);
+  Assertion.addMethod('greaterThan', assertAbove);
+
+  /**
+   * ### .least(value)
+   *
+   * Asserts that the target is greater than or equal to `value`.
+   *
+   *     expect(10).to.be.at.least(10);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a minimum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.of.at.least(2);
+   *     expect([ 1, 2, 3 ]).to.have.length.of.at.least(3);
+   *
+   * @name least
+   * @alias gte
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertLeast (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len >= n
+        , 'expected #{this} to have a length at least #{exp} but got #{act}'
+        , 'expected #{this} to have a length below #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj >= n
+        , 'expected #{this} to be at least ' + n
+        , 'expected #{this} to be below ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('least', assertLeast);
+  Assertion.addMethod('gte', assertLeast);
+
+  /**
+   * ### .below(value)
+   *
+   * Asserts that the target is less than `value`.
+   *
+   *     expect(5).to.be.below(10);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a maximum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.below(4);
+   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
+   *
+   * @name below
+   * @alias lt
+   * @alias lessThan
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertBelow (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len < n
+        , 'expected #{this} to have a length below #{exp} but got #{act}'
+        , 'expected #{this} to not have a length below #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj < n
+        , 'expected #{this} to be below ' + n
+        , 'expected #{this} to be at least ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('below', assertBelow);
+  Assertion.addMethod('lt', assertBelow);
+  Assertion.addMethod('lessThan', assertBelow);
+
+  /**
+   * ### .most(value)
+   *
+   * Asserts that the target is less than or equal to `value`.
+   *
+   *     expect(5).to.be.at.most(5);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a maximum length. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.of.at.most(4);
+   *     expect([ 1, 2, 3 ]).to.have.length.of.at.most(3);
+   *
+   * @name most
+   * @alias lte
+   * @param {Number} value
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertMost (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len <= n
+        , 'expected #{this} to have a length at most #{exp} but got #{act}'
+        , 'expected #{this} to have a length above #{exp}'
+        , n
+        , len
+      );
+    } else {
+      this.assert(
+          obj <= n
+        , 'expected #{this} to be at most ' + n
+        , 'expected #{this} to be above ' + n
+      );
+    }
+  }
+
+  Assertion.addMethod('most', assertMost);
+  Assertion.addMethod('lte', assertMost);
+
+  /**
+   * ### .within(start, finish)
+   *
+   * Asserts that the target is within a range.
+   *
+   *     expect(7).to.be.within(5,10);
+   *
+   * Can also be used in conjunction with `length` to
+   * assert a length range. The benefit being a
+   * more informative error message than if the length
+   * was supplied directly.
+   *
+   *     expect('foo').to.have.length.within(2,4);
+   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
+   *
+   * @name within
+   * @param {Number} start lowerbound inclusive
+   * @param {Number} finish upperbound inclusive
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('within', function (start, finish, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object')
+      , range = start + '..' + finish;
+    if (flag(this, 'doLength')) {
+      new Assertion(obj, msg).to.have.property('length');
+      var len = obj.length;
+      this.assert(
+          len >= start && len <= finish
+        , 'expected #{this} to have a length within ' + range
+        , 'expected #{this} to not have a length within ' + range
+      );
+    } else {
+      this.assert(
+          obj >= start && obj <= finish
+        , 'expected #{this} to be within ' + range
+        , 'expected #{this} to not be within ' + range
+      );
+    }
+  });
+
+  /**
+   * ### .instanceof(constructor)
+   *
+   * Asserts that the target is an instance of `constructor`.
+   *
+   *     var Tea = function (name) { this.name = name; }
+   *       , Chai = new Tea('chai');
+   *
+   *     expect(Chai).to.be.an.instanceof(Tea);
+   *     expect([ 1, 2, 3 ]).to.be.instanceof(Array);
+   *
+   * @name instanceof
+   * @param {Constructor} constructor
+   * @param {String} message _optional_
+   * @alias instanceOf
+   * @api public
+   */
+
+  function assertInstanceOf (constructor, msg) {
+    if (msg) flag(this, 'message', msg);
+    var name = _.getName(constructor);
+    this.assert(
+        flag(this, 'object') instanceof constructor
+      , 'expected #{this} to be an instance of ' + name
+      , 'expected #{this} to not be an instance of ' + name
+    );
+  };
+
+  Assertion.addMethod('instanceof', assertInstanceOf);
+  Assertion.addMethod('instanceOf', assertInstanceOf);
+
+  /**
+   * ### .property(name, [value])
+   *
+   * Asserts that the target has a property `name`, optionally asserting that
+   * the value of that property is strictly equal to  `value`.
+   * If the `deep` flag is set, you can use dot- and bracket-notation for deep
+   * references into objects and arrays.
+   *
+   *     // simple referencing
+   *     var obj = { foo: 'bar' };
+   *     expect(obj).to.have.property('foo');
+   *     expect(obj).to.have.property('foo', 'bar');
+   *
+   *     // deep referencing
+   *     var deepObj = {
+   *         green: { tea: 'matcha' }
+   *       , teas: [ 'chai', 'matcha', { tea: 'konacha' } ]
+   *     };
+
+   *     expect(deepObj).to.have.deep.property('green.tea', 'matcha');
+   *     expect(deepObj).to.have.deep.property('teas[1]', 'matcha');
+   *     expect(deepObj).to.have.deep.property('teas[2].tea', 'konacha');
+   *
+   * You can also use an array as the starting point of a `deep.property`
+   * assertion, or traverse nested arrays.
+   *
+   *     var arr = [
+   *         [ 'chai', 'matcha', 'konacha' ]
+   *       , [ { tea: 'chai' }
+   *         , { tea: 'matcha' }
+   *         , { tea: 'konacha' } ]
+   *     ];
+   *
+   *     expect(arr).to.have.deep.property('[0][1]', 'matcha');
+   *     expect(arr).to.have.deep.property('[1][2].tea', 'konacha');
+   *
+   * Furthermore, `property` changes the subject of the assertion
+   * to be the value of that property from the original object. This
+   * permits for further chainable assertions on that property.
+   *
+   *     expect(obj).to.have.property('foo')
+   *       .that.is.a('string');
+   *     expect(deepObj).to.have.property('green')
+   *       .that.is.an('object')
+   *       .that.deep.equals({ tea: 'matcha' });
+   *     expect(deepObj).to.have.property('teas')
+   *       .that.is.an('array')
+   *       .with.deep.property('[2]')
+   *         .that.deep.equals({ tea: 'konacha' });
+   *
+   * @name property
+   * @alias deep.property
+   * @param {String} name
+   * @param {Mixed} value (optional)
+   * @param {String} message _optional_
+   * @returns value of property for chaining
+   * @api public
+   */
+
+  Assertion.addMethod('property', function (name, val, msg) {
+    if (msg) flag(this, 'message', msg);
+
+    var descriptor = flag(this, 'deep') ? 'deep property ' : 'property '
+      , negate = flag(this, 'negate')
+      , obj = flag(this, 'object')
+      , value = flag(this, 'deep')
+        ? _.getPathValue(name, obj)
+        : obj[name];
+
+    if (negate && undefined !== val) {
+      if (undefined === value) {
+        msg = (msg != null) ? msg + ': ' : '';
+        throw new Error(msg + _.inspect(obj) + ' has no ' + descriptor + _.inspect(name));
+      }
+    } else {
+      this.assert(
+          undefined !== value
+        , 'expected #{this} to have a ' + descriptor + _.inspect(name)
+        , 'expected #{this} to not have ' + descriptor + _.inspect(name));
+    }
+
+    if (undefined !== val) {
+      this.assert(
+          val === value
+        , 'expected #{this} to have a ' + descriptor + _.inspect(name) + ' of #{exp}, but got #{act}'
+        , 'expected #{this} to not have a ' + descriptor + _.inspect(name) + ' of #{act}'
+        , val
+        , value
+      );
+    }
+
+    flag(this, 'object', value);
+  });
+
+
+  /**
+   * ### .ownProperty(name)
+   *
+   * Asserts that the target has an own property `name`.
+   *
+   *     expect('test').to.have.ownProperty('length');
+   *
+   * @name ownProperty
+   * @alias haveOwnProperty
+   * @param {String} name
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertOwnProperty (name, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        obj.hasOwnProperty(name)
+      , 'expected #{this} to have own property ' + _.inspect(name)
+      , 'expected #{this} to not have own property ' + _.inspect(name)
+    );
+  }
+
+  Assertion.addMethod('ownProperty', assertOwnProperty);
+  Assertion.addMethod('haveOwnProperty', assertOwnProperty);
+
+  /**
+   * ### .length(value)
+   *
+   * Asserts that the target's `length` property has
+   * the expected value.
+   *
+   *     expect([ 1, 2, 3]).to.have.length(3);
+   *     expect('foobar').to.have.length(6);
+   *
+   * Can also be used as a chain precursor to a value
+   * comparison for the length property.
+   *
+   *     expect('foo').to.have.length.above(2);
+   *     expect([ 1, 2, 3 ]).to.have.length.above(2);
+   *     expect('foo').to.have.length.below(4);
+   *     expect([ 1, 2, 3 ]).to.have.length.below(4);
+   *     expect('foo').to.have.length.within(2,4);
+   *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
+   *
+   * @name length
+   * @alias lengthOf
+   * @param {Number} length
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  function assertLengthChain () {
+    flag(this, 'doLength', true);
+  }
+
+  function assertLength (n, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    new Assertion(obj, msg).to.have.property('length');
+    var len = obj.length;
+
+    this.assert(
+        len == n
+      , 'expected #{this} to have a length of #{exp} but got #{act}'
+      , 'expected #{this} to not have a length of #{act}'
+      , n
+      , len
+    );
+  }
+
+  Assertion.addChainableMethod('length', assertLength, assertLengthChain);
+  Assertion.addMethod('lengthOf', assertLength, assertLengthChain);
+
+  /**
+   * ### .match(regexp)
+   *
+   * Asserts that the target matches a regular expression.
+   *
+   *     expect('foobar').to.match(/^foo/);
+   *
+   * @name match
+   * @param {RegExp} RegularExpression
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('match', function (re, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        re.exec(obj)
+      , 'expected #{this} to match ' + re
+      , 'expected #{this} not to match ' + re
+    );
+  });
+
+  /**
+   * ### .string(string)
+   *
+   * Asserts that the string target contains another string.
+   *
+   *     expect('foobar').to.have.string('bar');
+   *
+   * @name string
+   * @param {String} string
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('string', function (str, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    new Assertion(obj, msg).is.a('string');
+
+    this.assert(
+        ~obj.indexOf(str)
+      , 'expected #{this} to contain ' + _.inspect(str)
+      , 'expected #{this} to not contain ' + _.inspect(str)
+    );
+  });
+
+
+  /**
+   * ### .keys(key1, [key2], [...])
+   *
+   * Asserts that the target has exactly the given keys, or
+   * asserts the inclusion of some keys when using the
+   * `include` or `contain` modifiers.
+   *
+   *     expect({ foo: 1, bar: 2 }).to.have.keys(['foo', 'bar']);
+   *     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('foo', 'bar');
+   *
+   * @name keys
+   * @alias key
+   * @param {String...|Array} keys
+   * @api public
+   */
+
+  function assertKeys (keys) {
+    var obj = flag(this, 'object')
+      , str
+      , ok = true;
+
+    keys = keys instanceof Array
+      ? keys
+      : Array.prototype.slice.call(arguments);
+
+    if (!keys.length) throw new Error('keys required');
+
+    var actual = Object.keys(obj)
+      , len = keys.length;
+
+    // Inclusion
+    ok = keys.every(function(key){
+      return ~actual.indexOf(key);
+    });
+
+    // Strict
+    if (!flag(this, 'negate') && !flag(this, 'contains')) {
+      ok = ok && keys.length == actual.length;
+    }
+
+    // Key string
+    if (len > 1) {
+      keys = keys.map(function(key){
+        return _.inspect(key);
+      });
+      var last = keys.pop();
+      str = keys.join(', ') + ', and ' + last;
+    } else {
+      str = _.inspect(keys[0]);
+    }
+
+    // Form
+    str = (len > 1 ? 'keys ' : 'key ') + str;
+
+    // Have / include
+    str = (flag(this, 'contains') ? 'contain ' : 'have ') + str;
+
+    // Assertion
+    this.assert(
+        ok
+      , 'expected #{this} to ' + str
+      , 'expected #{this} to not ' + str
+    );
+  }
+
+  Assertion.addMethod('keys', assertKeys);
+  Assertion.addMethod('key', assertKeys);
+
+  /**
+   * ### .throw(constructor)
+   *
+   * Asserts that the function target will throw a specific error, or specific type of error
+   * (as determined using `instanceof`), optionally with a RegExp or string inclusion test
+   * for the error's message.
+   *
+   *     var err = new ReferenceError('This is a bad function.');
+   *     var fn = function () { throw err; }
+   *     expect(fn).to.throw(ReferenceError);
+   *     expect(fn).to.throw(Error);
+   *     expect(fn).to.throw(/bad function/);
+   *     expect(fn).to.not.throw('good function');
+   *     expect(fn).to.throw(ReferenceError, /bad function/);
+   *     expect(fn).to.throw(err);
+   *     expect(fn).to.not.throw(new RangeError('Out of range.'));
+   *
+   * Please note that when a throw expectation is negated, it will check each
+   * parameter independently, starting with error constructor type. The appropriate way
+   * to check for the existence of a type of error but for a message that does not match
+   * is to use `and`.
+   *
+   *     expect(fn).to.throw(ReferenceError)
+   *        .and.not.throw(/good function/);
+   *
+   * @name throw
+   * @alias throws
+   * @alias Throw
+   * @param {ErrorConstructor} constructor
+   * @param {String|RegExp} expected error message
+   * @param {String} message _optional_
+   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+   * @returns error for chaining (null if no error)
+   * @api public
+   */
+
+  function assertThrows (constructor, errMsg, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    new Assertion(obj, msg).is.a('function');
+
+    var thrown = false
+      , desiredError = null
+      , name = null
+      , thrownError = null;
+
+    if (arguments.length === 0) {
+      errMsg = null;
+      constructor = null;
+    } else if (constructor && (constructor instanceof RegExp || 'string' === typeof constructor)) {
+      errMsg = constructor;
+      constructor = null;
+    } else if (constructor && constructor instanceof Error) {
+      desiredError = constructor;
+      constructor = null;
+      errMsg = null;
+    } else if (typeof constructor === 'function') {
+      name = constructor.prototype.name || constructor.name;
+      if (name === 'Error' && constructor !== Error) {
+        name = (new constructor()).name;
+      }
+    } else {
+      constructor = null;
+    }
+
+    try {
+      obj();
+    } catch (err) {
+      // first, check desired error
+      if (desiredError) {
+        this.assert(
+            err === desiredError
+          , 'expected #{this} to throw #{exp} but #{act} was thrown'
+          , 'expected #{this} to not throw #{exp}'
+          , (desiredError instanceof Error ? desiredError.toString() : desiredError)
+          , (err instanceof Error ? err.toString() : err)
+        );
+
+        flag(this, 'object', err);
+        return this;
+      }
+
+      // next, check constructor
+      if (constructor) {
+        this.assert(
+            err instanceof constructor
+          , 'expected #{this} to throw #{exp} but #{act} was thrown'
+          , 'expected #{this} to not throw #{exp} but #{act} was thrown'
+          , name
+          , (err instanceof Error ? err.toString() : err)
+        );
+
+        if (!errMsg) {
+          flag(this, 'object', err);
+          return this;
+        }
+      }
+
+      // next, check message
+      var message = 'object' === _.type(err) && "message" in err
+        ? err.message
+        : '' + err;
+
+      if ((message != null) && errMsg && errMsg instanceof RegExp) {
+        this.assert(
+            errMsg.exec(message)
+          , 'expected #{this} to throw error matching #{exp} but got #{act}'
+          , 'expected #{this} to throw error not matching #{exp}'
+          , errMsg
+          , message
+        );
+
+        flag(this, 'object', err);
+        return this;
+      } else if ((message != null) && errMsg && 'string' === typeof errMsg) {
+        this.assert(
+            ~message.indexOf(errMsg)
+          , 'expected #{this} to throw error including #{exp} but got #{act}'
+          , 'expected #{this} to throw error not including #{act}'
+          , errMsg
+          , message
+        );
+
+        flag(this, 'object', err);
+        return this;
+      } else {
+        thrown = true;
+        thrownError = err;
+      }
+    }
+
+    var actuallyGot = ''
+      , expectedThrown = name !== null
+        ? name
+        : desiredError
+          ? '#{exp}' //_.inspect(desiredError)
+          : 'an error';
+
+    if (thrown) {
+      actuallyGot = ' but #{act} was thrown'
+    }
+
+    this.assert(
+        thrown === true
+      , 'expected #{this} to throw ' + expectedThrown + actuallyGot
+      , 'expected #{this} to not throw ' + expectedThrown + actuallyGot
+      , (desiredError instanceof Error ? desiredError.toString() : desiredError)
+      , (thrownError instanceof Error ? thrownError.toString() : thrownError)
+    );
+
+    flag(this, 'object', thrownError);
+  };
+
+  Assertion.addMethod('throw', assertThrows);
+  Assertion.addMethod('throws', assertThrows);
+  Assertion.addMethod('Throw', assertThrows);
+
+  /**
+   * ### .respondTo(method)
+   *
+   * Asserts that the object or class target will respond to a method.
+   *
+   *     Klass.prototype.bar = function(){};
+   *     expect(Klass).to.respondTo('bar');
+   *     expect(obj).to.respondTo('bar');
+   *
+   * To check if a constructor will respond to a static function,
+   * set the `itself` flag.
+   *
+   *     Klass.baz = function(){};
+   *     expect(Klass).itself.to.respondTo('baz');
+   *
+   * @name respondTo
+   * @param {String} method
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('respondTo', function (method, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object')
+      , itself = flag(this, 'itself')
+      , context = ('function' === _.type(obj) && !itself)
+        ? obj.prototype[method]
+        : obj[method];
+
+    this.assert(
+        'function' === typeof context
+      , 'expected #{this} to respond to ' + _.inspect(method)
+      , 'expected #{this} to not respond to ' + _.inspect(method)
+    );
+  });
+
+  /**
+   * ### .itself
+   *
+   * Sets the `itself` flag, later used by the `respondTo` assertion.
+   *
+   *     function Foo() {}
+   *     Foo.bar = function() {}
+   *     Foo.prototype.baz = function() {}
+   *
+   *     expect(Foo).itself.to.respondTo('bar');
+   *     expect(Foo).itself.not.to.respondTo('baz');
+   *
+   * @name itself
+   * @api public
+   */
+
+  Assertion.addProperty('itself', function () {
+    flag(this, 'itself', true);
+  });
+
+  /**
+   * ### .satisfy(method)
+   *
+   * Asserts that the target passes a given truth test.
+   *
+   *     expect(1).to.satisfy(function(num) { return num > 0; });
+   *
+   * @name satisfy
+   * @param {Function} matcher
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('satisfy', function (matcher, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        matcher(obj)
+      , 'expected #{this} to satisfy ' + _.objDisplay(matcher)
+      , 'expected #{this} to not satisfy' + _.objDisplay(matcher)
+      , this.negate ? false : true
+      , matcher(obj)
+    );
+  });
+
+  /**
+   * ### .closeTo(expected, delta)
+   *
+   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
+   *
+   *     expect(1.5).to.be.closeTo(1, 0.5);
+   *
+   * @name closeTo
+   * @param {Number} expected
+   * @param {Number} delta
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('closeTo', function (expected, delta, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+    this.assert(
+        Math.abs(obj - expected) <= delta
+      , 'expected #{this} to be close to ' + expected + ' +/- ' + delta
+      , 'expected #{this} not to be close to ' + expected + ' +/- ' + delta
+    );
+  });
+
+  function isSubsetOf(subset, superset) {
+    return subset.every(function(elem) {
+      return superset.indexOf(elem) !== -1;
+    })
+  }
+
+  /**
+   * ### .members(set)
+   *
+   * Asserts that the target is a superset of `set`,
+   * or that the target and `set` have the same members.
+   *
+   *     expect([1, 2, 3]).to.include.members([3, 2]);
+   *     expect([1, 2, 3]).to.not.include.members([3, 2, 8]);
+   *
+   *     expect([4, 2]).to.have.members([2, 4]);
+   *     expect([5, 2]).to.not.have.members([5, 2, 1]);
+   *
+   * @name members
+   * @param {Array} set
+   * @param {String} message _optional_
+   * @api public
+   */
+
+  Assertion.addMethod('members', function (subset, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object');
+
+    new Assertion(obj).to.be.an('array');
+    new Assertion(subset).to.be.an('array');
+
+    if (flag(this, 'contains')) {
+      return this.assert(
+          isSubsetOf(subset, obj)
+        , 'expected #{this} to be a superset of #{act}'
+        , 'expected #{this} to not be a superset of #{act}'
+        , obj
+        , subset
+      );
+    }
+
+    this.assert(
+        isSubsetOf(obj, subset) && isSubsetOf(subset, obj)
+        , 'expected #{this} to have the same members as #{act}'
+        , 'expected #{this} to not have the same members as #{act}'
+        , obj
+        , subset
+    );
+  });
+};
+
+});
+require.register("chai/lib/chai/interface/assert.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+
+module.exports = function (chai, util) {
+
+  /*!
+   * Chai dependencies.
+   */
+
+  var Assertion = chai.Assertion
+    , flag = util.flag;
+
+  /*!
+   * Module export.
+   */
+
+  /**
+   * ### assert(expression, message)
+   *
+   * Write your own test expressions.
+   *
+   *     assert('foo' !== 'bar', 'foo is not bar');
+   *     assert(Array.isArray([]), 'empty arrays are arrays');
+   *
+   * @param {Mixed} expression to test for truthiness
+   * @param {String} message to display on error
+   * @name assert
+   * @api public
+   */
+
+  var assert = chai.assert = function (express, errmsg) {
+    var test = new Assertion(null);
+    test.assert(
+        express
+      , errmsg
+      , '[ negation message unavailable ]'
+    );
+  };
+
+  /**
+   * ### .fail(actual, expected, [message], [operator])
+   *
+   * Throw a failure. Node.js `assert` module-compatible.
+   *
+   * @name fail
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @param {String} operator
+   * @api public
+   */
+
+  assert.fail = function (actual, expected, message, operator) {
+    message = message || 'assert.fail()';
+    throw new chai.AssertionError(message, {
+        actual: actual
+      , expected: expected
+      , operator: operator
+    }, assert.fail);
+  };
+
+  /**
+   * ### .ok(object, [message])
+   *
+   * Asserts that `object` is truthy.
+   *
+   *     assert.ok('everything', 'everything is ok');
+   *     assert.ok(false, 'this will fail');
+   *
+   * @name ok
+   * @param {Mixed} object to test
+   * @param {String} message
+   * @api public
+   */
+
+  assert.ok = function (val, msg) {
+    new Assertion(val, msg).is.ok;
+  };
+
+  /**
+   * ### .notOk(object, [message])
+   *
+   * Asserts that `object` is falsy.
+   *
+   *     assert.notOk('everything', 'this will fail');
+   *     assert.notOk(false, 'this will pass');
+   *
+   * @name notOk
+   * @param {Mixed} object to test
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notOk = function (val, msg) {
+    new Assertion(val, msg).is.not.ok;
+  };
+
+  /**
+   * ### .equal(actual, expected, [message])
+   *
+   * Asserts non-strict equality (`==`) of `actual` and `expected`.
+   *
+   *     assert.equal(3, '3', '== coerces values to strings');
+   *
+   * @name equal
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.equal = function (act, exp, msg) {
+    var test = new Assertion(act, msg);
+
+    test.assert(
+        exp == flag(test, 'object')
+      , 'expected #{this} to equal #{exp}'
+      , 'expected #{this} to not equal #{act}'
+      , exp
+      , act
+    );
+  };
+
+  /**
+   * ### .notEqual(actual, expected, [message])
+   *
+   * Asserts non-strict inequality (`!=`) of `actual` and `expected`.
+   *
+   *     assert.notEqual(3, 4, 'these numbers are not equal');
+   *
+   * @name notEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notEqual = function (act, exp, msg) {
+    var test = new Assertion(act, msg);
+
+    test.assert(
+        exp != flag(test, 'object')
+      , 'expected #{this} to not equal #{exp}'
+      , 'expected #{this} to equal #{act}'
+      , exp
+      , act
+    );
+  };
+
+  /**
+   * ### .strictEqual(actual, expected, [message])
+   *
+   * Asserts strict equality (`===`) of `actual` and `expected`.
+   *
+   *     assert.strictEqual(true, true, 'these booleans are strictly equal');
+   *
+   * @name strictEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.strictEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.equal(exp);
+  };
+
+  /**
+   * ### .notStrictEqual(actual, expected, [message])
+   *
+   * Asserts strict inequality (`!==`) of `actual` and `expected`.
+   *
+   *     assert.notStrictEqual(3, '3', 'no coercion for strict equality');
+   *
+   * @name notStrictEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notStrictEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.not.equal(exp);
+  };
+
+  /**
+   * ### .deepEqual(actual, expected, [message])
+   *
+   * Asserts that `actual` is deeply equal to `expected`.
+   *
+   *     assert.deepEqual({ tea: 'green' }, { tea: 'green' });
+   *
+   * @name deepEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.eql(exp);
+  };
+
+  /**
+   * ### .notDeepEqual(actual, expected, [message])
+   *
+   * Assert that `actual` is not deeply equal to `expected`.
+   *
+   *     assert.notDeepEqual({ tea: 'green' }, { tea: 'jasmine' });
+   *
+   * @name notDeepEqual
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notDeepEqual = function (act, exp, msg) {
+    new Assertion(act, msg).to.not.eql(exp);
+  };
+
+  /**
+   * ### .isTrue(value, [message])
+   *
+   * Asserts that `value` is true.
+   *
+   *     var teaServed = true;
+   *     assert.isTrue(teaServed, 'the tea has been served');
+   *
+   * @name isTrue
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isTrue = function (val, msg) {
+    new Assertion(val, msg).is['true'];
+  };
+
+  /**
+   * ### .isFalse(value, [message])
+   *
+   * Asserts that `value` is false.
+   *
+   *     var teaServed = false;
+   *     assert.isFalse(teaServed, 'no tea yet? hmm...');
+   *
+   * @name isFalse
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isFalse = function (val, msg) {
+    new Assertion(val, msg).is['false'];
+  };
+
+  /**
+   * ### .isNull(value, [message])
+   *
+   * Asserts that `value` is null.
+   *
+   *     assert.isNull(err, 'there was no error');
+   *
+   * @name isNull
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNull = function (val, msg) {
+    new Assertion(val, msg).to.equal(null);
+  };
+
+  /**
+   * ### .isNotNull(value, [message])
+   *
+   * Asserts that `value` is not null.
+   *
+   *     var tea = 'tasty chai';
+   *     assert.isNotNull(tea, 'great, time for tea!');
+   *
+   * @name isNotNull
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotNull = function (val, msg) {
+    new Assertion(val, msg).to.not.equal(null);
+  };
+
+  /**
+   * ### .isUndefined(value, [message])
+   *
+   * Asserts that `value` is `undefined`.
+   *
+   *     var tea;
+   *     assert.isUndefined(tea, 'no tea defined');
+   *
+   * @name isUndefined
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isUndefined = function (val, msg) {
+    new Assertion(val, msg).to.equal(undefined);
+  };
+
+  /**
+   * ### .isDefined(value, [message])
+   *
+   * Asserts that `value` is not `undefined`.
+   *
+   *     var tea = 'cup of chai';
+   *     assert.isDefined(tea, 'tea has been defined');
+   *
+   * @name isDefined
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isDefined = function (val, msg) {
+    new Assertion(val, msg).to.not.equal(undefined);
+  };
+
+  /**
+   * ### .isFunction(value, [message])
+   *
+   * Asserts that `value` is a function.
+   *
+   *     function serveTea() { return 'cup of tea'; };
+   *     assert.isFunction(serveTea, 'great, we can have tea now');
+   *
+   * @name isFunction
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isFunction = function (val, msg) {
+    new Assertion(val, msg).to.be.a('function');
+  };
+
+  /**
+   * ### .isNotFunction(value, [message])
+   *
+   * Asserts that `value` is _not_ a function.
+   *
+   *     var serveTea = [ 'heat', 'pour', 'sip' ];
+   *     assert.isNotFunction(serveTea, 'great, we have listed the steps');
+   *
+   * @name isNotFunction
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotFunction = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('function');
+  };
+
+  /**
+   * ### .isObject(value, [message])
+   *
+   * Asserts that `value` is an object (as revealed by
+   * `Object.prototype.toString`).
+   *
+   *     var selection = { name: 'Chai', serve: 'with spices' };
+   *     assert.isObject(selection, 'tea selection is an object');
+   *
+   * @name isObject
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isObject = function (val, msg) {
+    new Assertion(val, msg).to.be.a('object');
+  };
+
+  /**
+   * ### .isNotObject(value, [message])
+   *
+   * Asserts that `value` is _not_ an object.
+   *
+   *     var selection = 'chai'
+   *     assert.isObject(selection, 'tea selection is not an object');
+   *     assert.isObject(null, 'null is not an object');
+   *
+   * @name isNotObject
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotObject = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('object');
+  };
+
+  /**
+   * ### .isArray(value, [message])
+   *
+   * Asserts that `value` is an array.
+   *
+   *     var menu = [ 'green', 'chai', 'oolong' ];
+   *     assert.isArray(menu, 'what kind of tea do we want?');
+   *
+   * @name isArray
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isArray = function (val, msg) {
+    new Assertion(val, msg).to.be.an('array');
+  };
+
+  /**
+   * ### .isNotArray(value, [message])
+   *
+   * Asserts that `value` is _not_ an array.
+   *
+   *     var menu = 'green|chai|oolong';
+   *     assert.isNotArray(menu, 'what kind of tea do we want?');
+   *
+   * @name isNotArray
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotArray = function (val, msg) {
+    new Assertion(val, msg).to.not.be.an('array');
+  };
+
+  /**
+   * ### .isString(value, [message])
+   *
+   * Asserts that `value` is a string.
+   *
+   *     var teaOrder = 'chai';
+   *     assert.isString(teaOrder, 'order placed');
+   *
+   * @name isString
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isString = function (val, msg) {
+    new Assertion(val, msg).to.be.a('string');
+  };
+
+  /**
+   * ### .isNotString(value, [message])
+   *
+   * Asserts that `value` is _not_ a string.
+   *
+   *     var teaOrder = 4;
+   *     assert.isNotString(teaOrder, 'order placed');
+   *
+   * @name isNotString
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotString = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('string');
+  };
+
+  /**
+   * ### .isNumber(value, [message])
+   *
+   * Asserts that `value` is a number.
+   *
+   *     var cups = 2;
+   *     assert.isNumber(cups, 'how many cups');
+   *
+   * @name isNumber
+   * @param {Number} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNumber = function (val, msg) {
+    new Assertion(val, msg).to.be.a('number');
+  };
+
+  /**
+   * ### .isNotNumber(value, [message])
+   *
+   * Asserts that `value` is _not_ a number.
+   *
+   *     var cups = '2 cups please';
+   *     assert.isNotNumber(cups, 'how many cups');
+   *
+   * @name isNotNumber
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotNumber = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('number');
+  };
+
+  /**
+   * ### .isBoolean(value, [message])
+   *
+   * Asserts that `value` is a boolean.
+   *
+   *     var teaReady = true
+   *       , teaServed = false;
+   *
+   *     assert.isBoolean(teaReady, 'is the tea ready');
+   *     assert.isBoolean(teaServed, 'has tea been served');
+   *
+   * @name isBoolean
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isBoolean = function (val, msg) {
+    new Assertion(val, msg).to.be.a('boolean');
+  };
+
+  /**
+   * ### .isNotBoolean(value, [message])
+   *
+   * Asserts that `value` is _not_ a boolean.
+   *
+   *     var teaReady = 'yep'
+   *       , teaServed = 'nope';
+   *
+   *     assert.isNotBoolean(teaReady, 'is the tea ready');
+   *     assert.isNotBoolean(teaServed, 'has tea been served');
+   *
+   * @name isNotBoolean
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.isNotBoolean = function (val, msg) {
+    new Assertion(val, msg).to.not.be.a('boolean');
+  };
+
+  /**
+   * ### .typeOf(value, name, [message])
+   *
+   * Asserts that `value`'s type is `name`, as determined by
+   * `Object.prototype.toString`.
+   *
+   *     assert.typeOf({ tea: 'chai' }, 'object', 'we have an object');
+   *     assert.typeOf(['chai', 'jasmine'], 'array', 'we have an array');
+   *     assert.typeOf('tea', 'string', 'we have a string');
+   *     assert.typeOf(/tea/, 'regexp', 'we have a regular expression');
+   *     assert.typeOf(null, 'null', 'we have a null');
+   *     assert.typeOf(undefined, 'undefined', 'we have an undefined');
+   *
+   * @name typeOf
+   * @param {Mixed} value
+   * @param {String} name
+   * @param {String} message
+   * @api public
+   */
+
+  assert.typeOf = function (val, type, msg) {
+    new Assertion(val, msg).to.be.a(type);
+  };
+
+  /**
+   * ### .notTypeOf(value, name, [message])
+   *
+   * Asserts that `value`'s type is _not_ `name`, as determined by
+   * `Object.prototype.toString`.
+   *
+   *     assert.notTypeOf('tea', 'number', 'strings are not numbers');
+   *
+   * @name notTypeOf
+   * @param {Mixed} value
+   * @param {String} typeof name
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notTypeOf = function (val, type, msg) {
+    new Assertion(val, msg).to.not.be.a(type);
+  };
+
+  /**
+   * ### .instanceOf(object, constructor, [message])
+   *
+   * Asserts that `value` is an instance of `constructor`.
+   *
+   *     var Tea = function (name) { this.name = name; }
+   *       , chai = new Tea('chai');
+   *
+   *     assert.instanceOf(chai, Tea, 'chai is an instance of tea');
+   *
+   * @name instanceOf
+   * @param {Object} object
+   * @param {Constructor} constructor
+   * @param {String} message
+   * @api public
+   */
+
+  assert.instanceOf = function (val, type, msg) {
+    new Assertion(val, msg).to.be.instanceOf(type);
+  };
+
+  /**
+   * ### .notInstanceOf(object, constructor, [message])
+   *
+   * Asserts `value` is not an instance of `constructor`.
+   *
+   *     var Tea = function (name) { this.name = name; }
+   *       , chai = new String('chai');
+   *
+   *     assert.notInstanceOf(chai, Tea, 'chai is not an instance of tea');
+   *
+   * @name notInstanceOf
+   * @param {Object} object
+   * @param {Constructor} constructor
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notInstanceOf = function (val, type, msg) {
+    new Assertion(val, msg).to.not.be.instanceOf(type);
+  };
+
+  /**
+   * ### .include(haystack, needle, [message])
+   *
+   * Asserts that `haystack` includes `needle`. Works
+   * for strings and arrays.
+   *
+   *     assert.include('foobar', 'bar', 'foobar contains string "bar"');
+   *     assert.include([ 1, 2, 3 ], 3, 'array contains value');
+   *
+   * @name include
+   * @param {Array|String} haystack
+   * @param {Mixed} needle
+   * @param {String} message
+   * @api public
+   */
+
+  assert.include = function (exp, inc, msg) {
+    new Assertion(exp, msg).include(inc);
+  };
+
+  /**
+   * ### .notInclude(haystack, needle, [message])
+   *
+   * Asserts that `haystack` does not include `needle`. Works
+   * for strings and arrays.
+   *i
+   *     assert.notInclude('foobar', 'baz', 'string not include substring');
+   *     assert.notInclude([ 1, 2, 3 ], 4, 'array not include contain value');
+   *
+   * @name notInclude
+   * @param {Array|String} haystack
+   * @param {Mixed} needle
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notInclude = function (exp, inc, msg) {
+    new Assertion(exp, msg).not.include(inc);
+  };
+
+  /**
+   * ### .match(value, regexp, [message])
+   *
+   * Asserts that `value` matches the regular expression `regexp`.
+   *
+   *     assert.match('foobar', /^foo/, 'regexp matches');
+   *
+   * @name match
+   * @param {Mixed} value
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @api public
+   */
+
+  assert.match = function (exp, re, msg) {
+    new Assertion(exp, msg).to.match(re);
+  };
+
+  /**
+   * ### .notMatch(value, regexp, [message])
+   *
+   * Asserts that `value` does not match the regular expression `regexp`.
+   *
+   *     assert.notMatch('foobar', /^foo/, 'regexp does not match');
+   *
+   * @name notMatch
+   * @param {Mixed} value
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notMatch = function (exp, re, msg) {
+    new Assertion(exp, msg).to.not.match(re);
+  };
+
+  /**
+   * ### .property(object, property, [message])
+   *
+   * Asserts that `object` has a property named by `property`.
+   *
+   *     assert.property({ tea: { green: 'matcha' }}, 'tea');
+   *
+   * @name property
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.property = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.have.property(prop);
+  };
+
+  /**
+   * ### .notProperty(object, property, [message])
+   *
+   * Asserts that `object` does _not_ have a property named by `property`.
+   *
+   *     assert.notProperty({ tea: { green: 'matcha' }}, 'coffee');
+   *
+   * @name notProperty
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notProperty = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.not.have.property(prop);
+  };
+
+  /**
+   * ### .deepProperty(object, property, [message])
+   *
+   * Asserts that `object` has a property named by `property`, which can be a
+   * string using dot- and bracket-notation for deep reference.
+   *
+   *     assert.deepProperty({ tea: { green: 'matcha' }}, 'tea.green');
+   *
+   * @name deepProperty
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepProperty = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.have.deep.property(prop);
+  };
+
+  /**
+   * ### .notDeepProperty(object, property, [message])
+   *
+   * Asserts that `object` does _not_ have a property named by `property`, which
+   * can be a string using dot- and bracket-notation for deep reference.
+   *
+   *     assert.notDeepProperty({ tea: { green: 'matcha' }}, 'tea.oolong');
+   *
+   * @name notDeepProperty
+   * @param {Object} object
+   * @param {String} property
+   * @param {String} message
+   * @api public
+   */
+
+  assert.notDeepProperty = function (obj, prop, msg) {
+    new Assertion(obj, msg).to.not.have.deep.property(prop);
+  };
+
+  /**
+   * ### .propertyVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property` with value given
+   * by `value`.
+   *
+   *     assert.propertyVal({ tea: 'is good' }, 'tea', 'is good');
+   *
+   * @name propertyVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.propertyVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.have.property(prop, val);
+  };
+
+  /**
+   * ### .propertyNotVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property`, but with a value
+   * different from that given by `value`.
+   *
+   *     assert.propertyNotVal({ tea: 'is good' }, 'tea', 'is bad');
+   *
+   * @name propertyNotVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.propertyNotVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.not.have.property(prop, val);
+  };
+
+  /**
+   * ### .deepPropertyVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property` with value given
+   * by `value`. `property` can use dot- and bracket-notation for deep
+   * reference.
+   *
+   *     assert.deepPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'matcha');
+   *
+   * @name deepPropertyVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepPropertyVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.have.deep.property(prop, val);
+  };
+
+  /**
+   * ### .deepPropertyNotVal(object, property, value, [message])
+   *
+   * Asserts that `object` has a property named by `property`, but with a value
+   * different from that given by `value`. `property` can use dot- and
+   * bracket-notation for deep reference.
+   *
+   *     assert.deepPropertyNotVal({ tea: { green: 'matcha' }}, 'tea.green', 'konacha');
+   *
+   * @name deepPropertyNotVal
+   * @param {Object} object
+   * @param {String} property
+   * @param {Mixed} value
+   * @param {String} message
+   * @api public
+   */
+
+  assert.deepPropertyNotVal = function (obj, prop, val, msg) {
+    new Assertion(obj, msg).to.not.have.deep.property(prop, val);
+  };
+
+  /**
+   * ### .lengthOf(object, length, [message])
+   *
+   * Asserts that `object` has a `length` property with the expected value.
+   *
+   *     assert.lengthOf([1,2,3], 3, 'array has length of 3');
+   *     assert.lengthOf('foobar', 5, 'string has length of 6');
+   *
+   * @name lengthOf
+   * @param {Mixed} object
+   * @param {Number} length
+   * @param {String} message
+   * @api public
+   */
+
+  assert.lengthOf = function (exp, len, msg) {
+    new Assertion(exp, msg).to.have.length(len);
+  };
+
+  /**
+   * ### .throws(function, [constructor/string/regexp], [string/regexp], [message])
+   *
+   * Asserts that `function` will throw an error that is an instance of
+   * `constructor`, or alternately that it will throw an error with message
+   * matching `regexp`.
+   *
+   *     assert.throw(fn, 'function throws a reference error');
+   *     assert.throw(fn, /function throws a reference error/);
+   *     assert.throw(fn, ReferenceError);
+   *     assert.throw(fn, ReferenceError, 'function throws a reference error');
+   *     assert.throw(fn, ReferenceError, /function throws a reference error/);
+   *
+   * @name throws
+   * @alias throw
+   * @alias Throw
+   * @param {Function} function
+   * @param {ErrorConstructor} constructor
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+   * @api public
+   */
+
+  assert.Throw = function (fn, errt, errs, msg) {
+    if ('string' === typeof errt || errt instanceof RegExp) {
+      errs = errt;
+      errt = null;
+    }
+
+    var assertErr = new Assertion(fn, msg).to.Throw(errt, errs);
+    return flag(assertErr, 'object');
+  };
+
+  /**
+   * ### .doesNotThrow(function, [constructor/regexp], [message])
+   *
+   * Asserts that `function` will _not_ throw an error that is an instance of
+   * `constructor`, or alternately that it will not throw an error with message
+   * matching `regexp`.
+   *
+   *     assert.doesNotThrow(fn, Error, 'function does not throw');
+   *
+   * @name doesNotThrow
+   * @param {Function} function
+   * @param {ErrorConstructor} constructor
+   * @param {RegExp} regexp
+   * @param {String} message
+   * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+   * @api public
+   */
+
+  assert.doesNotThrow = function (fn, type, msg) {
+    if ('string' === typeof type) {
+      msg = type;
+      type = null;
+    }
+
+    new Assertion(fn, msg).to.not.Throw(type);
+  };
+
+  /**
+   * ### .operator(val1, operator, val2, [message])
+   *
+   * Compares two values using `operator`.
+   *
+   *     assert.operator(1, '<', 2, 'everything is ok');
+   *     assert.operator(1, '>', 2, 'this will fail');
+   *
+   * @name operator
+   * @param {Mixed} val1
+   * @param {String} operator
+   * @param {Mixed} val2
+   * @param {String} message
+   * @api public
+   */
+
+  assert.operator = function (val, operator, val2, msg) {
+    if (!~['==', '===', '>', '>=', '<', '<=', '!=', '!=='].indexOf(operator)) {
+      throw new Error('Invalid operator "' + operator + '"');
+    }
+    var test = new Assertion(eval(val + operator + val2), msg);
+    test.assert(
+        true === flag(test, 'object')
+      , 'expected ' + util.inspect(val) + ' to be ' + operator + ' ' + util.inspect(val2)
+      , 'expected ' + util.inspect(val) + ' to not be ' + operator + ' ' + util.inspect(val2) );
+  };
+
+  /**
+   * ### .closeTo(actual, expected, delta, [message])
+   *
+   * Asserts that the target is equal `expected`, to within a +/- `delta` range.
+   *
+   *     assert.closeTo(1.5, 1, 0.5, 'numbers are close');
+   *
+   * @name closeTo
+   * @param {Number} actual
+   * @param {Number} expected
+   * @param {Number} delta
+   * @param {String} message
+   * @api public
+   */
+
+  assert.closeTo = function (act, exp, delta, msg) {
+    new Assertion(act, msg).to.be.closeTo(exp, delta);
+  };
+
+  /**
+   * ### .sameMembers(set1, set2, [message])
+   *
+   * Asserts that `set1` and `set2` have the same members.
+   * Order is not taken into account.
+   *
+   *     assert.sameMembers([ 1, 2, 3 ], [ 2, 1, 3 ], 'same members');
+   *
+   * @name sameMembers
+   * @param {Array} superset
+   * @param {Array} subset
+   * @param {String} message
+   * @api public
+   */
+
+  assert.sameMembers = function (set1, set2, msg) {
+    new Assertion(set1, msg).to.have.same.members(set2);
+  }
+
+  /**
+   * ### .includeMembers(superset, subset, [message])
+   *
+   * Asserts that `subset` is included in `superset`.
+   * Order is not taken into account.
+   *
+   *     assert.includeMembers([ 1, 2, 3 ], [ 2, 1 ], 'include members');
+   *
+   * @name includeMembers
+   * @param {Array} superset
+   * @param {Array} subset
+   * @param {String} message
+   * @api public
+   */
+
+  assert.includeMembers = function (superset, subset, msg) {
+    new Assertion(superset, msg).to.include.members(subset);
+  }
+
+  /*!
+   * Undocumented / untested
+   */
+
+  assert.ifError = function (val, msg) {
+    new Assertion(val, msg).to.not.be.ok;
+  };
+
+  /*!
+   * Aliases.
+   */
+
+  (function alias(name, as){
+    assert[as] = assert[name];
+    return alias;
+  })
+  ('Throw', 'throw')
+  ('Throw', 'throws');
+};
+
+});
+require.register("chai/lib/chai/interface/expect.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (chai, util) {
+  chai.expect = function (val, message) {
+    return new chai.Assertion(val, message);
+  };
+};
+
+
+});
+require.register("chai/lib/chai/interface/should.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+module.exports = function (chai, util) {
+  var Assertion = chai.Assertion;
+
+  function loadShould () {
+    // modify Object.prototype to have `should`
+    Object.defineProperty(Object.prototype, 'should',
+      {
+        set: function (value) {
+          // See https://github.com/chaijs/chai/issues/86: this makes
+          // `whatever.should = someValue` actually set `someValue`, which is
+          // especially useful for `global.should = require('chai').should()`.
+          //
+          // Note that we have to use [[DefineProperty]] instead of [[Put]]
+          // since otherwise we would trigger this very setter!
+          Object.defineProperty(this, 'should', {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+          });
+        }
+      , get: function(){
+          if (this instanceof String || this instanceof Number) {
+            return new Assertion(this.constructor(this));
+          } else if (this instanceof Boolean) {
+            return new Assertion(this == true);
+          }
+          return new Assertion(this);
+        }
+      , configurable: true
+    });
+
+    var should = {};
+
+    should.equal = function (val1, val2, msg) {
+      new Assertion(val1, msg).to.equal(val2);
+    };
+
+    should.Throw = function (fn, errt, errs, msg) {
+      new Assertion(fn, msg).to.Throw(errt, errs);
+    };
+
+    should.exist = function (val, msg) {
+      new Assertion(val, msg).to.exist;
+    }
+
+    // negation
+    should.not = {}
+
+    should.not.equal = function (val1, val2, msg) {
+      new Assertion(val1, msg).to.not.equal(val2);
+    };
+
+    should.not.Throw = function (fn, errt, errs, msg) {
+      new Assertion(fn, msg).to.not.Throw(errt, errs);
+    };
+
+    should.not.exist = function (val, msg) {
+      new Assertion(val, msg).to.not.exist;
+    }
+
+    should['throw'] = should['Throw'];
+    should.not['throw'] = should.not['Throw'];
+
+    return should;
+  };
+
+  chai.should = loadShould;
+  chai.Should = loadShould;
+};
+
+});
+require.register("chai/lib/chai/utils/addChainableMethod.js", function(exports, require, module){
+/*!
+ * Chai - addChainingMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependencies
+ */
+
+var transferFlags = require('./transferFlags');
+
+/*!
+ * Module variables
+ */
+
+// Check whether `__proto__` is supported
+var hasProtoSupport = '__proto__' in Object;
+
+// Without `__proto__` support, this module will need to add properties to a function.
+// However, some Function.prototype methods cannot be overwritten,
+// and there seems no easy cross-platform way to detect them (@see chaijs/chai/issues/69).
+var excludeNames = /^(?:length|name|arguments|caller)$/;
+
+// Cache `Function` properties
+var call  = Function.prototype.call,
+    apply = Function.prototype.apply;
+
+/**
+ * ### addChainableMethod (ctx, name, method, chainingBehavior)
+ *
+ * Adds a method to an object, such that the method can also be chained.
+ *
+ *     utils.addChainableMethod(chai.Assertion.prototype, 'foo', function (str) {
+ *       var obj = utils.flag(this, 'object');
+ *       new chai.Assertion(obj).to.be.equal(str);
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.addChainableMethod('foo', fn, chainingBehavior);
+ *
+ * The result can then be used as both a method assertion, executing both `method` and
+ * `chainingBehavior`, or as a language chain, which only executes `chainingBehavior`.
+ *
+ *     expect(fooStr).to.be.foo('bar');
+ *     expect(fooStr).to.be.foo.equal('foo');
+ *
+ * @param {Object} ctx object to which the method is added
+ * @param {String} name of method to add
+ * @param {Function} method function to be used for `name`, when called
+ * @param {Function} chainingBehavior function to be called every time the property is accessed
+ * @name addChainableMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method, chainingBehavior) {
+  if (typeof chainingBehavior !== 'function') {
+    chainingBehavior = function () { };
+  }
+
+  var chainableBehavior = {
+      method: method
+    , chainingBehavior: chainingBehavior
+  };
+
+  // save the methods so we can overwrite them later, if we need to.
+  if (!ctx.__methods) {
+    ctx.__methods = {};
+  }
+  ctx.__methods[name] = chainableBehavior;
+
+  Object.defineProperty(ctx, name,
+    { get: function () {
+        chainableBehavior.chainingBehavior.call(this);
+
+        var assert = function () {
+          var result = chainableBehavior.method.apply(this, arguments);
+          return result === undefined ? this : result;
+        };
+
+        // Use `__proto__` if available
+        if (hasProtoSupport) {
+          // Inherit all properties from the object by replacing the `Function` prototype
+          var prototype = assert.__proto__ = Object.create(this);
+          // Restore the `call` and `apply` methods from `Function`
+          prototype.call = call;
+          prototype.apply = apply;
+        }
+        // Otherwise, redefine all properties (slow!)
+        else {
+          var asserterNames = Object.getOwnPropertyNames(ctx);
+          asserterNames.forEach(function (asserterName) {
+            if (!excludeNames.test(asserterName)) {
+              var pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
+              Object.defineProperty(assert, asserterName, pd);
+            }
+          });
+        }
+
+        transferFlags(this, assert);
+        return assert;
+      }
+    , configurable: true
+  });
+};
+
+});
+require.register("chai/lib/chai/utils/addMethod.js", function(exports, require, module){
+/*!
+ * Chai - addMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### .addMethod (ctx, name, method)
+ *
+ * Adds a method to the prototype of an object.
+ *
+ *     utils.addMethod(chai.Assertion.prototype, 'foo', function (str) {
+ *       var obj = utils.flag(this, 'object');
+ *       new chai.Assertion(obj).to.be.equal(str);
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.addMethod('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(fooStr).to.be.foo('bar');
+ *
+ * @param {Object} ctx object to which the method is added
+ * @param {String} name of method to add
+ * @param {Function} method function to be used for name
+ * @name addMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method) {
+  ctx[name] = function () {
+    var result = method.apply(this, arguments);
+    return result === undefined ? this : result;
+  };
+};
+
+});
+require.register("chai/lib/chai/utils/addProperty.js", function(exports, require, module){
+/*!
+ * Chai - addProperty utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### addProperty (ctx, name, getter)
+ *
+ * Adds a property to the prototype of an object.
+ *
+ *     utils.addProperty(chai.Assertion.prototype, 'foo', function () {
+ *       var obj = utils.flag(this, 'object');
+ *       new chai.Assertion(obj).to.be.instanceof(Foo);
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.addProperty('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.be.foo;
+ *
+ * @param {Object} ctx object to which the property is added
+ * @param {String} name of property to add
+ * @param {Function} getter function to be used for name
+ * @name addProperty
+ * @api public
+ */
+
+module.exports = function (ctx, name, getter) {
+  Object.defineProperty(ctx, name,
+    { get: function () {
+        var result = getter.call(this);
+        return result === undefined ? this : result;
+      }
+    , configurable: true
+  });
+};
+
+});
+require.register("chai/lib/chai/utils/flag.js", function(exports, require, module){
+/*!
+ * Chai - flag utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### flag(object ,key, [value])
+ *
+ * Get or set a flag value on an object. If a
+ * value is provided it will be set, else it will
+ * return the currently set value or `undefined` if
+ * the value is not set.
+ *
+ *     utils.flag(this, 'foo', 'bar'); // setter
+ *     utils.flag(this, 'foo'); // getter, returns `bar`
+ *
+ * @param {Object} object (constructed Assertion
+ * @param {String} key
+ * @param {Mixed} value (optional)
+ * @name flag
+ * @api private
+ */
+
+module.exports = function (obj, key, value) {
+  var flags = obj.__flags || (obj.__flags = Object.create(null));
+  if (arguments.length === 3) {
+    flags[key] = value;
+  } else {
+    return flags[key];
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/getActual.js", function(exports, require, module){
+/*!
+ * Chai - getActual utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * # getActual(object, [actual])
+ *
+ * Returns the `actual` value for an Assertion
+ *
+ * @param {Object} object (constructed Assertion)
+ * @param {Arguments} chai.Assertion.prototype.assert arguments
+ */
+
+module.exports = function (obj, args) {
+  var actual = args[4];
+  return 'undefined' !== typeof actual ? actual : obj._obj;
+};
+
+});
+require.register("chai/lib/chai/utils/getEnumerableProperties.js", function(exports, require, module){
+/*!
+ * Chai - getEnumerableProperties utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### .getEnumerableProperties(object)
+ *
+ * This allows the retrieval of enumerable property names of an object,
+ * inherited or not.
+ *
+ * @param {Object} object
+ * @returns {Array}
+ * @name getEnumerableProperties
+ * @api public
+ */
+
+module.exports = function getEnumerableProperties(object) {
+  var result = [];
+  for (var name in object) {
+    result.push(name);
+  }
+  return result;
+};
+
+});
+require.register("chai/lib/chai/utils/getMessage.js", function(exports, require, module){
+/*!
+ * Chai - message composition utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependancies
+ */
+
+var flag = require('./flag')
+  , getActual = require('./getActual')
+  , inspect = require('./inspect')
+  , objDisplay = require('./objDisplay');
+
+/**
+ * ### .getMessage(object, message, negateMessage)
+ *
+ * Construct the error message based on flags
+ * and template tags. Template tags will return
+ * a stringified inspection of the object referenced.
+ *
+ * Message template tags:
+ * - `#{this}` current asserted object
+ * - `#{act}` actual value
+ * - `#{exp}` expected value
+ *
+ * @param {Object} object (constructed Assertion)
+ * @param {Arguments} chai.Assertion.prototype.assert arguments
+ * @name getMessage
+ * @api public
+ */
+
+module.exports = function (obj, args) {
+  var negate = flag(obj, 'negate')
+    , val = flag(obj, 'object')
+    , expected = args[3]
+    , actual = getActual(obj, args)
+    , msg = negate ? args[2] : args[1]
+    , flagMsg = flag(obj, 'message');
+
+  msg = msg || '';
+  msg = msg
+    .replace(/#{this}/g, objDisplay(val))
+    .replace(/#{act}/g, objDisplay(actual))
+    .replace(/#{exp}/g, objDisplay(expected));
+
+  return flagMsg ? flagMsg + ': ' + msg : msg;
+};
+
+});
+require.register("chai/lib/chai/utils/getName.js", function(exports, require, module){
+/*!
+ * Chai - getName utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * # getName(func)
+ *
+ * Gets the name of a function, in a cross-browser way.
+ *
+ * @param {Function} a function (usually a constructor)
+ */
+
+module.exports = function (func) {
+  if (func.name) return func.name;
+
+  var match = /^\s?function ([^(]*)\(/.exec(func);
+  return match && match[1] ? match[1] : "";
+};
+
+});
+require.register("chai/lib/chai/utils/getPathValue.js", function(exports, require, module){
+/*!
+ * Chai - getPathValue utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * @see https://github.com/logicalparadox/filtr
+ * MIT Licensed
+ */
+
+/**
+ * ### .getPathValue(path, object)
+ *
+ * This allows the retrieval of values in an
+ * object given a string path.
+ *
+ *     var obj = {
+ *         prop1: {
+ *             arr: ['a', 'b', 'c']
+ *           , str: 'Hello'
+ *         }
+ *       , prop2: {
+ *             arr: [ { nested: 'Universe' } ]
+ *           , str: 'Hello again!'
+ *         }
+ *     }
+ *
+ * The following would be the results.
+ *
+ *     getPathValue('prop1.str', obj); // Hello
+ *     getPathValue('prop1.att[2]', obj); // b
+ *     getPathValue('prop2.arr[0].nested', obj); // Universe
+ *
+ * @param {String} path
+ * @param {Object} object
+ * @returns {Object} value or `undefined`
+ * @name getPathValue
+ * @api public
+ */
+
+var getPathValue = module.exports = function (path, obj) {
+  var parsed = parsePath(path);
+  return _getPathValue(parsed, obj);
+};
+
+/*!
+ * ## parsePath(path)
+ *
+ * Helper function used to parse string object
+ * paths. Use in conjunction with `_getPathValue`.
+ *
+ *      var parsed = parsePath('myobject.property.subprop');
+ *
+ * ### Paths:
+ *
+ * * Can be as near infinitely deep and nested
+ * * Arrays are also valid using the formal `myobject.document[3].property`.
+ *
+ * @param {String} path
+ * @returns {Object} parsed
+ * @api private
+ */
+
+function parsePath (path) {
+  var str = path.replace(/\[/g, '.[')
+    , parts = str.match(/(\\\.|[^.]+?)+/g);
+  return parts.map(function (value) {
+    var re = /\[(\d+)\]$/
+      , mArr = re.exec(value)
+    if (mArr) return { i: parseFloat(mArr[1]) };
+    else return { p: value };
+  });
+};
+
+/*!
+ * ## _getPathValue(parsed, obj)
+ *
+ * Helper companion function for `.parsePath` that returns
+ * the value located at the parsed address.
+ *
+ *      var value = getPathValue(parsed, obj);
+ *
+ * @param {Object} parsed definition from `parsePath`.
+ * @param {Object} object to search against
+ * @returns {Object|Undefined} value
+ * @api private
+ */
+
+function _getPathValue (parsed, obj) {
+  var tmp = obj
+    , res;
+  for (var i = 0, l = parsed.length; i < l; i++) {
+    var part = parsed[i];
+    if (tmp) {
+      if ('undefined' !== typeof part.p)
+        tmp = tmp[part.p];
+      else if ('undefined' !== typeof part.i)
+        tmp = tmp[part.i];
+      if (i == (l - 1)) res = tmp;
+    } else {
+      res = undefined;
+    }
+  }
+  return res;
+};
+
+});
+require.register("chai/lib/chai/utils/getProperties.js", function(exports, require, module){
+/*!
+ * Chai - getProperties utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### .getProperties(object)
+ *
+ * This allows the retrieval of property names of an object, enumerable or not,
+ * inherited or not.
+ *
+ * @param {Object} object
+ * @returns {Array}
+ * @name getProperties
+ * @api public
+ */
+
+module.exports = function getProperties(object) {
+  var result = Object.getOwnPropertyNames(subject);
+
+  function addProperty(property) {
+    if (result.indexOf(property) === -1) {
+      result.push(property);
+    }
+  }
+
+  var proto = Object.getPrototypeOf(subject);
+  while (proto !== null) {
+    Object.getOwnPropertyNames(proto).forEach(addProperty);
+    proto = Object.getPrototypeOf(proto);
+  }
+
+  return result;
+};
+
+});
+require.register("chai/lib/chai/utils/index.js", function(exports, require, module){
+/*!
+ * chai
+ * Copyright(c) 2011 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Main exports
+ */
+
+var exports = module.exports = {};
+
+/*!
+ * test utility
+ */
+
+exports.test = require('./test');
+
+/*!
+ * type utility
+ */
+
+exports.type = require('./type');
+
+/*!
+ * message utility
+ */
+
+exports.getMessage = require('./getMessage');
+
+/*!
+ * actual utility
+ */
+
+exports.getActual = require('./getActual');
+
+/*!
+ * Inspect util
+ */
+
+exports.inspect = require('./inspect');
+
+/*!
+ * Object Display util
+ */
+
+exports.objDisplay = require('./objDisplay');
+
+/*!
+ * Flag utility
+ */
+
+exports.flag = require('./flag');
+
+/*!
+ * Flag transferring utility
+ */
+
+exports.transferFlags = require('./transferFlags');
+
+/*!
+ * Deep equal utility
+ */
+
+exports.eql = require('deep-eql');
+
+/*!
+ * Deep path value
+ */
+
+exports.getPathValue = require('./getPathValue');
+
+/*!
+ * Function name
+ */
+
+exports.getName = require('./getName');
+
+/*!
+ * add Property
+ */
+
+exports.addProperty = require('./addProperty');
+
+/*!
+ * add Method
+ */
+
+exports.addMethod = require('./addMethod');
+
+/*!
+ * overwrite Property
+ */
+
+exports.overwriteProperty = require('./overwriteProperty');
+
+/*!
+ * overwrite Method
+ */
+
+exports.overwriteMethod = require('./overwriteMethod');
+
+/*!
+ * Add a chainable method
+ */
+
+exports.addChainableMethod = require('./addChainableMethod');
+
+/*!
+ * Overwrite chainable method
+ */
+
+exports.overwriteChainableMethod = require('./overwriteChainableMethod');
+
+
+});
+require.register("chai/lib/chai/utils/inspect.js", function(exports, require, module){
+// This is (almost) directly from Node.js utils
+// https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/util.js
+
+var getName = require('./getName');
+var getProperties = require('./getProperties');
+var getEnumerableProperties = require('./getEnumerableProperties');
+
+module.exports = inspect;
+
+/**
+ * Echos the value of a value. Trys to print the value out
+ * in the best way possible given the different types.
+ *
+ * @param {Object} obj The object to print out.
+ * @param {Boolean} showHidden Flag that shows hidden (not enumerable)
+ *    properties of objects.
+ * @param {Number} depth Depth in which to descend in object. Default is 2.
+ * @param {Boolean} colors Flag to turn on ANSI escape codes to color the
+ *    output. Default is false (no coloring).
+ */
+function inspect(obj, showHidden, depth, colors) {
+  var ctx = {
+    showHidden: showHidden,
+    seen: [],
+    stylize: function (str) { return str; }
+  };
+  return formatValue(ctx, obj, (typeof depth === 'undefined' ? 2 : depth));
+}
+
+// https://gist.github.com/1044128/
+var getOuterHTML = function(element) {
+  if ('outerHTML' in element) return element.outerHTML;
+  var ns = "http://www.w3.org/1999/xhtml";
+  var container = document.createElementNS(ns, '_');
+  var elemProto = (window.HTMLElement || window.Element).prototype;
+  var xmlSerializer = new XMLSerializer();
+  var html;
+  if (document.xmlVersion) {
+    return xmlSerializer.serializeToString(element);
+  } else {
+    container.appendChild(element.cloneNode(false));
+    html = container.innerHTML.replace('><', '>' + element.innerHTML + '<');
+    container.innerHTML = '';
+    return html;
+  }
+};
+
+// Returns true if object is a DOM element.
+var isDOMElement = function (object) {
+  if (typeof HTMLElement === 'object') {
+    return object instanceof HTMLElement;
+  } else {
+    return object &&
+      typeof object === 'object' &&
+      object.nodeType === 1 &&
+      typeof object.nodeName === 'string';
+  }
+};
+
+function formatValue(ctx, value, recurseTimes) {
+  // Provide a hook for user-specified inspect functions.
+  // Check that value is an object with an inspect function on it
+  if (value && typeof value.inspect === 'function' &&
+      // Filter out the util module, it's inspect function is special
+      value.inspect !== exports.inspect &&
+      // Also filter out any prototype objects using the circular check.
+      !(value.constructor && value.constructor.prototype === value)) {
+    var ret = value.inspect(recurseTimes);
+    if (typeof ret !== 'string') {
+      ret = formatValue(ctx, ret, recurseTimes);
+    }
+    return ret;
+  }
+
+  // Primitive types cannot have properties
+  var primitive = formatPrimitive(ctx, value);
+  if (primitive) {
+    return primitive;
+  }
+
+  // If it's DOM elem, get outer HTML.
+  if (isDOMElement(value)) {
+    return getOuterHTML(value);
+  }
+
+  // Look up the keys of the object.
+  var visibleKeys = getEnumerableProperties(value);
+  var keys = ctx.showHidden ? getProperties(value) : visibleKeys;
+
+  // Some type of object without properties can be shortcutted.
+  // In IE, errors have a single `stack` property, or if they are vanilla `Error`,
+  // a `stack` plus `description` property; ignore those for consistency.
+  if (keys.length === 0 || (isError(value) && (
+      (keys.length === 1 && keys[0] === 'stack') ||
+      (keys.length === 2 && keys[0] === 'description' && keys[1] === 'stack')
+     ))) {
+    if (typeof value === 'function') {
+      var name = getName(value);
+      var nameSuffix = name ? ': ' + name : '';
+      return ctx.stylize('[Function' + nameSuffix + ']', 'special');
+    }
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    }
+    if (isDate(value)) {
+      return ctx.stylize(Date.prototype.toUTCString.call(value), 'date');
+    }
+    if (isError(value)) {
+      return formatError(value);
+    }
+  }
+
+  var base = '', array = false, braces = ['{', '}'];
+
+  // Make Array say that they are Array
+  if (isArray(value)) {
+    array = true;
+    braces = ['[', ']'];
+  }
+
+  // Make functions say that they are functions
+  if (typeof value === 'function') {
+    var name = getName(value);
+    var nameSuffix = name ? ': ' + name : '';
+    base = ' [Function' + nameSuffix + ']';
+  }
+
+  // Make RegExps say that they are RegExps
+  if (isRegExp(value)) {
+    base = ' ' + RegExp.prototype.toString.call(value);
+  }
+
+  // Make dates with properties first say the date
+  if (isDate(value)) {
+    base = ' ' + Date.prototype.toUTCString.call(value);
+  }
+
+  // Make error with message first say the error
+  if (isError(value)) {
+    return formatError(value);
+  }
+
+  if (keys.length === 0 && (!array || value.length == 0)) {
+    return braces[0] + base + braces[1];
+  }
+
+  if (recurseTimes < 0) {
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    } else {
+      return ctx.stylize('[Object]', 'special');
+    }
+  }
+
+  ctx.seen.push(value);
+
+  var output;
+  if (array) {
+    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+  } else {
+    output = keys.map(function(key) {
+      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+    });
+  }
+
+  ctx.seen.pop();
+
+  return reduceToSingleString(output, base, braces);
+}
+
+
+function formatPrimitive(ctx, value) {
+  switch (typeof value) {
+    case 'undefined':
+      return ctx.stylize('undefined', 'undefined');
+
+    case 'string':
+      var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+                                               .replace(/'/g, "\\'")
+                                               .replace(/\\"/g, '"') + '\'';
+      return ctx.stylize(simple, 'string');
+
+    case 'number':
+      return ctx.stylize('' + value, 'number');
+
+    case 'boolean':
+      return ctx.stylize('' + value, 'boolean');
+  }
+  // For some reason typeof null is "object", so special case here.
+  if (value === null) {
+    return ctx.stylize('null', 'null');
+  }
+}
+
+
+function formatError(value) {
+  return '[' + Error.prototype.toString.call(value) + ']';
+}
+
+
+function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+  var output = [];
+  for (var i = 0, l = value.length; i < l; ++i) {
+    if (Object.prototype.hasOwnProperty.call(value, String(i))) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          String(i), true));
+    } else {
+      output.push('');
+    }
+  }
+  keys.forEach(function(key) {
+    if (!key.match(/^\d+$/)) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          key, true));
+    }
+  });
+  return output;
+}
+
+
+function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+  var name, str;
+  if (value.__lookupGetter__) {
+    if (value.__lookupGetter__(key)) {
+      if (value.__lookupSetter__(key)) {
+        str = ctx.stylize('[Getter/Setter]', 'special');
+      } else {
+        str = ctx.stylize('[Getter]', 'special');
+      }
+    } else {
+      if (value.__lookupSetter__(key)) {
+        str = ctx.stylize('[Setter]', 'special');
+      }
+    }
+  }
+  if (visibleKeys.indexOf(key) < 0) {
+    name = '[' + key + ']';
+  }
+  if (!str) {
+    if (ctx.seen.indexOf(value[key]) < 0) {
+      if (recurseTimes === null) {
+        str = formatValue(ctx, value[key], null);
+      } else {
+        str = formatValue(ctx, value[key], recurseTimes - 1);
+      }
+      if (str.indexOf('\n') > -1) {
+        if (array) {
+          str = str.split('\n').map(function(line) {
+            return '  ' + line;
+          }).join('\n').substr(2);
+        } else {
+          str = '\n' + str.split('\n').map(function(line) {
+            return '   ' + line;
+          }).join('\n');
+        }
+      }
+    } else {
+      str = ctx.stylize('[Circular]', 'special');
+    }
+  }
+  if (typeof name === 'undefined') {
+    if (array && key.match(/^\d+$/)) {
+      return str;
+    }
+    name = JSON.stringify('' + key);
+    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+      name = name.substr(1, name.length - 2);
+      name = ctx.stylize(name, 'name');
+    } else {
+      name = name.replace(/'/g, "\\'")
+                 .replace(/\\"/g, '"')
+                 .replace(/(^"|"$)/g, "'");
+      name = ctx.stylize(name, 'string');
+    }
+  }
+
+  return name + ': ' + str;
+}
+
+
+function reduceToSingleString(output, base, braces) {
+  var numLinesEst = 0;
+  var length = output.reduce(function(prev, cur) {
+    numLinesEst++;
+    if (cur.indexOf('\n') >= 0) numLinesEst++;
+    return prev + cur.length + 1;
+  }, 0);
+
+  if (length > 60) {
+    return braces[0] +
+           (base === '' ? '' : base + '\n ') +
+           ' ' +
+           output.join(',\n  ') +
+           ' ' +
+           braces[1];
+  }
+
+  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+}
+
+function isArray(ar) {
+  return Array.isArray(ar) ||
+         (typeof ar === 'object' && objectToString(ar) === '[object Array]');
+}
+
+function isRegExp(re) {
+  return typeof re === 'object' && objectToString(re) === '[object RegExp]';
+}
+
+function isDate(d) {
+  return typeof d === 'object' && objectToString(d) === '[object Date]';
+}
+
+function isError(e) {
+  return typeof e === 'object' && objectToString(e) === '[object Error]';
+}
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
+
+});
+require.register("chai/lib/chai/utils/objDisplay.js", function(exports, require, module){
+/*!
+ * Chai - flag utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependancies
+ */
+
+var inspect = require('./inspect');
+
+/**
+ * ### .objDisplay (object)
+ *
+ * Determines if an object or an array matches
+ * criteria to be inspected in-line for error
+ * messages or should be truncated.
+ *
+ * @param {Mixed} javascript object to inspect
+ * @name objDisplay
+ * @api public
+ */
+
+module.exports = function (obj) {
+  var str = inspect(obj)
+    , type = Object.prototype.toString.call(obj);
+
+  if (str.length >= 40) {
+    if (type === '[object Function]') {
+      return !obj.name || obj.name === ''
+        ? '[Function]'
+        : '[Function: ' + obj.name + ']';
+    } else if (type === '[object Array]') {
+      return '[ Array(' + obj.length + ') ]';
+    } else if (type === '[object Object]') {
+      var keys = Object.keys(obj)
+        , kstr = keys.length > 2
+          ? keys.splice(0, 2).join(', ') + ', ...'
+          : keys.join(', ');
+      return '{ Object (' + kstr + ') }';
+    } else {
+      return str;
+    }
+  } else {
+    return str;
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/overwriteMethod.js", function(exports, require, module){
+/*!
+ * Chai - overwriteMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### overwriteMethod (ctx, name, fn)
+ *
+ * Overwites an already existing method and provides
+ * access to previous function. Must return function
+ * to be used for name.
+ *
+ *     utils.overwriteMethod(chai.Assertion.prototype, 'equal', function (_super) {
+ *       return function (str) {
+ *         var obj = utils.flag(this, 'object');
+ *         if (obj instanceof Foo) {
+ *           new chai.Assertion(obj.value).to.equal(str);
+ *         } else {
+ *           _super.apply(this, arguments);
+ *         }
+ *       }
+ *     });
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.overwriteMethod('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.equal('bar');
+ *
+ * @param {Object} ctx object whose method is to be overwritten
+ * @param {String} name of method to overwrite
+ * @param {Function} method function that returns a function to be used for name
+ * @name overwriteMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method) {
+  var _method = ctx[name]
+    , _super = function () { return this; };
+
+  if (_method && 'function' === typeof _method)
+    _super = _method;
+
+  ctx[name] = function () {
+    var result = method(_super).apply(this, arguments);
+    return result === undefined ? this : result;
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/overwriteProperty.js", function(exports, require, module){
+/*!
+ * Chai - overwriteProperty utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### overwriteProperty (ctx, name, fn)
+ *
+ * Overwites an already existing property getter and provides
+ * access to previous value. Must return function to use as getter.
+ *
+ *     utils.overwriteProperty(chai.Assertion.prototype, 'ok', function (_super) {
+ *       return function () {
+ *         var obj = utils.flag(this, 'object');
+ *         if (obj instanceof Foo) {
+ *           new chai.Assertion(obj.name).to.equal('bar');
+ *         } else {
+ *           _super.call(this);
+ *         }
+ *       }
+ *     });
+ *
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.overwriteProperty('foo', fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.be.ok;
+ *
+ * @param {Object} ctx object whose property is to be overwritten
+ * @param {String} name of property to overwrite
+ * @param {Function} getter function that returns a getter function to be used for name
+ * @name overwriteProperty
+ * @api public
+ */
+
+module.exports = function (ctx, name, getter) {
+  var _get = Object.getOwnPropertyDescriptor(ctx, name)
+    , _super = function () {};
+
+  if (_get && 'function' === typeof _get.get)
+    _super = _get.get
+
+  Object.defineProperty(ctx, name,
+    { get: function () {
+        var result = getter(_super).call(this);
+        return result === undefined ? this : result;
+      }
+    , configurable: true
+  });
+};
+
+});
+require.register("chai/lib/chai/utils/overwriteChainableMethod.js", function(exports, require, module){
+/*!
+ * Chai - overwriteChainableMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### overwriteChainableMethod (ctx, name, fn)
+ *
+ * Overwites an already existing chainable method
+ * and provides access to the previous function or
+ * property.  Must return functions to be used for
+ * name.
+ *
+ *     utils.overwriteChainableMethod(chai.Assertion.prototype, 'length',
+ *       function (_super) {
+ *       }
+ *     , function (_super) {
+ *       }
+ *     );
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.overwriteChainableMethod('foo', fn, fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.have.length(3);
+ *     expect(myFoo).to.have.length.above(3);
+ *
+ * @param {Object} ctx object whose method / property is to be overwritten
+ * @param {String} name of method / property to overwrite
+ * @param {Function} method function that returns a function to be used for name
+ * @param {Function} chainingBehavior function that returns a function to be used for property
+ * @name overwriteChainableMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method, chainingBehavior) {
+  var chainableBehavior = ctx.__methods[name];
+
+  var _chainingBehavior = chainableBehavior.chainingBehavior;
+  chainableBehavior.chainingBehavior = function () {
+    var result = chainingBehavior(_chainingBehavior).call(this);
+    return result === undefined ? this : result;
+  };
+
+  var _method = chainableBehavior.method;
+  chainableBehavior.method = function () {
+    var result = method(_method).apply(this, arguments);
+    return result === undefined ? this : result;
+  };
+};
+
+});
+require.register("chai/lib/chai/utils/test.js", function(exports, require, module){
+/*!
+ * Chai - test utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Module dependancies
+ */
+
+var flag = require('./flag');
+
+/**
+ * # test(object, expression)
+ *
+ * Test and object for expression.
+ *
+ * @param {Object} object (constructed Assertion)
+ * @param {Arguments} chai.Assertion.prototype.assert arguments
+ */
+
+module.exports = function (obj, args) {
+  var negate = flag(obj, 'negate')
+    , expr = args[0];
+  return negate ? !expr : expr;
+};
+
+});
+require.register("chai/lib/chai/utils/transferFlags.js", function(exports, require, module){
+/*!
+ * Chai - transferFlags utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### transferFlags(assertion, object, includeAll = true)
+ *
+ * Transfer all the flags for `assertion` to `object`. If
+ * `includeAll` is set to `false`, then the base Chai
+ * assertion flags (namely `object`, `ssfi`, and `message`)
+ * will not be transferred.
+ *
+ *
+ *     var newAssertion = new Assertion();
+ *     utils.transferFlags(assertion, newAssertion);
+ *
+ *     var anotherAsseriton = new Assertion(myObj);
+ *     utils.transferFlags(assertion, anotherAssertion, false);
+ *
+ * @param {Assertion} assertion the assertion to transfer the flags from
+ * @param {Object} object the object to transfer the flags too; usually a new assertion
+ * @param {Boolean} includeAll
+ * @name getAllFlags
+ * @api private
+ */
+
+module.exports = function (assertion, object, includeAll) {
+  var flags = assertion.__flags || (assertion.__flags = Object.create(null));
+
+  if (!object.__flags) {
+    object.__flags = Object.create(null);
+  }
+
+  includeAll = arguments.length === 3 ? includeAll : true;
+
+  for (var flag in flags) {
+    if (includeAll ||
+        (flag !== 'object' && flag !== 'ssfi' && flag != 'message')) {
+      object.__flags[flag] = flags[flag];
+    }
+  }
+};
+
+});
+require.register("chai/lib/chai/utils/type.js", function(exports, require, module){
+/*!
+ * Chai - type utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/*!
+ * Detectable javascript natives
+ */
+
+var natives = {
+    '[object Arguments]': 'arguments'
+  , '[object Array]': 'array'
+  , '[object Date]': 'date'
+  , '[object Function]': 'function'
+  , '[object Number]': 'number'
+  , '[object RegExp]': 'regexp'
+  , '[object String]': 'string'
+};
+
+/**
+ * ### type(object)
+ *
+ * Better implementation of `typeof` detection that can
+ * be used cross-browser. Handles the inconsistencies of
+ * Array, `null`, and `undefined` detection.
+ *
+ *     utils.type({}) // 'object'
+ *     utils.type(null) // `null'
+ *     utils.type(undefined) // `undefined`
+ *     utils.type([]) // `array`
+ *
+ * @param {Mixed} object to detect type of
+ * @name type
+ * @api private
+ */
+
+module.exports = function (obj) {
+  var str = Object.prototype.toString.call(obj);
+  if (natives[str]) return natives[str];
+  if (obj === null) return 'null';
+  if (obj === undefined) return 'undefined';
+  if (obj === Object(obj)) return 'object';
+  return typeof obj;
+};
+
+});
+
+
+
+
+require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js");
+require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js");
+require.alias("chaijs-assertion-error/index.js", "assertion-error/index.js");
+require.alias("chaijs-assertion-error/index.js", "chaijs-assertion-error/index.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "chai/deps/deep-eql/lib/eql.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "chai/deps/deep-eql/index.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "deep-eql/index.js");
+require.alias("chaijs-type-detect/lib/type.js", "chaijs-deep-eql/deps/type-detect/lib/type.js");
+require.alias("chaijs-type-detect/lib/type.js", "chaijs-deep-eql/deps/type-detect/index.js");
+require.alias("chaijs-type-detect/lib/type.js", "chaijs-type-detect/index.js");
+require.alias("chaijs-deep-eql/lib/eql.js", "chaijs-deep-eql/index.js");
+require.alias("chai/index.js", "chai/index.js");if (typeof exports == "object") {
+  module.exports = require("chai");
+} else if (typeof define == "function" && define.amd) {
+  define([], function(){ return require("chai"); });
+} else {
+  this["chai"] = require("chai");
+}})();
\ No newline at end of file
diff --git a/test/vendor/mocha-1.17.1.css b/test/vendor/mocha-1.17.1.css
new file mode 100644
index 000000000000..42b9798fa4e3
--- /dev/null
+++ b/test/vendor/mocha-1.17.1.css
@@ -0,0 +1,270 @@
+@charset "utf-8";
+
+body {
+  margin:0;
+}
+
+#mocha {
+  font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
+  margin: 60px 50px;
+}
+
+#mocha ul,
+#mocha li {
+  margin: 0;
+  padding: 0;
+}
+
+#mocha ul {
+  list-style: none;
+}
+
+#mocha h1,
+#mocha h2 {
+  margin: 0;
+}
+
+#mocha h1 {
+  margin-top: 15px;
+  font-size: 1em;
+  font-weight: 200;
+}
+
+#mocha h1 a {
+  text-decoration: none;
+  color: inherit;
+}
+
+#mocha h1 a:hover {
+  text-decoration: underline;
+}
+
+#mocha .suite .suite h1 {
+  margin-top: 0;
+  font-size: .8em;
+}
+
+#mocha .hidden {
+  display: none;
+}
+
+#mocha h2 {
+  font-size: 12px;
+  font-weight: normal;
+  cursor: pointer;
+}
+
+#mocha .suite {
+  margin-left: 15px;
+}
+
+#mocha .test {
+  margin-left: 15px;
+  overflow: hidden;
+}
+
+#mocha .test.pending:hover h2::after {
+  content: '(pending)';
+  font-family: arial, sans-serif;
+}
+
+#mocha .test.pass.medium .duration {
+  background: #c09853;
+}
+
+#mocha .test.pass.slow .duration {
+  background: #b94a48;
+}
+
+#mocha .test.pass::before {
+  content: '✓';
+  font-size: 12px;
+  display: block;
+  float: left;
+  margin-right: 5px;
+  color: #00d6b2;
+}
+
+#mocha .test.pass .duration {
+  font-size: 9px;
+  margin-left: 5px;
+  padding: 2px 5px;
+  color: #fff;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
+  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -ms-border-radius: 5px;
+  -o-border-radius: 5px;
+  border-radius: 5px;
+}
+
+#mocha .test.pass.fast .duration {
+  display: none;
+}
+
+#mocha .test.pending {
+  color: #0b97c4;
+}
+
+#mocha .test.pending::before {
+  content: '◦';
+  color: #0b97c4;
+}
+
+#mocha .test.fail {
+  color: #c00;
+}
+
+#mocha .test.fail pre {
+  color: black;
+}
+
+#mocha .test.fail::before {
+  content: '✖';
+  font-size: 12px;
+  display: block;
+  float: left;
+  margin-right: 5px;
+  color: #c00;
+}
+
+#mocha .test pre.error {
+  color: #c00;
+  max-height: 300px;
+  overflow: auto;
+}
+
+/**
+ * (1): approximate for browsers not supporting calc
+ * (2): 42 = 2*15 + 2*10 + 2*1 (padding + margin + border)
+ *      ^^ seriously
+ */
+#mocha .test pre {
+  display: block;
+  float: left;
+  clear: left;
+  font: 12px/1.5 monaco, monospace;
+  margin: 5px;
+  padding: 15px;
+  border: 1px solid #eee;
+  max-width: 85%; /*(1)*/
+  max-width: calc(100% - 42px); /*(2)*/
+  word-wrap: break-word;
+  border-bottom-color: #ddd;
+  -webkit-border-radius: 3px;
+  -webkit-box-shadow: 0 1px 3px #eee;
+  -moz-border-radius: 3px;
+  -moz-box-shadow: 0 1px 3px #eee;
+  border-radius: 3px;
+}
+
+#mocha .test h2 {
+  position: relative;
+}
+
+#mocha .test a.replay {
+  position: absolute;
+  top: 3px;
+  right: 0;
+  text-decoration: none;
+  vertical-align: middle;
+  display: block;
+  width: 15px;
+  height: 15px;
+  line-height: 15px;
+  text-align: center;
+  background: #eee;
+  font-size: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+  -webkit-transition: opacity 200ms;
+  -moz-transition: opacity 200ms;
+  transition: opacity 200ms;
+  opacity: 0.3;
+  color: #888;
+}
+
+#mocha .test:hover a.replay {
+  opacity: 1;
+}
+
+#mocha-report.pass .test.fail {
+  display: none;
+}
+
+#mocha-report.fail .test.pass {
+  display: none;
+}
+
+#mocha-report.pending .test.pass,
+#mocha-report.pending .test.fail {
+  display: none;
+}
+#mocha-report.pending .test.pass.pending {
+  display: block;
+}
+
+#mocha-error {
+  color: #c00;
+  font-size: 1.5em;
+  font-weight: 100;
+  letter-spacing: 1px;
+}
+
+#mocha-stats {
+  position: fixed;
+  top: 15px;
+  right: 10px;
+  font-size: 12px;
+  margin: 0;
+  color: #888;
+  z-index: 1;
+}
+
+#mocha-stats .progress {
+  float: right;
+  padding-top: 0;
+}
+
+#mocha-stats em {
+  color: black;
+}
+
+#mocha-stats a {
+  text-decoration: none;
+  color: inherit;
+}
+
+#mocha-stats a:hover {
+  border-bottom: 1px solid #eee;
+}
+
+#mocha-stats li {
+  display: inline-block;
+  margin: 0 5px;
+  list-style: none;
+  padding-top: 11px;
+}
+
+#mocha-stats canvas {
+  width: 40px;
+  height: 40px;
+}
+
+#mocha code .comment { color: #ddd; }
+#mocha code .init { color: #2f6fad; }
+#mocha code .string { color: #5890ad; }
+#mocha code .keyword { color: #8a6343; }
+#mocha code .number { color: #2f6fad; }
+
+@media screen and (max-device-width: 480px) {
+  #mocha {
+    margin: 60px 0px;
+  }
+
+  #mocha #stats {
+    position: absolute;
+  }
+}
diff --git a/test/vendor/mocha-1.17.1.js b/test/vendor/mocha-1.17.1.js
new file mode 100644
index 000000000000..3dcdae6c1bdc
--- /dev/null
+++ b/test/vendor/mocha-1.17.1.js
@@ -0,0 +1,5812 @@
+;(function(){
+
+// CommonJS require()
+
+function require(p){
+    var path = require.resolve(p)
+      , mod = require.modules[path];
+    if (!mod) throw new Error('failed to require "' + p + '"');
+    if (!mod.exports) {
+      mod.exports = {};
+      mod.call(mod.exports, mod, mod.exports, require.relative(path));
+    }
+    return mod.exports;
+  }
+
+require.modules = {};
+
+require.resolve = function (path){
+    var orig = path
+      , reg = path + '.js'
+      , index = path + '/index.js';
+    return require.modules[reg] && reg
+      || require.modules[index] && index
+      || orig;
+  };
+
+require.register = function (path, fn){
+    require.modules[path] = fn;
+  };
+
+require.relative = function (parent) {
+    return function(p){
+      if ('.' != p.charAt(0)) return require(p);
+
+      var path = parent.split('/')
+        , segs = p.split('/');
+      path.pop();
+
+      for (var i = 0; i < segs.length; i++) {
+        var seg = segs[i];
+        if ('..' == seg) path.pop();
+        else if ('.' != seg) path.push(seg);
+      }
+
+      return require(path.join('/'));
+    };
+  };
+
+
+require.register("browser/debug.js", function(module, exports, require){
+
+module.exports = function(type){
+  return function(){
+  }
+};
+
+}); // module: browser/debug.js
+
+require.register("browser/diff.js", function(module, exports, require){
+/* See LICENSE file for terms of use */
+
+/*
+ * Text diff implementation.
+ *
+ * This library supports the following APIS:
+ * JsDiff.diffChars: Character by character diff
+ * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
+ * JsDiff.diffLines: Line based diff
+ *
+ * JsDiff.diffCss: Diff targeted at CSS content
+ *
+ * These methods are based on the implementation proposed in
+ * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
+ * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
+ */
+var JsDiff = (function() {
+  /*jshint maxparams: 5*/
+  function clonePath(path) {
+    return { newPos: path.newPos, components: path.components.slice(0) };
+  }
+  function removeEmpty(array) {
+    var ret = [];
+    for (var i = 0; i < array.length; i++) {
+      if (array[i]) {
+        ret.push(array[i]);
+      }
+    }
+    return ret;
+  }
+  function escapeHTML(s) {
+    var n = s;
+    n = n.replace(/&/g, '&amp;');
+    n = n.replace(/</g, '&lt;');
+    n = n.replace(/>/g, '&gt;');
+    n = n.replace(/"/g, '&quot;');
+
+    return n;
+  }
+
+  var Diff = function(ignoreWhitespace) {
+    this.ignoreWhitespace = ignoreWhitespace;
+  };
+  Diff.prototype = {
+      diff: function(oldString, newString) {
+        // Handle the identity case (this is due to unrolling editLength == 0
+        if (newString === oldString) {
+          return [{ value: newString }];
+        }
+        if (!newString) {
+          return [{ value: oldString, removed: true }];
+        }
+        if (!oldString) {
+          return [{ value: newString, added: true }];
+        }
+
+        newString = this.tokenize(newString);
+        oldString = this.tokenize(oldString);
+
+        var newLen = newString.length, oldLen = oldString.length;
+        var maxEditLength = newLen + oldLen;
+        var bestPath = [{ newPos: -1, components: [] }];
+
+        // Seed editLength = 0
+        var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
+        if (bestPath[0].newPos+1 >= newLen && oldPos+1 >= oldLen) {
+          return bestPath[0].components;
+        }
+
+        for (var editLength = 1; editLength <= maxEditLength; editLength++) {
+          for (var diagonalPath = -1*editLength; diagonalPath <= editLength; diagonalPath+=2) {
+            var basePath;
+            var addPath = bestPath[diagonalPath-1],
+                removePath = bestPath[diagonalPath+1];
+            oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
+            if (addPath) {
+              // No one else is going to attempt to use this value, clear it
+              bestPath[diagonalPath-1] = undefined;
+            }
+
+            var canAdd = addPath && addPath.newPos+1 < newLen;
+            var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
+            if (!canAdd && !canRemove) {
+              bestPath[diagonalPath] = undefined;
+              continue;
+            }
+
+            // Select the diagonal that we want to branch from. We select the prior
+            // path whose position in the new string is the farthest from the origin
+            // and does not pass the bounds of the diff graph
+            if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
+              basePath = clonePath(removePath);
+              this.pushComponent(basePath.components, oldString[oldPos], undefined, true);
+            } else {
+              basePath = clonePath(addPath);
+              basePath.newPos++;
+              this.pushComponent(basePath.components, newString[basePath.newPos], true, undefined);
+            }
+
+            var oldPos = this.extractCommon(basePath, newString, oldString, diagonalPath);
+
+            if (basePath.newPos+1 >= newLen && oldPos+1 >= oldLen) {
+              return basePath.components;
+            } else {
+              bestPath[diagonalPath] = basePath;
+            }
+          }
+        }
+      },
+
+      pushComponent: function(components, value, added, removed) {
+        var last = components[components.length-1];
+        if (last && last.added === added && last.removed === removed) {
+          // We need to clone here as the component clone operation is just
+          // as shallow array clone
+          components[components.length-1] =
+            {value: this.join(last.value, value), added: added, removed: removed };
+        } else {
+          components.push({value: value, added: added, removed: removed });
+        }
+      },
+      extractCommon: function(basePath, newString, oldString, diagonalPath) {
+        var newLen = newString.length,
+            oldLen = oldString.length,
+            newPos = basePath.newPos,
+            oldPos = newPos - diagonalPath;
+        while (newPos+1 < newLen && oldPos+1 < oldLen && this.equals(newString[newPos+1], oldString[oldPos+1])) {
+          newPos++;
+          oldPos++;
+
+          this.pushComponent(basePath.components, newString[newPos], undefined, undefined);
+        }
+        basePath.newPos = newPos;
+        return oldPos;
+      },
+
+      equals: function(left, right) {
+        var reWhitespace = /\S/;
+        if (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right)) {
+          return true;
+        } else {
+          return left === right;
+        }
+      },
+      join: function(left, right) {
+        return left + right;
+      },
+      tokenize: function(value) {
+        return value;
+      }
+  };
+
+  var CharDiff = new Diff();
+
+  var WordDiff = new Diff(true);
+  var WordWithSpaceDiff = new Diff();
+  WordDiff.tokenize = WordWithSpaceDiff.tokenize = function(value) {
+    return removeEmpty(value.split(/(\s+|\b)/));
+  };
+
+  var CssDiff = new Diff(true);
+  CssDiff.tokenize = function(value) {
+    return removeEmpty(value.split(/([{}:;,]|\s+)/));
+  };
+
+  var LineDiff = new Diff();
+  LineDiff.tokenize = function(value) {
+    return value.split(/^/m);
+  };
+
+  return {
+    Diff: Diff,
+
+    diffChars: function(oldStr, newStr) { return CharDiff.diff(oldStr, newStr); },
+    diffWords: function(oldStr, newStr) { return WordDiff.diff(oldStr, newStr); },
+    diffWordsWithSpace: function(oldStr, newStr) { return WordWithSpaceDiff.diff(oldStr, newStr); },
+    diffLines: function(oldStr, newStr) { return LineDiff.diff(oldStr, newStr); },
+
+    diffCss: function(oldStr, newStr) { return CssDiff.diff(oldStr, newStr); },
+
+    createPatch: function(fileName, oldStr, newStr, oldHeader, newHeader) {
+      var ret = [];
+
+      ret.push('Index: ' + fileName);
+      ret.push('===================================================================');
+      ret.push('--- ' + fileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
+      ret.push('+++ ' + fileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
+
+      var diff = LineDiff.diff(oldStr, newStr);
+      if (!diff[diff.length-1].value) {
+        diff.pop();   // Remove trailing newline add
+      }
+      diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier
+
+      function contextLines(lines) {
+        return lines.map(function(entry) { return ' ' + entry; });
+      }
+      function eofNL(curRange, i, current) {
+        var last = diff[diff.length-2],
+            isLast = i === diff.length-2,
+            isLastOfType = i === diff.length-3 && (current.added !== last.added || current.removed !== last.removed);
+
+        // Figure out if this is the last line for the given file and missing NL
+        if (!/\n$/.test(current.value) && (isLast || isLastOfType)) {
+          curRange.push('\\ No newline at end of file');
+        }
+      }
+
+      var oldRangeStart = 0, newRangeStart = 0, curRange = [],
+          oldLine = 1, newLine = 1;
+      for (var i = 0; i < diff.length; i++) {
+        var current = diff[i],
+            lines = current.lines || current.value.replace(/\n$/, '').split('\n');
+        current.lines = lines;
+
+        if (current.added || current.removed) {
+          if (!oldRangeStart) {
+            var prev = diff[i-1];
+            oldRangeStart = oldLine;
+            newRangeStart = newLine;
+
+            if (prev) {
+              curRange = contextLines(prev.lines.slice(-4));
+              oldRangeStart -= curRange.length;
+              newRangeStart -= curRange.length;
+            }
+          }
+          curRange.push.apply(curRange, lines.map(function(entry) { return (current.added?'+':'-') + entry; }));
+          eofNL(curRange, i, current);
+
+          if (current.added) {
+            newLine += lines.length;
+          } else {
+            oldLine += lines.length;
+          }
+        } else {
+          if (oldRangeStart) {
+            // Close out any changes that have been output (or join overlapping)
+            if (lines.length <= 8 && i < diff.length-2) {
+              // Overlapping
+              curRange.push.apply(curRange, contextLines(lines));
+            } else {
+              // end the range and output
+              var contextSize = Math.min(lines.length, 4);
+              ret.push(
+                  '@@ -' + oldRangeStart + ',' + (oldLine-oldRangeStart+contextSize)
+                  + ' +' + newRangeStart + ',' + (newLine-newRangeStart+contextSize)
+                  + ' @@');
+              ret.push.apply(ret, curRange);
+              ret.push.apply(ret, contextLines(lines.slice(0, contextSize)));
+              if (lines.length <= 4) {
+                eofNL(ret, i, current);
+              }
+
+              oldRangeStart = 0;  newRangeStart = 0; curRange = [];
+            }
+          }
+          oldLine += lines.length;
+          newLine += lines.length;
+        }
+      }
+
+      return ret.join('\n') + '\n';
+    },
+
+    applyPatch: function(oldStr, uniDiff) {
+      var diffstr = uniDiff.split('\n');
+      var diff = [];
+      var remEOFNL = false,
+          addEOFNL = false;
+
+      for (var i = (diffstr[0][0]==='I'?4:0); i < diffstr.length; i++) {
+        if(diffstr[i][0] === '@') {
+          var meh = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+          diff.unshift({
+            start:meh[3],
+            oldlength:meh[2],
+            oldlines:[],
+            newlength:meh[4],
+            newlines:[]
+          });
+        } else if(diffstr[i][0] === '+') {
+          diff[0].newlines.push(diffstr[i].substr(1));
+        } else if(diffstr[i][0] === '-') {
+          diff[0].oldlines.push(diffstr[i].substr(1));
+        } else if(diffstr[i][0] === ' ') {
+          diff[0].newlines.push(diffstr[i].substr(1));
+          diff[0].oldlines.push(diffstr[i].substr(1));
+        } else if(diffstr[i][0] === '\\') {
+          if (diffstr[i-1][0] === '+') {
+            remEOFNL = true;
+          } else if(diffstr[i-1][0] === '-') {
+            addEOFNL = true;
+          }
+        }
+      }
+
+      var str = oldStr.split('\n');
+      for (var i = diff.length - 1; i >= 0; i--) {
+        var d = diff[i];
+        for (var j = 0; j < d.oldlength; j++) {
+          if(str[d.start-1+j] !== d.oldlines[j]) {
+            return false;
+          }
+        }
+        Array.prototype.splice.apply(str,[d.start-1,+d.oldlength].concat(d.newlines));
+      }
+
+      if (remEOFNL) {
+        while (!str[str.length-1]) {
+          str.pop();
+        }
+      } else if (addEOFNL) {
+        str.push('');
+      }
+      return str.join('\n');
+    },
+
+    convertChangesToXML: function(changes){
+      var ret = [];
+      for ( var i = 0; i < changes.length; i++) {
+        var change = changes[i];
+        if (change.added) {
+          ret.push('<ins>');
+        } else if (change.removed) {
+          ret.push('<del>');
+        }
+
+        ret.push(escapeHTML(change.value));
+
+        if (change.added) {
+          ret.push('</ins>');
+        } else if (change.removed) {
+          ret.push('</del>');
+        }
+      }
+      return ret.join('');
+    },
+
+    // See: http://code.google.com/p/google-diff-match-patch/wiki/API
+    convertChangesToDMP: function(changes){
+      var ret = [], change;
+      for ( var i = 0; i < changes.length; i++) {
+        change = changes[i];
+        ret.push([(change.added ? 1 : change.removed ? -1 : 0), change.value]);
+      }
+      return ret;
+    }
+  };
+})();
+
+if (typeof module !== 'undefined') {
+    module.exports = JsDiff;
+}
+
+}); // module: browser/diff.js
+
+require.register("browser/events.js", function(module, exports, require){
+
+/**
+ * Module exports.
+ */
+
+exports.EventEmitter = EventEmitter;
+
+/**
+ * Check if `obj` is an array.
+ */
+
+function isArray(obj) {
+  return '[object Array]' == {}.toString.call(obj);
+}
+
+/**
+ * Event emitter constructor.
+ *
+ * @api public
+ */
+
+function EventEmitter(){};
+
+/**
+ * Adds a listener.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.on = function (name, fn) {
+  if (!this.$events) {
+    this.$events = {};
+  }
+
+  if (!this.$events[name]) {
+    this.$events[name] = fn;
+  } else if (isArray(this.$events[name])) {
+    this.$events[name].push(fn);
+  } else {
+    this.$events[name] = [this.$events[name], fn];
+  }
+
+  return this;
+};
+
+EventEmitter.prototype.addListener = EventEmitter.prototype.on;
+
+/**
+ * Adds a volatile listener.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.once = function (name, fn) {
+  var self = this;
+
+  function on () {
+    self.removeListener(name, on);
+    fn.apply(this, arguments);
+  };
+
+  on.listener = fn;
+  this.on(name, on);
+
+  return this;
+};
+
+/**
+ * Removes a listener.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.removeListener = function (name, fn) {
+  if (this.$events && this.$events[name]) {
+    var list = this.$events[name];
+
+    if (isArray(list)) {
+      var pos = -1;
+
+      for (var i = 0, l = list.length; i < l; i++) {
+        if (list[i] === fn || (list[i].listener && list[i].listener === fn)) {
+          pos = i;
+          break;
+        }
+      }
+
+      if (pos < 0) {
+        return this;
+      }
+
+      list.splice(pos, 1);
+
+      if (!list.length) {
+        delete this.$events[name];
+      }
+    } else if (list === fn || (list.listener && list.listener === fn)) {
+      delete this.$events[name];
+    }
+  }
+
+  return this;
+};
+
+/**
+ * Removes all listeners for an event.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.removeAllListeners = function (name) {
+  if (name === undefined) {
+    this.$events = {};
+    return this;
+  }
+
+  if (this.$events && this.$events[name]) {
+    this.$events[name] = null;
+  }
+
+  return this;
+};
+
+/**
+ * Gets all listeners for a certain event.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.listeners = function (name) {
+  if (!this.$events) {
+    this.$events = {};
+  }
+
+  if (!this.$events[name]) {
+    this.$events[name] = [];
+  }
+
+  if (!isArray(this.$events[name])) {
+    this.$events[name] = [this.$events[name]];
+  }
+
+  return this.$events[name];
+};
+
+/**
+ * Emits an event.
+ *
+ * @api public
+ */
+
+EventEmitter.prototype.emit = function (name) {
+  if (!this.$events) {
+    return false;
+  }
+
+  var handler = this.$events[name];
+
+  if (!handler) {
+    return false;
+  }
+
+  var args = [].slice.call(arguments, 1);
+
+  if ('function' == typeof handler) {
+    handler.apply(this, args);
+  } else if (isArray(handler)) {
+    var listeners = handler.slice();
+
+    for (var i = 0, l = listeners.length; i < l; i++) {
+      listeners[i].apply(this, args);
+    }
+  } else {
+    return false;
+  }
+
+  return true;
+};
+}); // module: browser/events.js
+
+require.register("browser/fs.js", function(module, exports, require){
+
+}); // module: browser/fs.js
+
+require.register("browser/path.js", function(module, exports, require){
+
+}); // module: browser/path.js
+
+require.register("browser/progress.js", function(module, exports, require){
+/**
+ * Expose `Progress`.
+ */
+
+module.exports = Progress;
+
+/**
+ * Initialize a new `Progress` indicator.
+ */
+
+function Progress() {
+  this.percent = 0;
+  this.size(0);
+  this.fontSize(11);
+  this.font('helvetica, arial, sans-serif');
+}
+
+/**
+ * Set progress size to `n`.
+ *
+ * @param {Number} n
+ * @return {Progress} for chaining
+ * @api public
+ */
+
+Progress.prototype.size = function(n){
+  this._size = n;
+  return this;
+};
+
+/**
+ * Set text to `str`.
+ *
+ * @param {String} str
+ * @return {Progress} for chaining
+ * @api public
+ */
+
+Progress.prototype.text = function(str){
+  this._text = str;
+  return this;
+};
+
+/**
+ * Set font size to `n`.
+ *
+ * @param {Number} n
+ * @return {Progress} for chaining
+ * @api public
+ */
+
+Progress.prototype.fontSize = function(n){
+  this._fontSize = n;
+  return this;
+};
+
+/**
+ * Set font `family`.
+ *
+ * @param {String} family
+ * @return {Progress} for chaining
+ */
+
+Progress.prototype.font = function(family){
+  this._font = family;
+  return this;
+};
+
+/**
+ * Update percentage to `n`.
+ *
+ * @param {Number} n
+ * @return {Progress} for chaining
+ */
+
+Progress.prototype.update = function(n){
+  this.percent = n;
+  return this;
+};
+
+/**
+ * Draw on `ctx`.
+ *
+ * @param {CanvasRenderingContext2d} ctx
+ * @return {Progress} for chaining
+ */
+
+Progress.prototype.draw = function(ctx){
+  try {
+    var percent = Math.min(this.percent, 100)
+      , size = this._size
+      , half = size / 2
+      , x = half
+      , y = half
+      , rad = half - 1
+      , fontSize = this._fontSize;
+  
+    ctx.font = fontSize + 'px ' + this._font;
+  
+    var angle = Math.PI * 2 * (percent / 100);
+    ctx.clearRect(0, 0, size, size);
+  
+    // outer circle
+    ctx.strokeStyle = '#9f9f9f';
+    ctx.beginPath();
+    ctx.arc(x, y, rad, 0, angle, false);
+    ctx.stroke();
+  
+    // inner circle
+    ctx.strokeStyle = '#eee';
+    ctx.beginPath();
+    ctx.arc(x, y, rad - 1, 0, angle, true);
+    ctx.stroke();
+  
+    // text
+    var text = this._text || (percent | 0) + '%'
+      , w = ctx.measureText(text).width;
+  
+    ctx.fillText(
+        text
+      , x - w / 2 + 1
+      , y + fontSize / 2 - 1);
+  } catch (ex) {} //don't fail if we can't render progress
+  return this;
+};
+
+}); // module: browser/progress.js
+
+require.register("browser/tty.js", function(module, exports, require){
+
+exports.isatty = function(){
+  return true;
+};
+
+exports.getWindowSize = function(){
+  if ('innerHeight' in global) {
+    return [global.innerHeight, global.innerWidth];
+  } else {
+    // In a Web Worker, the DOM Window is not available.
+    return [640, 480];
+  }
+};
+
+}); // module: browser/tty.js
+
+require.register("context.js", function(module, exports, require){
+
+/**
+ * Expose `Context`.
+ */
+
+module.exports = Context;
+
+/**
+ * Initialize a new `Context`.
+ *
+ * @api private
+ */
+
+function Context(){}
+
+/**
+ * Set or get the context `Runnable` to `runnable`.
+ *
+ * @param {Runnable} runnable
+ * @return {Context}
+ * @api private
+ */
+
+Context.prototype.runnable = function(runnable){
+  if (0 == arguments.length) return this._runnable;
+  this.test = this._runnable = runnable;
+  return this;
+};
+
+/**
+ * Set test timeout `ms`.
+ *
+ * @param {Number} ms
+ * @return {Context} self
+ * @api private
+ */
+
+Context.prototype.timeout = function(ms){
+  this.runnable().timeout(ms);
+  return this;
+};
+
+/**
+ * Set test slowness threshold `ms`.
+ *
+ * @param {Number} ms
+ * @return {Context} self
+ * @api private
+ */
+
+Context.prototype.slow = function(ms){
+  this.runnable().slow(ms);
+  return this;
+};
+
+/**
+ * Inspect the context void of `._runnable`.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Context.prototype.inspect = function(){
+  return JSON.stringify(this, function(key, val){
+    if ('_runnable' == key) return;
+    if ('test' == key) return;
+    return val;
+  }, 2);
+};
+
+}); // module: context.js
+
+require.register("hook.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Runnable = require('./runnable');
+
+/**
+ * Expose `Hook`.
+ */
+
+module.exports = Hook;
+
+/**
+ * Initialize a new `Hook` with the given `title` and callback `fn`.
+ *
+ * @param {String} title
+ * @param {Function} fn
+ * @api private
+ */
+
+function Hook(title, fn) {
+  Runnable.call(this, title, fn);
+  this.type = 'hook';
+}
+
+/**
+ * Inherit from `Runnable.prototype`.
+ */
+
+function F(){};
+F.prototype = Runnable.prototype;
+Hook.prototype = new F;
+Hook.prototype.constructor = Hook;
+
+
+/**
+ * Get or set the test `err`.
+ *
+ * @param {Error} err
+ * @return {Error}
+ * @api public
+ */
+
+Hook.prototype.error = function(err){
+  if (0 == arguments.length) {
+    var err = this._error;
+    this._error = null;
+    return err;
+  }
+
+  this._error = err;
+};
+
+}); // module: hook.js
+
+require.register("interfaces/bdd.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test')
+  , utils = require('../utils');
+
+/**
+ * BDD-style interface:
+ *
+ *      describe('Array', function(){
+ *        describe('#indexOf()', function(){
+ *          it('should return -1 when not present', function(){
+ *
+ *          });
+ *
+ *          it('should return the index when present', function(){
+ *
+ *          });
+ *        });
+ *      });
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('pre-require', function(context, file, mocha){
+
+    /**
+     * Execute before running tests.
+     */
+
+    context.before = function(fn){
+      suites[0].beforeAll(fn);
+    };
+
+    /**
+     * Execute after running tests.
+     */
+
+    context.after = function(fn){
+      suites[0].afterAll(fn);
+    };
+
+    /**
+     * Execute before each test case.
+     */
+
+    context.beforeEach = function(fn){
+      suites[0].beforeEach(fn);
+    };
+
+    /**
+     * Execute after each test case.
+     */
+
+    context.afterEach = function(fn){
+      suites[0].afterEach(fn);
+    };
+
+    /**
+     * Describe a "suite" with the given `title`
+     * and callback `fn` containing nested suites
+     * and/or tests.
+     */
+
+    context.describe = context.context = function(title, fn){
+      var suite = Suite.create(suites[0], title);
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+      return suite;
+    };
+
+    /**
+     * Pending describe.
+     */
+
+    context.xdescribe =
+    context.xcontext =
+    context.describe.skip = function(title, fn){
+      var suite = Suite.create(suites[0], title);
+      suite.pending = true;
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+    };
+
+    /**
+     * Exclusive suite.
+     */
+
+    context.describe.only = function(title, fn){
+      var suite = context.describe(title, fn);
+      mocha.grep(suite.fullTitle());
+      return suite;
+    };
+
+    /**
+     * Describe a specification or test-case
+     * with the given `title` and callback `fn`
+     * acting as a thunk.
+     */
+
+    context.it = context.specify = function(title, fn){
+      var suite = suites[0];
+      if (suite.pending) var fn = null;
+      var test = new Test(title, fn);
+      suite.addTest(test);
+      return test;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.it.only = function(title, fn){
+      var test = context.it(title, fn);
+      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      mocha.grep(new RegExp(reString));
+      return test;
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.xit =
+    context.xspecify =
+    context.it.skip = function(title){
+      context.it(title);
+    };
+  });
+};
+
+}); // module: interfaces/bdd.js
+
+require.register("interfaces/exports.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test');
+
+/**
+ * TDD-style interface:
+ *
+ *     exports.Array = {
+ *       '#indexOf()': {
+ *         'should return -1 when the value is not present': function(){
+ *
+ *         },
+ *
+ *         'should return the correct index when the value is present': function(){
+ *
+ *         }
+ *       }
+ *     };
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('require', visit);
+
+  function visit(obj) {
+    var suite;
+    for (var key in obj) {
+      if ('function' == typeof obj[key]) {
+        var fn = obj[key];
+        switch (key) {
+          case 'before':
+            suites[0].beforeAll(fn);
+            break;
+          case 'after':
+            suites[0].afterAll(fn);
+            break;
+          case 'beforeEach':
+            suites[0].beforeEach(fn);
+            break;
+          case 'afterEach':
+            suites[0].afterEach(fn);
+            break;
+          default:
+            suites[0].addTest(new Test(key, fn));
+        }
+      } else {
+        var suite = Suite.create(suites[0], key);
+        suites.unshift(suite);
+        visit(obj[key]);
+        suites.shift();
+      }
+    }
+  }
+};
+
+}); // module: interfaces/exports.js
+
+require.register("interfaces/index.js", function(module, exports, require){
+
+exports.bdd = require('./bdd');
+exports.tdd = require('./tdd');
+exports.qunit = require('./qunit');
+exports.exports = require('./exports');
+
+}); // module: interfaces/index.js
+
+require.register("interfaces/qunit.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test')
+  , utils = require('../utils');
+
+/**
+ * QUnit-style interface:
+ *
+ *     suite('Array');
+ *
+ *     test('#length', function(){
+ *       var arr = [1,2,3];
+ *       ok(arr.length == 3);
+ *     });
+ *
+ *     test('#indexOf()', function(){
+ *       var arr = [1,2,3];
+ *       ok(arr.indexOf(1) == 0);
+ *       ok(arr.indexOf(2) == 1);
+ *       ok(arr.indexOf(3) == 2);
+ *     });
+ *
+ *     suite('String');
+ *
+ *     test('#length', function(){
+ *       ok('foo'.length == 3);
+ *     });
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('pre-require', function(context, file, mocha){
+
+    /**
+     * Execute before running tests.
+     */
+
+    context.before = function(fn){
+      suites[0].beforeAll(fn);
+    };
+
+    /**
+     * Execute after running tests.
+     */
+
+    context.after = function(fn){
+      suites[0].afterAll(fn);
+    };
+
+    /**
+     * Execute before each test case.
+     */
+
+    context.beforeEach = function(fn){
+      suites[0].beforeEach(fn);
+    };
+
+    /**
+     * Execute after each test case.
+     */
+
+    context.afterEach = function(fn){
+      suites[0].afterEach(fn);
+    };
+
+    /**
+     * Describe a "suite" with the given `title`.
+     */
+
+    context.suite = function(title){
+      if (suites.length > 1) suites.shift();
+      var suite = Suite.create(suites[0], title);
+      suites.unshift(suite);
+      return suite;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.suite.only = function(title, fn){
+      var suite = context.suite(title, fn);
+      mocha.grep(suite.fullTitle());
+    };
+
+    /**
+     * Describe a specification or test-case
+     * with the given `title` and callback `fn`
+     * acting as a thunk.
+     */
+
+    context.test = function(title, fn){
+      var test = new Test(title, fn);
+      suites[0].addTest(test);
+      return test;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.test.only = function(title, fn){
+      var test = context.test(title, fn);
+      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      mocha.grep(new RegExp(reString));
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.test.skip = function(title){
+      context.test(title);
+    };
+  });
+};
+
+}); // module: interfaces/qunit.js
+
+require.register("interfaces/tdd.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Suite = require('../suite')
+  , Test = require('../test')
+  , utils = require('../utils');;
+
+/**
+ * TDD-style interface:
+ *
+ *      suite('Array', function(){
+ *        suite('#indexOf()', function(){
+ *          suiteSetup(function(){
+ *
+ *          });
+ *
+ *          test('should return -1 when not present', function(){
+ *
+ *          });
+ *
+ *          test('should return the index when present', function(){
+ *
+ *          });
+ *
+ *          suiteTeardown(function(){
+ *
+ *          });
+ *        });
+ *      });
+ *
+ */
+
+module.exports = function(suite){
+  var suites = [suite];
+
+  suite.on('pre-require', function(context, file, mocha){
+
+    /**
+     * Execute before each test case.
+     */
+
+    context.setup = function(fn){
+      suites[0].beforeEach(fn);
+    };
+
+    /**
+     * Execute after each test case.
+     */
+
+    context.teardown = function(fn){
+      suites[0].afterEach(fn);
+    };
+
+    /**
+     * Execute before the suite.
+     */
+
+    context.suiteSetup = function(fn){
+      suites[0].beforeAll(fn);
+    };
+
+    /**
+     * Execute after the suite.
+     */
+
+    context.suiteTeardown = function(fn){
+      suites[0].afterAll(fn);
+    };
+
+    /**
+     * Describe a "suite" with the given `title`
+     * and callback `fn` containing nested suites
+     * and/or tests.
+     */
+
+    context.suite = function(title, fn){
+      var suite = Suite.create(suites[0], title);
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+      return suite;
+    };
+
+    /**
+     * Pending suite.
+     */
+    context.suite.skip = function(title, fn) {
+      var suite = Suite.create(suites[0], title);
+      suite.pending = true;
+      suites.unshift(suite);
+      fn.call(suite);
+      suites.shift();
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.suite.only = function(title, fn){
+      var suite = context.suite(title, fn);
+      mocha.grep(suite.fullTitle());
+    };
+
+    /**
+     * Describe a specification or test-case
+     * with the given `title` and callback `fn`
+     * acting as a thunk.
+     */
+
+    context.test = function(title, fn){
+      var suite = suites[0];
+      if (suite.pending) var fn = null;
+      var test = new Test(title, fn);
+      suite.addTest(test);
+      return test;
+    };
+
+    /**
+     * Exclusive test-case.
+     */
+
+    context.test.only = function(title, fn){
+      var test = context.test(title, fn);
+      var reString = '^' + utils.escapeRegexp(test.fullTitle()) + '$';
+      mocha.grep(new RegExp(reString));
+    };
+
+    /**
+     * Pending test case.
+     */
+
+    context.test.skip = function(title){
+      context.test(title);
+    };
+  });
+};
+
+}); // module: interfaces/tdd.js
+
+require.register("mocha.js", function(module, exports, require){
+/*!
+ * mocha
+ * Copyright(c) 2011 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var path = require('browser/path')
+  , utils = require('./utils');
+
+/**
+ * Expose `Mocha`.
+ */
+
+exports = module.exports = Mocha;
+
+/**
+ * Expose internals.
+ */
+
+exports.utils = utils;
+exports.interfaces = require('./interfaces');
+exports.reporters = require('./reporters');
+exports.Runnable = require('./runnable');
+exports.Context = require('./context');
+exports.Runner = require('./runner');
+exports.Suite = require('./suite');
+exports.Hook = require('./hook');
+exports.Test = require('./test');
+
+/**
+ * Return image `name` path.
+ *
+ * @param {String} name
+ * @return {String}
+ * @api private
+ */
+
+function image(name) {
+  return __dirname + '/../images/' + name + '.png';
+}
+
+/**
+ * Setup mocha with `options`.
+ *
+ * Options:
+ *
+ *   - `ui` name "bdd", "tdd", "exports" etc
+ *   - `reporter` reporter instance, defaults to `mocha.reporters.Dot`
+ *   - `globals` array of accepted globals
+ *   - `timeout` timeout in milliseconds
+ *   - `bail` bail on the first test failure
+ *   - `slow` milliseconds to wait before considering a test slow
+ *   - `ignoreLeaks` ignore global leaks
+ *   - `grep` string or regexp to filter tests with
+ *
+ * @param {Object} options
+ * @api public
+ */
+
+function Mocha(options) {
+  options = options || {};
+  this.files = [];
+  this.options = options;
+  this.grep(options.grep);
+  this.suite = new exports.Suite('', new exports.Context);
+  this.ui(options.ui);
+  this.bail(options.bail);
+  this.reporter(options.reporter);
+  if (null != options.timeout) this.timeout(options.timeout);
+  this.useColors(options.useColors)
+  if (options.slow) this.slow(options.slow);
+
+  this.suite.on('pre-require', function (context) {
+    exports.afterEach = context.afterEach || context.teardown;
+    exports.after = context.after || context.suiteTeardown;
+    exports.beforeEach = context.beforeEach || context.setup;
+    exports.before = context.before || context.suiteSetup;
+    exports.describe = context.describe || context.suite;
+    exports.it = context.it || context.test;
+    exports.setup = context.setup || context.beforeEach;
+    exports.suiteSetup = context.suiteSetup || context.before;
+    exports.suiteTeardown = context.suiteTeardown || context.after;
+    exports.suite = context.suite || context.describe;
+    exports.teardown = context.teardown || context.afterEach;
+    exports.test = context.test || context.it;
+  });
+}
+
+/**
+ * Enable or disable bailing on the first failure.
+ *
+ * @param {Boolean} [bail]
+ * @api public
+ */
+
+Mocha.prototype.bail = function(bail){
+  if (0 == arguments.length) bail = true;
+  this.suite.bail(bail);
+  return this;
+};
+
+/**
+ * Add test `file`.
+ *
+ * @param {String} file
+ * @api public
+ */
+
+Mocha.prototype.addFile = function(file){
+  this.files.push(file);
+  return this;
+};
+
+/**
+ * Set reporter to `reporter`, defaults to "dot".
+ *
+ * @param {String|Function} reporter name or constructor
+ * @api public
+ */
+
+Mocha.prototype.reporter = function(reporter){
+  if ('function' == typeof reporter) {
+    this._reporter = reporter;
+  } else {
+    reporter = reporter || 'dot';
+    var _reporter;
+    try { _reporter = require('./reporters/' + reporter); } catch (err) {};
+    if (!_reporter) try { _reporter = require(reporter); } catch (err) {};
+    if (!_reporter && reporter === 'teamcity')
+      console.warn('The Teamcity reporter was moved to a package named ' +
+        'mocha-teamcity-reporter ' +
+        '(https://npmjs.org/package/mocha-teamcity-reporter).');
+    if (!_reporter) throw new Error('invalid reporter "' + reporter + '"');
+    this._reporter = _reporter;
+  }
+  return this;
+};
+
+/**
+ * Set test UI `name`, defaults to "bdd".
+ *
+ * @param {String} bdd
+ * @api public
+ */
+
+Mocha.prototype.ui = function(name){
+  name = name || 'bdd';
+  this._ui = exports.interfaces[name];
+  if (!this._ui) try { this._ui = require(name); } catch (err) {};
+  if (!this._ui) throw new Error('invalid interface "' + name + '"');
+  this._ui = this._ui(this.suite);
+  return this;
+};
+
+/**
+ * Load registered files.
+ *
+ * @api private
+ */
+
+Mocha.prototype.loadFiles = function(fn){
+  var self = this;
+  var suite = this.suite;
+  var pending = this.files.length;
+  this.files.forEach(function(file){
+    file = path.resolve(file);
+    suite.emit('pre-require', global, file, self);
+    suite.emit('require', require(file), file, self);
+    suite.emit('post-require', global, file, self);
+    --pending || (fn && fn());
+  });
+};
+
+/**
+ * Enable growl support.
+ *
+ * @api private
+ */
+
+Mocha.prototype._growl = function(runner, reporter) {
+  var notify = require('growl');
+
+  runner.on('end', function(){
+    var stats = reporter.stats;
+    if (stats.failures) {
+      var msg = stats.failures + ' of ' + runner.total + ' tests failed';
+      notify(msg, { name: 'mocha', title: 'Failed', image: image('error') });
+    } else {
+      notify(stats.passes + ' tests passed in ' + stats.duration + 'ms', {
+          name: 'mocha'
+        , title: 'Passed'
+        , image: image('ok')
+      });
+    }
+  });
+};
+
+/**
+ * Add regexp to grep, if `re` is a string it is escaped.
+ *
+ * @param {RegExp|String} re
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.grep = function(re){
+  this.options.grep = 'string' == typeof re
+    ? new RegExp(utils.escapeRegexp(re))
+    : re;
+  return this;
+};
+
+/**
+ * Invert `.grep()` matches.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.invert = function(){
+  this.options.invert = true;
+  return this;
+};
+
+/**
+ * Ignore global leaks.
+ *
+ * @param {Boolean} ignore
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.ignoreLeaks = function(ignore){
+  this.options.ignoreLeaks = !!ignore;
+  return this;
+};
+
+/**
+ * Enable global leak checking.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.checkLeaks = function(){
+  this.options.ignoreLeaks = false;
+  return this;
+};
+
+/**
+ * Enable growl support.
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.growl = function(){
+  this.options.growl = true;
+  return this;
+};
+
+/**
+ * Ignore `globals` array or string.
+ *
+ * @param {Array|String} globals
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.globals = function(globals){
+  this.options.globals = (this.options.globals || []).concat(globals);
+  return this;
+};
+
+/**
+ * Emit color output.
+ *
+ * @param {Boolean} colors
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.useColors = function(colors){
+  this.options.useColors = arguments.length && colors != undefined
+    ? colors
+    : true;
+  return this;
+};
+
+/**
+ * Use inline diffs rather than +/-.
+ *
+ * @param {Boolean} inlineDiffs
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.useInlineDiffs = function(inlineDiffs) {
+  this.options.useInlineDiffs = arguments.length && inlineDiffs != undefined
+  ? inlineDiffs
+  : false;
+  return this;
+};
+
+/**
+ * Set the timeout in milliseconds.
+ *
+ * @param {Number} timeout
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.timeout = function(timeout){
+  this.suite.timeout(timeout);
+  return this;
+};
+
+/**
+ * Set slowness threshold in milliseconds.
+ *
+ * @param {Number} slow
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.slow = function(slow){
+  this.suite.slow(slow);
+  return this;
+};
+
+/**
+ * Makes all tests async (accepting a callback)
+ *
+ * @return {Mocha}
+ * @api public
+ */
+
+Mocha.prototype.asyncOnly = function(){
+  this.options.asyncOnly = true;
+  return this;
+};
+
+/**
+ * Run tests and invoke `fn()` when complete.
+ *
+ * @param {Function} fn
+ * @return {Runner}
+ * @api public
+ */
+
+Mocha.prototype.run = function(fn){
+  if (this.files.length) this.loadFiles();
+  var suite = this.suite;
+  var options = this.options;
+  var runner = new exports.Runner(suite);
+  var reporter = new this._reporter(runner);
+  runner.ignoreLeaks = false !== options.ignoreLeaks;
+  runner.asyncOnly = options.asyncOnly;
+  if (options.grep) runner.grep(options.grep, options.invert);
+  if (options.globals) runner.globals(options.globals);
+  if (options.growl) this._growl(runner, reporter);
+  exports.reporters.Base.useColors = options.useColors;
+  exports.reporters.Base.inlineDiffs = options.useInlineDiffs;
+  return runner.run(fn);
+};
+
+}); // module: mocha.js
+
+require.register("ms.js", function(module, exports, require){
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} options
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options){
+  options = options || {};
+  if ('string' == typeof val) return parse(val);
+  return options.long ? longFormat(val) : shortFormat(val);
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  var match = /^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)?$/i.exec(str);
+  if (!match) return;
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 's':
+      return n * s;
+    case 'ms':
+      return n;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function shortFormat(ms) {
+  if (ms >= d) return Math.round(ms / d) + 'd';
+  if (ms >= h) return Math.round(ms / h) + 'h';
+  if (ms >= m) return Math.round(ms / m) + 'm';
+  if (ms >= s) return Math.round(ms / s) + 's';
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function longFormat(ms) {
+  return plural(ms, d, 'day')
+    || plural(ms, h, 'hour')
+    || plural(ms, m, 'minute')
+    || plural(ms, s, 'second')
+    || ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) return;
+  if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
+
+}); // module: ms.js
+
+require.register("reporters/base.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var tty = require('browser/tty')
+  , diff = require('browser/diff')
+  , ms = require('../ms')
+  , utils = require('../utils');
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Check if both stdio streams are associated with a tty.
+ */
+
+var isatty = tty.isatty(1) && tty.isatty(2);
+
+/**
+ * Expose `Base`.
+ */
+
+exports = module.exports = Base;
+
+/**
+ * Enable coloring by default.
+ */
+
+exports.useColors = isatty || (process.env.MOCHA_COLORS !== undefined);
+
+/**
+ * Inline diffs instead of +/-
+ */
+
+exports.inlineDiffs = false;
+
+/**
+ * Default color map.
+ */
+
+exports.colors = {
+    'pass': 90
+  , 'fail': 31
+  , 'bright pass': 92
+  , 'bright fail': 91
+  , 'bright yellow': 93
+  , 'pending': 36
+  , 'suite': 0
+  , 'error title': 0
+  , 'error message': 31
+  , 'error stack': 90
+  , 'checkmark': 32
+  , 'fast': 90
+  , 'medium': 33
+  , 'slow': 31
+  , 'green': 32
+  , 'light': 90
+  , 'diff gutter': 90
+  , 'diff added': 42
+  , 'diff removed': 41
+};
+
+/**
+ * Default symbol map.
+ */
+
+exports.symbols = {
+  ok: '✓',
+  err: '✖',
+  dot: '․'
+};
+
+// With node.js on Windows: use symbols available in terminal default fonts
+if ('win32' == process.platform) {
+  exports.symbols.ok = '\u221A';
+  exports.symbols.err = '\u00D7';
+  exports.symbols.dot = '.';
+}
+
+/**
+ * Color `str` with the given `type`,
+ * allowing colors to be disabled,
+ * as well as user-defined color
+ * schemes.
+ *
+ * @param {String} type
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+var color = exports.color = function(type, str) {
+  if (!exports.useColors) return str;
+  return '\u001b[' + exports.colors[type] + 'm' + str + '\u001b[0m';
+};
+
+/**
+ * Expose term window size, with some
+ * defaults for when stderr is not a tty.
+ */
+
+exports.window = {
+  width: isatty
+    ? process.stdout.getWindowSize
+      ? process.stdout.getWindowSize(1)[0]
+      : tty.getWindowSize()[1]
+    : 75
+};
+
+/**
+ * Expose some basic cursor interactions
+ * that are common among reporters.
+ */
+
+exports.cursor = {
+  hide: function(){
+    isatty && process.stdout.write('\u001b[?25l');
+  },
+
+  show: function(){
+    isatty && process.stdout.write('\u001b[?25h');
+  },
+
+  deleteLine: function(){
+    isatty && process.stdout.write('\u001b[2K');
+  },
+
+  beginningOfLine: function(){
+    isatty && process.stdout.write('\u001b[0G');
+  },
+
+  CR: function(){
+    if (isatty) {
+      exports.cursor.deleteLine();
+      exports.cursor.beginningOfLine();
+    } else {
+      process.stdout.write('\r');
+    }
+  }
+};
+
+/**
+ * Outut the given `failures` as a list.
+ *
+ * @param {Array} failures
+ * @api public
+ */
+
+exports.list = function(failures){
+  console.error();
+  failures.forEach(function(test, i){
+    // format
+    var fmt = color('error title', '  %s) %s:\n')
+      + color('error message', '     %s')
+      + color('error stack', '\n%s\n');
+
+    // msg
+    var err = test.err
+      , message = err.message || ''
+      , stack = err.stack || message
+      , index = stack.indexOf(message) + message.length
+      , msg = stack.slice(0, index)
+      , actual = err.actual
+      , expected = err.expected
+      , escape = true;
+
+    // uncaught
+    if (err.uncaught) {
+      msg = 'Uncaught ' + msg;
+    }
+
+    // explicitly show diff
+    if (err.showDiff && sameType(actual, expected)) {
+      escape = false;
+      err.actual = actual = stringify(canonicalize(actual));
+      err.expected = expected = stringify(canonicalize(expected));
+    }
+
+    // actual / expected diff
+    if ('string' == typeof actual && 'string' == typeof expected) {
+      fmt = color('error title', '  %s) %s:\n%s') + color('error stack', '\n%s\n');
+      var match = message.match(/^([^:]+): expected/);
+      msg = '\n      ' + color('error message', match ? match[1] : msg);
+
+      if (exports.inlineDiffs) {
+        msg += inlineDiff(err, escape);
+      } else {
+        msg += unifiedDiff(err, escape);
+      }
+    }
+
+    // indent stack trace without msg
+    stack = stack.slice(index ? index + 1 : index)
+      .replace(/^/gm, '  ');
+
+    console.error(fmt, (i + 1), test.fullTitle(), msg, stack);
+  });
+};
+
+/**
+ * Initialize a new `Base` reporter.
+ *
+ * All other reporters generally
+ * inherit from this reporter, providing
+ * stats such as test duration, number
+ * of tests passed / failed etc.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Base(runner) {
+  var self = this
+    , stats = this.stats = { suites: 0, tests: 0, passes: 0, pending: 0, failures: 0 }
+    , failures = this.failures = [];
+
+  if (!runner) return;
+  this.runner = runner;
+
+  runner.stats = stats;
+
+  runner.on('start', function(){
+    stats.start = new Date;
+  });
+
+  runner.on('suite', function(suite){
+    stats.suites = stats.suites || 0;
+    suite.root || stats.suites++;
+  });
+
+  runner.on('test end', function(test){
+    stats.tests = stats.tests || 0;
+    stats.tests++;
+  });
+
+  runner.on('pass', function(test){
+    stats.passes = stats.passes || 0;
+
+    var medium = test.slow() / 2;
+    test.speed = test.duration > test.slow()
+      ? 'slow'
+      : test.duration > medium
+        ? 'medium'
+        : 'fast';
+
+    stats.passes++;
+  });
+
+  runner.on('fail', function(test, err){
+    stats.failures = stats.failures || 0;
+    stats.failures++;
+    test.err = err;
+    failures.push(test);
+  });
+
+  runner.on('end', function(){
+    stats.end = new Date;
+    stats.duration = new Date - stats.start;
+  });
+
+  runner.on('pending', function(){
+    stats.pending++;
+  });
+}
+
+/**
+ * Output common epilogue used by many of
+ * the bundled reporters.
+ *
+ * @api public
+ */
+
+Base.prototype.epilogue = function(){
+  var stats = this.stats;
+  var tests;
+  var fmt;
+
+  console.log();
+
+  // passes
+  fmt = color('bright pass', ' ')
+    + color('green', ' %d passing')
+    + color('light', ' (%s)');
+
+  console.log(fmt,
+    stats.passes || 0,
+    ms(stats.duration));
+
+  // pending
+  if (stats.pending) {
+    fmt = color('pending', ' ')
+      + color('pending', ' %d pending');
+
+    console.log(fmt, stats.pending);
+  }
+
+  // failures
+  if (stats.failures) {
+    fmt = color('fail', '  %d failing');
+
+    console.error(fmt,
+      stats.failures);
+
+    Base.list(this.failures);
+    console.error();
+  }
+
+  console.log();
+};
+
+/**
+ * Pad the given `str` to `len`.
+ *
+ * @param {String} str
+ * @param {String} len
+ * @return {String}
+ * @api private
+ */
+
+function pad(str, len) {
+  str = String(str);
+  return Array(len - str.length + 1).join(' ') + str;
+}
+
+
+/**
+ * Returns an inline diff between 2 strings with coloured ANSI output
+ *
+ * @param {Error} Error with actual/expected
+ * @return {String} Diff
+ * @api private
+ */
+
+function inlineDiff(err, escape) {
+  var msg = errorDiff(err, 'WordsWithSpace', escape);
+
+  // linenos
+  var lines = msg.split('\n');
+  if (lines.length > 4) {
+    var width = String(lines.length).length;
+    msg = lines.map(function(str, i){
+      return pad(++i, width) + ' |' + ' ' + str;
+    }).join('\n');
+  }
+
+  // legend
+  msg = '\n'
+    + color('diff removed', 'actual')
+    + ' '
+    + color('diff added', 'expected')
+    + '\n\n'
+    + msg
+    + '\n';
+
+  // indent
+  msg = msg.replace(/^/gm, '      ');
+  return msg;
+}
+
+/**
+ * Returns a unified diff between 2 strings
+ *
+ * @param {Error} Error with actual/expected
+ * @return {String} Diff
+ * @api private
+ */
+
+function unifiedDiff(err, escape) {
+  var indent = '      ';
+  function cleanUp(line) {
+    if (escape) {
+      line = escapeInvisibles(line);
+    }
+    if (line[0] === '+') return indent + colorLines('diff added', line);
+    if (line[0] === '-') return indent + colorLines('diff removed', line);
+    if (line.match(/\@\@/)) return null;
+    if (line.match(/\\ No newline/)) return null;
+    else return indent + line;
+  }
+  function notBlank(line) {
+    return line != null;
+  }
+  msg = diff.createPatch('string', err.actual, err.expected);
+  var lines = msg.split('\n').splice(4);
+  return '\n      '
+         + colorLines('diff added',   '+ expected') + ' '
+         + colorLines('diff removed', '- actual')
+         + '\n\n'
+         + lines.map(cleanUp).filter(notBlank).join('\n');
+}
+
+/**
+ * Return a character diff for `err`.
+ *
+ * @param {Error} err
+ * @return {String}
+ * @api private
+ */
+
+function errorDiff(err, type, escape) {
+  var actual   = escape ? escapeInvisibles(err.actual)   : err.actual;
+  var expected = escape ? escapeInvisibles(err.expected) : err.expected;
+  return diff['diff' + type](actual, expected).map(function(str){
+    if (str.added) return colorLines('diff added', str.value);
+    if (str.removed) return colorLines('diff removed', str.value);
+    return str.value;
+  }).join('');
+}
+
+/**
+ * Returns a string with all invisible characters in plain text
+ *
+ * @param {String} line
+ * @return {String}
+ * @api private
+ */
+function escapeInvisibles(line) {
+    return line.replace(/\t/g, '<tab>')
+               .replace(/\r/g, '<CR>')
+               .replace(/\n/g, '<LF>\n');
+}
+
+/**
+ * Color lines for `str`, using the color `name`.
+ *
+ * @param {String} name
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+function colorLines(name, str) {
+  return str.split('\n').map(function(str){
+    return color(name, str);
+  }).join('\n');
+}
+
+/**
+ * Stringify `obj`.
+ *
+ * @param {Object} obj
+ * @return {String}
+ * @api private
+ */
+
+function stringify(obj) {
+  if (obj instanceof RegExp) return obj.toString();
+  return JSON.stringify(obj, null, 2);
+}
+
+/**
+ * Return a new object that has the keys in sorted order.
+ * @param {Object} obj
+ * @return {Object}
+ * @api private
+ */
+
+ function canonicalize(obj, stack) {
+   stack = stack || [];
+
+   if (utils.indexOf(stack, obj) !== -1) return obj;
+
+   var canonicalizedObj;
+
+   if ('[object Array]' == {}.toString.call(obj)) {
+     stack.push(obj);
+     canonicalizedObj = utils.map(obj, function(item) {
+       return canonicalize(item, stack);
+     });
+     stack.pop();
+   } else if (typeof obj === 'object' && obj !== null) {
+     stack.push(obj);
+     canonicalizedObj = {};
+     utils.forEach(utils.keys(obj).sort(), function(key) {
+       canonicalizedObj[key] = canonicalize(obj[key], stack);
+     });
+     stack.pop();
+   } else {
+     canonicalizedObj = obj;
+   }
+
+   return canonicalizedObj;
+ }
+
+/**
+ * Check that a / b have the same type.
+ *
+ * @param {Object} a
+ * @param {Object} b
+ * @return {Boolean}
+ * @api private
+ */
+
+function sameType(a, b) {
+  a = Object.prototype.toString.call(a);
+  b = Object.prototype.toString.call(b);
+  return a == b;
+}
+
+
+}); // module: reporters/base.js
+
+require.register("reporters/doc.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils');
+
+/**
+ * Expose `Doc`.
+ */
+
+exports = module.exports = Doc;
+
+/**
+ * Initialize a new `Doc` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Doc(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , total = runner.total
+    , indents = 2;
+
+  function indent() {
+    return Array(indents).join('  ');
+  }
+
+  runner.on('suite', function(suite){
+    if (suite.root) return;
+    ++indents;
+    console.log('%s<section class="suite">', indent());
+    ++indents;
+    console.log('%s<h1>%s</h1>', indent(), utils.escape(suite.title));
+    console.log('%s<dl>', indent());
+  });
+
+  runner.on('suite end', function(suite){
+    if (suite.root) return;
+    console.log('%s</dl>', indent());
+    --indents;
+    console.log('%s</section>', indent());
+    --indents;
+  });
+
+  runner.on('pass', function(test){
+    console.log('%s  <dt>%s</dt>', indent(), utils.escape(test.title));
+    var code = utils.escape(utils.clean(test.fn.toString()));
+    console.log('%s  <dd><pre><code>%s</code></pre></dd>', indent(), code);
+  });
+}
+
+}); // module: reporters/doc.js
+
+require.register("reporters/dot.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , color = Base.color;
+
+/**
+ * Expose `Dot`.
+ */
+
+exports = module.exports = Dot;
+
+/**
+ * Initialize a new `Dot` matrix test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Dot(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , width = Base.window.width * .75 | 0
+    , n = 0;
+
+  runner.on('start', function(){
+    process.stdout.write('\n  ');
+  });
+
+  runner.on('pending', function(test){
+    process.stdout.write(color('pending', Base.symbols.dot));
+  });
+
+  runner.on('pass', function(test){
+    if (++n % width == 0) process.stdout.write('\n  ');
+    if ('slow' == test.speed) {
+      process.stdout.write(color('bright yellow', Base.symbols.dot));
+    } else {
+      process.stdout.write(color(test.speed, Base.symbols.dot));
+    }
+  });
+
+  runner.on('fail', function(test, err){
+    if (++n % width == 0) process.stdout.write('\n  ');
+    process.stdout.write(color('fail', Base.symbols.dot));
+  });
+
+  runner.on('end', function(){
+    console.log();
+    self.epilogue();
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Dot.prototype = new F;
+Dot.prototype.constructor = Dot;
+
+}); // module: reporters/dot.js
+
+require.register("reporters/html-cov.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var JSONCov = require('./json-cov')
+  , fs = require('browser/fs');
+
+/**
+ * Expose `HTMLCov`.
+ */
+
+exports = module.exports = HTMLCov;
+
+/**
+ * Initialize a new `JsCoverage` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function HTMLCov(runner) {
+  var jade = require('jade')
+    , file = __dirname + '/templates/coverage.jade'
+    , str = fs.readFileSync(file, 'utf8')
+    , fn = jade.compile(str, { filename: file })
+    , self = this;
+
+  JSONCov.call(this, runner, false);
+
+  runner.on('end', function(){
+    process.stdout.write(fn({
+        cov: self.cov
+      , coverageClass: coverageClass
+    }));
+  });
+}
+
+/**
+ * Return coverage class for `n`.
+ *
+ * @return {String}
+ * @api private
+ */
+
+function coverageClass(n) {
+  if (n >= 75) return 'high';
+  if (n >= 50) return 'medium';
+  if (n >= 25) return 'low';
+  return 'terrible';
+}
+}); // module: reporters/html-cov.js
+
+require.register("reporters/html.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils')
+  , Progress = require('../browser/progress')
+  , escape = utils.escape;
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Expose `HTML`.
+ */
+
+exports = module.exports = HTML;
+
+/**
+ * Stats template.
+ */
+
+var statsTemplate = '<ul id="mocha-stats">'
+  + '<li class="progress"><canvas width="40" height="40"></canvas></li>'
+  + '<li class="passes"><a href="#">passes:</a> <em>0</em></li>'
+  + '<li class="failures"><a href="#">failures:</a> <em>0</em></li>'
+  + '<li class="duration">duration: <em>0</em>s</li>'
+  + '</ul>';
+
+/**
+ * Initialize a new `HTML` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function HTML(runner, root) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , total = runner.total
+    , stat = fragment(statsTemplate)
+    , items = stat.getElementsByTagName('li')
+    , passes = items[1].getElementsByTagName('em')[0]
+    , passesLink = items[1].getElementsByTagName('a')[0]
+    , failures = items[2].getElementsByTagName('em')[0]
+    , failuresLink = items[2].getElementsByTagName('a')[0]
+    , duration = items[3].getElementsByTagName('em')[0]
+    , canvas = stat.getElementsByTagName('canvas')[0]
+    , report = fragment('<ul id="mocha-report"></ul>')
+    , stack = [report]
+    , progress
+    , ctx
+
+  root = root || document.getElementById('mocha');
+
+  if (canvas.getContext) {
+    var ratio = window.devicePixelRatio || 1;
+    canvas.style.width = canvas.width;
+    canvas.style.height = canvas.height;
+    canvas.width *= ratio;
+    canvas.height *= ratio;
+    ctx = canvas.getContext('2d');
+    ctx.scale(ratio, ratio);
+    progress = new Progress;
+  }
+
+  if (!root) return error('#mocha div missing, add it to your document');
+
+  // pass toggle
+  on(passesLink, 'click', function(){
+    unhide();
+    var name = /pass/.test(report.className) ? '' : ' pass';
+    report.className = report.className.replace(/fail|pass/g, '') + name;
+    if (report.className.trim()) hideSuitesWithout('test pass');
+  });
+
+  // failure toggle
+  on(failuresLink, 'click', function(){
+    unhide();
+    var name = /fail/.test(report.className) ? '' : ' fail';
+    report.className = report.className.replace(/fail|pass/g, '') + name;
+    if (report.className.trim()) hideSuitesWithout('test fail');
+  });
+
+  root.appendChild(stat);
+  root.appendChild(report);
+
+  if (progress) progress.size(40);
+
+  runner.on('suite', function(suite){
+    if (suite.root) return;
+
+    // suite
+    var url = self.suiteURL(suite);
+    var el = fragment('<li class="suite"><h1><a href="%s">%s</a></h1></li>', url, escape(suite.title));
+
+    // container
+    stack[0].appendChild(el);
+    stack.unshift(document.createElement('ul'));
+    el.appendChild(stack[0]);
+  });
+
+  runner.on('suite end', function(suite){
+    if (suite.root) return;
+    stack.shift();
+  });
+
+  runner.on('fail', function(test, err){
+    if ('hook' == test.type) runner.emit('test end', test);
+  });
+
+  runner.on('test end', function(test){
+    // TODO: add to stats
+    var percent = stats.tests / this.total * 100 | 0;
+    if (progress) progress.update(percent).draw(ctx);
+
+    // update stats
+    var ms = new Date - stats.start;
+    text(passes, stats.passes);
+    text(failures, stats.failures);
+    text(duration, (ms / 1000).toFixed(2));
+
+    // test
+    if ('passed' == test.state) {
+      var url = self.testURL(test);
+      var el = fragment('<li class="test pass %e"><h2>%e<span class="duration">%ems</span> <a href="%s" class="replay">‣</a></h2></li>', test.speed, test.title, test.duration, url);
+    } else if (test.pending) {
+      var el = fragment('<li class="test pass pending"><h2>%e</h2></li>', test.title);
+    } else {
+      var el = fragment('<li class="test fail"><h2>%e <a href="?grep=%e" class="replay">‣</a></h2></li>', test.title, encodeURIComponent(test.fullTitle()));
+      var str = test.err.stack || test.err.toString();
+
+      // FF / Opera do not add the message
+      if (!~str.indexOf(test.err.message)) {
+        str = test.err.message + '\n' + str;
+      }
+
+      // <=IE7 stringifies to [Object Error]. Since it can be overloaded, we
+      // check for the result of the stringifying.
+      if ('[object Error]' == str) str = test.err.message;
+
+      // Safari doesn't give you a stack. Let's at least provide a source line.
+      if (!test.err.stack && test.err.sourceURL && test.err.line !== undefined) {
+        str += "\n(" + test.err.sourceURL + ":" + test.err.line + ")";
+      }
+
+      el.appendChild(fragment('<pre class="error">%e</pre>', str));
+    }
+
+    // toggle code
+    // TODO: defer
+    if (!test.pending) {
+      var h2 = el.getElementsByTagName('h2')[0];
+
+      on(h2, 'click', function(){
+        pre.style.display = 'none' == pre.style.display
+          ? 'block'
+          : 'none';
+      });
+
+      var pre = fragment('<pre><code>%e</code></pre>', utils.clean(test.fn.toString()));
+      el.appendChild(pre);
+      pre.style.display = 'none';
+    }
+
+    // Don't call .appendChild if #mocha-report was already .shift()'ed off the stack.
+    if (stack[0]) stack[0].appendChild(el);
+  });
+}
+
+/**
+ * Provide suite URL
+ *
+ * @param {Object} [suite]
+ */
+
+HTML.prototype.suiteURL = function(suite){
+  return '?grep=' + encodeURIComponent(suite.fullTitle());
+};
+
+/**
+ * Provide test URL
+ *
+ * @param {Object} [test]
+ */
+
+HTML.prototype.testURL = function(test){
+  return '?grep=' + encodeURIComponent(test.fullTitle());
+};
+
+/**
+ * Display error `msg`.
+ */
+
+function error(msg) {
+  document.body.appendChild(fragment('<div id="mocha-error">%s</div>', msg));
+}
+
+/**
+ * Return a DOM fragment from `html`.
+ */
+
+function fragment(html) {
+  var args = arguments
+    , div = document.createElement('div')
+    , i = 1;
+
+  div.innerHTML = html.replace(/%([se])/g, function(_, type){
+    switch (type) {
+      case 's': return String(args[i++]);
+      case 'e': return escape(args[i++]);
+    }
+  });
+
+  return div.firstChild;
+}
+
+/**
+ * Check for suites that do not have elements
+ * with `classname`, and hide them.
+ */
+
+function hideSuitesWithout(classname) {
+  var suites = document.getElementsByClassName('suite');
+  for (var i = 0; i < suites.length; i++) {
+    var els = suites[i].getElementsByClassName(classname);
+    if (0 == els.length) suites[i].className += ' hidden';
+  }
+}
+
+/**
+ * Unhide .hidden suites.
+ */
+
+function unhide() {
+  var els = document.getElementsByClassName('suite hidden');
+  for (var i = 0; i < els.length; ++i) {
+    els[i].className = els[i].className.replace('suite hidden', 'suite');
+  }
+}
+
+/**
+ * Set `el` text to `str`.
+ */
+
+function text(el, str) {
+  if (el.textContent) {
+    el.textContent = str;
+  } else {
+    el.innerText = str;
+  }
+}
+
+/**
+ * Listen on `event` with callback `fn`.
+ */
+
+function on(el, event, fn) {
+  if (el.addEventListener) {
+    el.addEventListener(event, fn, false);
+  } else {
+    el.attachEvent('on' + event, fn);
+  }
+}
+
+}); // module: reporters/html.js
+
+require.register("reporters/index.js", function(module, exports, require){
+
+exports.Base = require('./base');
+exports.Dot = require('./dot');
+exports.Doc = require('./doc');
+exports.TAP = require('./tap');
+exports.JSON = require('./json');
+exports.HTML = require('./html');
+exports.List = require('./list');
+exports.Min = require('./min');
+exports.Spec = require('./spec');
+exports.Nyan = require('./nyan');
+exports.XUnit = require('./xunit');
+exports.Markdown = require('./markdown');
+exports.Progress = require('./progress');
+exports.Landing = require('./landing');
+exports.JSONCov = require('./json-cov');
+exports.HTMLCov = require('./html-cov');
+exports.JSONStream = require('./json-stream');
+
+}); // module: reporters/index.js
+
+require.register("reporters/json-cov.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base');
+
+/**
+ * Expose `JSONCov`.
+ */
+
+exports = module.exports = JSONCov;
+
+/**
+ * Initialize a new `JsCoverage` reporter.
+ *
+ * @param {Runner} runner
+ * @param {Boolean} output
+ * @api public
+ */
+
+function JSONCov(runner, output) {
+  var self = this
+    , output = 1 == arguments.length ? true : output;
+
+  Base.call(this, runner);
+
+  var tests = []
+    , failures = []
+    , passes = [];
+
+  runner.on('test end', function(test){
+    tests.push(test);
+  });
+
+  runner.on('pass', function(test){
+    passes.push(test);
+  });
+
+  runner.on('fail', function(test){
+    failures.push(test);
+  });
+
+  runner.on('end', function(){
+    var cov = global._$jscoverage || {};
+    var result = self.cov = map(cov);
+    result.stats = self.stats;
+    result.tests = tests.map(clean);
+    result.failures = failures.map(clean);
+    result.passes = passes.map(clean);
+    if (!output) return;
+    process.stdout.write(JSON.stringify(result, null, 2 ));
+  });
+}
+
+/**
+ * Map jscoverage data to a JSON structure
+ * suitable for reporting.
+ *
+ * @param {Object} cov
+ * @return {Object}
+ * @api private
+ */
+
+function map(cov) {
+  var ret = {
+      instrumentation: 'node-jscoverage'
+    , sloc: 0
+    , hits: 0
+    , misses: 0
+    , coverage: 0
+    , files: []
+  };
+
+  for (var filename in cov) {
+    var data = coverage(filename, cov[filename]);
+    ret.files.push(data);
+    ret.hits += data.hits;
+    ret.misses += data.misses;
+    ret.sloc += data.sloc;
+  }
+
+  ret.files.sort(function(a, b) {
+    return a.filename.localeCompare(b.filename);
+  });
+
+  if (ret.sloc > 0) {
+    ret.coverage = (ret.hits / ret.sloc) * 100;
+  }
+
+  return ret;
+};
+
+/**
+ * Map jscoverage data for a single source file
+ * to a JSON structure suitable for reporting.
+ *
+ * @param {String} filename name of the source file
+ * @param {Object} data jscoverage coverage data
+ * @return {Object}
+ * @api private
+ */
+
+function coverage(filename, data) {
+  var ret = {
+    filename: filename,
+    coverage: 0,
+    hits: 0,
+    misses: 0,
+    sloc: 0,
+    source: {}
+  };
+
+  data.source.forEach(function(line, num){
+    num++;
+
+    if (data[num] === 0) {
+      ret.misses++;
+      ret.sloc++;
+    } else if (data[num] !== undefined) {
+      ret.hits++;
+      ret.sloc++;
+    }
+
+    ret.source[num] = {
+        source: line
+      , coverage: data[num] === undefined
+        ? ''
+        : data[num]
+    };
+  });
+
+  ret.coverage = ret.hits / ret.sloc * 100;
+
+  return ret;
+}
+
+/**
+ * Return a plain-object representation of `test`
+ * free of cyclic properties etc.
+ *
+ * @param {Object} test
+ * @return {Object}
+ * @api private
+ */
+
+function clean(test) {
+  return {
+      title: test.title
+    , fullTitle: test.fullTitle()
+    , duration: test.duration
+  }
+}
+
+}); // module: reporters/json-cov.js
+
+require.register("reporters/json-stream.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , color = Base.color;
+
+/**
+ * Expose `List`.
+ */
+
+exports = module.exports = List;
+
+/**
+ * Initialize a new `List` test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function List(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , total = runner.total;
+
+  runner.on('start', function(){
+    console.log(JSON.stringify(['start', { total: total }]));
+  });
+
+  runner.on('pass', function(test){
+    console.log(JSON.stringify(['pass', clean(test)]));
+  });
+
+  runner.on('fail', function(test, err){
+    console.log(JSON.stringify(['fail', clean(test)]));
+  });
+
+  runner.on('end', function(){
+    process.stdout.write(JSON.stringify(['end', self.stats]));
+  });
+}
+
+/**
+ * Return a plain-object representation of `test`
+ * free of cyclic properties etc.
+ *
+ * @param {Object} test
+ * @return {Object}
+ * @api private
+ */
+
+function clean(test) {
+  return {
+      title: test.title
+    , fullTitle: test.fullTitle()
+    , duration: test.duration
+  }
+}
+}); // module: reporters/json-stream.js
+
+require.register("reporters/json.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `JSON`.
+ */
+
+exports = module.exports = JSONReporter;
+
+/**
+ * Initialize a new `JSON` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function JSONReporter(runner) {
+  var self = this;
+  Base.call(this, runner);
+
+  var tests = []
+    , failures = []
+    , passes = [];
+
+  runner.on('test end', function(test){
+    tests.push(test);
+  });
+
+  runner.on('pass', function(test){
+    passes.push(test);
+  });
+
+  runner.on('fail', function(test){
+    failures.push(test);
+  });
+
+  runner.on('end', function(){
+    var obj = {
+        stats: self.stats
+      , tests: tests.map(clean)
+      , failures: failures.map(clean)
+      , passes: passes.map(clean)
+    };
+
+    process.stdout.write(JSON.stringify(obj, null, 2));
+  });
+}
+
+/**
+ * Return a plain-object representation of `test`
+ * free of cyclic properties etc.
+ *
+ * @param {Object} test
+ * @return {Object}
+ * @api private
+ */
+
+function clean(test) {
+  return {
+      title: test.title
+    , fullTitle: test.fullTitle()
+    , duration: test.duration
+  }
+}
+}); // module: reporters/json.js
+
+require.register("reporters/landing.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `Landing`.
+ */
+
+exports = module.exports = Landing;
+
+/**
+ * Airplane color.
+ */
+
+Base.colors.plane = 0;
+
+/**
+ * Airplane crash color.
+ */
+
+Base.colors['plane crash'] = 31;
+
+/**
+ * Runway color.
+ */
+
+Base.colors.runway = 90;
+
+/**
+ * Initialize a new `Landing` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Landing(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , width = Base.window.width * .75 | 0
+    , total = runner.total
+    , stream = process.stdout
+    , plane = color('plane', '✈')
+    , crashed = -1
+    , n = 0;
+
+  function runway() {
+    var buf = Array(width).join('-');
+    return '  ' + color('runway', buf);
+  }
+
+  runner.on('start', function(){
+    stream.write('\n  ');
+    cursor.hide();
+  });
+
+  runner.on('test end', function(test){
+    // check if the plane crashed
+    var col = -1 == crashed
+      ? width * ++n / total | 0
+      : crashed;
+
+    // show the crash
+    if ('failed' == test.state) {
+      plane = color('plane crash', '✈');
+      crashed = col;
+    }
+
+    // render landing strip
+    stream.write('\u001b[4F\n\n');
+    stream.write(runway());
+    stream.write('\n  ');
+    stream.write(color('runway', Array(col).join('⋅')));
+    stream.write(plane)
+    stream.write(color('runway', Array(width - col).join('⋅') + '\n'));
+    stream.write(runway());
+    stream.write('\u001b[0m');
+  });
+
+  runner.on('end', function(){
+    cursor.show();
+    console.log();
+    self.epilogue();
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Landing.prototype = new F;
+Landing.prototype.constructor = Landing;
+
+}); // module: reporters/landing.js
+
+require.register("reporters/list.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `List`.
+ */
+
+exports = module.exports = List;
+
+/**
+ * Initialize a new `List` test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function List(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , n = 0;
+
+  runner.on('start', function(){
+    console.log();
+  });
+
+  runner.on('test', function(test){
+    process.stdout.write(color('pass', '    ' + test.fullTitle() + ': '));
+  });
+
+  runner.on('pending', function(test){
+    var fmt = color('checkmark', '  -')
+      + color('pending', ' %s');
+    console.log(fmt, test.fullTitle());
+  });
+
+  runner.on('pass', function(test){
+    var fmt = color('checkmark', '  '+Base.symbols.dot)
+      + color('pass', ' %s: ')
+      + color(test.speed, '%dms');
+    cursor.CR();
+    console.log(fmt, test.fullTitle(), test.duration);
+  });
+
+  runner.on('fail', function(test, err){
+    cursor.CR();
+    console.log(color('fail', '  %d) %s'), ++n, test.fullTitle());
+  });
+
+  runner.on('end', self.epilogue.bind(self));
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+List.prototype = new F;
+List.prototype.constructor = List;
+
+
+}); // module: reporters/list.js
+
+require.register("reporters/markdown.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils');
+
+/**
+ * Expose `Markdown`.
+ */
+
+exports = module.exports = Markdown;
+
+/**
+ * Initialize a new `Markdown` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Markdown(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , level = 0
+    , buf = '';
+
+  function title(str) {
+    return Array(level).join('#') + ' ' + str;
+  }
+
+  function indent() {
+    return Array(level).join('  ');
+  }
+
+  function mapTOC(suite, obj) {
+    var ret = obj;
+    obj = obj[suite.title] = obj[suite.title] || { suite: suite };
+    suite.suites.forEach(function(suite){
+      mapTOC(suite, obj);
+    });
+    return ret;
+  }
+
+  function stringifyTOC(obj, level) {
+    ++level;
+    var buf = '';
+    var link;
+    for (var key in obj) {
+      if ('suite' == key) continue;
+      if (key) link = ' - [' + key + '](#' + utils.slug(obj[key].suite.fullTitle()) + ')\n';
+      if (key) buf += Array(level).join('  ') + link;
+      buf += stringifyTOC(obj[key], level);
+    }
+    --level;
+    return buf;
+  }
+
+  function generateTOC(suite) {
+    var obj = mapTOC(suite, {});
+    return stringifyTOC(obj, 0);
+  }
+
+  generateTOC(runner.suite);
+
+  runner.on('suite', function(suite){
+    ++level;
+    var slug = utils.slug(suite.fullTitle());
+    buf += '<a name="' + slug + '"></a>' + '\n';
+    buf += title(suite.title) + '\n';
+  });
+
+  runner.on('suite end', function(suite){
+    --level;
+  });
+
+  runner.on('pass', function(test){
+    var code = utils.clean(test.fn.toString());
+    buf += test.title + '.\n';
+    buf += '\n```js\n';
+    buf += code + '\n';
+    buf += '```\n\n';
+  });
+
+  runner.on('end', function(){
+    process.stdout.write('# TOC\n');
+    process.stdout.write(generateTOC(runner.suite));
+    process.stdout.write(buf);
+  });
+}
+}); // module: reporters/markdown.js
+
+require.register("reporters/min.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base');
+
+/**
+ * Expose `Min`.
+ */
+
+exports = module.exports = Min;
+
+/**
+ * Initialize a new `Min` minimal test reporter (best used with --watch).
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Min(runner) {
+  Base.call(this, runner);
+
+  runner.on('start', function(){
+    // clear screen
+    process.stdout.write('\u001b[2J');
+    // set cursor position
+    process.stdout.write('\u001b[1;3H');
+  });
+
+  runner.on('end', this.epilogue.bind(this));
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Min.prototype = new F;
+Min.prototype.constructor = Min;
+
+
+}); // module: reporters/min.js
+
+require.register("reporters/nyan.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , color = Base.color;
+
+/**
+ * Expose `Dot`.
+ */
+
+exports = module.exports = NyanCat;
+
+/**
+ * Initialize a new `Dot` matrix test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function NyanCat(runner) {
+  Base.call(this, runner);
+  var self = this
+    , stats = this.stats
+    , width = Base.window.width * .75 | 0
+    , rainbowColors = this.rainbowColors = self.generateColors()
+    , colorIndex = this.colorIndex = 0
+    , numerOfLines = this.numberOfLines = 4
+    , trajectories = this.trajectories = [[], [], [], []]
+    , nyanCatWidth = this.nyanCatWidth = 11
+    , trajectoryWidthMax = this.trajectoryWidthMax = (width - nyanCatWidth)
+    , scoreboardWidth = this.scoreboardWidth = 5
+    , tick = this.tick = 0
+    , n = 0;
+
+  runner.on('start', function(){
+    Base.cursor.hide();
+    self.draw();
+  });
+
+  runner.on('pending', function(test){
+    self.draw();
+  });
+
+  runner.on('pass', function(test){
+    self.draw();
+  });
+
+  runner.on('fail', function(test, err){
+    self.draw();
+  });
+
+  runner.on('end', function(){
+    Base.cursor.show();
+    for (var i = 0; i < self.numberOfLines; i++) write('\n');
+    self.epilogue();
+  });
+}
+
+/**
+ * Draw the nyan cat
+ *
+ * @api private
+ */
+
+NyanCat.prototype.draw = function(){
+  this.appendRainbow();
+  this.drawScoreboard();
+  this.drawRainbow();
+  this.drawNyanCat();
+  this.tick = !this.tick;
+};
+
+/**
+ * Draw the "scoreboard" showing the number
+ * of passes, failures and pending tests.
+ *
+ * @api private
+ */
+
+NyanCat.prototype.drawScoreboard = function(){
+  var stats = this.stats;
+  var colors = Base.colors;
+
+  function draw(color, n) {
+    write(' ');
+    write('\u001b[' + color + 'm' + n + '\u001b[0m');
+    write('\n');
+  }
+
+  draw(colors.green, stats.passes);
+  draw(colors.fail, stats.failures);
+  draw(colors.pending, stats.pending);
+  write('\n');
+
+  this.cursorUp(this.numberOfLines);
+};
+
+/**
+ * Append the rainbow.
+ *
+ * @api private
+ */
+
+NyanCat.prototype.appendRainbow = function(){
+  var segment = this.tick ? '_' : '-';
+  var rainbowified = this.rainbowify(segment);
+
+  for (var index = 0; index < this.numberOfLines; index++) {
+    var trajectory = this.trajectories[index];
+    if (trajectory.length >= this.trajectoryWidthMax) trajectory.shift();
+    trajectory.push(rainbowified);
+  }
+};
+
+/**
+ * Draw the rainbow.
+ *
+ * @api private
+ */
+
+NyanCat.prototype.drawRainbow = function(){
+  var self = this;
+
+  this.trajectories.forEach(function(line, index) {
+    write('\u001b[' + self.scoreboardWidth + 'C');
+    write(line.join(''));
+    write('\n');
+  });
+
+  this.cursorUp(this.numberOfLines);
+};
+
+/**
+ * Draw the nyan cat
+ *
+ * @api private
+ */
+
+NyanCat.prototype.drawNyanCat = function() {
+  var self = this;
+  var startWidth = this.scoreboardWidth + this.trajectories[0].length;
+  var color = '\u001b[' + startWidth + 'C';
+  var padding = '';
+
+  write(color);
+  write('_,------,');
+  write('\n');
+
+  write(color);
+  padding = self.tick ? '  ' : '   ';
+  write('_|' + padding + '/\\_/\\ ');
+  write('\n');
+
+  write(color);
+  padding = self.tick ? '_' : '__';
+  var tail = self.tick ? '~' : '^';
+  var face;
+  write(tail + '|' + padding + this.face() + ' ');
+  write('\n');
+
+  write(color);
+  padding = self.tick ? ' ' : '  ';
+  write(padding + '""  "" ');
+  write('\n');
+
+  this.cursorUp(this.numberOfLines);
+};
+
+/**
+ * Draw nyan cat face.
+ *
+ * @return {String}
+ * @api private
+ */
+
+NyanCat.prototype.face = function() {
+  var stats = this.stats;
+  if (stats.failures) {
+    return '( x .x)';
+  } else if (stats.pending) {
+    return '( o .o)';
+  } else if(stats.passes) {
+    return '( ^ .^)';
+  } else {
+    return '( - .-)';
+  }
+}
+
+/**
+ * Move cursor up `n`.
+ *
+ * @param {Number} n
+ * @api private
+ */
+
+NyanCat.prototype.cursorUp = function(n) {
+  write('\u001b[' + n + 'A');
+};
+
+/**
+ * Move cursor down `n`.
+ *
+ * @param {Number} n
+ * @api private
+ */
+
+NyanCat.prototype.cursorDown = function(n) {
+  write('\u001b[' + n + 'B');
+};
+
+/**
+ * Generate rainbow colors.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+NyanCat.prototype.generateColors = function(){
+  var colors = [];
+
+  for (var i = 0; i < (6 * 7); i++) {
+    var pi3 = Math.floor(Math.PI / 3);
+    var n = (i * (1.0 / 6));
+    var r = Math.floor(3 * Math.sin(n) + 3);
+    var g = Math.floor(3 * Math.sin(n + 2 * pi3) + 3);
+    var b = Math.floor(3 * Math.sin(n + 4 * pi3) + 3);
+    colors.push(36 * r + 6 * g + b + 16);
+  }
+
+  return colors;
+};
+
+/**
+ * Apply rainbow to the given `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+NyanCat.prototype.rainbowify = function(str){
+  var color = this.rainbowColors[this.colorIndex % this.rainbowColors.length];
+  this.colorIndex += 1;
+  return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m';
+};
+
+/**
+ * Stdout helper.
+ */
+
+function write(string) {
+  process.stdout.write(string);
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+NyanCat.prototype = new F;
+NyanCat.prototype.constructor = NyanCat;
+
+
+}); // module: reporters/nyan.js
+
+require.register("reporters/progress.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `Progress`.
+ */
+
+exports = module.exports = Progress;
+
+/**
+ * General progress bar color.
+ */
+
+Base.colors.progress = 90;
+
+/**
+ * Initialize a new `Progress` bar test reporter.
+ *
+ * @param {Runner} runner
+ * @param {Object} options
+ * @api public
+ */
+
+function Progress(runner, options) {
+  Base.call(this, runner);
+
+  var self = this
+    , options = options || {}
+    , stats = this.stats
+    , width = Base.window.width * .50 | 0
+    , total = runner.total
+    , complete = 0
+    , max = Math.max;
+
+  // default chars
+  options.open = options.open || '[';
+  options.complete = options.complete || '▬';
+  options.incomplete = options.incomplete || Base.symbols.dot;
+  options.close = options.close || ']';
+  options.verbose = false;
+
+  // tests started
+  runner.on('start', function(){
+    console.log();
+    cursor.hide();
+  });
+
+  // tests complete
+  runner.on('test end', function(){
+    complete++;
+    var incomplete = total - complete
+      , percent = complete / total
+      , n = width * percent | 0
+      , i = width - n;
+
+    cursor.CR();
+    process.stdout.write('\u001b[J');
+    process.stdout.write(color('progress', '  ' + options.open));
+    process.stdout.write(Array(n).join(options.complete));
+    process.stdout.write(Array(i).join(options.incomplete));
+    process.stdout.write(color('progress', options.close));
+    if (options.verbose) {
+      process.stdout.write(color('progress', ' ' + complete + ' of ' + total));
+    }
+  });
+
+  // tests are complete, output some stats
+  // and the failures if any
+  runner.on('end', function(){
+    cursor.show();
+    console.log();
+    self.epilogue();
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Progress.prototype = new F;
+Progress.prototype.constructor = Progress;
+
+
+}); // module: reporters/progress.js
+
+require.register("reporters/spec.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `Spec`.
+ */
+
+exports = module.exports = Spec;
+
+/**
+ * Initialize a new `Spec` test reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function Spec(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , indents = 0
+    , n = 0;
+
+  function indent() {
+    return Array(indents).join('  ')
+  }
+
+  runner.on('start', function(){
+    console.log();
+  });
+
+  runner.on('suite', function(suite){
+    ++indents;
+    console.log(color('suite', '%s%s'), indent(), suite.title);
+  });
+
+  runner.on('suite end', function(suite){
+    --indents;
+    if (1 == indents) console.log();
+  });
+
+  runner.on('pending', function(test){
+    var fmt = indent() + color('pending', '  - %s');
+    console.log(fmt, test.title);
+  });
+
+  runner.on('pass', function(test){
+    if ('fast' == test.speed) {
+      var fmt = indent()
+        + color('checkmark', '  ' + Base.symbols.ok)
+        + color('pass', ' %s ');
+      cursor.CR();
+      console.log(fmt, test.title);
+    } else {
+      var fmt = indent()
+        + color('checkmark', '  ' + Base.symbols.ok)
+        + color('pass', ' %s ')
+        + color(test.speed, '(%dms)');
+      cursor.CR();
+      console.log(fmt, test.title, test.duration);
+    }
+  });
+
+  runner.on('fail', function(test, err){
+    cursor.CR();
+    console.log(indent() + color('fail', '  %d) %s'), ++n, test.title);
+  });
+
+  runner.on('end', self.epilogue.bind(self));
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+Spec.prototype = new F;
+Spec.prototype.constructor = Spec;
+
+
+}); // module: reporters/spec.js
+
+require.register("reporters/tap.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , cursor = Base.cursor
+  , color = Base.color;
+
+/**
+ * Expose `TAP`.
+ */
+
+exports = module.exports = TAP;
+
+/**
+ * Initialize a new `TAP` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function TAP(runner) {
+  Base.call(this, runner);
+
+  var self = this
+    , stats = this.stats
+    , n = 1
+    , passes = 0
+    , failures = 0;
+
+  runner.on('start', function(){
+    var total = runner.grepTotal(runner.suite);
+    console.log('%d..%d', 1, total);
+  });
+
+  runner.on('test end', function(){
+    ++n;
+  });
+
+  runner.on('pending', function(test){
+    console.log('ok %d %s # SKIP -', n, title(test));
+  });
+
+  runner.on('pass', function(test){
+    passes++;
+    console.log('ok %d %s', n, title(test));
+  });
+
+  runner.on('fail', function(test, err){
+    failures++;
+    console.log('not ok %d %s', n, title(test));
+    if (err.stack) console.log(err.stack.replace(/^/gm, '  '));
+  });
+
+  runner.on('end', function(){
+    console.log('# tests ' + (passes + failures));
+    console.log('# pass ' + passes);
+    console.log('# fail ' + failures);
+  });
+}
+
+/**
+ * Return a TAP-safe title of `test`
+ *
+ * @param {Object} test
+ * @return {String}
+ * @api private
+ */
+
+function title(test) {
+  return test.fullTitle().replace(/#/g, '');
+}
+
+}); // module: reporters/tap.js
+
+require.register("reporters/xunit.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Base = require('./base')
+  , utils = require('../utils')
+  , escape = utils.escape;
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Expose `XUnit`.
+ */
+
+exports = module.exports = XUnit;
+
+/**
+ * Initialize a new `XUnit` reporter.
+ *
+ * @param {Runner} runner
+ * @api public
+ */
+
+function XUnit(runner) {
+  Base.call(this, runner);
+  var stats = this.stats
+    , tests = []
+    , self = this;
+
+  runner.on('pending', function(test){
+    tests.push(test);
+  });
+
+  runner.on('pass', function(test){
+    tests.push(test);
+  });
+
+  runner.on('fail', function(test){
+    tests.push(test);
+  });
+
+  runner.on('end', function(){
+    console.log(tag('testsuite', {
+        name: 'Mocha Tests'
+      , tests: stats.tests
+      , failures: stats.failures
+      , errors: stats.failures
+      , skipped: stats.tests - stats.failures - stats.passes
+      , timestamp: (new Date).toUTCString()
+      , time: (stats.duration / 1000) || 0
+    }, false));
+
+    tests.forEach(test);
+    console.log('</testsuite>');
+  });
+}
+
+/**
+ * Inherit from `Base.prototype`.
+ */
+
+function F(){};
+F.prototype = Base.prototype;
+XUnit.prototype = new F;
+XUnit.prototype.constructor = XUnit;
+
+
+/**
+ * Output tag for the given `test.`
+ */
+
+function test(test) {
+  var attrs = {
+      classname: test.parent.fullTitle()
+    , name: test.title
+    , time: (test.duration / 1000) || 0
+  };
+
+  if ('failed' == test.state) {
+    var err = test.err;
+    attrs.message = escape(err.message);
+    console.log(tag('testcase', attrs, false, tag('failure', attrs, false, cdata(err.stack))));
+  } else if (test.pending) {
+    console.log(tag('testcase', attrs, false, tag('skipped', {}, true)));
+  } else {
+    console.log(tag('testcase', attrs, true) );
+  }
+}
+
+/**
+ * HTML tag helper.
+ */
+
+function tag(name, attrs, close, content) {
+  var end = close ? '/>' : '>'
+    , pairs = []
+    , tag;
+
+  for (var key in attrs) {
+    pairs.push(key + '="' + escape(attrs[key]) + '"');
+  }
+
+  tag = '<' + name + (pairs.length ? ' ' + pairs.join(' ') : '') + end;
+  if (content) tag += content + '</' + name + end;
+  return tag;
+}
+
+/**
+ * Return cdata escaped CDATA `str`.
+ */
+
+function cdata(str) {
+  return '<![CDATA[' + escape(str) + ']]>';
+}
+
+}); // module: reporters/xunit.js
+
+require.register("runnable.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = require('browser/events').EventEmitter
+  , debug = require('browser/debug')('mocha:runnable')
+  , milliseconds = require('./ms');
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date
+  , setTimeout = global.setTimeout
+  , setInterval = global.setInterval
+  , clearTimeout = global.clearTimeout
+  , clearInterval = global.clearInterval;
+
+/**
+ * Object#toString().
+ */
+
+var toString = Object.prototype.toString;
+
+/**
+ * Expose `Runnable`.
+ */
+
+module.exports = Runnable;
+
+/**
+ * Initialize a new `Runnable` with the given `title` and callback `fn`.
+ *
+ * @param {String} title
+ * @param {Function} fn
+ * @api private
+ */
+
+function Runnable(title, fn) {
+  this.title = title;
+  this.fn = fn;
+  this.async = fn && fn.length;
+  this.sync = ! this.async;
+  this._timeout = 2000;
+  this._slow = 75;
+  this.timedOut = false;
+}
+
+/**
+ * Inherit from `EventEmitter.prototype`.
+ */
+
+function F(){};
+F.prototype = EventEmitter.prototype;
+Runnable.prototype = new F;
+Runnable.prototype.constructor = Runnable;
+
+
+/**
+ * Set & get timeout `ms`.
+ *
+ * @param {Number|String} ms
+ * @return {Runnable|Number} ms or self
+ * @api private
+ */
+
+Runnable.prototype.timeout = function(ms){
+  if (0 == arguments.length) return this._timeout;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('timeout %d', ms);
+  this._timeout = ms;
+  if (this.timer) this.resetTimeout();
+  return this;
+};
+
+/**
+ * Set & get slow `ms`.
+ *
+ * @param {Number|String} ms
+ * @return {Runnable|Number} ms or self
+ * @api private
+ */
+
+Runnable.prototype.slow = function(ms){
+  if (0 === arguments.length) return this._slow;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('timeout %d', ms);
+  this._slow = ms;
+  return this;
+};
+
+/**
+ * Return the full title generated by recursively
+ * concatenating the parent's full title.
+ *
+ * @return {String}
+ * @api public
+ */
+
+Runnable.prototype.fullTitle = function(){
+  return this.parent.fullTitle() + ' ' + this.title;
+};
+
+/**
+ * Clear the timeout.
+ *
+ * @api private
+ */
+
+Runnable.prototype.clearTimeout = function(){
+  clearTimeout(this.timer);
+};
+
+/**
+ * Inspect the runnable void of private properties.
+ *
+ * @return {String}
+ * @api private
+ */
+
+Runnable.prototype.inspect = function(){
+  return JSON.stringify(this, function(key, val){
+    if ('_' == key[0]) return;
+    if ('parent' == key) return '#<Suite>';
+    if ('ctx' == key) return '#<Context>';
+    return val;
+  }, 2);
+};
+
+/**
+ * Reset the timeout.
+ *
+ * @api private
+ */
+
+Runnable.prototype.resetTimeout = function(){
+  var self = this;
+  var ms = this.timeout() || 1e9;
+
+  this.clearTimeout();
+  this.timer = setTimeout(function(){
+    self.callback(new Error('timeout of ' + ms + 'ms exceeded'));
+    self.timedOut = true;
+  }, ms);
+};
+
+/**
+ * Whitelist these globals for this test run
+ *
+ * @api private
+ */
+Runnable.prototype.globals = function(arr){
+  var self = this;
+  this._allowedGlobals = arr;
+};
+
+/**
+ * Run the test and invoke `fn(err)`.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+
+Runnable.prototype.run = function(fn){
+  var self = this
+    , ms = this.timeout()
+    , start = new Date
+    , ctx = this.ctx
+    , finished
+    , emitted;
+
+  if (ctx) ctx.runnable(this);
+
+  // timeout
+  if (this.async) {
+    if (ms) {
+      this.timer = setTimeout(function(){
+        done(new Error('timeout of ' + ms + 'ms exceeded'));
+        self.timedOut = true;
+      }, ms);
+    }
+  }
+
+  // called multiple times
+  function multiple(err) {
+    if (emitted) return;
+    emitted = true;
+    self.emit('error', err || new Error('done() called multiple times'));
+  }
+
+  // finished
+  function done(err) {
+    if (self.timedOut) return;
+    if (finished) return multiple(err);
+    self.clearTimeout();
+    self.duration = new Date - start;
+    finished = true;
+    fn(err);
+  }
+
+  // for .resetTimeout()
+  this.callback = done;
+
+  // async
+  if (this.async) {
+    try {
+      this.fn.call(ctx, function(err){
+        if (err instanceof Error || toString.call(err) === "[object Error]") return done(err);
+        if (null != err) return done(new Error('done() invoked with non-Error: ' + err));
+        done();
+      });
+    } catch (err) {
+      done(err);
+    }
+    return;
+  }
+
+  if (this.asyncOnly) {
+    return done(new Error('--async-only option in use without declaring `done()`'));
+  }
+
+  // sync
+  try {
+    if (!this.pending) this.fn.call(ctx);
+    this.duration = new Date - start;
+    fn();
+  } catch (err) {
+    fn(err);
+  }
+};
+
+}); // module: runnable.js
+
+require.register("runner.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = require('browser/events').EventEmitter
+  , debug = require('browser/debug')('mocha:runner')
+  , Test = require('./test')
+  , utils = require('./utils')
+  , filter = utils.filter
+  , keys = utils.keys;
+
+/**
+ * Non-enumerable globals.
+ */
+
+var globals = [
+  'setTimeout',
+  'clearTimeout',
+  'setInterval',
+  'clearInterval',
+  'XMLHttpRequest',
+  'Date'
+];
+
+/**
+ * Expose `Runner`.
+ */
+
+module.exports = Runner;
+
+/**
+ * Initialize a `Runner` for the given `suite`.
+ *
+ * Events:
+ *
+ *   - `start`  execution started
+ *   - `end`  execution complete
+ *   - `suite`  (suite) test suite execution started
+ *   - `suite end`  (suite) all tests (and sub-suites) have finished
+ *   - `test`  (test) test execution started
+ *   - `test end`  (test) test completed
+ *   - `hook`  (hook) hook execution started
+ *   - `hook end`  (hook) hook complete
+ *   - `pass`  (test) test passed
+ *   - `fail`  (test, err) test failed
+ *   - `pending`  (test) test pending
+ *
+ * @api public
+ */
+
+function Runner(suite) {
+  var self = this;
+  this._globals = [];
+  this._abort = false;
+  this.suite = suite;
+  this.total = suite.total();
+  this.failures = 0;
+  this.on('test end', function(test){ self.checkGlobals(test); });
+  this.on('hook end', function(hook){ self.checkGlobals(hook); });
+  this.grep(/.*/);
+  this.globals(this.globalProps().concat(extraGlobals()));
+}
+
+/**
+ * Wrapper for setImmediate, process.nextTick, or browser polyfill.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.immediately = global.setImmediate || process.nextTick;
+
+/**
+ * Inherit from `EventEmitter.prototype`.
+ */
+
+function F(){};
+F.prototype = EventEmitter.prototype;
+Runner.prototype = new F;
+Runner.prototype.constructor = Runner;
+
+
+/**
+ * Run tests with full titles matching `re`. Updates runner.total
+ * with number of tests matched.
+ *
+ * @param {RegExp} re
+ * @param {Boolean} invert
+ * @return {Runner} for chaining
+ * @api public
+ */
+
+Runner.prototype.grep = function(re, invert){
+  debug('grep %s', re);
+  this._grep = re;
+  this._invert = invert;
+  this.total = this.grepTotal(this.suite);
+  return this;
+};
+
+/**
+ * Returns the number of tests matching the grep search for the
+ * given suite.
+ *
+ * @param {Suite} suite
+ * @return {Number}
+ * @api public
+ */
+
+Runner.prototype.grepTotal = function(suite) {
+  var self = this;
+  var total = 0;
+
+  suite.eachTest(function(test){
+    var match = self._grep.test(test.fullTitle());
+    if (self._invert) match = !match;
+    if (match) total++;
+  });
+
+  return total;
+};
+
+/**
+ * Return a list of global properties.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+Runner.prototype.globalProps = function() {
+  var props = utils.keys(global);
+
+  // non-enumerables
+  for (var i = 0; i < globals.length; ++i) {
+    if (~utils.indexOf(props, globals[i])) continue;
+    props.push(globals[i]);
+  }
+
+  return props;
+};
+
+/**
+ * Allow the given `arr` of globals.
+ *
+ * @param {Array} arr
+ * @return {Runner} for chaining
+ * @api public
+ */
+
+Runner.prototype.globals = function(arr){
+  if (0 == arguments.length) return this._globals;
+  debug('globals %j', arr);
+  this._globals = this._globals.concat(arr);
+  return this;
+};
+
+/**
+ * Check for global variable leaks.
+ *
+ * @api private
+ */
+
+Runner.prototype.checkGlobals = function(test){
+  if (this.ignoreLeaks) return;
+  var ok = this._globals;
+
+  var globals = this.globalProps();
+  var isNode = process.kill;
+  var leaks;
+
+  if (test) {
+    ok = ok.concat(test._allowedGlobals || []);
+  }
+
+  if(this.prevGlobalsLength == globals.length) return;
+  this.prevGlobalsLength = globals.length;
+
+  leaks = filterLeaks(ok, globals);
+  this._globals = this._globals.concat(leaks);
+
+  if (leaks.length > 1) {
+    this.fail(test, new Error('global leaks detected: ' + leaks.join(', ') + ''));
+  } else if (leaks.length) {
+    this.fail(test, new Error('global leak detected: ' + leaks[0]));
+  }
+};
+
+/**
+ * Fail the given `test`.
+ *
+ * @param {Test} test
+ * @param {Error} err
+ * @api private
+ */
+
+Runner.prototype.fail = function(test, err){
+  ++this.failures;
+  test.state = 'failed';
+
+  if ('string' == typeof err) {
+    err = new Error('the string "' + err + '" was thrown, throw an Error :)');
+  }
+
+  this.emit('fail', test, err);
+};
+
+/**
+ * Fail the given `hook` with `err`.
+ *
+ * Hook failures work in the following pattern:
+ * - If bail, then exit
+ * - Failed `before` hook skips all tests in a suite and subsuites,
+ *   but jumps to corresponding `after` hook
+ * - Failed `before each` hook skips remaining tests in a
+ *   suite and jumps to corresponding `after each` hook,
+ *   which is run only once
+ * - Failed `after` hook does not alter
+ *   execution order
+ * - Failed `after each` hook skips remaining tests in a
+ *   suite and subsuites, but executes other `after each`
+ *   hooks
+ *
+ * @param {Hook} hook
+ * @param {Error} err
+ * @api private
+ */
+
+Runner.prototype.failHook = function(hook, err){
+  this.fail(hook, err);
+  if (this.suite.bail()) {
+    this.emit('end');
+  }
+};
+
+/**
+ * Run hook `name` callbacks and then invoke `fn()`.
+ *
+ * @param {String} name
+ * @param {Function} function
+ * @api private
+ */
+
+Runner.prototype.hook = function(name, fn){
+  var suite = this.suite
+    , hooks = suite['_' + name]
+    , self = this
+    , timer;
+
+  function next(i) {
+    var hook = hooks[i];
+    if (!hook) return fn();
+    if (self.failures && suite.bail()) return fn();
+    self.currentRunnable = hook;
+
+    hook.ctx.currentTest = self.test;
+
+    self.emit('hook', hook);
+
+    hook.on('error', function(err){
+      self.failHook(hook, err);
+    });
+
+    hook.run(function(err){
+      hook.removeAllListeners('error');
+      var testError = hook.error();
+      if (testError) self.fail(self.test, testError);
+      if (err) {
+        self.failHook(hook, err);
+
+        // stop executing hooks, notify callee of hook err
+        return fn(err);
+      }
+      self.emit('hook end', hook);
+      delete hook.ctx.currentTest;
+      next(++i);
+    });
+  }
+
+  Runner.immediately(function(){
+    next(0);
+  });
+};
+
+/**
+ * Run hook `name` for the given array of `suites`
+ * in order, and callback `fn(err, errSuite)`.
+ *
+ * @param {String} name
+ * @param {Array} suites
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.hooks = function(name, suites, fn){
+  var self = this
+    , orig = this.suite;
+
+  function next(suite) {
+    self.suite = suite;
+
+    if (!suite) {
+      self.suite = orig;
+      return fn();
+    }
+
+    self.hook(name, function(err){
+      if (err) {
+        var errSuite = self.suite;
+        self.suite = orig;
+        return fn(err, errSuite);
+      }
+
+      next(suites.pop());
+    });
+  }
+
+  next(suites.pop());
+};
+
+/**
+ * Run hooks from the top level down.
+ *
+ * @param {String} name
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.hookUp = function(name, fn){
+  var suites = [this.suite].concat(this.parents()).reverse();
+  this.hooks(name, suites, fn);
+};
+
+/**
+ * Run hooks from the bottom up.
+ *
+ * @param {String} name
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.hookDown = function(name, fn){
+  var suites = [this.suite].concat(this.parents());
+  this.hooks(name, suites, fn);
+};
+
+/**
+ * Return an array of parent Suites from
+ * closest to furthest.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+Runner.prototype.parents = function(){
+  var suite = this.suite
+    , suites = [];
+  while (suite = suite.parent) suites.push(suite);
+  return suites;
+};
+
+/**
+ * Run the current test and callback `fn(err)`.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.runTest = function(fn){
+  var test = this.test
+    , self = this;
+
+  if (this.asyncOnly) test.asyncOnly = true;
+
+  try {
+    test.on('error', function(err){
+      self.fail(test, err);
+    });
+    test.run(fn);
+  } catch (err) {
+    fn(err);
+  }
+};
+
+/**
+ * Run tests in the given `suite` and invoke
+ * the callback `fn()` when complete.
+ *
+ * @param {Suite} suite
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.runTests = function(suite, fn){
+  var self = this
+    , tests = suite.tests.slice()
+    , test;
+
+
+  function hookErr(err, errSuite, after) {
+    // before/after Each hook for errSuite failed:
+    var orig = self.suite;
+
+    // for failed 'after each' hook start from errSuite parent,
+    // otherwise start from errSuite itself
+    self.suite = after ? errSuite.parent : errSuite;
+
+    if (self.suite) {
+      // call hookUp afterEach
+      self.hookUp('afterEach', function(err2, errSuite2) {
+        self.suite = orig;
+        // some hooks may fail even now
+        if (err2) return hookErr(err2, errSuite2, true);
+        // report error suite
+        fn(errSuite);
+      });
+    } else {
+      // there is no need calling other 'after each' hooks
+      self.suite = orig;
+      fn(errSuite);
+    }
+  }
+
+  function next(err, errSuite) {
+    // if we bail after first err
+    if (self.failures && suite._bail) return fn();
+
+    if (self._abort) return fn();
+
+    if (err) return hookErr(err, errSuite, true);
+
+    // next test
+    test = tests.shift();
+
+    // all done
+    if (!test) return fn();
+
+    // grep
+    var match = self._grep.test(test.fullTitle());
+    if (self._invert) match = !match;
+    if (!match) return next();
+
+    // pending
+    if (test.pending) {
+      self.emit('pending', test);
+      self.emit('test end', test);
+      return next();
+    }
+
+    // execute test and hook(s)
+    self.emit('test', self.test = test);
+    self.hookDown('beforeEach', function(err, errSuite){
+
+      if (err) return hookErr(err, errSuite, false);
+
+      self.currentRunnable = self.test;
+      self.runTest(function(err){
+        test = self.test;
+
+        if (err) {
+          self.fail(test, err);
+          self.emit('test end', test);
+          return self.hookUp('afterEach', next);
+        }
+
+        test.state = 'passed';
+        self.emit('pass', test);
+        self.emit('test end', test);
+        self.hookUp('afterEach', next);
+      });
+    });
+  }
+
+  this.next = next;
+  next();
+};
+
+/**
+ * Run the given `suite` and invoke the
+ * callback `fn()` when complete.
+ *
+ * @param {Suite} suite
+ * @param {Function} fn
+ * @api private
+ */
+
+Runner.prototype.runSuite = function(suite, fn){
+  var total = this.grepTotal(suite)
+    , self = this
+    , i = 0;
+
+  debug('run suite %s', suite.fullTitle());
+
+  if (!total) return fn();
+
+  this.emit('suite', this.suite = suite);
+
+  function next(errSuite) {
+    if (errSuite) {
+      // current suite failed on a hook from errSuite
+      if (errSuite == suite) {
+        // if errSuite is current suite
+        // continue to the next sibling suite
+        return done();
+      } else {
+        // errSuite is among the parents of current suite
+        // stop execution of errSuite and all sub-suites
+        return done(errSuite);
+      }
+    }
+
+    if (self._abort) return done();
+
+    var curr = suite.suites[i++];
+    if (!curr) return done();
+    self.runSuite(curr, next);
+  }
+
+  function done(errSuite) {
+    self.suite = suite;
+    self.hook('afterAll', function(){
+      self.emit('suite end', suite);
+      fn(errSuite);
+    });
+  }
+
+  this.hook('beforeAll', function(err){
+    if (err) return done();
+    self.runTests(suite, next);
+  });
+};
+
+/**
+ * Handle uncaught exceptions.
+ *
+ * @param {Error} err
+ * @api private
+ */
+
+Runner.prototype.uncaught = function(err){
+  debug('uncaught exception %s', err.message);
+  var runnable = this.currentRunnable;
+  if (!runnable || 'failed' == runnable.state) return;
+  runnable.clearTimeout();
+  err.uncaught = true;
+  this.fail(runnable, err);
+
+  // recover from test
+  if ('test' == runnable.type) {
+    this.emit('test end', runnable);
+    this.hookUp('afterEach', this.next);
+    return;
+  }
+
+  // bail on hooks
+  this.emit('end');
+};
+
+/**
+ * Run the root suite and invoke `fn(failures)`
+ * on completion.
+ *
+ * @param {Function} fn
+ * @return {Runner} for chaining
+ * @api public
+ */
+
+Runner.prototype.run = function(fn){
+  var self = this
+    , fn = fn || function(){};
+
+  function uncaught(err){
+    self.uncaught(err);
+  }
+
+  debug('start');
+
+  // callback
+  this.on('end', function(){
+    debug('end');
+    process.removeListener('uncaughtException', uncaught);
+    fn(self.failures);
+  });
+
+  // run suites
+  this.emit('start');
+  this.runSuite(this.suite, function(){
+    debug('finished running');
+    self.emit('end');
+  });
+
+  // uncaught exception
+  process.on('uncaughtException', uncaught);
+
+  return this;
+};
+
+/**
+ * Cleanly abort execution
+ *
+ * @return {Runner} for chaining
+ * @api public
+ */
+Runner.prototype.abort = function(){
+  debug('aborting');
+  this._abort = true;
+}
+
+/**
+ * Filter leaks with the given globals flagged as `ok`.
+ *
+ * @param {Array} ok
+ * @param {Array} globals
+ * @return {Array}
+ * @api private
+ */
+
+function filterLeaks(ok, globals) {
+  return filter(globals, function(key){
+    // Firefox and Chrome exposes iframes as index inside the window object
+    if (/^d+/.test(key)) return false;
+
+    // in firefox
+    // if runner runs in an iframe, this iframe's window.getInterface method not init at first
+    // it is assigned in some seconds
+    if (global.navigator && /^getInterface/.test(key)) return false;
+
+    // an iframe could be approached by window[iframeIndex]
+    // in ie6,7,8 and opera, iframeIndex is enumerable, this could cause leak
+    if (global.navigator && /^\d+/.test(key)) return false;
+
+    // Opera and IE expose global variables for HTML element IDs (issue #243)
+    if (/^mocha-/.test(key)) return false;
+
+    var matched = filter(ok, function(ok){
+      if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]);
+      return key == ok;
+    });
+    return matched.length == 0 && (!global.navigator || 'onerror' !== key);
+  });
+}
+
+/**
+ * Array of globals dependent on the environment.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+ function extraGlobals() {
+  if (typeof(process) === 'object' &&
+      typeof(process.version) === 'string') {
+
+    var nodeVersion = process.version.split('.').reduce(function(a, v) {
+      return a << 8 | v;
+    });
+
+    // 'errno' was renamed to process._errno in v0.9.11.
+
+    if (nodeVersion < 0x00090B) {
+      return ['errno'];
+    }
+  }
+
+  return [];
+ }
+
+}); // module: runner.js
+
+require.register("suite.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = require('browser/events').EventEmitter
+  , debug = require('browser/debug')('mocha:suite')
+  , milliseconds = require('./ms')
+  , utils = require('./utils')
+  , Hook = require('./hook');
+
+/**
+ * Expose `Suite`.
+ */
+
+exports = module.exports = Suite;
+
+/**
+ * Create a new `Suite` with the given `title`
+ * and parent `Suite`. When a suite with the
+ * same title is already present, that suite
+ * is returned to provide nicer reporter
+ * and more flexible meta-testing.
+ *
+ * @param {Suite} parent
+ * @param {String} title
+ * @return {Suite}
+ * @api public
+ */
+
+exports.create = function(parent, title){
+  var suite = new Suite(title, parent.ctx);
+  suite.parent = parent;
+  if (parent.pending) suite.pending = true;
+  title = suite.fullTitle();
+  parent.addSuite(suite);
+  return suite;
+};
+
+/**
+ * Initialize a new `Suite` with the given
+ * `title` and `ctx`.
+ *
+ * @param {String} title
+ * @param {Context} ctx
+ * @api private
+ */
+
+function Suite(title, ctx) {
+  this.title = title;
+  this.ctx = ctx;
+  this.suites = [];
+  this.tests = [];
+  this.pending = false;
+  this._beforeEach = [];
+  this._beforeAll = [];
+  this._afterEach = [];
+  this._afterAll = [];
+  this.root = !title;
+  this._timeout = 2000;
+  this._slow = 75;
+  this._bail = false;
+}
+
+/**
+ * Inherit from `EventEmitter.prototype`.
+ */
+
+function F(){};
+F.prototype = EventEmitter.prototype;
+Suite.prototype = new F;
+Suite.prototype.constructor = Suite;
+
+
+/**
+ * Return a clone of this `Suite`.
+ *
+ * @return {Suite}
+ * @api private
+ */
+
+Suite.prototype.clone = function(){
+  var suite = new Suite(this.title);
+  debug('clone');
+  suite.ctx = this.ctx;
+  suite.timeout(this.timeout());
+  suite.slow(this.slow());
+  suite.bail(this.bail());
+  return suite;
+};
+
+/**
+ * Set timeout `ms` or short-hand such as "2s".
+ *
+ * @param {Number|String} ms
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.timeout = function(ms){
+  if (0 == arguments.length) return this._timeout;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('timeout %d', ms);
+  this._timeout = parseInt(ms, 10);
+  return this;
+};
+
+/**
+ * Set slow `ms` or short-hand such as "2s".
+ *
+ * @param {Number|String} ms
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.slow = function(ms){
+  if (0 === arguments.length) return this._slow;
+  if ('string' == typeof ms) ms = milliseconds(ms);
+  debug('slow %d', ms);
+  this._slow = ms;
+  return this;
+};
+
+/**
+ * Sets whether to bail after first error.
+ *
+ * @parma {Boolean} bail
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.bail = function(bail){
+  if (0 == arguments.length) return this._bail;
+  debug('bail %s', bail);
+  this._bail = bail;
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` before running tests.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.beforeAll = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"before all" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._beforeAll.push(hook);
+  this.emit('beforeAll', hook);
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` after running tests.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.afterAll = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"after all" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._afterAll.push(hook);
+  this.emit('afterAll', hook);
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` before each test case.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.beforeEach = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"before each" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._beforeEach.push(hook);
+  this.emit('beforeEach', hook);
+  return this;
+};
+
+/**
+ * Run `fn(test[, done])` after each test case.
+ *
+ * @param {Function} fn
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.afterEach = function(fn){
+  if (this.pending) return this;
+  var hook = new Hook('"after each" hook', fn);
+  hook.parent = this;
+  hook.timeout(this.timeout());
+  hook.slow(this.slow());
+  hook.ctx = this.ctx;
+  this._afterEach.push(hook);
+  this.emit('afterEach', hook);
+  return this;
+};
+
+/**
+ * Add a test `suite`.
+ *
+ * @param {Suite} suite
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.addSuite = function(suite){
+  suite.parent = this;
+  suite.timeout(this.timeout());
+  suite.slow(this.slow());
+  suite.bail(this.bail());
+  this.suites.push(suite);
+  this.emit('suite', suite);
+  return this;
+};
+
+/**
+ * Add a `test` to this suite.
+ *
+ * @param {Test} test
+ * @return {Suite} for chaining
+ * @api private
+ */
+
+Suite.prototype.addTest = function(test){
+  test.parent = this;
+  test.timeout(this.timeout());
+  test.slow(this.slow());
+  test.ctx = this.ctx;
+  this.tests.push(test);
+  this.emit('test', test);
+  return this;
+};
+
+/**
+ * Return the full title generated by recursively
+ * concatenating the parent's full title.
+ *
+ * @return {String}
+ * @api public
+ */
+
+Suite.prototype.fullTitle = function(){
+  if (this.parent) {
+    var full = this.parent.fullTitle();
+    if (full) return full + ' ' + this.title;
+  }
+  return this.title;
+};
+
+/**
+ * Return the total number of tests.
+ *
+ * @return {Number}
+ * @api public
+ */
+
+Suite.prototype.total = function(){
+  return utils.reduce(this.suites, function(sum, suite){
+    return sum + suite.total();
+  }, 0) + this.tests.length;
+};
+
+/**
+ * Iterates through each suite recursively to find
+ * all tests. Applies a function in the format
+ * `fn(test)`.
+ *
+ * @param {Function} fn
+ * @return {Suite}
+ * @api private
+ */
+
+Suite.prototype.eachTest = function(fn){
+  utils.forEach(this.tests, fn);
+  utils.forEach(this.suites, function(suite){
+    suite.eachTest(fn);
+  });
+  return this;
+};
+
+}); // module: suite.js
+
+require.register("test.js", function(module, exports, require){
+
+/**
+ * Module dependencies.
+ */
+
+var Runnable = require('./runnable');
+
+/**
+ * Expose `Test`.
+ */
+
+module.exports = Test;
+
+/**
+ * Initialize a new `Test` with the given `title` and callback `fn`.
+ *
+ * @param {String} title
+ * @param {Function} fn
+ * @api private
+ */
+
+function Test(title, fn) {
+  Runnable.call(this, title, fn);
+  this.pending = !fn;
+  this.type = 'test';
+}
+
+/**
+ * Inherit from `Runnable.prototype`.
+ */
+
+function F(){};
+F.prototype = Runnable.prototype;
+Test.prototype = new F;
+Test.prototype.constructor = Test;
+
+
+}); // module: test.js
+
+require.register("utils.js", function(module, exports, require){
+/**
+ * Module dependencies.
+ */
+
+var fs = require('browser/fs')
+  , path = require('browser/path')
+  , join = path.join
+  , debug = require('browser/debug')('mocha:watch');
+
+/**
+ * Ignored directories.
+ */
+
+var ignore = ['node_modules', '.git'];
+
+/**
+ * Escape special characters in the given string of html.
+ *
+ * @param  {String} html
+ * @return {String}
+ * @api private
+ */
+
+exports.escape = function(html){
+  return String(html)
+    .replace(/&/g, '&amp;')
+    .replace(/"/g, '&quot;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
+};
+
+/**
+ * Array#forEach (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} scope
+ * @api private
+ */
+
+exports.forEach = function(arr, fn, scope){
+  for (var i = 0, l = arr.length; i < l; i++)
+    fn.call(scope, arr[i], i);
+};
+
+/**
+ * Array#map (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} scope
+ * @api private
+ */
+
+exports.map = function(arr, fn, scope){
+  var result = [];
+  for (var i = 0, l = arr.length; i < l; i++)
+    result.push(fn.call(scope, arr[i], i));
+  return result;
+};
+
+/**
+ * Array#indexOf (<=IE8)
+ *
+ * @parma {Array} arr
+ * @param {Object} obj to find index of
+ * @param {Number} start
+ * @api private
+ */
+
+exports.indexOf = function(arr, obj, start){
+  for (var i = start || 0, l = arr.length; i < l; i++) {
+    if (arr[i] === obj)
+      return i;
+  }
+  return -1;
+};
+
+/**
+ * Array#reduce (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @param {Object} initial value
+ * @api private
+ */
+
+exports.reduce = function(arr, fn, val){
+  var rval = val;
+
+  for (var i = 0, l = arr.length; i < l; i++) {
+    rval = fn(rval, arr[i], i, arr);
+  }
+
+  return rval;
+};
+
+/**
+ * Array#filter (<=IE8)
+ *
+ * @param {Array} array
+ * @param {Function} fn
+ * @api private
+ */
+
+exports.filter = function(arr, fn){
+  var ret = [];
+
+  for (var i = 0, l = arr.length; i < l; i++) {
+    var val = arr[i];
+    if (fn(val, i, arr)) ret.push(val);
+  }
+
+  return ret;
+};
+
+/**
+ * Object.keys (<=IE8)
+ *
+ * @param {Object} obj
+ * @return {Array} keys
+ * @api private
+ */
+
+exports.keys = Object.keys || function(obj) {
+  var keys = []
+    , has = Object.prototype.hasOwnProperty // for `window` on <=IE8
+
+  for (var key in obj) {
+    if (has.call(obj, key)) {
+      keys.push(key);
+    }
+  }
+
+  return keys;
+};
+
+/**
+ * Watch the given `files` for changes
+ * and invoke `fn(file)` on modification.
+ *
+ * @param {Array} files
+ * @param {Function} fn
+ * @api private
+ */
+
+exports.watch = function(files, fn){
+  var options = { interval: 100 };
+  files.forEach(function(file){
+    debug('file %s', file);
+    fs.watchFile(file, options, function(curr, prev){
+      if (prev.mtime < curr.mtime) fn(file);
+    });
+  });
+};
+
+/**
+ * Ignored files.
+ */
+
+function ignored(path){
+  return !~ignore.indexOf(path);
+}
+
+/**
+ * Lookup files in the given `dir`.
+ *
+ * @return {Array}
+ * @api private
+ */
+
+exports.files = function(dir, ret){
+  ret = ret || [];
+
+  fs.readdirSync(dir)
+  .filter(ignored)
+  .forEach(function(path){
+    path = join(dir, path);
+    if (fs.statSync(path).isDirectory()) {
+      exports.files(path, ret);
+    } else if (path.match(/\.(js|coffee|litcoffee|coffee.md)$/)) {
+      ret.push(path);
+    }
+  });
+
+  return ret;
+};
+
+/**
+ * Compute a slug from the given `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+exports.slug = function(str){
+  return str
+    .toLowerCase()
+    .replace(/ +/g, '-')
+    .replace(/[^-\w]/g, '');
+};
+
+/**
+ * Strip the function definition from `str`,
+ * and re-indent for pre whitespace.
+ */
+
+exports.clean = function(str) {
+  str = str
+    .replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, '')
+    .replace(/^function *\(.*\) *{/, '')
+    .replace(/\s+\}$/, '');
+
+  var spaces = str.match(/^\n?( *)/)[1].length
+    , tabs = str.match(/^\n?(\t*)/)[1].length
+    , re = new RegExp('^\n?' + (tabs ? '\t' : ' ') + '{' + (tabs ? tabs : spaces) + '}', 'gm');
+
+  str = str.replace(re, '');
+
+  return exports.trim(str);
+};
+
+/**
+ * Escape regular expression characters in `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+exports.escapeRegexp = function(str){
+  return str.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&");
+};
+
+/**
+ * Trim the given `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+exports.trim = function(str){
+  return str.replace(/^\s+|\s+$/g, '');
+};
+
+/**
+ * Parse the given `qs`.
+ *
+ * @param {String} qs
+ * @return {Object}
+ * @api private
+ */
+
+exports.parseQuery = function(qs){
+  return exports.reduce(qs.replace('?', '').split('&'), function(obj, pair){
+    var i = pair.indexOf('=')
+      , key = pair.slice(0, i)
+      , val = pair.slice(++i);
+
+    obj[key] = decodeURIComponent(val);
+    return obj;
+  }, {});
+};
+
+/**
+ * Highlight the given string of `js`.
+ *
+ * @param {String} js
+ * @return {String}
+ * @api private
+ */
+
+function highlight(js) {
+  return js
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/\/\/(.*)/gm, '<span class="comment">//$1</span>')
+    .replace(/('.*?')/gm, '<span class="string">$1</span>')
+    .replace(/(\d+\.\d+)/gm, '<span class="number">$1</span>')
+    .replace(/(\d+)/gm, '<span class="number">$1</span>')
+    .replace(/\bnew *(\w+)/gm, '<span class="keyword">new</span> <span class="init">$1</span>')
+    .replace(/\b(function|new|throw|return|var|if|else)\b/gm, '<span class="keyword">$1</span>')
+}
+
+/**
+ * Highlight the contents of tag `name`.
+ *
+ * @param {String} name
+ * @api private
+ */
+
+exports.highlightTags = function(name) {
+  var code = document.getElementsByTagName(name);
+  for (var i = 0, len = code.length; i < len; ++i) {
+    code[i].innerHTML = highlight(code[i].innerHTML);
+  }
+};
+
+}); // module: utils.js
+// The global object is "self" in Web Workers.
+global = (function() { return this; })();
+
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+
+var Date = global.Date;
+var setTimeout = global.setTimeout;
+var setInterval = global.setInterval;
+var clearTimeout = global.clearTimeout;
+var clearInterval = global.clearInterval;
+
+/**
+ * Node shims.
+ *
+ * These are meant only to allow
+ * mocha.js to run untouched, not
+ * to allow running node code in
+ * the browser.
+ */
+
+var process = {};
+process.exit = function(status){};
+process.stdout = {};
+
+var uncaughtExceptionHandlers = [];
+
+/**
+ * Remove uncaughtException listener.
+ */
+
+process.removeListener = function(e, fn){
+  if ('uncaughtException' == e) {
+    global.onerror = function() {};
+    var i = Mocha.utils.indexOf(uncaughtExceptionHandlers, fn);
+    if (i != -1) { uncaughtExceptionHandlers.splice(i, 1); }
+  }
+};
+
+/**
+ * Implements uncaughtException listener.
+ */
+
+process.on = function(e, fn){
+  if ('uncaughtException' == e) {
+    global.onerror = function(err, url, line){
+      fn(new Error(err + ' (' + url + ':' + line + ')'));
+      return true;
+    };
+    uncaughtExceptionHandlers.push(fn);
+  }
+};
+
+/**
+ * Expose mocha.
+ */
+
+var Mocha = global.Mocha = require('mocha'),
+    mocha = global.mocha = new Mocha({ reporter: 'html' });
+
+// The BDD UI is registered by default, but no UI will be functional in the
+// browser without an explicit call to the overridden `mocha.ui` (see below).
+// Ensure that this default UI does not expose its methods to the global scope.
+mocha.suite.removeAllListeners('pre-require');
+
+var immediateQueue = []
+  , immediateTimeout;
+
+function timeslice() {
+  var immediateStart = new Date().getTime();
+  while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
+    immediateQueue.shift()();
+  }
+  if (immediateQueue.length) {
+    immediateTimeout = setTimeout(timeslice, 0);
+  } else {
+    immediateTimeout = null;
+  }
+}
+
+/**
+ * High-performance override of Runner.immediately.
+ */
+
+Mocha.Runner.immediately = function(callback) {
+  immediateQueue.push(callback);
+  if (!immediateTimeout) {
+    immediateTimeout = setTimeout(timeslice, 0);
+  }
+};
+
+/**
+ * Function to allow assertion libraries to throw errors directly into mocha.
+ * This is useful when running tests in a browser because window.onerror will
+ * only receive the 'message' attribute of the Error.
+ */
+mocha.throwError = function(err) {
+  Mocha.utils.forEach(uncaughtExceptionHandlers, function (fn) {
+    fn(err);
+  });
+  throw err;
+};
+
+/**
+ * Override ui to ensure that the ui functions are initialized.
+ * Normally this would happen in Mocha.prototype.loadFiles.
+ */
+
+mocha.ui = function(ui){
+  Mocha.prototype.ui.call(this, ui);
+  this.suite.emit('pre-require', global, null, this);
+  return this;
+};
+
+/**
+ * Setup mocha with the given setting options.
+ */
+
+mocha.setup = function(opts){
+  if ('string' == typeof opts) opts = { ui: opts };
+  for (var opt in opts) this[opt](opts[opt]);
+  return this;
+};
+
+/**
+ * Run mocha, returning the Runner.
+ */
+
+mocha.run = function(fn){
+  var options = mocha.options;
+  mocha.globals('location');
+
+  var query = Mocha.utils.parseQuery(global.location.search || '');
+  if (query.grep) mocha.grep(query.grep);
+  if (query.invert) mocha.invert();
+
+  return Mocha.prototype.run.call(mocha, function(){
+    // The DOM Document is not available in Web Workers.
+    if (global.document) {
+      Mocha.utils.highlightTags('code');
+    }
+    if (fn) fn();
+  });
+};
+
+/**
+ * Expose the process shim.
+ */
+
+Mocha.process = process;
+})();
\ No newline at end of file
diff --git a/test/vendor/sinon-1.9.0.js b/test/vendor/sinon-1.9.0.js
new file mode 100644
index 000000000000..428b729b649b
--- /dev/null
+++ b/test/vendor/sinon-1.9.0.js
@@ -0,0 +1,4794 @@
+/**
+ * Sinon.JS 1.9.0, 2014/03/05
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
+ *
+ * (The BSD License)
+ * 
+ * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of Christian Johansen nor the names of his contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+this.sinon = (function () {
+var samsam, formatio;
+function define(mod, deps, fn) { if (mod == "samsam") { samsam = deps(); } else { formatio = fn(samsam); } }
+define.amd = true;
+((typeof define === "function" && define.amd && function (m) { define("samsam", m); }) ||
+ (typeof module === "object" &&
+      function (m) { module.exports = m(); }) || // Node
+ function (m) { this.samsam = m(); } // Browser globals
+)(function () {
+    var o = Object.prototype;
+    var div = typeof document !== "undefined" && document.createElement("div");
+
+    function isNaN(value) {
+        // Unlike global isNaN, this avoids type coercion
+        // typeof check avoids IE host object issues, hat tip to
+        // lodash
+        var val = value; // JsLint thinks value !== value is "weird"
+        return typeof value === "number" && value !== val;
+    }
+
+    function getClass(value) {
+        // Returns the internal [[Class]] by calling Object.prototype.toString
+        // with the provided value as this. Return value is a string, naming the
+        // internal class, e.g. "Array"
+        return o.toString.call(value).split(/[ \]]/)[1];
+    }
+
+    /**
+     * @name samsam.isArguments
+     * @param Object object
+     *
+     * Returns ``true`` if ``object`` is an ``arguments`` object,
+     * ``false`` otherwise.
+     */
+    function isArguments(object) {
+        if (typeof object !== "object" || typeof object.length !== "number" ||
+                getClass(object) === "Array") {
+            return false;
+        }
+        if (typeof object.callee == "function") { return true; }
+        try {
+            object[object.length] = 6;
+            delete object[object.length];
+        } catch (e) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @name samsam.isElement
+     * @param Object object
+     *
+     * Returns ``true`` if ``object`` is a DOM element node. Unlike
+     * Underscore.js/lodash, this function will return ``false`` if ``object``
+     * is an *element-like* object, i.e. a regular object with a ``nodeType``
+     * property that holds the value ``1``.
+     */
+    function isElement(object) {
+        if (!object || object.nodeType !== 1 || !div) { return false; }
+        try {
+            object.appendChild(div);
+            object.removeChild(div);
+        } catch (e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @name samsam.keys
+     * @param Object object
+     *
+     * Return an array of own property names.
+     */
+    function keys(object) {
+        var ks = [], prop;
+        for (prop in object) {
+            if (o.hasOwnProperty.call(object, prop)) { ks.push(prop); }
+        }
+        return ks;
+    }
+
+    /**
+     * @name samsam.isDate
+     * @param Object value
+     *
+     * Returns true if the object is a ``Date``, or *date-like*. Duck typing
+     * of date objects work by checking that the object has a ``getTime``
+     * function whose return value equals the return value from the object's
+     * ``valueOf``.
+     */
+    function isDate(value) {
+        return typeof value.getTime == "function" &&
+            value.getTime() == value.valueOf();
+    }
+
+    /**
+     * @name samsam.isNegZero
+     * @param Object value
+     *
+     * Returns ``true`` if ``value`` is ``-0``.
+     */
+    function isNegZero(value) {
+        return value === 0 && 1 / value === -Infinity;
+    }
+
+    /**
+     * @name samsam.equal
+     * @param Object obj1
+     * @param Object obj2
+     *
+     * Returns ``true`` if two objects are strictly equal. Compared to
+     * ``===`` there are two exceptions:
+     *
+     *   - NaN is considered equal to NaN
+     *   - -0 and +0 are not considered equal
+     */
+    function identical(obj1, obj2) {
+        if (obj1 === obj2 || (isNaN(obj1) && isNaN(obj2))) {
+            return obj1 !== 0 || isNegZero(obj1) === isNegZero(obj2);
+        }
+    }
+
+
+    /**
+     * @name samsam.deepEqual
+     * @param Object obj1
+     * @param Object obj2
+     *
+     * Deep equal comparison. Two values are "deep equal" if:
+     *
+     *   - They are equal, according to samsam.identical
+     *   - They are both date objects representing the same time
+     *   - They are both arrays containing elements that are all deepEqual
+     *   - They are objects with the same set of properties, and each property
+     *     in ``obj1`` is deepEqual to the corresponding property in ``obj2``
+     *
+     * Supports cyclic objects.
+     */
+    function deepEqualCyclic(obj1, obj2) {
+
+        // used for cyclic comparison
+        // contain already visited objects
+        var objects1 = [],
+            objects2 = [],
+        // contain pathes (position in the object structure)
+        // of the already visited objects
+        // indexes same as in objects arrays
+            paths1 = [],
+            paths2 = [],
+        // contains combinations of already compared objects
+        // in the manner: { "$1['ref']$2['ref']": true }
+            compared = {};
+
+        /**
+         * used to check, if the value of a property is an object
+         * (cyclic logic is only needed for objects)
+         * only needed for cyclic logic
+         */
+        function isObject(value) {
+
+            if (typeof value === 'object' && value !== null &&
+                    !(value instanceof Boolean) &&
+                    !(value instanceof Date)    &&
+                    !(value instanceof Number)  &&
+                    !(value instanceof RegExp)  &&
+                    !(value instanceof String)) {
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * returns the index of the given object in the
+         * given objects array, -1 if not contained
+         * only needed for cyclic logic
+         */
+        function getIndex(objects, obj) {
+
+            var i;
+            for (i = 0; i < objects.length; i++) {
+                if (objects[i] === obj) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        // does the recursion for the deep equal check
+        return (function deepEqual(obj1, obj2, path1, path2) {
+            var type1 = typeof obj1;
+            var type2 = typeof obj2;
+
+            // == null also matches undefined
+            if (obj1 === obj2 ||
+                    isNaN(obj1) || isNaN(obj2) ||
+                    obj1 == null || obj2 == null ||
+                    type1 !== "object" || type2 !== "object") {
+
+                return identical(obj1, obj2);
+            }
+
+            // Elements are only equal if identical(expected, actual)
+            if (isElement(obj1) || isElement(obj2)) { return false; }
+
+            var isDate1 = isDate(obj1), isDate2 = isDate(obj2);
+            if (isDate1 || isDate2) {
+                if (!isDate1 || !isDate2 || obj1.getTime() !== obj2.getTime()) {
+                    return false;
+                }
+            }
+
+            if (obj1 instanceof RegExp && obj2 instanceof RegExp) {
+                if (obj1.toString() !== obj2.toString()) { return false; }
+            }
+
+            var class1 = getClass(obj1);
+            var class2 = getClass(obj2);
+            var keys1 = keys(obj1);
+            var keys2 = keys(obj2);
+
+            if (isArguments(obj1) || isArguments(obj2)) {
+                if (obj1.length !== obj2.length) { return false; }
+            } else {
+                if (type1 !== type2 || class1 !== class2 ||
+                        keys1.length !== keys2.length) {
+                    return false;
+                }
+            }
+
+            var key, i, l,
+                // following vars are used for the cyclic logic
+                value1, value2,
+                isObject1, isObject2,
+                index1, index2,
+                newPath1, newPath2;
+
+            for (i = 0, l = keys1.length; i < l; i++) {
+                key = keys1[i];
+                if (!o.hasOwnProperty.call(obj2, key)) {
+                    return false;
+                }
+
+                // Start of the cyclic logic
+
+                value1 = obj1[key];
+                value2 = obj2[key];
+
+                isObject1 = isObject(value1);
+                isObject2 = isObject(value2);
+
+                // determine, if the objects were already visited
+                // (it's faster to check for isObject first, than to
+                // get -1 from getIndex for non objects)
+                index1 = isObject1 ? getIndex(objects1, value1) : -1;
+                index2 = isObject2 ? getIndex(objects2, value2) : -1;
+
+                // determine the new pathes of the objects
+                // - for non cyclic objects the current path will be extended
+                //   by current property name
+                // - for cyclic objects the stored path is taken
+                newPath1 = index1 !== -1
+                    ? paths1[index1]
+                    : path1 + '[' + JSON.stringify(key) + ']';
+                newPath2 = index2 !== -1
+                    ? paths2[index2]
+                    : path2 + '[' + JSON.stringify(key) + ']';
+
+                // stop recursion if current objects are already compared
+                if (compared[newPath1 + newPath2]) {
+                    return true;
+                }
+
+                // remember the current objects and their pathes
+                if (index1 === -1 && isObject1) {
+                    objects1.push(value1);
+                    paths1.push(newPath1);
+                }
+                if (index2 === -1 && isObject2) {
+                    objects2.push(value2);
+                    paths2.push(newPath2);
+                }
+
+                // remember that the current objects are already compared
+                if (isObject1 && isObject2) {
+                    compared[newPath1 + newPath2] = true;
+                }
+
+                // End of cyclic logic
+
+                // neither value1 nor value2 is a cycle
+                // continue with next level
+                if (!deepEqual(value1, value2, newPath1, newPath2)) {
+                    return false;
+                }
+            }
+
+            return true;
+
+        }(obj1, obj2, '$1', '$2'));
+    }
+
+    var match;
+
+    function arrayContains(array, subset) {
+        if (subset.length === 0) { return true; }
+        var i, l, j, k;
+        for (i = 0, l = array.length; i < l; ++i) {
+            if (match(array[i], subset[0])) {
+                for (j = 0, k = subset.length; j < k; ++j) {
+                    if (!match(array[i + j], subset[j])) { return false; }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @name samsam.match
+     * @param Object object
+     * @param Object matcher
+     *
+     * Compare arbitrary value ``object`` with matcher.
+     */
+    match = function match(object, matcher) {
+        if (matcher && typeof matcher.test === "function") {
+            return matcher.test(object);
+        }
+
+        if (typeof matcher === "function") {
+            return matcher(object) === true;
+        }
+
+        if (typeof matcher === "string") {
+            matcher = matcher.toLowerCase();
+            var notNull = typeof object === "string" || !!object;
+            return notNull &&
+                (String(object)).toLowerCase().indexOf(matcher) >= 0;
+        }
+
+        if (typeof matcher === "number") {
+            return matcher === object;
+        }
+
+        if (typeof matcher === "boolean") {
+            return matcher === object;
+        }
+
+        if (getClass(object) === "Array" && getClass(matcher) === "Array") {
+            return arrayContains(object, matcher);
+        }
+
+        if (matcher && typeof matcher === "object") {
+            var prop;
+            for (prop in matcher) {
+                if (!match(object[prop], matcher[prop])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        throw new Error("Matcher was not a string, a number, a " +
+                        "function, a boolean or an object");
+    };
+
+    return {
+        isArguments: isArguments,
+        isElement: isElement,
+        isDate: isDate,
+        isNegZero: isNegZero,
+        identical: identical,
+        deepEqual: deepEqualCyclic,
+        match: match,
+        keys: keys
+    };
+});
+((typeof define === "function" && define.amd && function (m) {
+    define("formatio", ["samsam"], m);
+}) || (typeof module === "object" && function (m) {
+    module.exports = m(require("samsam"));
+}) || function (m) { this.formatio = m(this.samsam); }
+)(function (samsam) {
+    
+    var formatio = {
+        excludeConstructors: ["Object", /^.$/],
+        quoteStrings: true
+    };
+
+    var hasOwn = Object.prototype.hasOwnProperty;
+
+    var specialObjects = [];
+    if (typeof global !== "undefined") {
+        specialObjects.push({ object: global, value: "[object global]" });
+    }
+    if (typeof document !== "undefined") {
+        specialObjects.push({
+            object: document,
+            value: "[object HTMLDocument]"
+        });
+    }
+    if (typeof window !== "undefined") {
+        specialObjects.push({ object: window, value: "[object Window]" });
+    }
+
+    function functionName(func) {
+        if (!func) { return ""; }
+        if (func.displayName) { return func.displayName; }
+        if (func.name) { return func.name; }
+        var matches = func.toString().match(/function\s+([^\(]+)/m);
+        return (matches && matches[1]) || "";
+    }
+
+    function constructorName(f, object) {
+        var name = functionName(object && object.constructor);
+        var excludes = f.excludeConstructors ||
+                formatio.excludeConstructors || [];
+
+        var i, l;
+        for (i = 0, l = excludes.length; i < l; ++i) {
+            if (typeof excludes[i] === "string" && excludes[i] === name) {
+                return "";
+            } else if (excludes[i].test && excludes[i].test(name)) {
+                return "";
+            }
+        }
+
+        return name;
+    }
+
+    function isCircular(object, objects) {
+        if (typeof object !== "object") { return false; }
+        var i, l;
+        for (i = 0, l = objects.length; i < l; ++i) {
+            if (objects[i] === object) { return true; }
+        }
+        return false;
+    }
+
+    function ascii(f, object, processed, indent) {
+        if (typeof object === "string") {
+            var qs = f.quoteStrings;
+            var quote = typeof qs !== "boolean" || qs;
+            return processed || quote ? '"' + object + '"' : object;
+        }
+
+        if (typeof object === "function" && !(object instanceof RegExp)) {
+            return ascii.func(object);
+        }
+
+        processed = processed || [];
+
+        if (isCircular(object, processed)) { return "[Circular]"; }
+
+        if (Object.prototype.toString.call(object) === "[object Array]") {
+            return ascii.array.call(f, object, processed);
+        }
+
+        if (!object) { return String((1/object) === -Infinity ? "-0" : object); }
+        if (samsam.isElement(object)) { return ascii.element(object); }
+
+        if (typeof object.toString === "function" &&
+                object.toString !== Object.prototype.toString) {
+            return object.toString();
+        }
+
+        var i, l;
+        for (i = 0, l = specialObjects.length; i < l; i++) {
+            if (object === specialObjects[i].object) {
+                return specialObjects[i].value;
+            }
+        }
+
+        return ascii.object.call(f, object, processed, indent);
+    }
+
+    ascii.func = function (func) {
+        return "function " + functionName(func) + "() {}";
+    };
+
+    ascii.array = function (array, processed) {
+        processed = processed || [];
+        processed.push(array);
+        var i, l, pieces = [];
+        for (i = 0, l = array.length; i < l; ++i) {
+            pieces.push(ascii(this, array[i], processed));
+        }
+        return "[" + pieces.join(", ") + "]";
+    };
+
+    ascii.object = function (object, processed, indent) {
+        processed = processed || [];
+        processed.push(object);
+        indent = indent || 0;
+        var pieces = [], properties = samsam.keys(object).sort();
+        var length = 3;
+        var prop, str, obj, i, l;
+
+        for (i = 0, l = properties.length; i < l; ++i) {
+            prop = properties[i];
+            obj = object[prop];
+
+            if (isCircular(obj, processed)) {
+                str = "[Circular]";
+            } else {
+                str = ascii(this, obj, processed, indent + 2);
+            }
+
+            str = (/\s/.test(prop) ? '"' + prop + '"' : prop) + ": " + str;
+            length += str.length;
+            pieces.push(str);
+        }
+
+        var cons = constructorName(this, object);
+        var prefix = cons ? "[" + cons + "] " : "";
+        var is = "";
+        for (i = 0, l = indent; i < l; ++i) { is += " "; }
+
+        if (length + indent > 80) {
+            return prefix + "{\n  " + is + pieces.join(",\n  " + is) + "\n" +
+                is + "}";
+        }
+        return prefix + "{ " + pieces.join(", ") + " }";
+    };
+
+    ascii.element = function (element) {
+        var tagName = element.tagName.toLowerCase();
+        var attrs = element.attributes, attr, pairs = [], attrName, i, l, val;
+
+        for (i = 0, l = attrs.length; i < l; ++i) {
+            attr = attrs.item(i);
+            attrName = attr.nodeName.toLowerCase().replace("html:", "");
+            val = attr.nodeValue;
+            if (attrName !== "contenteditable" || val !== "inherit") {
+                if (!!val) { pairs.push(attrName + "=\"" + val + "\""); }
+            }
+        }
+
+        var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
+        var content = element.innerHTML;
+
+        if (content.length > 20) {
+            content = content.substr(0, 20) + "[...]";
+        }
+
+        var res = formatted + pairs.join(" ") + ">" + content +
+                "</" + tagName + ">";
+
+        return res.replace(/ contentEditable="inherit"/, "");
+    };
+
+    function Formatio(options) {
+        for (var opt in options) {
+            this[opt] = options[opt];
+        }
+    }
+
+    Formatio.prototype = {
+        functionName: functionName,
+
+        configure: function (options) {
+            return new Formatio(options);
+        },
+
+        constructorName: function (object) {
+            return constructorName(this, object);
+        },
+
+        ascii: function (object, processed, indent) {
+            return ascii(this, object, processed, indent);
+        }
+    };
+
+    return Formatio.prototype;
+});
+/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
+/*global module, require, __dirname, document*/
+/**
+ * Sinon core utilities. For internal use only.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+var sinon = (function (formatio) {
+    var div = typeof document != "undefined" && document.createElement("div");
+    var hasOwn = Object.prototype.hasOwnProperty;
+
+    function isDOMNode(obj) {
+        var success = false;
+
+        try {
+            obj.appendChild(div);
+            success = div.parentNode == obj;
+        } catch (e) {
+            return false;
+        } finally {
+            try {
+                obj.removeChild(div);
+            } catch (e) {
+                // Remove failed, not much we can do about that
+            }
+        }
+
+        return success;
+    }
+
+    function isElement(obj) {
+        return div && obj && obj.nodeType === 1 && isDOMNode(obj);
+    }
+
+    function isFunction(obj) {
+        return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
+    }
+
+    function mirrorProperties(target, source) {
+        for (var prop in source) {
+            if (!hasOwn.call(target, prop)) {
+                target[prop] = source[prop];
+            }
+        }
+    }
+
+    function isRestorable (obj) {
+        return typeof obj === "function" && typeof obj.restore === "function" && obj.restore.sinon;
+    }
+
+    var sinon = {
+        wrapMethod: function wrapMethod(object, property, method) {
+            if (!object) {
+                throw new TypeError("Should wrap property of object");
+            }
+
+            if (typeof method != "function") {
+                throw new TypeError("Method wrapper should be function");
+            }
+
+            var wrappedMethod = object[property],
+                error;
+
+            if (!isFunction(wrappedMethod)) {
+                error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
+                                    property + " as function");
+            }
+
+            if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
+                error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
+            }
+
+            if (wrappedMethod.calledBefore) {
+                var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
+                error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
+            }
+
+            if (error) {
+                if (wrappedMethod._stack) {
+                    error.stack += '\n--------------\n' + wrappedMethod._stack;
+                }
+                throw error;
+            }
+
+            // IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
+            // when using hasOwn.call on objects from other frames.
+            var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
+            object[property] = method;
+            method.displayName = property;
+            // Set up a stack trace which can be used later to find what line of
+            // code the original method was created on.
+            method._stack = (new Error('Stack Trace for original')).stack;
+
+            method.restore = function () {
+                // For prototype properties try to reset by delete first.
+                // If this fails (ex: localStorage on mobile safari) then force a reset
+                // via direct assignment.
+                if (!owned) {
+                    delete object[property];
+                }
+                if (object[property] === method) {
+                    object[property] = wrappedMethod;
+                }
+            };
+
+            method.restore.sinon = true;
+            mirrorProperties(method, wrappedMethod);
+
+            return method;
+        },
+
+        extend: function extend(target) {
+            for (var i = 1, l = arguments.length; i < l; i += 1) {
+                for (var prop in arguments[i]) {
+                    if (arguments[i].hasOwnProperty(prop)) {
+                        target[prop] = arguments[i][prop];
+                    }
+
+                    // DONT ENUM bug, only care about toString
+                    if (arguments[i].hasOwnProperty("toString") &&
+                        arguments[i].toString != target.toString) {
+                        target.toString = arguments[i].toString;
+                    }
+                }
+            }
+
+            return target;
+        },
+
+        create: function create(proto) {
+            var F = function () {};
+            F.prototype = proto;
+            return new F();
+        },
+
+        deepEqual: function deepEqual(a, b) {
+            if (sinon.match && sinon.match.isMatcher(a)) {
+                return a.test(b);
+            }
+            if (typeof a != "object" || typeof b != "object") {
+                return a === b;
+            }
+
+            if (isElement(a) || isElement(b)) {
+                return a === b;
+            }
+
+            if (a === b) {
+                return true;
+            }
+
+            if ((a === null && b !== null) || (a !== null && b === null)) {
+                return false;
+            }
+
+            if (a instanceof RegExp && b instanceof RegExp) {
+              return (a.source === b.source) && (a.global === b.global) && 
+                (a.ignoreCase === b.ignoreCase) && (a.multiline === b.multiline);
+            }
+
+            var aString = Object.prototype.toString.call(a);
+            if (aString != Object.prototype.toString.call(b)) {
+                return false;
+            }
+
+            if (aString == "[object Date]") {
+                return a.valueOf() === b.valueOf();
+            }
+
+            var prop, aLength = 0, bLength = 0;
+
+            if (aString == "[object Array]" && a.length !== b.length) {
+                return false;
+            }
+
+            for (prop in a) {
+                aLength += 1;
+
+                if (!deepEqual(a[prop], b[prop])) {
+                    return false;
+                }
+            }
+
+            for (prop in b) {
+                bLength += 1;
+            }
+
+            return aLength == bLength;
+        },
+
+        functionName: function functionName(func) {
+            var name = func.displayName || func.name;
+
+            // Use function decomposition as a last resort to get function
+            // name. Does not rely on function decomposition to work - if it
+            // doesn't debugging will be slightly less informative
+            // (i.e. toString will say 'spy' rather than 'myFunc').
+            if (!name) {
+                var matches = func.toString().match(/function ([^\s\(]+)/);
+                name = matches && matches[1];
+            }
+
+            return name;
+        },
+
+        functionToString: function toString() {
+            if (this.getCall && this.callCount) {
+                var thisValue, prop, i = this.callCount;
+
+                while (i--) {
+                    thisValue = this.getCall(i).thisValue;
+
+                    for (prop in thisValue) {
+                        if (thisValue[prop] === this) {
+                            return prop;
+                        }
+                    }
+                }
+            }
+
+            return this.displayName || "sinon fake";
+        },
+
+        getConfig: function (custom) {
+            var config = {};
+            custom = custom || {};
+            var defaults = sinon.defaultConfig;
+
+            for (var prop in defaults) {
+                if (defaults.hasOwnProperty(prop)) {
+                    config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
+                }
+            }
+
+            return config;
+        },
+
+        format: function (val) {
+            return "" + val;
+        },
+
+        defaultConfig: {
+            injectIntoThis: true,
+            injectInto: null,
+            properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+            useFakeTimers: true,
+            useFakeServer: true
+        },
+
+        timesInWords: function timesInWords(count) {
+            return count == 1 && "once" ||
+                count == 2 && "twice" ||
+                count == 3 && "thrice" ||
+                (count || 0) + " times";
+        },
+
+        calledInOrder: function (spies) {
+            for (var i = 1, l = spies.length; i < l; i++) {
+                if (!spies[i - 1].calledBefore(spies[i]) || !spies[i].called) {
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        orderByFirstCall: function (spies) {
+            return spies.sort(function (a, b) {
+                // uuid, won't ever be equal
+                var aCall = a.getCall(0);
+                var bCall = b.getCall(0);
+                var aId = aCall && aCall.callId || -1;
+                var bId = bCall && bCall.callId || -1;
+
+                return aId < bId ? -1 : 1;
+            });
+        },
+
+        log: function () {},
+
+        logError: function (label, err) {
+            var msg = label + " threw exception: ";
+            sinon.log(msg + "[" + err.name + "] " + err.message);
+            if (err.stack) { sinon.log(err.stack); }
+
+            setTimeout(function () {
+                err.message = msg + err.message;
+                throw err;
+            }, 0);
+        },
+
+        typeOf: function (value) {
+            if (value === null) {
+                return "null";
+            }
+            else if (value === undefined) {
+                return "undefined";
+            }
+            var string = Object.prototype.toString.call(value);
+            return string.substring(8, string.length - 1).toLowerCase();
+        },
+
+        createStubInstance: function (constructor) {
+            if (typeof constructor !== "function") {
+                throw new TypeError("The constructor should be a function.");
+            }
+            return sinon.stub(sinon.create(constructor.prototype));
+        },
+
+        restore: function (object) {
+            if (object !== null && typeof object === "object") {
+                for (var prop in object) {
+                    if (isRestorable(object[prop])) {
+                        object[prop].restore();
+                    }
+                }
+            }
+            else if (isRestorable(object)) {
+                object.restore();
+            }
+        }
+    };
+
+    var isNode = typeof module !== "undefined" && module.exports;
+    var isAMD = typeof define === 'function' && typeof define.amd === 'object' && define.amd;
+
+    if (isAMD) {
+        define(function(){
+            return sinon;
+        });
+    } else if (isNode) {
+        try {
+            formatio = require("formatio");
+        } catch (e) {}
+        module.exports = sinon;
+        module.exports.spy = require("./sinon/spy");
+        module.exports.spyCall = require("./sinon/call");
+        module.exports.behavior = require("./sinon/behavior");
+        module.exports.stub = require("./sinon/stub");
+        module.exports.mock = require("./sinon/mock");
+        module.exports.collection = require("./sinon/collection");
+        module.exports.assert = require("./sinon/assert");
+        module.exports.sandbox = require("./sinon/sandbox");
+        module.exports.test = require("./sinon/test");
+        module.exports.testCase = require("./sinon/test_case");
+        module.exports.assert = require("./sinon/assert");
+        module.exports.match = require("./sinon/match");
+    }
+
+    if (formatio) {
+        var formatter = formatio.configure({ quoteStrings: false });
+        sinon.format = function () {
+            return formatter.ascii.apply(formatter, arguments);
+        };
+    } else if (isNode) {
+        try {
+            var util = require("util");
+            sinon.format = function (value) {
+                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
+            };
+        } catch (e) {
+            /* Node, but no util module - would be very old, but better safe than
+             sorry */
+        }
+    }
+
+    return sinon;
+}(typeof formatio == "object" && formatio));
+
+/* @depend ../sinon.js */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Match functions
+ *
+ * @author Maximilian Antoni (mail@maxantoni.de)
+ * @license BSD
+ *
+ * Copyright (c) 2012 Maximilian Antoni
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function assertType(value, type, name) {
+        var actual = sinon.typeOf(value);
+        if (actual !== type) {
+            throw new TypeError("Expected type of " + name + " to be " +
+                type + ", but was " + actual);
+        }
+    }
+
+    var matcher = {
+        toString: function () {
+            return this.message;
+        }
+    };
+
+    function isMatcher(object) {
+        return matcher.isPrototypeOf(object);
+    }
+
+    function matchObject(expectation, actual) {
+        if (actual === null || actual === undefined) {
+            return false;
+        }
+        for (var key in expectation) {
+            if (expectation.hasOwnProperty(key)) {
+                var exp = expectation[key];
+                var act = actual[key];
+                if (match.isMatcher(exp)) {
+                    if (!exp.test(act)) {
+                        return false;
+                    }
+                } else if (sinon.typeOf(exp) === "object") {
+                    if (!matchObject(exp, act)) {
+                        return false;
+                    }
+                } else if (!sinon.deepEqual(exp, act)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    matcher.or = function (m2) {
+        if (!arguments.length) {
+            throw new TypeError("Matcher expected");
+        } else if (!isMatcher(m2)) {
+            m2 = match(m2);
+        }
+        var m1 = this;
+        var or = sinon.create(matcher);
+        or.test = function (actual) {
+            return m1.test(actual) || m2.test(actual);
+        };
+        or.message = m1.message + ".or(" + m2.message + ")";
+        return or;
+    };
+
+    matcher.and = function (m2) {
+        if (!arguments.length) {
+            throw new TypeError("Matcher expected");
+        } else if (!isMatcher(m2)) {
+            m2 = match(m2);
+        }
+        var m1 = this;
+        var and = sinon.create(matcher);
+        and.test = function (actual) {
+            return m1.test(actual) && m2.test(actual);
+        };
+        and.message = m1.message + ".and(" + m2.message + ")";
+        return and;
+    };
+
+    var match = function (expectation, message) {
+        var m = sinon.create(matcher);
+        var type = sinon.typeOf(expectation);
+        switch (type) {
+        case "object":
+            if (typeof expectation.test === "function") {
+                m.test = function (actual) {
+                    return expectation.test(actual) === true;
+                };
+                m.message = "match(" + sinon.functionName(expectation.test) + ")";
+                return m;
+            }
+            var str = [];
+            for (var key in expectation) {
+                if (expectation.hasOwnProperty(key)) {
+                    str.push(key + ": " + expectation[key]);
+                }
+            }
+            m.test = function (actual) {
+                return matchObject(expectation, actual);
+            };
+            m.message = "match(" + str.join(", ") + ")";
+            break;
+        case "number":
+            m.test = function (actual) {
+                return expectation == actual;
+            };
+            break;
+        case "string":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return actual.indexOf(expectation) !== -1;
+            };
+            m.message = "match(\"" + expectation + "\")";
+            break;
+        case "regexp":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return expectation.test(actual);
+            };
+            break;
+        case "function":
+            m.test = expectation;
+            if (message) {
+                m.message = message;
+            } else {
+                m.message = "match(" + sinon.functionName(expectation) + ")";
+            }
+            break;
+        default:
+            m.test = function (actual) {
+              return sinon.deepEqual(expectation, actual);
+            };
+        }
+        if (!m.message) {
+            m.message = "match(" + expectation + ")";
+        }
+        return m;
+    };
+
+    match.isMatcher = isMatcher;
+
+    match.any = match(function () {
+        return true;
+    }, "any");
+
+    match.defined = match(function (actual) {
+        return actual !== null && actual !== undefined;
+    }, "defined");
+
+    match.truthy = match(function (actual) {
+        return !!actual;
+    }, "truthy");
+
+    match.falsy = match(function (actual) {
+        return !actual;
+    }, "falsy");
+
+    match.same = function (expectation) {
+        return match(function (actual) {
+            return expectation === actual;
+        }, "same(" + expectation + ")");
+    };
+
+    match.typeOf = function (type) {
+        assertType(type, "string", "type");
+        return match(function (actual) {
+            return sinon.typeOf(actual) === type;
+        }, "typeOf(\"" + type + "\")");
+    };
+
+    match.instanceOf = function (type) {
+        assertType(type, "function", "type");
+        return match(function (actual) {
+            return actual instanceof type;
+        }, "instanceOf(" + sinon.functionName(type) + ")");
+    };
+
+    function createPropertyMatcher(propertyTest, messagePrefix) {
+        return function (property, value) {
+            assertType(property, "string", "property");
+            var onlyProperty = arguments.length === 1;
+            var message = messagePrefix + "(\"" + property + "\"";
+            if (!onlyProperty) {
+                message += ", " + value;
+            }
+            message += ")";
+            return match(function (actual) {
+                if (actual === undefined || actual === null ||
+                        !propertyTest(actual, property)) {
+                    return false;
+                }
+                return onlyProperty || sinon.deepEqual(value, actual[property]);
+            }, message);
+        };
+    }
+
+    match.has = createPropertyMatcher(function (actual, property) {
+        if (typeof actual === "object") {
+            return property in actual;
+        }
+        return actual[property] !== undefined;
+    }, "has");
+
+    match.hasOwn = createPropertyMatcher(function (actual, property) {
+        return actual.hasOwnProperty(property);
+    }, "hasOwn");
+
+    match.bool = match.typeOf("boolean");
+    match.number = match.typeOf("number");
+    match.string = match.typeOf("string");
+    match.object = match.typeOf("object");
+    match.func = match.typeOf("function");
+    match.array = match.typeOf("array");
+    match.regexp = match.typeOf("regexp");
+    match.date = match.typeOf("date");
+
+    if (commonJSModule) {
+        module.exports = match;
+    } else {
+        sinon.match = match;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+  * @depend ../sinon.js
+  * @depend match.js
+  */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+  * Spy calls
+  *
+  * @author Christian Johansen (christian@cjohansen.no)
+  * @author Maximilian Antoni (mail@maxantoni.de)
+  * @license BSD
+  *
+  * Copyright (c) 2010-2013 Christian Johansen
+  * Copyright (c) 2013 Maximilian Antoni
+  */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function throwYieldError(proxy, text, args) {
+        var msg = sinon.functionName(proxy) + text;
+        if (args.length) {
+            msg += " Received [" + slice.call(args).join(", ") + "]";
+        }
+        throw new Error(msg);
+    }
+
+    var slice = Array.prototype.slice;
+
+    var callProto = {
+        calledOn: function calledOn(thisValue) {
+            if (sinon.match && sinon.match.isMatcher(thisValue)) {
+                return thisValue.test(this.thisValue);
+            }
+            return this.thisValue === thisValue;
+        },
+
+        calledWith: function calledWith() {
+            for (var i = 0, l = arguments.length; i < l; i += 1) {
+                if (!sinon.deepEqual(arguments[i], this.args[i])) {
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        calledWithMatch: function calledWithMatch() {
+            for (var i = 0, l = arguments.length; i < l; i += 1) {
+                var actual = this.args[i];
+                var expectation = arguments[i];
+                if (!sinon.match || !sinon.match(expectation).test(actual)) {
+                    return false;
+                }
+            }
+            return true;
+        },
+
+        calledWithExactly: function calledWithExactly() {
+            return arguments.length == this.args.length &&
+                this.calledWith.apply(this, arguments);
+        },
+
+        notCalledWith: function notCalledWith() {
+            return !this.calledWith.apply(this, arguments);
+        },
+
+        notCalledWithMatch: function notCalledWithMatch() {
+            return !this.calledWithMatch.apply(this, arguments);
+        },
+
+        returned: function returned(value) {
+            return sinon.deepEqual(value, this.returnValue);
+        },
+
+        threw: function threw(error) {
+            if (typeof error === "undefined" || !this.exception) {
+                return !!this.exception;
+            }
+
+            return this.exception === error || this.exception.name === error;
+        },
+
+        calledWithNew: function calledWithNew() {
+            return this.proxy.prototype && this.thisValue instanceof this.proxy;
+        },
+
+        calledBefore: function (other) {
+            return this.callId < other.callId;
+        },
+
+        calledAfter: function (other) {
+            return this.callId > other.callId;
+        },
+
+        callArg: function (pos) {
+            this.args[pos]();
+        },
+
+        callArgOn: function (pos, thisValue) {
+            this.args[pos].apply(thisValue);
+        },
+
+        callArgWith: function (pos) {
+            this.callArgOnWith.apply(this, [pos, null].concat(slice.call(arguments, 1)));
+        },
+
+        callArgOnWith: function (pos, thisValue) {
+            var args = slice.call(arguments, 2);
+            this.args[pos].apply(thisValue, args);
+        },
+
+        "yield": function () {
+            this.yieldOn.apply(this, [null].concat(slice.call(arguments, 0)));
+        },
+
+        yieldOn: function (thisValue) {
+            var args = this.args;
+            for (var i = 0, l = args.length; i < l; ++i) {
+                if (typeof args[i] === "function") {
+                    args[i].apply(thisValue, slice.call(arguments, 1));
+                    return;
+                }
+            }
+            throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
+        },
+
+        yieldTo: function (prop) {
+            this.yieldToOn.apply(this, [prop, null].concat(slice.call(arguments, 1)));
+        },
+
+        yieldToOn: function (prop, thisValue) {
+            var args = this.args;
+            for (var i = 0, l = args.length; i < l; ++i) {
+                if (args[i] && typeof args[i][prop] === "function") {
+                    args[i][prop].apply(thisValue, slice.call(arguments, 2));
+                    return;
+                }
+            }
+            throwYieldError(this.proxy, " cannot yield to '" + prop +
+                "' since no callback was passed.", args);
+        },
+
+        toString: function () {
+            var callStr = this.proxy.toString() + "(";
+            var args = [];
+
+            for (var i = 0, l = this.args.length; i < l; ++i) {
+                args.push(sinon.format(this.args[i]));
+            }
+
+            callStr = callStr + args.join(", ") + ")";
+
+            if (typeof this.returnValue != "undefined") {
+                callStr += " => " + sinon.format(this.returnValue);
+            }
+
+            if (this.exception) {
+                callStr += " !" + this.exception.name;
+
+                if (this.exception.message) {
+                    callStr += "(" + this.exception.message + ")";
+                }
+            }
+
+            return callStr;
+        }
+    };
+
+    callProto.invokeCallback = callProto.yield;
+
+    function createSpyCall(spy, thisValue, args, returnValue, exception, id) {
+        if (typeof id !== "number") {
+            throw new TypeError("Call id is not a number");
+        }
+        var proxyCall = sinon.create(callProto);
+        proxyCall.proxy = spy;
+        proxyCall.thisValue = thisValue;
+        proxyCall.args = args;
+        proxyCall.returnValue = returnValue;
+        proxyCall.exception = exception;
+        proxyCall.callId = id;
+
+        return proxyCall;
+    }
+    createSpyCall.toString = callProto.toString; // used by mocks
+
+    if (commonJSModule) {
+        module.exports = createSpyCall;
+    } else {
+        sinon.spyCall = createSpyCall;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+
+/**
+  * @depend ../sinon.js
+  * @depend call.js
+  */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+  * Spy functions
+  *
+  * @author Christian Johansen (christian@cjohansen.no)
+  * @license BSD
+  *
+  * Copyright (c) 2010-2013 Christian Johansen
+  */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    var push = Array.prototype.push;
+    var slice = Array.prototype.slice;
+    var callId = 0;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function spy(object, property) {
+        if (!property && typeof object == "function") {
+            return spy.create(object);
+        }
+
+        if (!object && !property) {
+            return spy.create(function () { });
+        }
+
+        var method = object[property];
+        return sinon.wrapMethod(object, property, spy.create(method));
+    }
+
+    function matchingFake(fakes, args, strict) {
+        if (!fakes) {
+            return;
+        }
+
+        for (var i = 0, l = fakes.length; i < l; i++) {
+            if (fakes[i].matches(args, strict)) {
+                return fakes[i];
+            }
+        }
+    }
+
+    function incrementCallCount() {
+        this.called = true;
+        this.callCount += 1;
+        this.notCalled = false;
+        this.calledOnce = this.callCount == 1;
+        this.calledTwice = this.callCount == 2;
+        this.calledThrice = this.callCount == 3;
+    }
+
+    function createCallProperties() {
+        this.firstCall = this.getCall(0);
+        this.secondCall = this.getCall(1);
+        this.thirdCall = this.getCall(2);
+        this.lastCall = this.getCall(this.callCount - 1);
+    }
+
+    var vars = "a,b,c,d,e,f,g,h,i,j,k,l";
+    function createProxy(func) {
+        // Retain the function length:
+        var p;
+        if (func.length) {
+            eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
+                ") { return p.invoke(func, this, slice.call(arguments)); });");
+        }
+        else {
+            p = function proxy() {
+                return p.invoke(func, this, slice.call(arguments));
+            };
+        }
+        return p;
+    }
+
+    var uuid = 0;
+
+    // Public API
+    var spyApi = {
+        reset: function () {
+            this.called = false;
+            this.notCalled = true;
+            this.calledOnce = false;
+            this.calledTwice = false;
+            this.calledThrice = false;
+            this.callCount = 0;
+            this.firstCall = null;
+            this.secondCall = null;
+            this.thirdCall = null;
+            this.lastCall = null;
+            this.args = [];
+            this.returnValues = [];
+            this.thisValues = [];
+            this.exceptions = [];
+            this.callIds = [];
+            if (this.fakes) {
+                for (var i = 0; i < this.fakes.length; i++) {
+                    this.fakes[i].reset();
+                }
+            }
+        },
+
+        create: function create(func) {
+            var name;
+
+            if (typeof func != "function") {
+                func = function () { };
+            } else {
+                name = sinon.functionName(func);
+            }
+
+            var proxy = createProxy(func);
+
+            sinon.extend(proxy, spy);
+            delete proxy.create;
+            sinon.extend(proxy, func);
+
+            proxy.reset();
+            proxy.prototype = func.prototype;
+            proxy.displayName = name || "spy";
+            proxy.toString = sinon.functionToString;
+            proxy._create = sinon.spy.create;
+            proxy.id = "spy#" + uuid++;
+
+            return proxy;
+        },
+
+        invoke: function invoke(func, thisValue, args) {
+            var matching = matchingFake(this.fakes, args);
+            var exception, returnValue;
+
+            incrementCallCount.call(this);
+            push.call(this.thisValues, thisValue);
+            push.call(this.args, args);
+            push.call(this.callIds, callId++);
+
+            try {
+                if (matching) {
+                    returnValue = matching.invoke(func, thisValue, args);
+                } else {
+                    returnValue = (this.func || func).apply(thisValue, args);
+                }
+
+                var thisCall = this.getCall(this.callCount - 1);
+                if (thisCall.calledWithNew() && typeof returnValue !== 'object') {
+                    returnValue = thisValue;
+                }
+            } catch (e) {
+                exception = e;
+            }
+
+            push.call(this.exceptions, exception);
+            push.call(this.returnValues, returnValue);
+
+            createCallProperties.call(this);
+
+            if (exception !== undefined) {
+                throw exception;
+            }
+
+            return returnValue;
+        },
+
+        getCall: function getCall(i) {
+            if (i < 0 || i >= this.callCount) {
+                return null;
+            }
+
+            return sinon.spyCall(this, this.thisValues[i], this.args[i],
+                                    this.returnValues[i], this.exceptions[i],
+                                    this.callIds[i]);
+        },
+
+        getCalls: function () {
+            var calls = [];
+            var i;
+
+            for (i = 0; i < this.callCount; i++) {
+                calls.push(this.getCall(i));
+            }
+
+            return calls;
+        },
+
+        calledBefore: function calledBefore(spyFn) {
+            if (!this.called) {
+                return false;
+            }
+
+            if (!spyFn.called) {
+                return true;
+            }
+
+            return this.callIds[0] < spyFn.callIds[spyFn.callIds.length - 1];
+        },
+
+        calledAfter: function calledAfter(spyFn) {
+            if (!this.called || !spyFn.called) {
+                return false;
+            }
+
+            return this.callIds[this.callCount - 1] > spyFn.callIds[spyFn.callCount - 1];
+        },
+
+        withArgs: function () {
+            var args = slice.call(arguments);
+
+            if (this.fakes) {
+                var match = matchingFake(this.fakes, args, true);
+
+                if (match) {
+                    return match;
+                }
+            } else {
+                this.fakes = [];
+            }
+
+            var original = this;
+            var fake = this._create();
+            fake.matchingAguments = args;
+            fake.parent = this;
+            push.call(this.fakes, fake);
+
+            fake.withArgs = function () {
+                return original.withArgs.apply(original, arguments);
+            };
+
+            for (var i = 0; i < this.args.length; i++) {
+                if (fake.matches(this.args[i])) {
+                    incrementCallCount.call(fake);
+                    push.call(fake.thisValues, this.thisValues[i]);
+                    push.call(fake.args, this.args[i]);
+                    push.call(fake.returnValues, this.returnValues[i]);
+                    push.call(fake.exceptions, this.exceptions[i]);
+                    push.call(fake.callIds, this.callIds[i]);
+                }
+            }
+            createCallProperties.call(fake);
+
+            return fake;
+        },
+
+        matches: function (args, strict) {
+            var margs = this.matchingAguments;
+
+            if (margs.length <= args.length &&
+                sinon.deepEqual(margs, args.slice(0, margs.length))) {
+                return !strict || margs.length == args.length;
+            }
+        },
+
+        printf: function (format) {
+            var spy = this;
+            var args = slice.call(arguments, 1);
+            var formatter;
+
+            return (format || "").replace(/%(.)/g, function (match, specifyer) {
+                formatter = spyApi.formatters[specifyer];
+
+                if (typeof formatter == "function") {
+                    return formatter.call(null, spy, args);
+                } else if (!isNaN(parseInt(specifyer, 10))) {
+                    return sinon.format(args[specifyer - 1]);
+                }
+
+                return "%" + specifyer;
+            });
+        }
+    };
+
+    function delegateToCalls(method, matchAny, actual, notCalled) {
+        spyApi[method] = function () {
+            if (!this.called) {
+                if (notCalled) {
+                    return notCalled.apply(this, arguments);
+                }
+                return false;
+            }
+
+            var currentCall;
+            var matches = 0;
+
+            for (var i = 0, l = this.callCount; i < l; i += 1) {
+                currentCall = this.getCall(i);
+
+                if (currentCall[actual || method].apply(currentCall, arguments)) {
+                    matches += 1;
+
+                    if (matchAny) {
+                        return true;
+                    }
+                }
+            }
+
+            return matches === this.callCount;
+        };
+    }
+
+    delegateToCalls("calledOn", true);
+    delegateToCalls("alwaysCalledOn", false, "calledOn");
+    delegateToCalls("calledWith", true);
+    delegateToCalls("calledWithMatch", true);
+    delegateToCalls("alwaysCalledWith", false, "calledWith");
+    delegateToCalls("alwaysCalledWithMatch", false, "calledWithMatch");
+    delegateToCalls("calledWithExactly", true);
+    delegateToCalls("alwaysCalledWithExactly", false, "calledWithExactly");
+    delegateToCalls("neverCalledWith", false, "notCalledWith",
+        function () { return true; });
+    delegateToCalls("neverCalledWithMatch", false, "notCalledWithMatch",
+        function () { return true; });
+    delegateToCalls("threw", true);
+    delegateToCalls("alwaysThrew", false, "threw");
+    delegateToCalls("returned", true);
+    delegateToCalls("alwaysReturned", false, "returned");
+    delegateToCalls("calledWithNew", true);
+    delegateToCalls("alwaysCalledWithNew", false, "calledWithNew");
+    delegateToCalls("callArg", false, "callArgWith", function () {
+        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+    });
+    spyApi.callArgWith = spyApi.callArg;
+    delegateToCalls("callArgOn", false, "callArgOnWith", function () {
+        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+    });
+    spyApi.callArgOnWith = spyApi.callArgOn;
+    delegateToCalls("yield", false, "yield", function () {
+        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+    });
+    // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
+    spyApi.invokeCallback = spyApi.yield;
+    delegateToCalls("yieldOn", false, "yieldOn", function () {
+        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+    });
+    delegateToCalls("yieldTo", false, "yieldTo", function (property) {
+        throw new Error(this.toString() + " cannot yield to '" + property +
+            "' since it was not yet invoked.");
+    });
+    delegateToCalls("yieldToOn", false, "yieldToOn", function (property) {
+        throw new Error(this.toString() + " cannot yield to '" + property +
+            "' since it was not yet invoked.");
+    });
+
+    spyApi.formatters = {
+        "c": function (spy) {
+            return sinon.timesInWords(spy.callCount);
+        },
+
+        "n": function (spy) {
+            return spy.toString();
+        },
+
+        "C": function (spy) {
+            var calls = [];
+
+            for (var i = 0, l = spy.callCount; i < l; ++i) {
+                var stringifiedCall = "    " + spy.getCall(i).toString();
+                if (/\n/.test(calls[i - 1])) {
+                    stringifiedCall = "\n" + stringifiedCall;
+                }
+                push.call(calls, stringifiedCall);
+            }
+
+            return calls.length > 0 ? "\n" + calls.join("\n") : "";
+        },
+
+        "t": function (spy) {
+            var objects = [];
+
+            for (var i = 0, l = spy.callCount; i < l; ++i) {
+                push.call(objects, sinon.format(spy.thisValues[i]));
+            }
+
+            return objects.join(", ");
+        },
+
+        "*": function (spy, args) {
+            var formatted = [];
+
+            for (var i = 0, l = args.length; i < l; ++i) {
+                push.call(formatted, sinon.format(args[i]));
+            }
+
+            return formatted.join(", ");
+        }
+    };
+
+    sinon.extend(spy, spyApi);
+
+    spy.spyCall = sinon.spyCall;
+
+    if (commonJSModule) {
+        module.exports = spy;
+    } else {
+        sinon.spy = spy;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global module, require, sinon, process, setImmediate, setTimeout*/
+/**
+ * Stub behavior
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @author Tim Fischbach (mail@timfischbach.de)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    var slice = Array.prototype.slice;
+    var join = Array.prototype.join;
+    var proto;
+
+    var nextTick = (function () {
+        if (typeof process === "object" && typeof process.nextTick === "function") {
+            return process.nextTick;
+        } else if (typeof setImmediate === "function") {
+            return setImmediate;
+        } else {
+            return function (callback) {
+                setTimeout(callback, 0);
+            };
+        }
+    })();
+
+    function throwsException(error, message) {
+        if (typeof error == "string") {
+            this.exception = new Error(message || "");
+            this.exception.name = error;
+        } else if (!error) {
+            this.exception = new Error("Error");
+        } else {
+            this.exception = error;
+        }
+
+        return this;
+    }
+
+    function getCallback(behavior, args) {
+        var callArgAt = behavior.callArgAt;
+
+        if (callArgAt < 0) {
+            var callArgProp = behavior.callArgProp;
+
+            for (var i = 0, l = args.length; i < l; ++i) {
+                if (!callArgProp && typeof args[i] == "function") {
+                    return args[i];
+                }
+
+                if (callArgProp && args[i] &&
+                    typeof args[i][callArgProp] == "function") {
+                    return args[i][callArgProp];
+                }
+            }
+
+            return null;
+        }
+
+        return args[callArgAt];
+    }
+
+    function getCallbackError(behavior, func, args) {
+        if (behavior.callArgAt < 0) {
+            var msg;
+
+            if (behavior.callArgProp) {
+                msg = sinon.functionName(behavior.stub) +
+                    " expected to yield to '" + behavior.callArgProp +
+                    "', but no object with such a property was passed.";
+            } else {
+                msg = sinon.functionName(behavior.stub) +
+                    " expected to yield, but no callback was passed.";
+            }
+
+            if (args.length > 0) {
+                msg += " Received [" + join.call(args, ", ") + "]";
+            }
+
+            return msg;
+        }
+
+        return "argument at index " + behavior.callArgAt + " is not a function: " + func;
+    }
+
+    function callCallback(behavior, args) {
+        if (typeof behavior.callArgAt == "number") {
+            var func = getCallback(behavior, args);
+
+            if (typeof func != "function") {
+                throw new TypeError(getCallbackError(behavior, func, args));
+            }
+
+            if (behavior.callbackAsync) {
+                nextTick(function() {
+                    func.apply(behavior.callbackContext, behavior.callbackArguments);
+                });
+            } else {
+                func.apply(behavior.callbackContext, behavior.callbackArguments);
+            }
+        }
+    }
+
+    proto = {
+        create: function(stub) {
+            var behavior = sinon.extend({}, sinon.behavior);
+            delete behavior.create;
+            behavior.stub = stub;
+
+            return behavior;
+        },
+
+        isPresent: function() {
+            return (typeof this.callArgAt == 'number' ||
+                    this.exception ||
+                    typeof this.returnArgAt == 'number' ||
+                    this.returnThis ||
+                    this.returnValueDefined);
+        },
+
+        invoke: function(context, args) {
+            callCallback(this, args);
+
+            if (this.exception) {
+                throw this.exception;
+            } else if (typeof this.returnArgAt == 'number') {
+                return args[this.returnArgAt];
+            } else if (this.returnThis) {
+                return context;
+            }
+
+            return this.returnValue;
+        },
+
+        onCall: function(index) {
+            return this.stub.onCall(index);
+        },
+
+        onFirstCall: function() {
+            return this.stub.onFirstCall();
+        },
+
+        onSecondCall: function() {
+            return this.stub.onSecondCall();
+        },
+
+        onThirdCall: function() {
+            return this.stub.onThirdCall();
+        },
+
+        withArgs: function(/* arguments */) {
+            throw new Error('Defining a stub by invoking "stub.onCall(...).withArgs(...)" is not supported. ' +
+                            'Use "stub.withArgs(...).onCall(...)" to define sequential behavior for calls with certain arguments.');
+        },
+
+        callsArg: function callsArg(pos) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = [];
+            this.callbackContext = undefined;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        callsArgOn: function callsArgOn(pos, context) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = [];
+            this.callbackContext = context;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        callsArgWith: function callsArgWith(pos) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = slice.call(arguments, 1);
+            this.callbackContext = undefined;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        callsArgOnWith: function callsArgWith(pos, context) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = pos;
+            this.callbackArguments = slice.call(arguments, 2);
+            this.callbackContext = context;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yields: function () {
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 0);
+            this.callbackContext = undefined;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yieldsOn: function (context) {
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 1);
+            this.callbackContext = context;
+            this.callArgProp = undefined;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yieldsTo: function (prop) {
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 1);
+            this.callbackContext = undefined;
+            this.callArgProp = prop;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+        yieldsToOn: function (prop, context) {
+            if (typeof context != "object") {
+                throw new TypeError("argument context is not an object");
+            }
+
+            this.callArgAt = -1;
+            this.callbackArguments = slice.call(arguments, 2);
+            this.callbackContext = context;
+            this.callArgProp = prop;
+            this.callbackAsync = false;
+
+            return this;
+        },
+
+
+        "throws": throwsException,
+        throwsException: throwsException,
+
+        returns: function returns(value) {
+            this.returnValue = value;
+            this.returnValueDefined = true;
+
+            return this;
+        },
+
+        returnsArg: function returnsArg(pos) {
+            if (typeof pos != "number") {
+                throw new TypeError("argument index is not number");
+            }
+
+            this.returnArgAt = pos;
+
+            return this;
+        },
+
+        returnsThis: function returnsThis() {
+            this.returnThis = true;
+
+            return this;
+        }
+    };
+
+    // create asynchronous versions of callsArg* and yields* methods
+    for (var method in proto) {
+        // need to avoid creating anotherasync versions of the newly added async methods
+        if (proto.hasOwnProperty(method) &&
+            method.match(/^(callsArg|yields)/) &&
+            !method.match(/Async/)) {
+            proto[method + 'Async'] = (function (syncFnName) {
+                return function () {
+                    var result = this[syncFnName].apply(this, arguments);
+                    this.callbackAsync = true;
+                    return result;
+                };
+            })(method);
+        }
+    }
+
+    if (commonJSModule) {
+        module.exports = proto;
+    } else {
+        sinon.behavior = proto;
+    }
+}(typeof sinon == "object" && sinon || null));
+/**
+ * @depend ../sinon.js
+ * @depend spy.js
+ * @depend behavior.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global module, require, sinon*/
+/**
+ * Stub functions
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function stub(object, property, func) {
+        if (!!func && typeof func != "function") {
+            throw new TypeError("Custom stub should be function");
+        }
+
+        var wrapper;
+
+        if (func) {
+            wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
+        } else {
+            wrapper = stub.create();
+        }
+
+        if (!object && typeof property === "undefined") {
+            return sinon.stub.create();
+        }
+
+        if (typeof property === "undefined" && typeof object == "object") {
+            for (var prop in object) {
+                if (typeof object[prop] === "function") {
+                    stub(object, prop);
+                }
+            }
+
+            return object;
+        }
+
+        return sinon.wrapMethod(object, property, wrapper);
+    }
+
+    function getDefaultBehavior(stub) {
+        return stub.defaultBehavior || getParentBehaviour(stub) || sinon.behavior.create(stub);
+    }
+
+    function getParentBehaviour(stub) {
+        return (stub.parent && getCurrentBehavior(stub.parent));
+    }
+
+    function getCurrentBehavior(stub) {
+        var behavior = stub.behaviors[stub.callCount - 1];
+        return behavior && behavior.isPresent() ? behavior : getDefaultBehavior(stub);
+    }
+
+    var uuid = 0;
+
+    sinon.extend(stub, (function () {
+        var proto = {
+            create: function create() {
+                var functionStub = function () {
+                    return getCurrentBehavior(functionStub).invoke(this, arguments);
+                };
+
+                functionStub.id = "stub#" + uuid++;
+                var orig = functionStub;
+                functionStub = sinon.spy.create(functionStub);
+                functionStub.func = orig;
+
+                sinon.extend(functionStub, stub);
+                functionStub._create = sinon.stub.create;
+                functionStub.displayName = "stub";
+                functionStub.toString = sinon.functionToString;
+
+                functionStub.defaultBehavior = null;
+                functionStub.behaviors = [];
+
+                return functionStub;
+            },
+
+            resetBehavior: function () {
+                var i;
+
+                this.defaultBehavior = null;
+                this.behaviors = [];
+
+                delete this.returnValue;
+                delete this.returnArgAt;
+                this.returnThis = false;
+
+                if (this.fakes) {
+                    for (i = 0; i < this.fakes.length; i++) {
+                        this.fakes[i].resetBehavior();
+                    }
+                }
+            },
+
+            onCall: function(index) {
+                if (!this.behaviors[index]) {
+                    this.behaviors[index] = sinon.behavior.create(this);
+                }
+
+                return this.behaviors[index];
+            },
+
+            onFirstCall: function() {
+                return this.onCall(0);
+            },
+
+            onSecondCall: function() {
+                return this.onCall(1);
+            },
+
+            onThirdCall: function() {
+                return this.onCall(2);
+            }
+        };
+
+        for (var method in sinon.behavior) {
+            if (sinon.behavior.hasOwnProperty(method) &&
+                !proto.hasOwnProperty(method) &&
+                method != 'create' &&
+                method != 'withArgs' &&
+                method != 'invoke') {
+                proto[method] = (function(behaviorMethod) {
+                    return function() {
+                        this.defaultBehavior = this.defaultBehavior || sinon.behavior.create(this);
+                        this.defaultBehavior[behaviorMethod].apply(this.defaultBehavior, arguments);
+                        return this;
+                    };
+                }(method));
+            }
+        }
+
+        return proto;
+    }()));
+
+    if (commonJSModule) {
+        module.exports = stub;
+    } else {
+        sinon.stub = stub;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false*/
+/*global module, require, sinon*/
+/**
+ * Mock functions.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    var push = [].push;
+    var match;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    match = sinon.match;
+
+    if (!match && commonJSModule) {
+        match = require("./match");
+    }
+
+    function mock(object) {
+        if (!object) {
+            return sinon.expectation.create("Anonymous mock");
+        }
+
+        return mock.create(object);
+    }
+
+    sinon.mock = mock;
+
+    sinon.extend(mock, (function () {
+        function each(collection, callback) {
+            if (!collection) {
+                return;
+            }
+
+            for (var i = 0, l = collection.length; i < l; i += 1) {
+                callback(collection[i]);
+            }
+        }
+
+        return {
+            create: function create(object) {
+                if (!object) {
+                    throw new TypeError("object is null");
+                }
+
+                var mockObject = sinon.extend({}, mock);
+                mockObject.object = object;
+                delete mockObject.create;
+
+                return mockObject;
+            },
+
+            expects: function expects(method) {
+                if (!method) {
+                    throw new TypeError("method is falsy");
+                }
+
+                if (!this.expectations) {
+                    this.expectations = {};
+                    this.proxies = [];
+                }
+
+                if (!this.expectations[method]) {
+                    this.expectations[method] = [];
+                    var mockObject = this;
+
+                    sinon.wrapMethod(this.object, method, function () {
+                        return mockObject.invokeMethod(method, this, arguments);
+                    });
+
+                    push.call(this.proxies, method);
+                }
+
+                var expectation = sinon.expectation.create(method);
+                push.call(this.expectations[method], expectation);
+
+                return expectation;
+            },
+
+            restore: function restore() {
+                var object = this.object;
+
+                each(this.proxies, function (proxy) {
+                    if (typeof object[proxy].restore == "function") {
+                        object[proxy].restore();
+                    }
+                });
+            },
+
+            verify: function verify() {
+                var expectations = this.expectations || {};
+                var messages = [], met = [];
+
+                each(this.proxies, function (proxy) {
+                    each(expectations[proxy], function (expectation) {
+                        if (!expectation.met()) {
+                            push.call(messages, expectation.toString());
+                        } else {
+                            push.call(met, expectation.toString());
+                        }
+                    });
+                });
+
+                this.restore();
+
+                if (messages.length > 0) {
+                    sinon.expectation.fail(messages.concat(met).join("\n"));
+                } else {
+                    sinon.expectation.pass(messages.concat(met).join("\n"));
+                }
+
+                return true;
+            },
+
+            invokeMethod: function invokeMethod(method, thisValue, args) {
+                var expectations = this.expectations && this.expectations[method];
+                var length = expectations && expectations.length || 0, i;
+
+                for (i = 0; i < length; i += 1) {
+                    if (!expectations[i].met() &&
+                        expectations[i].allowsCall(thisValue, args)) {
+                        return expectations[i].apply(thisValue, args);
+                    }
+                }
+
+                var messages = [], available, exhausted = 0;
+
+                for (i = 0; i < length; i += 1) {
+                    if (expectations[i].allowsCall(thisValue, args)) {
+                        available = available || expectations[i];
+                    } else {
+                        exhausted += 1;
+                    }
+                    push.call(messages, "    " + expectations[i].toString());
+                }
+
+                if (exhausted === 0) {
+                    return available.apply(thisValue, args);
+                }
+
+                messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
+                    proxy: method,
+                    args: args
+                }));
+
+                sinon.expectation.fail(messages.join("\n"));
+            }
+        };
+    }()));
+
+    var times = sinon.timesInWords;
+
+    sinon.expectation = (function () {
+        var slice = Array.prototype.slice;
+        var _invoke = sinon.spy.invoke;
+
+        function callCountInWords(callCount) {
+            if (callCount == 0) {
+                return "never called";
+            } else {
+                return "called " + times(callCount);
+            }
+        }
+
+        function expectedCallCountInWords(expectation) {
+            var min = expectation.minCalls;
+            var max = expectation.maxCalls;
+
+            if (typeof min == "number" && typeof max == "number") {
+                var str = times(min);
+
+                if (min != max) {
+                    str = "at least " + str + " and at most " + times(max);
+                }
+
+                return str;
+            }
+
+            if (typeof min == "number") {
+                return "at least " + times(min);
+            }
+
+            return "at most " + times(max);
+        }
+
+        function receivedMinCalls(expectation) {
+            var hasMinLimit = typeof expectation.minCalls == "number";
+            return !hasMinLimit || expectation.callCount >= expectation.minCalls;
+        }
+
+        function receivedMaxCalls(expectation) {
+            if (typeof expectation.maxCalls != "number") {
+                return false;
+            }
+
+            return expectation.callCount == expectation.maxCalls;
+        }
+
+        function verifyMatcher(possibleMatcher, arg){
+            if (match && match.isMatcher(possibleMatcher)) {
+                return possibleMatcher.test(arg);
+            } else {
+                return true;
+            }
+        }
+
+        return {
+            minCalls: 1,
+            maxCalls: 1,
+
+            create: function create(methodName) {
+                var expectation = sinon.extend(sinon.stub.create(), sinon.expectation);
+                delete expectation.create;
+                expectation.method = methodName;
+
+                return expectation;
+            },
+
+            invoke: function invoke(func, thisValue, args) {
+                this.verifyCallAllowed(thisValue, args);
+
+                return _invoke.apply(this, arguments);
+            },
+
+            atLeast: function atLeast(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not number");
+                }
+
+                if (!this.limitsSet) {
+                    this.maxCalls = null;
+                    this.limitsSet = true;
+                }
+
+                this.minCalls = num;
+
+                return this;
+            },
+
+            atMost: function atMost(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not number");
+                }
+
+                if (!this.limitsSet) {
+                    this.minCalls = null;
+                    this.limitsSet = true;
+                }
+
+                this.maxCalls = num;
+
+                return this;
+            },
+
+            never: function never() {
+                return this.exactly(0);
+            },
+
+            once: function once() {
+                return this.exactly(1);
+            },
+
+            twice: function twice() {
+                return this.exactly(2);
+            },
+
+            thrice: function thrice() {
+                return this.exactly(3);
+            },
+
+            exactly: function exactly(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not a number");
+                }
+
+                this.atLeast(num);
+                return this.atMost(num);
+            },
+
+            met: function met() {
+                return !this.failed && receivedMinCalls(this);
+            },
+
+            verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
+                if (receivedMaxCalls(this)) {
+                    this.failed = true;
+                    sinon.expectation.fail(this.method + " already called " + times(this.maxCalls));
+                }
+
+                if ("expectedThis" in this && this.expectedThis !== thisValue) {
+                    sinon.expectation.fail(this.method + " called with " + thisValue + " as thisValue, expected " +
+                        this.expectedThis);
+                }
+
+                if (!("expectedArguments" in this)) {
+                    return;
+                }
+
+                if (!args) {
+                    sinon.expectation.fail(this.method + " received no arguments, expected " +
+                        sinon.format(this.expectedArguments));
+                }
+
+                if (args.length < this.expectedArguments.length) {
+                    sinon.expectation.fail(this.method + " received too few arguments (" + sinon.format(args) +
+                        "), expected " + sinon.format(this.expectedArguments));
+                }
+
+                if (this.expectsExactArgCount &&
+                    args.length != this.expectedArguments.length) {
+                    sinon.expectation.fail(this.method + " received too many arguments (" + sinon.format(args) +
+                        "), expected " + sinon.format(this.expectedArguments));
+                }
+
+                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+
+                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
+                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
+                            ", didn't match " + this.expectedArguments.toString());
+                    }
+
+                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
+                            ", expected " + sinon.format(this.expectedArguments));
+                    }
+                }
+            },
+
+            allowsCall: function allowsCall(thisValue, args) {
+                if (this.met() && receivedMaxCalls(this)) {
+                    return false;
+                }
+
+                if ("expectedThis" in this && this.expectedThis !== thisValue) {
+                    return false;
+                }
+
+                if (!("expectedArguments" in this)) {
+                    return true;
+                }
+
+                args = args || [];
+
+                if (args.length < this.expectedArguments.length) {
+                    return false;
+                }
+
+                if (this.expectsExactArgCount &&
+                    args.length != this.expectedArguments.length) {
+                    return false;
+                }
+
+                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
+                        return false;
+                    }
+
+                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+                        return false;
+                    }
+                }
+
+                return true;
+            },
+
+            withArgs: function withArgs() {
+                this.expectedArguments = slice.call(arguments);
+                return this;
+            },
+
+            withExactArgs: function withExactArgs() {
+                this.withArgs.apply(this, arguments);
+                this.expectsExactArgCount = true;
+                return this;
+            },
+
+            on: function on(thisValue) {
+                this.expectedThis = thisValue;
+                return this;
+            },
+
+            toString: function () {
+                var args = (this.expectedArguments || []).slice();
+
+                if (!this.expectsExactArgCount) {
+                    push.call(args, "[...]");
+                }
+
+                var callStr = sinon.spyCall.toString.call({
+                    proxy: this.method || "anonymous mock expectation",
+                    args: args
+                });
+
+                var message = callStr.replace(", [...", "[, ...") + " " +
+                    expectedCallCountInWords(this);
+
+                if (this.met()) {
+                    return "Expectation met: " + message;
+                }
+
+                return "Expected " + message + " (" +
+                    callCountInWords(this.callCount) + ")";
+            },
+
+            verify: function verify() {
+                if (!this.met()) {
+                    sinon.expectation.fail(this.toString());
+                } else {
+                    sinon.expectation.pass(this.toString());
+                }
+
+                return true;
+            },
+
+            pass: function(message) {
+              sinon.assert.pass(message);
+            },
+            fail: function (message) {
+                var exception = new Error(message);
+                exception.name = "ExpectationError";
+
+                throw exception;
+            }
+        };
+    }());
+
+    if (commonJSModule) {
+        module.exports = mock;
+    } else {
+        sinon.mock = mock;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true*/
+/*global module, require, sinon*/
+/**
+ * Collections of stubs, spies and mocks.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+    var push = [].push;
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function getFakes(fakeCollection) {
+        if (!fakeCollection.fakes) {
+            fakeCollection.fakes = [];
+        }
+
+        return fakeCollection.fakes;
+    }
+
+    function each(fakeCollection, method) {
+        var fakes = getFakes(fakeCollection);
+
+        for (var i = 0, l = fakes.length; i < l; i += 1) {
+            if (typeof fakes[i][method] == "function") {
+                fakes[i][method]();
+            }
+        }
+    }
+
+    function compact(fakeCollection) {
+        var fakes = getFakes(fakeCollection);
+        var i = 0;
+        while (i < fakes.length) {
+          fakes.splice(i, 1);
+        }
+    }
+
+    var collection = {
+        verify: function resolve() {
+            each(this, "verify");
+        },
+
+        restore: function restore() {
+            each(this, "restore");
+            compact(this);
+        },
+
+        verifyAndRestore: function verifyAndRestore() {
+            var exception;
+
+            try {
+                this.verify();
+            } catch (e) {
+                exception = e;
+            }
+
+            this.restore();
+
+            if (exception) {
+                throw exception;
+            }
+        },
+
+        add: function add(fake) {
+            push.call(getFakes(this), fake);
+            return fake;
+        },
+
+        spy: function spy() {
+            return this.add(sinon.spy.apply(sinon, arguments));
+        },
+
+        stub: function stub(object, property, value) {
+            if (property) {
+                var original = object[property];
+
+                if (typeof original != "function") {
+                    if (!hasOwnProperty.call(object, property)) {
+                        throw new TypeError("Cannot stub non-existent own property " + property);
+                    }
+
+                    object[property] = value;
+
+                    return this.add({
+                        restore: function () {
+                            object[property] = original;
+                        }
+                    });
+                }
+            }
+            if (!property && !!object && typeof object == "object") {
+                var stubbedObj = sinon.stub.apply(sinon, arguments);
+
+                for (var prop in stubbedObj) {
+                    if (typeof stubbedObj[prop] === "function") {
+                        this.add(stubbedObj[prop]);
+                    }
+                }
+
+                return stubbedObj;
+            }
+
+            return this.add(sinon.stub.apply(sinon, arguments));
+        },
+
+        mock: function mock() {
+            return this.add(sinon.mock.apply(sinon, arguments));
+        },
+
+        inject: function inject(obj) {
+            var col = this;
+
+            obj.spy = function () {
+                return col.spy.apply(col, arguments);
+            };
+
+            obj.stub = function () {
+                return col.stub.apply(col, arguments);
+            };
+
+            obj.mock = function () {
+                return col.mock.apply(col, arguments);
+            };
+
+            return obj;
+        }
+    };
+
+    if (commonJSModule) {
+        module.exports = collection;
+    } else {
+        sinon.collection = collection;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
+/*global module, require, window*/
+/**
+ * Fake timer API
+ * setTimeout
+ * setInterval
+ * clearTimeout
+ * clearInterval
+ * tick
+ * reset
+ * Date
+ *
+ * Inspired by jsUnitMockTimeOut from JsUnit
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    var sinon = {};
+}
+
+(function (global) {
+    var id = 1;
+
+    function addTimer(args, recurring) {
+        if (args.length === 0) {
+            throw new Error("Function requires at least 1 parameter");
+        }
+
+        if (typeof args[0] === "undefined") {
+            throw new Error("Callback must be provided to timer calls");
+        }
+
+        var toId = id++;
+        var delay = args[1] || 0;
+
+        if (!this.timeouts) {
+            this.timeouts = {};
+        }
+
+        this.timeouts[toId] = {
+            id: toId,
+            func: args[0],
+            callAt: this.now + delay,
+            invokeArgs: Array.prototype.slice.call(args, 2)
+        };
+
+        if (recurring === true) {
+            this.timeouts[toId].interval = delay;
+        }
+
+        return toId;
+    }
+
+    function parseTime(str) {
+        if (!str) {
+            return 0;
+        }
+
+        var strings = str.split(":");
+        var l = strings.length, i = l;
+        var ms = 0, parsed;
+
+        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
+            throw new Error("tick only understands numbers and 'h:m:s'");
+        }
+
+        while (i--) {
+            parsed = parseInt(strings[i], 10);
+
+            if (parsed >= 60) {
+                throw new Error("Invalid time " + str);
+            }
+
+            ms += parsed * Math.pow(60, (l - i - 1));
+        }
+
+        return ms * 1000;
+    }
+
+    function createObject(object) {
+        var newObject;
+
+        if (Object.create) {
+            newObject = Object.create(object);
+        } else {
+            var F = function () {};
+            F.prototype = object;
+            newObject = new F();
+        }
+
+        newObject.Date.clock = newObject;
+        return newObject;
+    }
+
+    sinon.clock = {
+        now: 0,
+
+        create: function create(now) {
+            var clock = createObject(this);
+
+            if (typeof now == "number") {
+                clock.now = now;
+            }
+
+            if (!!now && typeof now == "object") {
+                throw new TypeError("now should be milliseconds since UNIX epoch");
+            }
+
+            return clock;
+        },
+
+        setTimeout: function setTimeout(callback, timeout) {
+            return addTimer.call(this, arguments, false);
+        },
+
+        clearTimeout: function clearTimeout(timerId) {
+            if (!this.timeouts) {
+                this.timeouts = [];
+            }
+
+            if (timerId in this.timeouts) {
+                delete this.timeouts[timerId];
+            }
+        },
+
+        setInterval: function setInterval(callback, timeout) {
+            return addTimer.call(this, arguments, true);
+        },
+
+        clearInterval: function clearInterval(timerId) {
+            this.clearTimeout(timerId);
+        },
+
+        setImmediate: function setImmediate(callback) {
+            var passThruArgs = Array.prototype.slice.call(arguments, 1);
+
+            return addTimer.call(this, [callback, 0].concat(passThruArgs), false);
+        },
+
+        clearImmediate: function clearImmediate(timerId) {
+            this.clearTimeout(timerId);
+        },
+
+        tick: function tick(ms) {
+            ms = typeof ms == "number" ? ms : parseTime(ms);
+            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
+            var timer = this.firstTimerInRange(tickFrom, tickTo);
+
+            var firstException;
+            while (timer && tickFrom <= tickTo) {
+                if (this.timeouts[timer.id]) {
+                    tickFrom = this.now = timer.callAt;
+                    try {
+                      this.callTimer(timer);
+                    } catch (e) {
+                      firstException = firstException || e;
+                    }
+                }
+
+                timer = this.firstTimerInRange(previous, tickTo);
+                previous = tickFrom;
+            }
+
+            this.now = tickTo;
+
+            if (firstException) {
+              throw firstException;
+            }
+
+            return this.now;
+        },
+
+        firstTimerInRange: function (from, to) {
+            var timer, smallest = null, originalTimer;
+
+            for (var id in this.timeouts) {
+                if (this.timeouts.hasOwnProperty(id)) {
+                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
+                        continue;
+                    }
+
+                    if (smallest === null || this.timeouts[id].callAt < smallest) {
+                        originalTimer = this.timeouts[id];
+                        smallest = this.timeouts[id].callAt;
+
+                        timer = {
+                            func: this.timeouts[id].func,
+                            callAt: this.timeouts[id].callAt,
+                            interval: this.timeouts[id].interval,
+                            id: this.timeouts[id].id,
+                            invokeArgs: this.timeouts[id].invokeArgs
+                        };
+                    }
+                }
+            }
+
+            return timer || null;
+        },
+
+        callTimer: function (timer) {
+            if (typeof timer.interval == "number") {
+                this.timeouts[timer.id].callAt += timer.interval;
+            } else {
+                delete this.timeouts[timer.id];
+            }
+
+            try {
+                if (typeof timer.func == "function") {
+                    timer.func.apply(null, timer.invokeArgs);
+                } else {
+                    eval(timer.func);
+                }
+            } catch (e) {
+              var exception = e;
+            }
+
+            if (!this.timeouts[timer.id]) {
+                if (exception) {
+                  throw exception;
+                }
+                return;
+            }
+
+            if (exception) {
+              throw exception;
+            }
+        },
+
+        reset: function reset() {
+            this.timeouts = {};
+        },
+
+        Date: (function () {
+            var NativeDate = Date;
+
+            function ClockDate(year, month, date, hour, minute, second, ms) {
+                // Defensive and verbose to avoid potential harm in passing
+                // explicit undefined when user does not pass argument
+                switch (arguments.length) {
+                case 0:
+                    return new NativeDate(ClockDate.clock.now);
+                case 1:
+                    return new NativeDate(year);
+                case 2:
+                    return new NativeDate(year, month);
+                case 3:
+                    return new NativeDate(year, month, date);
+                case 4:
+                    return new NativeDate(year, month, date, hour);
+                case 5:
+                    return new NativeDate(year, month, date, hour, minute);
+                case 6:
+                    return new NativeDate(year, month, date, hour, minute, second);
+                default:
+                    return new NativeDate(year, month, date, hour, minute, second, ms);
+                }
+            }
+
+            return mirrorDateProperties(ClockDate, NativeDate);
+        }())
+    };
+
+    function mirrorDateProperties(target, source) {
+        if (source.now) {
+            target.now = function now() {
+                return target.clock.now;
+            };
+        } else {
+            delete target.now;
+        }
+
+        if (source.toSource) {
+            target.toSource = function toSource() {
+                return source.toSource();
+            };
+        } else {
+            delete target.toSource;
+        }
+
+        target.toString = function toString() {
+            return source.toString();
+        };
+
+        target.prototype = source.prototype;
+        target.parse = source.parse;
+        target.UTC = source.UTC;
+        target.prototype.toUTCString = source.prototype.toUTCString;
+
+        for (var prop in source) {
+            if (source.hasOwnProperty(prop)) {
+                target[prop] = source[prop];
+            }
+        }
+
+        return target;
+    }
+
+    var methods = ["Date", "setTimeout", "setInterval",
+                   "clearTimeout", "clearInterval"];
+
+    if (typeof global.setImmediate !== "undefined") {
+        methods.push("setImmediate");
+    }
+
+    if (typeof global.clearImmediate !== "undefined") {
+        methods.push("clearImmediate");
+    }
+
+    function restore() {
+        var method;
+
+        for (var i = 0, l = this.methods.length; i < l; i++) {
+            method = this.methods[i];
+
+            if (global[method].hadOwnProperty) {
+                global[method] = this["_" + method];
+            } else {
+                try {
+                    delete global[method];
+                } catch (e) {}
+            }
+        }
+
+        // Prevent multiple executions which will completely remove these props
+        this.methods = [];
+    }
+
+    function stubGlobal(method, clock) {
+        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
+        clock["_" + method] = global[method];
+
+        if (method == "Date") {
+            var date = mirrorDateProperties(clock[method], global[method]);
+            global[method] = date;
+        } else {
+            global[method] = function () {
+                return clock[method].apply(clock, arguments);
+            };
+
+            for (var prop in clock[method]) {
+                if (clock[method].hasOwnProperty(prop)) {
+                    global[method][prop] = clock[method][prop];
+                }
+            }
+        }
+
+        global[method].clock = clock;
+    }
+
+    sinon.useFakeTimers = function useFakeTimers(now) {
+        var clock = sinon.clock.create(now);
+        clock.restore = restore;
+        clock.methods = Array.prototype.slice.call(arguments,
+                                                   typeof now == "number" ? 1 : 0);
+
+        if (clock.methods.length === 0) {
+            clock.methods = methods;
+        }
+
+        for (var i = 0, l = clock.methods.length; i < l; i++) {
+            stubGlobal(clock.methods[i], clock);
+        }
+
+        return clock;
+    };
+}(typeof global != "undefined" && typeof global !== "function" ? global : this));
+
+sinon.timers = {
+    setTimeout: setTimeout,
+    clearTimeout: clearTimeout,
+    setImmediate: (typeof setImmediate !== "undefined" ? setImmediate : undefined),
+    clearImmediate: (typeof clearImmediate !== "undefined" ? clearImmediate: undefined),
+    setInterval: setInterval,
+    clearInterval: clearInterval,
+    Date: Date
+};
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = sinon;
+}
+
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Minimal Event interface implementation
+ *
+ * Original implementation by Sven Fuchs: https://gist.github.com/995028
+ * Modifications and tests by Christian Johansen.
+ *
+ * @author Sven Fuchs (svenfuchs@artweb-design.de)
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2011 Sven Fuchs, Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    this.sinon = {};
+}
+
+(function () {
+    var push = [].push;
+
+    sinon.Event = function Event(type, bubbles, cancelable, target) {
+        this.initEvent(type, bubbles, cancelable, target);
+    };
+
+    sinon.Event.prototype = {
+        initEvent: function(type, bubbles, cancelable, target) {
+            this.type = type;
+            this.bubbles = bubbles;
+            this.cancelable = cancelable;
+            this.target = target;
+        },
+
+        stopPropagation: function () {},
+
+        preventDefault: function () {
+            this.defaultPrevented = true;
+        }
+    };
+
+    sinon.ProgressEvent = function ProgressEvent(type, progressEventRaw, target) {
+        this.initEvent(type, false, false, target);
+        this.loaded = progressEventRaw.loaded || null;
+        this.total = progressEventRaw.total || null;
+    };
+
+    sinon.ProgressEvent.prototype = new sinon.Event();
+
+    sinon.ProgressEvent.prototype.constructor =  sinon.ProgressEvent;
+
+    sinon.CustomEvent = function CustomEvent(type, customData, target) {
+        this.initEvent(type, false, false, target);
+        this.detail = customData.detail || null;
+    };
+
+    sinon.CustomEvent.prototype = new sinon.Event();
+
+    sinon.CustomEvent.prototype.constructor =  sinon.CustomEvent;
+
+    sinon.EventTarget = {
+        addEventListener: function addEventListener(event, listener) {
+            this.eventListeners = this.eventListeners || {};
+            this.eventListeners[event] = this.eventListeners[event] || [];
+            push.call(this.eventListeners[event], listener);
+        },
+
+        removeEventListener: function removeEventListener(event, listener) {
+            var listeners = this.eventListeners && this.eventListeners[event] || [];
+
+            for (var i = 0, l = listeners.length; i < l; ++i) {
+                if (listeners[i] == listener) {
+                    return listeners.splice(i, 1);
+                }
+            }
+        },
+
+        dispatchEvent: function dispatchEvent(event) {
+            var type = event.type;
+            var listeners = this.eventListeners && this.eventListeners[type] || [];
+
+            for (var i = 0; i < listeners.length; i++) {
+                if (typeof listeners[i] == "function") {
+                    listeners[i].call(this, event);
+                } else {
+                    listeners[i].handleEvent(event);
+                }
+            }
+
+            return !!event.defaultPrevented;
+        }
+    };
+}());
+
+/**
+ * @depend ../../sinon.js
+ * @depend event.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Fake XMLHttpRequest object
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+// wrapper for global
+(function(global) {
+    if (typeof sinon === "undefined") {
+        global.sinon = {};
+    }
+
+    var supportsProgress = typeof ProgressEvent !== "undefined";
+    var supportsCustomEvent = typeof CustomEvent !== "undefined";
+    sinon.xhr = { XMLHttpRequest: global.XMLHttpRequest };
+    var xhr = sinon.xhr;
+    xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
+    xhr.GlobalActiveXObject = global.ActiveXObject;
+    xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
+    xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
+    xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
+                                     ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
+    xhr.supportsCORS = 'withCredentials' in (new sinon.xhr.GlobalXMLHttpRequest());
+
+    /*jsl:ignore*/
+    var unsafeHeaders = {
+        "Accept-Charset": true,
+        "Accept-Encoding": true,
+        "Connection": true,
+        "Content-Length": true,
+        "Cookie": true,
+        "Cookie2": true,
+        "Content-Transfer-Encoding": true,
+        "Date": true,
+        "Expect": true,
+        "Host": true,
+        "Keep-Alive": true,
+        "Referer": true,
+        "TE": true,
+        "Trailer": true,
+        "Transfer-Encoding": true,
+        "Upgrade": true,
+        "User-Agent": true,
+        "Via": true
+    };
+    /*jsl:end*/
+
+    function FakeXMLHttpRequest() {
+        this.readyState = FakeXMLHttpRequest.UNSENT;
+        this.requestHeaders = {};
+        this.requestBody = null;
+        this.status = 0;
+        this.statusText = "";
+        this.upload = new UploadProgress();
+        if (sinon.xhr.supportsCORS) {
+            this.withCredentials = false;
+        }
+
+
+        var xhr = this;
+        var events = ["loadstart", "load", "abort", "loadend"];
+
+        function addEventListener(eventName) {
+            xhr.addEventListener(eventName, function (event) {
+                var listener = xhr["on" + eventName];
+
+                if (listener && typeof listener == "function") {
+                    listener.call(this, event);
+                }
+            });
+        }
+
+        for (var i = events.length - 1; i >= 0; i--) {
+            addEventListener(events[i]);
+        }
+
+        if (typeof FakeXMLHttpRequest.onCreate == "function") {
+            FakeXMLHttpRequest.onCreate(this);
+        }
+    }
+
+    // An upload object is created for each
+    // FakeXMLHttpRequest and allows upload
+    // events to be simulated using uploadProgress
+    // and uploadError.
+    function UploadProgress() {
+        this.eventListeners = {
+            "progress": [],
+            "load": [],
+            "abort": [],
+            "error": []
+        }
+    }
+
+    UploadProgress.prototype.addEventListener = function(event, listener) {
+        this.eventListeners[event].push(listener);
+    };
+
+    UploadProgress.prototype.removeEventListener = function(event, listener) {
+        var listeners = this.eventListeners[event] || [];
+
+        for (var i = 0, l = listeners.length; i < l; ++i) {
+            if (listeners[i] == listener) {
+                return listeners.splice(i, 1);
+            }
+        }
+    };
+
+    UploadProgress.prototype.dispatchEvent = function(event) {
+        var listeners = this.eventListeners[event.type] || [];
+
+        for (var i = 0, listener; (listener = listeners[i]) != null; i++) {
+            listener(event);
+        }
+    };
+
+    function verifyState(xhr) {
+        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+
+        if (xhr.sendFlag) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+    }
+
+    // filtering to enable a white-list version of Sinon FakeXhr,
+    // where whitelisted requests are passed through to real XHR
+    function each(collection, callback) {
+        if (!collection) return;
+        for (var i = 0, l = collection.length; i < l; i += 1) {
+            callback(collection[i]);
+        }
+    }
+    function some(collection, callback) {
+        for (var index = 0; index < collection.length; index++) {
+            if(callback(collection[index]) === true) return true;
+        }
+        return false;
+    }
+    // largest arity in XHR is 5 - XHR#open
+    var apply = function(obj,method,args) {
+        switch(args.length) {
+        case 0: return obj[method]();
+        case 1: return obj[method](args[0]);
+        case 2: return obj[method](args[0],args[1]);
+        case 3: return obj[method](args[0],args[1],args[2]);
+        case 4: return obj[method](args[0],args[1],args[2],args[3]);
+        case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
+        }
+    };
+
+    FakeXMLHttpRequest.filters = [];
+    FakeXMLHttpRequest.addFilter = function(fn) {
+        this.filters.push(fn)
+    };
+    var IE6Re = /MSIE 6/;
+    FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
+        var xhr = new sinon.xhr.workingXHR();
+        each(["open","setRequestHeader","send","abort","getResponseHeader",
+              "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
+             function(method) {
+                 fakeXhr[method] = function() {
+                   return apply(xhr,method,arguments);
+                 };
+             });
+
+        var copyAttrs = function(args) {
+            each(args, function(attr) {
+              try {
+                fakeXhr[attr] = xhr[attr]
+              } catch(e) {
+                if(!IE6Re.test(navigator.userAgent)) throw e;
+              }
+            });
+        };
+
+        var stateChange = function() {
+            fakeXhr.readyState = xhr.readyState;
+            if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                copyAttrs(["status","statusText"]);
+            }
+            if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
+                copyAttrs(["responseText"]);
+            }
+            if(xhr.readyState === FakeXMLHttpRequest.DONE) {
+                copyAttrs(["responseXML"]);
+            }
+            if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr, { target: fakeXhr });
+        };
+        if(xhr.addEventListener) {
+          for(var event in fakeXhr.eventListeners) {
+              if(fakeXhr.eventListeners.hasOwnProperty(event)) {
+                  each(fakeXhr.eventListeners[event],function(handler) {
+                      xhr.addEventListener(event, handler);
+                  });
+              }
+          }
+          xhr.addEventListener("readystatechange",stateChange);
+        } else {
+          xhr.onreadystatechange = stateChange;
+        }
+        apply(xhr,"open",xhrArgs);
+    };
+    FakeXMLHttpRequest.useFilters = false;
+
+    function verifyRequestOpened(xhr) {
+        if (xhr.readyState != FakeXMLHttpRequest.OPENED) {
+            throw new Error("INVALID_STATE_ERR - " + xhr.readyState);
+        }
+    }
+
+    function verifyRequestSent(xhr) {
+        if (xhr.readyState == FakeXMLHttpRequest.DONE) {
+            throw new Error("Request done");
+        }
+    }
+
+    function verifyHeadersReceived(xhr) {
+        if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
+            throw new Error("No headers received");
+        }
+    }
+
+    function verifyResponseBodyType(body) {
+        if (typeof body != "string") {
+            var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
+                                 body + ", which is not a string.");
+            error.name = "InvalidBodyException";
+            throw error;
+        }
+    }
+
+    sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
+        async: true,
+
+        open: function open(method, url, async, username, password) {
+            this.method = method;
+            this.url = url;
+            this.async = typeof async == "boolean" ? async : true;
+            this.username = username;
+            this.password = password;
+            this.responseText = null;
+            this.responseXML = null;
+            this.requestHeaders = {};
+            this.sendFlag = false;
+            if(sinon.FakeXMLHttpRequest.useFilters === true) {
+                var xhrArgs = arguments;
+                var defake = some(FakeXMLHttpRequest.filters,function(filter) {
+                    return filter.apply(this,xhrArgs)
+                });
+                if (defake) {
+                  return sinon.FakeXMLHttpRequest.defake(this,arguments);
+                }
+            }
+            this.readyStateChange(FakeXMLHttpRequest.OPENED);
+        },
+
+        readyStateChange: function readyStateChange(state) {
+            this.readyState = state;
+
+            if (typeof this.onreadystatechange == "function") {
+                try {
+                    this.onreadystatechange();
+                } catch (e) {
+                    sinon.logError("Fake XHR onreadystatechange handler", e);
+                }
+            }
+
+            this.dispatchEvent(new sinon.Event("readystatechange"));
+
+            switch (this.readyState) {
+                case FakeXMLHttpRequest.DONE:
+                    this.dispatchEvent(new sinon.Event("load", false, false, this));
+                    this.dispatchEvent(new sinon.Event("loadend", false, false, this));
+                    this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
+                    if (supportsProgress) {
+                        this.upload.dispatchEvent(new sinon.ProgressEvent('progress', {loaded: 100, total: 100}));
+                    }
+                    break;
+            }
+        },
+
+        setRequestHeader: function setRequestHeader(header, value) {
+            verifyState(this);
+
+            if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
+                throw new Error("Refused to set unsafe header \"" + header + "\"");
+            }
+
+            if (this.requestHeaders[header]) {
+                this.requestHeaders[header] += "," + value;
+            } else {
+                this.requestHeaders[header] = value;
+            }
+        },
+
+        // Helps testing
+        setResponseHeaders: function setResponseHeaders(headers) {
+            verifyRequestOpened(this);
+            this.responseHeaders = {};
+
+            for (var header in headers) {
+                if (headers.hasOwnProperty(header)) {
+                    this.responseHeaders[header] = headers[header];
+                }
+            }
+
+            if (this.async) {
+                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
+            } else {
+                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
+            }
+        },
+
+        // Currently treats ALL data as a DOMString (i.e. no Document)
+        send: function send(data) {
+            verifyState(this);
+
+            if (!/^(get|head)$/i.test(this.method)) {
+                if (this.requestHeaders["Content-Type"]) {
+                    var value = this.requestHeaders["Content-Type"].split(";");
+                    this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
+                } else {
+                    this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
+                }
+
+                this.requestBody = data;
+            }
+
+            this.errorFlag = false;
+            this.sendFlag = this.async;
+            this.readyStateChange(FakeXMLHttpRequest.OPENED);
+
+            if (typeof this.onSend == "function") {
+                this.onSend(this);
+            }
+
+            this.dispatchEvent(new sinon.Event("loadstart", false, false, this));
+        },
+
+        abort: function abort() {
+            this.aborted = true;
+            this.responseText = null;
+            this.errorFlag = true;
+            this.requestHeaders = {};
+
+            if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
+                this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
+                this.sendFlag = false;
+            }
+
+            this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
+
+            this.dispatchEvent(new sinon.Event("abort", false, false, this));
+
+            this.upload.dispatchEvent(new sinon.Event("abort", false, false, this));
+
+            if (typeof this.onerror === "function") {
+                this.onerror();
+            }
+        },
+
+        getResponseHeader: function getResponseHeader(header) {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return null;
+            }
+
+            if (/^Set-Cookie2?$/i.test(header)) {
+                return null;
+            }
+
+            header = header.toLowerCase();
+
+            for (var h in this.responseHeaders) {
+                if (h.toLowerCase() == header) {
+                    return this.responseHeaders[h];
+                }
+            }
+
+            return null;
+        },
+
+        getAllResponseHeaders: function getAllResponseHeaders() {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return "";
+            }
+
+            var headers = "";
+
+            for (var header in this.responseHeaders) {
+                if (this.responseHeaders.hasOwnProperty(header) &&
+                    !/^Set-Cookie2?$/i.test(header)) {
+                    headers += header + ": " + this.responseHeaders[header] + "\r\n";
+                }
+            }
+
+            return headers;
+        },
+
+        setResponseBody: function setResponseBody(body) {
+            verifyRequestSent(this);
+            verifyHeadersReceived(this);
+            verifyResponseBodyType(body);
+
+            var chunkSize = this.chunkSize || 10;
+            var index = 0;
+            this.responseText = "";
+
+            do {
+                if (this.async) {
+                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
+                }
+
+                this.responseText += body.substring(index, index + chunkSize);
+                index += chunkSize;
+            } while (index < body.length);
+
+            var type = this.getResponseHeader("Content-Type");
+
+            if (this.responseText &&
+                (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
+                try {
+                    this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
+                } catch (e) {
+                    // Unable to parse XML - no biggie
+                }
+            }
+
+            if (this.async) {
+                this.readyStateChange(FakeXMLHttpRequest.DONE);
+            } else {
+                this.readyState = FakeXMLHttpRequest.DONE;
+            }
+        },
+
+        respond: function respond(status, headers, body) {
+            this.status = typeof status == "number" ? status : 200;
+            this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
+            this.setResponseHeaders(headers || {});
+            this.setResponseBody(body || "");
+        },
+
+        uploadProgress: function uploadProgress(progressEventRaw) {
+            if (supportsProgress) {
+                this.upload.dispatchEvent(new sinon.ProgressEvent("progress", progressEventRaw));
+            }
+        },
+
+        uploadError: function uploadError(error) {
+            if (supportsCustomEvent) {
+                this.upload.dispatchEvent(new sinon.CustomEvent("error", {"detail": error}));
+            }
+        }
+    });
+
+    sinon.extend(FakeXMLHttpRequest, {
+        UNSENT: 0,
+        OPENED: 1,
+        HEADERS_RECEIVED: 2,
+        LOADING: 3,
+        DONE: 4
+    });
+
+    // Borrowed from JSpec
+    FakeXMLHttpRequest.parseXML = function parseXML(text) {
+        var xmlDoc;
+
+        if (typeof DOMParser != "undefined") {
+            var parser = new DOMParser();
+            xmlDoc = parser.parseFromString(text, "text/xml");
+        } else {
+            xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+            xmlDoc.async = "false";
+            xmlDoc.loadXML(text);
+        }
+
+        return xmlDoc;
+    };
+
+    FakeXMLHttpRequest.statusCodes = {
+        100: "Continue",
+        101: "Switching Protocols",
+        200: "OK",
+        201: "Created",
+        202: "Accepted",
+        203: "Non-Authoritative Information",
+        204: "No Content",
+        205: "Reset Content",
+        206: "Partial Content",
+        300: "Multiple Choice",
+        301: "Moved Permanently",
+        302: "Found",
+        303: "See Other",
+        304: "Not Modified",
+        305: "Use Proxy",
+        307: "Temporary Redirect",
+        400: "Bad Request",
+        401: "Unauthorized",
+        402: "Payment Required",
+        403: "Forbidden",
+        404: "Not Found",
+        405: "Method Not Allowed",
+        406: "Not Acceptable",
+        407: "Proxy Authentication Required",
+        408: "Request Timeout",
+        409: "Conflict",
+        410: "Gone",
+        411: "Length Required",
+        412: "Precondition Failed",
+        413: "Request Entity Too Large",
+        414: "Request-URI Too Long",
+        415: "Unsupported Media Type",
+        416: "Requested Range Not Satisfiable",
+        417: "Expectation Failed",
+        422: "Unprocessable Entity",
+        500: "Internal Server Error",
+        501: "Not Implemented",
+        502: "Bad Gateway",
+        503: "Service Unavailable",
+        504: "Gateway Timeout",
+        505: "HTTP Version Not Supported"
+    };
+
+    sinon.useFakeXMLHttpRequest = function () {
+        sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
+            if (xhr.supportsXHR) {
+                global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
+            }
+
+            if (xhr.supportsActiveX) {
+                global.ActiveXObject = xhr.GlobalActiveXObject;
+            }
+
+            delete sinon.FakeXMLHttpRequest.restore;
+
+            if (keepOnCreate !== true) {
+                delete sinon.FakeXMLHttpRequest.onCreate;
+            }
+        };
+        if (xhr.supportsXHR) {
+            global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
+        }
+
+        if (xhr.supportsActiveX) {
+            global.ActiveXObject = function ActiveXObject(objId) {
+                if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
+
+                    return new sinon.FakeXMLHttpRequest();
+                }
+
+                return new xhr.GlobalActiveXObject(objId);
+            };
+        }
+
+        return sinon.FakeXMLHttpRequest;
+    };
+
+    sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
+
+})(typeof global === "object" ? global : this);
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = sinon;
+}
+
+/**
+ * @depend fake_xml_http_request.js
+ */
+/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
+/*global module, require, window*/
+/**
+ * The Sinon "server" mimics a web server that receives requests from
+ * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
+ * both synchronously and asynchronously. To respond synchronuously, canned
+ * answers have to be provided upfront.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    var sinon = {};
+}
+
+sinon.fakeServer = (function () {
+    var push = [].push;
+    function F() {}
+
+    function create(proto) {
+        F.prototype = proto;
+        return new F();
+    }
+
+    function responseArray(handler) {
+        var response = handler;
+
+        if (Object.prototype.toString.call(handler) != "[object Array]") {
+            response = [200, {}, handler];
+        }
+
+        if (typeof response[2] != "string") {
+            throw new TypeError("Fake server response body should be string, but was " +
+                                typeof response[2]);
+        }
+
+        return response;
+    }
+
+    var wloc = typeof window !== "undefined" ? window.location : {};
+    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
+
+    function matchOne(response, reqMethod, reqUrl) {
+        var rmeth = response.method;
+        var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
+        var url = response.url;
+        var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
+
+        return matchMethod && matchUrl;
+    }
+
+    function match(response, request) {
+        var requestUrl = request.url;
+
+        if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
+            requestUrl = requestUrl.replace(rCurrLoc, "");
+        }
+
+        if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
+            if (typeof response.response == "function") {
+                var ru = response.url;
+                var args = [request].concat(ru && typeof ru.exec == "function" ? ru.exec(requestUrl).slice(1) : []);
+                return response.response.apply(response, args);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    function log(response, request) {
+        var str;
+
+        str =  "Request:\n"  + sinon.format(request)  + "\n\n";
+        str += "Response:\n" + sinon.format(response) + "\n\n";
+
+        sinon.log(str);
+    }
+
+    return {
+        create: function () {
+            var server = create(this);
+            this.xhr = sinon.useFakeXMLHttpRequest();
+            server.requests = [];
+
+            this.xhr.onCreate = function (xhrObj) {
+                server.addRequest(xhrObj);
+            };
+
+            return server;
+        },
+
+        addRequest: function addRequest(xhrObj) {
+            var server = this;
+            push.call(this.requests, xhrObj);
+
+            xhrObj.onSend = function () {
+                server.handleRequest(this);
+
+                if (server.autoRespond && !server.responding) {
+                    setTimeout(function () {
+                        server.responding = false;
+                        server.respond();
+                    }, server.autoRespondAfter || 10);
+
+                    server.responding = true;
+                }
+            };
+        },
+
+        getHTTPMethod: function getHTTPMethod(request) {
+            if (this.fakeHTTPMethods && /post/i.test(request.method)) {
+                var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
+                return !!matches ? matches[1] : request.method;
+            }
+
+            return request.method;
+        },
+
+        handleRequest: function handleRequest(xhr) {
+            if (xhr.async) {
+                if (!this.queue) {
+                    this.queue = [];
+                }
+
+                push.call(this.queue, xhr);
+            } else {
+                this.processRequest(xhr);
+            }
+        },
+
+        respondWith: function respondWith(method, url, body) {
+            if (arguments.length == 1 && typeof method != "function") {
+                this.response = responseArray(method);
+                return;
+            }
+
+            if (!this.responses) { this.responses = []; }
+
+            if (arguments.length == 1) {
+                body = method;
+                url = method = null;
+            }
+
+            if (arguments.length == 2) {
+                body = url;
+                url = method;
+                method = null;
+            }
+
+            push.call(this.responses, {
+                method: method,
+                url: url,
+                response: typeof body == "function" ? body : responseArray(body)
+            });
+        },
+
+        respond: function respond() {
+            if (arguments.length > 0) this.respondWith.apply(this, arguments);
+            var queue = this.queue || [];
+            var requests = queue.splice(0);
+            var request;
+
+            while(request = requests.shift()) {
+                this.processRequest(request);
+            }
+        },
+
+        processRequest: function processRequest(request) {
+            try {
+                if (request.aborted) {
+                    return;
+                }
+
+                var response = this.response || [404, {}, ""];
+
+                if (this.responses) {
+                    for (var l = this.responses.length, i = l - 1; i >= 0; i--) {
+                        if (match.call(this, this.responses[i], request)) {
+                            response = this.responses[i].response;
+                            break;
+                        }
+                    }
+                }
+
+                if (request.readyState != 4) {
+                    log(response, request);
+
+                    request.respond(response[0], response[1], response[2]);
+                }
+            } catch (e) {
+                sinon.logError("Fake server request processing", e);
+            }
+        },
+
+        restore: function restore() {
+            return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
+        }
+    };
+}());
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = sinon;
+}
+
+/**
+ * @depend fake_server.js
+ * @depend fake_timers.js
+ */
+/*jslint browser: true, eqeqeq: false, onevar: false*/
+/*global sinon*/
+/**
+ * Add-on for sinon.fakeServer that automatically handles a fake timer along with
+ * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
+ * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
+ * it polls the object for completion with setInterval. Dispite the direct
+ * motivation, there is nothing jQuery-specific in this file, so it can be used
+ * in any environment where the ajax implementation depends on setInterval or
+ * setTimeout.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function () {
+    function Server() {}
+    Server.prototype = sinon.fakeServer;
+
+    sinon.fakeServerWithClock = new Server();
+
+    sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
+        if (xhr.async) {
+            if (typeof setTimeout.clock == "object") {
+                this.clock = setTimeout.clock;
+            } else {
+                this.clock = sinon.useFakeTimers();
+                this.resetClock = true;
+            }
+
+            if (!this.longestTimeout) {
+                var clockSetTimeout = this.clock.setTimeout;
+                var clockSetInterval = this.clock.setInterval;
+                var server = this;
+
+                this.clock.setTimeout = function (fn, timeout) {
+                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+                    return clockSetTimeout.apply(this, arguments);
+                };
+
+                this.clock.setInterval = function (fn, timeout) {
+                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+                    return clockSetInterval.apply(this, arguments);
+                };
+            }
+        }
+
+        return sinon.fakeServer.addRequest.call(this, xhr);
+    };
+
+    sinon.fakeServerWithClock.respond = function respond() {
+        var returnVal = sinon.fakeServer.respond.apply(this, arguments);
+
+        if (this.clock) {
+            this.clock.tick(this.longestTimeout || 0);
+            this.longestTimeout = 0;
+
+            if (this.resetClock) {
+                this.clock.restore();
+                this.resetClock = false;
+            }
+        }
+
+        return returnVal;
+    };
+
+    sinon.fakeServerWithClock.restore = function restore() {
+        if (this.clock) {
+            this.clock.restore();
+        }
+
+        return sinon.fakeServer.restore.apply(this, arguments);
+    };
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend collection.js
+ * @depend util/fake_timers.js
+ * @depend util/fake_server_with_clock.js
+ */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global require, module*/
+/**
+ * Manages fake collections as well as fake utilities such as Sinon's
+ * timers and fake XHR implementation in one convenient object.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof module !== 'undefined' && module.exports) {
+    var sinon = require("../sinon");
+    sinon.extend(sinon, require("./util/fake_timers"));
+}
+
+(function () {
+    var push = [].push;
+
+    function exposeValue(sandbox, config, key, value) {
+        if (!value) {
+            return;
+        }
+
+        if (config.injectInto && !(key in config.injectInto)) {
+            config.injectInto[key] = value;
+            sandbox.injectedKeys.push(key);
+        } else {
+            push.call(sandbox.args, value);
+        }
+    }
+
+    function prepareSandboxFromConfig(config) {
+        var sandbox = sinon.create(sinon.sandbox);
+
+        if (config.useFakeServer) {
+            if (typeof config.useFakeServer == "object") {
+                sandbox.serverPrototype = config.useFakeServer;
+            }
+
+            sandbox.useFakeServer();
+        }
+
+        if (config.useFakeTimers) {
+            if (typeof config.useFakeTimers == "object") {
+                sandbox.useFakeTimers.apply(sandbox, config.useFakeTimers);
+            } else {
+                sandbox.useFakeTimers();
+            }
+        }
+
+        return sandbox;
+    }
+
+    sinon.sandbox = sinon.extend(sinon.create(sinon.collection), {
+        useFakeTimers: function useFakeTimers() {
+            this.clock = sinon.useFakeTimers.apply(sinon, arguments);
+
+            return this.add(this.clock);
+        },
+
+        serverPrototype: sinon.fakeServer,
+
+        useFakeServer: function useFakeServer() {
+            var proto = this.serverPrototype || sinon.fakeServer;
+
+            if (!proto || !proto.create) {
+                return null;
+            }
+
+            this.server = proto.create();
+            return this.add(this.server);
+        },
+
+        inject: function (obj) {
+            sinon.collection.inject.call(this, obj);
+
+            if (this.clock) {
+                obj.clock = this.clock;
+            }
+
+            if (this.server) {
+                obj.server = this.server;
+                obj.requests = this.server.requests;
+            }
+
+            return obj;
+        },
+
+        restore: function () {
+            sinon.collection.restore.apply(this, arguments);
+            this.restoreContext();
+        },
+
+        restoreContext: function () {
+            if (this.injectedKeys) {
+                for (var i = 0, j = this.injectedKeys.length; i < j; i++) {
+                    delete this.injectInto[this.injectedKeys[i]];
+                }
+                this.injectedKeys = [];
+            }
+        },
+
+        create: function (config) {
+            if (!config) {
+                return sinon.create(sinon.sandbox);
+            }
+
+            var sandbox = prepareSandboxFromConfig(config);
+            sandbox.args = sandbox.args || [];
+            sandbox.injectedKeys = [];
+            sandbox.injectInto = config.injectInto;
+            var prop, value, exposed = sandbox.inject({});
+
+            if (config.properties) {
+                for (var i = 0, l = config.properties.length; i < l; i++) {
+                    prop = config.properties[i];
+                    value = exposed[prop] || prop == "sandbox" && sandbox;
+                    exposeValue(sandbox, config, prop, value);
+                }
+            } else {
+                exposeValue(sandbox, config, "sandbox", value);
+            }
+
+            return sandbox;
+        }
+    });
+
+    sinon.sandbox.useFakeXMLHttpRequest = sinon.sandbox.useFakeServer;
+
+    if (typeof module !== 'undefined' && module.exports) {
+        module.exports = sinon.sandbox;
+    }
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ * @depend sandbox.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Test function, sandboxes fakes
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function test(callback) {
+        var type = typeof callback;
+
+        if (type != "function") {
+            throw new TypeError("sinon.test needs to wrap a test function, got " + type);
+        }
+
+        return function () {
+            var config = sinon.getConfig(sinon.config);
+            config.injectInto = config.injectIntoThis && this || config.injectInto;
+            var sandbox = sinon.sandbox.create(config);
+            var exception, result;
+            var args = Array.prototype.slice.call(arguments).concat(sandbox.args);
+
+            try {
+                result = callback.apply(this, args);
+            } catch (e) {
+                exception = e;
+            }
+
+            if (typeof exception !== "undefined") {
+                sandbox.restore();
+                throw exception;
+            }
+            else {
+                sandbox.verifyAndRestore();
+            }
+
+            return result;
+        };
+    }
+
+    test.config = {
+        injectIntoThis: true,
+        injectInto: null,
+        properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+        useFakeTimers: true,
+        useFakeServer: true
+    };
+
+    if (commonJSModule) {
+        module.exports = test;
+    } else {
+        sinon.test = test;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend test.js
+ */
+/*jslint eqeqeq: false, onevar: false, eqeqeq: false*/
+/*global module, require, sinon*/
+/**
+ * Test case, sandboxes all test functions
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module !== 'undefined' && module.exports;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon || !Object.prototype.hasOwnProperty) {
+        return;
+    }
+
+    function createTest(property, setUp, tearDown) {
+        return function () {
+            if (setUp) {
+                setUp.apply(this, arguments);
+            }
+
+            var exception, result;
+
+            try {
+                result = property.apply(this, arguments);
+            } catch (e) {
+                exception = e;
+            }
+
+            if (tearDown) {
+                tearDown.apply(this, arguments);
+            }
+
+            if (exception) {
+                throw exception;
+            }
+
+            return result;
+        };
+    }
+
+    function testCase(tests, prefix) {
+        /*jsl:ignore*/
+        if (!tests || typeof tests != "object") {
+            throw new TypeError("sinon.testCase needs an object with test functions");
+        }
+        /*jsl:end*/
+
+        prefix = prefix || "test";
+        var rPrefix = new RegExp("^" + prefix);
+        var methods = {}, testName, property, method;
+        var setUp = tests.setUp;
+        var tearDown = tests.tearDown;
+
+        for (testName in tests) {
+            if (tests.hasOwnProperty(testName)) {
+                property = tests[testName];
+
+                if (/^(setUp|tearDown)$/.test(testName)) {
+                    continue;
+                }
+
+                if (typeof property == "function" && rPrefix.test(testName)) {
+                    method = property;
+
+                    if (setUp || tearDown) {
+                        method = createTest(property, setUp, tearDown);
+                    }
+
+                    methods[testName] = sinon.test(method);
+                } else {
+                    methods[testName] = tests[testName];
+                }
+            }
+        }
+
+        return methods;
+    }
+
+    if (commonJSModule) {
+        module.exports = testCase;
+    } else {
+        sinon.testCase = testCase;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Assertions matching the test spy retrieval interface.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon, global) {
+    var commonJSModule = typeof module !== "undefined" && module.exports;
+    var slice = Array.prototype.slice;
+    var assert;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function verifyIsStub() {
+        var method;
+
+        for (var i = 0, l = arguments.length; i < l; ++i) {
+            method = arguments[i];
+
+            if (!method) {
+                assert.fail("fake is not a spy");
+            }
+
+            if (typeof method != "function") {
+                assert.fail(method + " is not a function");
+            }
+
+            if (typeof method.getCall != "function") {
+                assert.fail(method + " is not stubbed");
+            }
+        }
+    }
+
+    function failAssertion(object, msg) {
+        object = object || global;
+        var failMethod = object.fail || assert.fail;
+        failMethod.call(object, msg);
+    }
+
+    function mirrorPropAsAssertion(name, method, message) {
+        if (arguments.length == 2) {
+            message = method;
+            method = name;
+        }
+
+        assert[name] = function (fake) {
+            verifyIsStub(fake);
+
+            var args = slice.call(arguments, 1);
+            var failed = false;
+
+            if (typeof method == "function") {
+                failed = !method(fake);
+            } else {
+                failed = typeof fake[method] == "function" ?
+                    !fake[method].apply(fake, args) : !fake[method];
+            }
+
+            if (failed) {
+                failAssertion(this, fake.printf.apply(fake, [message].concat(args)));
+            } else {
+                assert.pass(name);
+            }
+        };
+    }
+
+    function exposedName(prefix, prop) {
+        return !prefix || /^fail/.test(prop) ? prop :
+            prefix + prop.slice(0, 1).toUpperCase() + prop.slice(1);
+    }
+
+    assert = {
+        failException: "AssertError",
+
+        fail: function fail(message) {
+            var error = new Error(message);
+            error.name = this.failException || assert.failException;
+
+            throw error;
+        },
+
+        pass: function pass(assertion) {},
+
+        callOrder: function assertCallOrder() {
+            verifyIsStub.apply(null, arguments);
+            var expected = "", actual = "";
+
+            if (!sinon.calledInOrder(arguments)) {
+                try {
+                    expected = [].join.call(arguments, ", ");
+                    var calls = slice.call(arguments);
+                    var i = calls.length;
+                    while (i) {
+                        if (!calls[--i].called) {
+                            calls.splice(i, 1);
+                        }
+                    }
+                    actual = sinon.orderByFirstCall(calls).join(", ");
+                } catch (e) {
+                    // If this fails, we'll just fall back to the blank string
+                }
+
+                failAssertion(this, "expected " + expected + " to be " +
+                              "called in order but were called as " + actual);
+            } else {
+                assert.pass("callOrder");
+            }
+        },
+
+        callCount: function assertCallCount(method, count) {
+            verifyIsStub(method);
+
+            if (method.callCount != count) {
+                var msg = "expected %n to be called " + sinon.timesInWords(count) +
+                    " but was called %c%C";
+                failAssertion(this, method.printf(msg));
+            } else {
+                assert.pass("callCount");
+            }
+        },
+
+        expose: function expose(target, options) {
+            if (!target) {
+                throw new TypeError("target is null or undefined");
+            }
+
+            var o = options || {};
+            var prefix = typeof o.prefix == "undefined" && "assert" || o.prefix;
+            var includeFail = typeof o.includeFail == "undefined" || !!o.includeFail;
+
+            for (var method in this) {
+                if (method != "export" && (includeFail || !/^(fail)/.test(method))) {
+                    target[exposedName(prefix, method)] = this[method];
+                }
+            }
+
+            return target;
+        },
+
+        match: function match(actual, expectation) {
+            var matcher = sinon.match(expectation);
+            if (matcher.test(actual)) {
+                assert.pass("match");
+            } else {
+                var formatted = [
+                    "expected value to match",
+                    "    expected = " + sinon.format(expectation),
+                    "    actual = " + sinon.format(actual)
+                ]
+                failAssertion(this, formatted.join("\n"));
+            }
+        }
+    };
+
+    mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
+    mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
+                          "expected %n to not have been called but was called %c%C");
+    mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
+    mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
+    mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
+    mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
+    mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
+    mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
+    mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
+    mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
+    mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
+    mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
+    mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
+    mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
+    mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
+    mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
+    mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
+    mirrorPropAsAssertion("threw", "%n did not throw exception%C");
+    mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
+
+    if (commonJSModule) {
+        module.exports = assert;
+    } else {
+        sinon.assert = assert;
+    }
+}(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : (typeof self != "undefined") ? self : global));
+
+return sinon;}.call(typeof window != 'undefined' && window || {}));
diff --git a/test/webapp_test.js b/test/webapp_test.js
new file mode 100644
index 000000000000..cc66dd6924f4
--- /dev/null
+++ b/test/webapp_test.js
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var expect = chai.expect;
+
+describe("test", function() {
+  "use strict";
+
+  it("is true", function() {
+    expect(true).eql(true);
+  });
+});

From 934cdb3f40de7cac3d5e15f5fd4fc82ef488484b Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 035/117] Bug 979880: Added basic view toggling utility in app
 router. r=dmose,r=ametaireau

--HG--
extra : transplant_source : %3AG%17%0D%B5%AB%F2%3E%9D%A3J%1Di%DF%29%E5%BC%EC%AF%AF
---
 static/index.html    |  10 ++--
 static/js/webapp.js  | 111 ++++++++++++++++++++++++++++++++++++++++++-
 static/l10n/data.ini |  10 +++-
 test/webapp_test.js  |  36 ++++++++++++--
 4 files changed, 158 insertions(+), 9 deletions(-)

diff --git a/static/index.html b/static/index.html
index 2679f7021f42..f4dad0cbe3bc 100644
--- a/static/index.html
+++ b/static/index.html
@@ -17,11 +17,15 @@
       <h1>Loop</h1>
     </header>
 
-    <div id="call-launcher">
-      <p><button class="btn">Call</button></p>
+    <div id="home">
+      <p data-l10n-id="welcome">Welcome to the Loop web client.</p>
     </div>
 
-    <div id="call" class="conversation">
+    <div id="call-launcher" class="hide">
+      <p><button class="btn btn-success" data-l10n-id="start_call">Start call</button></p>
+    </div>
+
+    <div id="call" class="conversation hide">
       <nav class="controls">
         <button class="btn" data-l10n-id="start">Start</button>
         <button class="btn" data-l10n-id="stop">Stop</button>
diff --git a/static/js/webapp.js b/static/js/webapp.js
index 5eb89386a0b1..5725e014b556 100644
--- a/static/js/webapp.js
+++ b/static/js/webapp.js
@@ -8,11 +8,118 @@ var loop = loop || {};
 loop.webapp = (function() {
   "use strict";
 
+  var router;
+
+  /**
+   * Base Backbone view.
+   */
+  var BaseView = Backbone.View.extend({
+    hide: function() {
+      this.$el.hide();
+      return this;
+    },
+
+    show: function() {
+      this.$el.show();
+      return this;
+    }
+  });
+
+  /**
+   * Homepage view.
+   */
+  var HomeView = BaseView.extend({
+    el: "#home"
+  });
+
+  /**
+   * Call launcher view.
+   */
+  var CallLauncherView = BaseView.extend({
+    el: "#call-launcher",
+
+    events: {
+      "click button": "launchCall"
+    },
+
+    initialize: function(options) {
+      options = options || {};
+      if (!options.token) {
+        throw new Error("missing required token");
+      }
+      this.token = options.token;
+    },
+
+    launchCall: function(event) {
+      event.preventDefault();
+      // XXX: request the loop server for call information using this.token
+    }
+  });
+
+  /**
+   * Call view.
+   */
+  var CallView = BaseView.extend({
+    el: "#call"
+  });
+
+  /**
+   * App Router. Allows defining a main active view and ease toggling it when
+   * the active route changes.
+   * @link http://mikeygee.com/blog/backbone.html
+   */
+  var Router = Backbone.Router.extend({
+    view: undefined,
+
+    routes: {
+        "": "home",
+        "call/:token": "call"
+    },
+
+    initialize: function() {
+      this.loadView(new HomeView());
+    },
+
+    /**
+     * Loads and render current active view.
+     *
+     * @param {BaseView} view View.
+     */
+    loadView : function(view) {
+      this.view && this.view.hide();
+      this.view = view.render().show();
+    },
+
+    /**
+     * Main entry point.
+     */
+    home: function() {
+      this.loadView(new HomeView());
+    },
+
+    /**
+     * Call setup view.
+     *
+     * @param  {String} token Call token.
+     */
+    call: function(token) {
+      this.loadView(new CallLauncherView({token: token}));
+    }
+  });
+
+  /**
+   * App initialization.
+   */
   function init() {
-    console.log("Loop app started.");
+    router = new Router();
+    Backbone.history.start();
   }
 
   return {
-    init: init
+    init: init,
+    BaseView: BaseView,
+    HomeView: HomeView,
+    Router: Router,
+    CallLauncherView: CallLauncherView
   };
 })();
diff --git a/static/l10n/data.ini b/static/l10n/data.ini
index ecd38f8d181f..489091c6cd90 100644
--- a/static/l10n/data.ini
+++ b/static/l10n/data.ini
@@ -1,3 +1,11 @@
-[en-US]
+[en]
 start=Start
 stop=Stop
+start_call=Start the call
+welcome=Welcome to the Loop web client.
+
+[fr]
+start=Démarrer
+stop=Arrêter
+start_call=Démarrer l'appel
+welcome=Bienvenue sur Loop.
diff --git a/test/webapp_test.js b/test/webapp_test.js
index cc66dd6924f4..d5e6c7907838 100644
--- a/test/webapp_test.js
+++ b/test/webapp_test.js
@@ -2,12 +2,42 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* global loop */
+
 var expect = chai.expect;
 
-describe("test", function() {
+describe("Router", function() {
   "use strict";
 
-  it("is true", function() {
-    expect(true).eql(true);
+  var router;
+
+  beforeEach(function() {
+    router = new loop.webapp.Router();
+  });
+
+  describe("#constructor", function() {
+    it("should define a default active view", function() {
+      expect(router.view).to.be.an.instanceOf(loop.webapp.HomeView);
+    });
+  });
+
+  describe("#loadView", function() {
+    it("should set the active view", function() {
+      router.loadView(new loop.webapp.CallLauncherView({token: "fake"}));
+
+      expect(router.view).to.be.an.instanceOf(loop.webapp.CallLauncherView);
+    });
+  });
+});
+
+describe("CallLauncherView", function() {
+  "use strict";
+
+  describe("#constructor", function() {
+    it("should require a token option", function() {
+      expect(function() {
+        new loop.webapp.CallLauncherView();
+      }).to.Throw(Error, /missing required token/);
+    });
   });
 });

From f5876d76c95497a7d1bf09bee2d0a41b252199c5 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 036/117] Bug 979880 - Implement basic UI+logic for initiating
 a call. r=Standard8

--HG--
extra : transplant_source : U%1EN%CB%0A%BD%96%3D%0EU%3B%B9F%FD%20%CA%AA%A7%21h
---
 .../components/loop/standalone/.jshintignore  |   2 +-
 static/index.html                             |   8 +-
 static/js/webapp.js                           | 195 +++++++++++++++---
 test/webapp_test.js                           | 144 ++++++++++---
 4 files changed, 292 insertions(+), 57 deletions(-)

diff --git a/browser/components/loop/standalone/.jshintignore b/browser/components/loop/standalone/.jshintignore
index 1adfbf46b9b3..feeabf52a72a 100644
--- a/browser/components/loop/standalone/.jshintignore
+++ b/browser/components/loop/standalone/.jshintignore
@@ -1,4 +1,4 @@
 node_modules
-static/libs
+static/shared/libs
 test/vendor
 
diff --git a/static/index.html b/static/index.html
index f4dad0cbe3bc..9c18c4336fe6 100644
--- a/static/index.html
+++ b/static/index.html
@@ -21,9 +21,11 @@
       <p data-l10n-id="welcome">Welcome to the Loop web client.</p>
     </div>
 
-    <div id="call-launcher" class="hide">
-      <p><button class="btn btn-success" data-l10n-id="start_call">Start call</button></p>
-    </div>
+    <form id="conversation-form" class="hide">
+      <p>
+        <button class="btn btn-success" data-l10n-id="start_call">Start call</button>
+      </p>
+    </form>
 
     <div id="call" class="conversation hide">
       <nav class="controls">
diff --git a/static/js/webapp.js b/static/js/webapp.js
index 5725e014b556..74f7cb090560 100644
--- a/static/js/webapp.js
+++ b/static/js/webapp.js
@@ -8,17 +8,114 @@ var loop = loop || {};
 loop.webapp = (function() {
   "use strict";
 
+  /**
+   * Base Loop server URL.
+   *
+   * XXX: should be configurable, but how?
+   *
+   * @type {String}
+   */
+  var baseApiUrl = "http://localhost:5000";
+
+  /**
+   * App router.
+   * @type {loop.webapp.Router}
+   */
   var router;
 
+  /**
+   * Current conversation model instance.
+   * @type {loop.webapp.ConversationModel}
+   */
+  var conversation;
+
+  /**
+   * Conversation model.
+   */
+  var ConversationModel = Backbone.Model.extend({
+    defaults: {
+      loopToken:    undefined, // Loop conversation token
+      sessionId:    undefined, // TB session id
+      sessionToken: undefined, // TB session token
+      apiKey:       undefined  // TB api key
+    },
+
+    /**
+     * Initiates a conversation, requesting call session information to the Loop
+     * server and updates appropriately the current model attributes with the
+     * data.
+     *
+     * Triggered events:
+     *
+     * - `session:ready` when the session information have been succesfully
+     *   retrieved from the server;
+     * - `session:error` when the request failed.
+     *
+     * @param  {Object} options Conversation options.
+     * @throws {Error} If no conversation token is set
+     */
+    initiate: function(options) {
+      options = options || {};
+
+      if (!this.get("loopToken")) {
+        throw new Error("missing required attribute loopToken");
+      }
+
+      var request = $.ajax({
+        url:         baseApiUrl + "/calls/" + this.get("loopToken"),
+        method:      "POST",
+        contentType: "application/json",
+        data:        JSON.stringify({}),
+        dataType:    "json"
+      });
+
+      request.done(this.setReady.bind(this));
+
+      request.fail(function(xhr, _, statusText) {
+        var serverError = xhr.status + " " + statusText;
+        if (typeof xhr.responseJSON === "object" && xhr.responseJSON.error) {
+          serverError += "; " + xhr.responseJSON.error;
+        }
+        this.trigger("session:error", new Error(
+          "Retrieval of session information failed: HTTP " + serverError));
+      }.bind(this));
+    },
+
+    /**
+     * Sets session information and triggers the `session:ready` event.
+     *
+     * @param {Object} sessionData Conversation session information.
+     */
+    setReady: function(sessionData) {
+      // Explicit property assignment to prevent later "surprises"
+      this.set({
+        sessionId:    sessionData.sessionId,
+        sessionToken: sessionData.sessionToken,
+        apiKey:       sessionData.apiKey
+      }).trigger("session:ready", this);
+      return this;
+    }
+  });
+
   /**
    * Base Backbone view.
    */
   var BaseView = Backbone.View.extend({
+    /**
+     * Hides view element.
+     *
+     * @return {BaseView}
+     */
     hide: function() {
       this.$el.hide();
       return this;
     },
 
+    /**
+     * Shows view element.
+     *
+     * @return {BaseView}
+     */
     show: function() {
       this.$el.show();
       return this;
@@ -33,34 +130,35 @@ loop.webapp = (function() {
   });
 
   /**
-   * Call launcher view.
+   * Conversation launcher view. A ConversationModel is associated and attached
+   * as a `model` property.
    */
-  var CallLauncherView = BaseView.extend({
-    el: "#call-launcher",
+  var ConversationFormView = BaseView.extend({
+    el: "#conversation-form",
 
     events: {
-      "click button": "launchCall"
+      "submit": "initiate"
     },
 
-    initialize: function(options) {
-      options = options || {};
-      if (!options.token) {
-        throw new Error("missing required token");
-      }
-      this.token = options.token;
+    initialize: function() {
+      this.listenTo(this.model, "session:error", function(error) {
+        // XXX: display a proper error notification to end user, probably
+        //      reusing the BB notification system from the Loop desktop client.
+        alert(error);
+      });
     },
 
-    launchCall: function(event) {
+    initiate: function(event) {
       event.preventDefault();
-      // XXX: request the loop server for call information using this.token
+      this.model.initiate();
     }
   });
 
   /**
-   * Call view.
+   * Conversation view.
    */
-  var CallView = BaseView.extend({
-    el: "#call"
+  var ConversationView = BaseView.extend({
+    el: "#conversation"
   });
 
   /**
@@ -69,41 +167,76 @@ loop.webapp = (function() {
    * @link http://mikeygee.com/blog/backbone.html
    */
   var Router = Backbone.Router.extend({
-    view: undefined,
+    _conversation: undefined,
+    activeView: undefined,
 
     routes: {
-        "": "home",
-        "call/:token": "call"
+      "": "home",
+      "call/:token": "initiate"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+      options = options || {};
+      if (!options.conversation) {
+        throw new Error("missing required conversation");
+      }
+      this._conversation = options.conversation;
+      this.listenTo(this._conversation, "session:ready",
+                    this._onConversationSessionReady);
+
+      // Load default view
       this.loadView(new HomeView());
     },
 
+    /**
+     * Called when a conversation session is ready.
+     *
+     * @param  {ConversationModel} conversation Conversation model instance.
+     */
+    _onConversationSessionReady: function(conversation) {
+      // XXX: navigate to the conversation route
+      //      establish conversation with TB sdk
+      //      setup conversation view accordingly
+      alert("conversation session ready");
+      console.log("conversation session info", conversation);
+    },
+
     /**
      * Loads and render current active view.
      *
      * @param {BaseView} view View.
      */
     loadView : function(view) {
-      this.view && this.view.hide();
-      this.view = view.render().show();
+      if (this.activeView) {
+        this.activeView.hide();
+      }
+      this.activeView = view.render().show();
     },
 
     /**
-     * Main entry point.
+     * Default entry point.
      */
     home: function() {
       this.loadView(new HomeView());
     },
 
     /**
-     * Call setup view.
+     * Loads conversation launcher view, setting the received conversation token
+     * to the current conversation model.
      *
-     * @param  {String} token Call token.
+     * @param  {String} loopToken Loop conversation token.
      */
-    call: function(token) {
-      this.loadView(new CallLauncherView({token: token}));
+    initiate: function(loopToken) {
+      this._conversation.set("loopToken", loopToken);
+      this.loadView(new ConversationFormView({model: this._conversation}));
+    },
+
+    /**
+     * Loads conversation establishment view.
+     *
+     */
+    conversation: function() {
+      this.loadView(new ConversationView({model: this._conversation}));
     }
   });
 
@@ -111,15 +244,17 @@ loop.webapp = (function() {
    * App initialization.
    */
   function init() {
-    router = new Router();
+    conversation = new ConversationModel();
+    router = new Router({conversation: conversation});
     Backbone.history.start();
   }
 
   return {
-    init: init,
     BaseView: BaseView,
+    ConversationFormView: ConversationFormView,
+    ConversationModel: ConversationModel,
     HomeView: HomeView,
-    Router: Router,
-    CallLauncherView: CallLauncherView
+    init: init,
+    Router: Router
   };
 })();
diff --git a/test/webapp_test.js b/test/webapp_test.js
index d5e6c7907838..5ccbaced6087 100644
--- a/test/webapp_test.js
+++ b/test/webapp_test.js
@@ -2,42 +2,140 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* global loop */
+/* global loop, sinon */
 
 var expect = chai.expect;
 
-describe("Router", function() {
+describe("loop.webapp", function() {
   "use strict";
 
-  var router;
+  var sandbox, fakeXHR, requests = [];
 
   beforeEach(function() {
-    router = new loop.webapp.Router();
+    sandbox = sinon.sandbox.create();
+    fakeXHR = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+    // https://github.com/cjohansen/Sinon.JS/issues/393
+    fakeXHR.xhr.onCreate = function(xhr) {
+      requests.push(xhr);
+    };
   });
 
-  describe("#constructor", function() {
-    it("should define a default active view", function() {
-      expect(router.view).to.be.an.instanceOf(loop.webapp.HomeView);
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("ConversationModel", function() {
+    var conversation, fakeSessionData;
+
+    beforeEach(function() {
+      conversation = new loop.webapp.ConversationModel();
+      fakeSessionData = {
+        sessionId:    "sessionId",
+        sessionToken: "sessionToken",
+        apiKey:       "apiKey"
+      };
+    });
+
+    describe("#initiate", function() {
+      it("should prevent launching a conversation when token is missing",
+        function() {
+          expect(function() {
+            conversation.initiate();
+          }).to.Throw(Error, /missing required attribute loopToken/);
+        });
+
+      it("should update conversation session information from server data",
+        function() {
+          conversation.set("loopToken", "fakeToken");
+          conversation.initiate();
+
+          expect(requests).to.have.length.of(1);
+
+          requests[0].respond(200, {"Content-Type": "application/json"},
+                                   JSON.stringify(fakeSessionData));
+
+          expect(conversation.get("sessionId")).eql("sessionId");
+          expect(conversation.get("sessionToken")).eql("sessionToken");
+          expect(conversation.get("apiKey")).eql("apiKey");
+        });
+
+      it("should trigger a `session:error` on failure", function(done) {
+        conversation.set("loopToken", "fakeToken");
+        conversation.initiate();
+
+        conversation.on("session:error", function(err) {
+          expect(err.message).to.match(/failed: HTTP 400 Bad Request; fake/);
+          done();
+        });
+
+        requests[0].respond(400, {"Content-Type": "application/json"},
+                                  JSON.stringify({error: "fake"}));
+      });
+    });
+
+    describe("#setReady", function() {
+      it("should update conversation session information", function() {
+        conversation.setReady(fakeSessionData);
+
+        expect(conversation.get("sessionId")).eql("sessionId");
+        expect(conversation.get("sessionToken")).eql("sessionToken");
+        expect(conversation.get("apiKey")).eql("apiKey");
+      });
+
+      it("should trigger a `session:ready` event", function(done) {
+        conversation.on("session:ready", function() {
+          done();
+        }).setReady(fakeSessionData);
+      });
     });
   });
 
-  describe("#loadView", function() {
-    it("should set the active view", function() {
-      router.loadView(new loop.webapp.CallLauncherView({token: "fake"}));
+  describe("Router", function() {
+    var router, conversation;
 
-      expect(router.view).to.be.an.instanceOf(loop.webapp.CallLauncherView);
-    });
-  });
-});
-
-describe("CallLauncherView", function() {
-  "use strict";
-
-  describe("#constructor", function() {
-    it("should require a token option", function() {
-      expect(function() {
-        new loop.webapp.CallLauncherView();
-      }).to.Throw(Error, /missing required token/);
+    beforeEach(function() {
+      conversation = new loop.webapp.ConversationModel({loopToken: "fake"});
+      router = new loop.webapp.Router({conversation: conversation});
+    });
+
+    describe("#constructor", function() {
+      it("should define a default active view", function() {
+        expect(router.activeView).to.be.an.instanceOf(loop.webapp.HomeView);
+      });
+    });
+
+    describe("#loadView", function() {
+      it("should set the active view", function() {
+        router.loadView(new loop.webapp.ConversationFormView({
+          model: conversation
+        }));
+
+        expect(router.activeView).to.be.an.instanceOf(
+          loop.webapp.ConversationFormView);
+      });
+    });
+  });
+
+  describe("ConversationFormView", function() {
+    describe("#initiate", function() {
+      var conversation, initiate, view, fakeSubmitEvent;
+
+      beforeEach(function() {
+        conversation = new loop.webapp.ConversationModel();
+        view = new loop.webapp.ConversationFormView({model: conversation});
+        fakeSubmitEvent = {preventDefault: sinon.spy()};
+      });
+
+      it("should start the conversation establishment process", function() {
+        initiate = sinon.stub(conversation, "initiate");
+        conversation.set("loopToken", "fake");
+
+        view.initiate(fakeSubmitEvent);
+
+        sinon.assert.calledOnce(fakeSubmitEvent.preventDefault);
+        sinon.assert.calledOnce(initiate);
+      });
     });
   });
 });

From 4d461a3f49582f4714e566a4dd3a294ea081c62e Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 037/117] Bug 979880 - Call establishment. r=dmose

--HG--
extra : transplant_source : j/P2f%EE%F1i%0B%98%18%3C%3D%0A%DD%10%1D%E4C%04
---
 static/index.html   |  11 ++--
 static/js/webapp.js | 101 ++++++++++++++++++++++++++++-----
 test/webapp_test.js | 135 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 228 insertions(+), 19 deletions(-)

diff --git a/static/index.html b/static/index.html
index 9c18c4336fe6..9019fb32ae27 100644
--- a/static/index.html
+++ b/static/index.html
@@ -27,18 +27,21 @@
       </p>
     </form>
 
-    <div id="call" class="conversation hide">
+    <div id="conversation" class="conversation hide">
       <nav class="controls">
         <button class="btn" data-l10n-id="start">Start</button>
         <button class="btn" data-l10n-id="stop">Stop</button>
       </nav>
-      <div class="media nested">
-        <video class="remote" src="http://v2v.cc/~j/theora_testsuite/320x240.ogg"></video>
-        <video class="local" src="http://v2v.cc/~j/theora_testsuite/320x240.ogg"></video>
+      <!-- XXX: We really want .nested instead of .side-by-side, but partner SDK
+                makes it rather difficult. To be investigated later. -->
+      <div class="media side-by-side">
+        <div id="incoming" class="remote"></div>
+        <div id="outgoing" class="local"></div>
       </div>
     </div>
 
     <!-- libs -->
+    <script src="http://static.opentok.com/webrtc/v2.0/js/TB.min.js"></script>
     <script type="text/javascript" src="shared/libs/webl10n-20130617.js"></script>
     <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
diff --git a/static/js/webapp.js b/static/js/webapp.js
index 74f7cb090560..bdb23c66dc53 100644
--- a/static/js/webapp.js
+++ b/static/js/webapp.js
@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/*global loop:true*/
+/* global loop:true */
 
 var loop = loop || {};
-loop.webapp = (function() {
+loop.webapp = (function($, TB) {
   "use strict";
 
   /**
@@ -61,6 +61,11 @@ loop.webapp = (function() {
         throw new Error("missing required attribute loopToken");
       }
 
+      // Check if the session is already set
+      if (this.isSessionReady()) {
+        return this.trigger("session:ready", this);
+      }
+
       var request = $.ajax({
         url:         baseApiUrl + "/calls/" + this.get("loopToken"),
         method:      "POST",
@@ -81,6 +86,15 @@ loop.webapp = (function() {
       }.bind(this));
     },
 
+    /**
+     * Checks that the session is ready.
+     *
+     * @return {Boolean}
+     */
+    isSessionReady: function() {
+      return !!this.get("sessionId");
+    },
+
     /**
      * Sets session information and triggers the `session:ready` event.
      *
@@ -158,7 +172,51 @@ loop.webapp = (function() {
    * Conversation view.
    */
   var ConversationView = BaseView.extend({
-    el: "#conversation"
+    el: "#conversation",
+
+    /**
+     * Establishes webrtc communication using TB sdk.
+     */
+    initialize: function() {
+      this.videoStyles = { width: "100%", height: "100%" };
+      // XXX: this feels like to be moved to the ConversationModel, but as it's
+      // tighly coupled with the DOM (element ids to receive streams), we'd need
+      // an abstraction we probably don't want yet.
+      this.session   = TB.initSession(this.model.get("sessionId"));
+      this.publisher = TB.initPublisher(this.model.get("apiKey"), "outgoing",
+                                        this.videoStyles);
+
+      this.session.connect(this.model.get("apiKey"),
+                           this.model.get("sessionToken"));
+
+      this.listenTo(this.session, "sessionConnected", this._sessionConnected);
+      this.listenTo(this.session, "streamCreated", this._streamCreated);
+      this.listenTo(this.session, "connectionDestroyed", this._sessionEnded);
+    },
+
+    _sessionConnected: function(event) {
+      this.session.publish(this.publisher);
+      this._subscribeToStreams(event.streams);
+    },
+
+    _streamCreated: function(event) {
+      this._subscribeToStreams(event.streams);
+    },
+
+    _sessionEnded: function(event) {
+      // XXX: better end user notification
+      alert("Your session has ended. Reason: " + event.reason);
+      this.model.trigger("session:ended");
+    },
+
+    _subscribeToStreams: function(streams) {
+      streams.forEach(function(stream) {
+        if (stream.connection.connectionId !==
+            this.session.connection.connectionId) {
+          this.session.subscribe(stream, "incoming", this.videoStyles);
+        }
+      }.bind(this));
+    }
   });
 
   /**
@@ -172,6 +230,7 @@ loop.webapp = (function() {
 
     routes: {
       "": "home",
+      "call/ongoing": "conversation",
       "call/:token": "initiate"
     },
 
@@ -181,24 +240,26 @@ loop.webapp = (function() {
         throw new Error("missing required conversation");
       }
       this._conversation = options.conversation;
-      this.listenTo(this._conversation, "session:ready",
-                    this._onConversationSessionReady);
+
+      this.listenTo(this._conversation, "session:ready", this._onSessionReady);
+      this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
 
       // Load default view
       this.loadView(new HomeView());
     },
 
     /**
-     * Called when a conversation session is ready.
-     *
-     * @param  {ConversationModel} conversation Conversation model instance.
+     * Navigates to conversation when the call session is ready.
      */
-    _onConversationSessionReady: function(conversation) {
-      // XXX: navigate to the conversation route
-      //      establish conversation with TB sdk
-      //      setup conversation view accordingly
-      alert("conversation session ready");
-      console.log("conversation session info", conversation);
+    _onSessionReady: function() {
+      this.navigate("call/ongoing", {trigger: true});
+    },
+
+    /**
+     * Navigates back to initiate when the call session has ended.
+     */
+    _onSessionEnded: function() {
+      this.navigate("call/" + this._conversation.get("token"), {trigger: true});
     },
 
     /**
@@ -236,6 +297,15 @@ loop.webapp = (function() {
      *
      */
     conversation: function() {
+      if (!this._conversation.isSessionReady()) {
+        var loopToken = this._conversation.get("loopToken");
+        if (loopToken) {
+          return this.navigate("call/" + loopToken, {trigger: true});
+        } else {
+          // XXX: notify user that a call token is missing
+          return this.navigate("home", {trigger: true});
+        }
+      }
       this.loadView(new ConversationView({model: this._conversation}));
     }
   });
@@ -253,8 +323,9 @@ loop.webapp = (function() {
     BaseView: BaseView,
     ConversationFormView: ConversationFormView,
     ConversationModel: ConversationModel,
+    ConversationView: ConversationView,
     HomeView: HomeView,
     init: init,
     Router: Router
   };
-})();
+})(jQuery, window.TB);
diff --git a/test/webapp_test.js b/test/webapp_test.js
index 5ccbaced6087..d27f9b57c439 100644
--- a/test/webapp_test.js
+++ b/test/webapp_test.js
@@ -25,6 +25,129 @@ describe("loop.webapp", function() {
     sandbox.restore();
   });
 
+  describe("Router", function() {
+    var conversation, fakeSessionData;
+
+    beforeEach(function() {
+      conversation = new loop.webapp.ConversationModel();
+      fakeSessionData = {
+        sessionId:    "sessionId",
+        sessionToken: "sessionToken",
+        apiKey:       "apiKey"
+      };
+    });
+
+    describe("#constructor", function() {
+      it("should require a ConversationModel instance", function() {
+        expect(function() {
+          new loop.webapp.Router();
+        }).to.Throw(Error, /missing required conversation/);
+      });
+
+      it("should load the HomeView", function() {
+        sandbox.stub(loop.webapp.Router.prototype, "loadView");
+
+        var router = new loop.webapp.Router({conversation: conversation});
+
+        sinon.assert.calledOnce(router.loadView);
+        sinon.assert.calledWithMatch(router.loadView,
+                                     {$el: {selector: "#home"}});
+      });
+    });
+
+    describe("constructed", function() {
+      var router;
+
+      beforeEach(function() {
+        router = new loop.webapp.Router({conversation: conversation});
+      });
+
+      describe("#loadView", function() {
+        // XXX hard to test as hell… functional?
+        it("should load the passed view");
+      });
+    });
+
+    describe("Routes", function() {
+      var router;
+
+      beforeEach(function() {
+        router = new loop.webapp.Router({conversation: conversation});
+        sandbox.stub(router, "loadView");
+      });
+
+      describe("#home", function() {
+        it("should load the HomeView", function() {
+          router.home();
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWithMatch(router.loadView,
+                                       {$el: {selector: "#home"}});
+        });
+      });
+
+      describe("#initiate", function() {
+        it("should load the ConversationFormView and set the token",
+          function() {
+            router.initiate("fakeToken");
+
+            sinon.assert.calledOnce(router.loadView);
+            sinon.assert.calledWithMatch(router.loadView, {
+              $el: {selector: "#conversation-form"},
+              model: {attributes: {loopToken: "fakeToken"}}
+            });
+          });
+      });
+
+      describe("#conversation", function() {
+        it("should load the ConversationView if session is set", function() {
+          sandbox.stub(loop.webapp.ConversationView.prototype, "initialize");
+          conversation.set("sessionId", "fakeSessionId");
+
+          router.conversation();
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWithMatch(router.loadView, {
+            $el: {selector: "#conversation"}
+          });
+        });
+
+        it("should redirect to #call/{token} if session isn't ready",
+          function() {
+            conversation.set("loopToken", "fakeToken");
+            sandbox.stub(router, "navigate");
+
+            router.conversation();
+
+            sinon.assert.calledOnce(router.navigate);
+            sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
+          });
+
+        it("should redirect to #home if no call token is set", function() {
+          sandbox.stub(router, "navigate");
+
+          router.conversation();
+
+          sinon.assert.calledOnce(router.navigate);
+          sinon.assert.calledWithMatch(router.navigate, "home");
+        });
+      });
+    });
+
+    describe("Events", function() {
+      it("should navigate to call/ongoing once the call session is ready",
+        function() {
+          sandbox.stub(loop.webapp.Router.prototype, "navigate");
+          var router = new loop.webapp.Router({conversation: conversation});
+
+          conversation.setReady(fakeSessionData);
+
+          sinon.assert.calledOnce(router.navigate);
+          sinon.assert.calledWith(router.navigate, "call/ongoing");
+        });
+    });
+  });
+
   describe("ConversationModel", function() {
     var conversation, fakeSessionData;
 
@@ -60,6 +183,18 @@ describe("loop.webapp", function() {
           expect(conversation.get("apiKey")).eql("apiKey");
         });
 
+      it("should trigger session:ready without fetching session data over "+
+         "HTTP when already set", function(done) {
+          sandbox.stub(jQuery, "ajax");
+          conversation.set("loopToken", "fakeToken");
+          conversation.set(fakeSessionData);
+
+          conversation.on("session:ready", function() {
+            sinon.assert.notCalled($.ajax);
+            done();
+          }).initiate();
+        });
+
       it("should trigger a `session:error` on failure", function(done) {
         conversation.set("loopToken", "fakeToken");
         conversation.initiate();

From 9c9063be9e7f6f3ce9b8d774e73743371f2698c5 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 038/117] Bug 979880 - Attempt at fixing Partner SDK styles.
 r=dmose

--HG--
extra : transplant_source : %9F%C7%CE%01%03%10%A4%CD%E0ikQ%01%1AB%206%9Fp%ED
---
 static/index.html                  | 16 +++++++++++-----
 static/shared/css/conversation.css |  9 +++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/static/index.html b/static/index.html
index 9019fb32ae27..87ba077e563f 100644
--- a/static/index.html
+++ b/static/index.html
@@ -32,11 +32,17 @@
         <button class="btn" data-l10n-id="start">Start</button>
         <button class="btn" data-l10n-id="stop">Stop</button>
       </nav>
-      <!-- XXX: We really want .nested instead of .side-by-side, but partner SDK
-                makes it rather difficult. To be investigated later. -->
-      <div class="media side-by-side">
-        <div id="incoming" class="remote"></div>
-        <div id="outgoing" class="local"></div>
+      <div class="media nested">
+        <!-- both these wrappers are required by the SDK; this is fragile and
+             will break if a future version of SDK updates this generated DOM,
+             especially as the SDK seems to actually move wrapped contents into
+             their own generated stuff -->
+        <div class="remote">
+          <div id="incoming"></div>
+        </div>
+        <div class="local">
+          <div id="outgoing"></div>
+        </div>
       </div>
     </div>
 
diff --git a/static/shared/css/conversation.css b/static/shared/css/conversation.css
index d65bdced5a03..ad3e199425b4 100644
--- a/static/shared/css/conversation.css
+++ b/static/shared/css/conversation.css
@@ -41,3 +41,12 @@
 .conversation .media.side-by-side .local {
   width: 50%;
 }
+
+/**
+ * Overriden SDK styles; .OT_video-container is using absolute positioning
+ * therefore moves the video elements it contains outside of the current
+ * viewport.
+ */
+.conversation .OT_video-container {
+  position: inherit;
+}

From 574fa16a0842006ac8017b2319e311ad7a4bc8b6 Mon Sep 17 00:00:00 2001
From: Romain Gauthier <romain.gauthier@monkeypatch.me>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 039/117] Bug 987597: Send an caller identifier when obtaining
 a call-url. r=Standard8

--HG--
extra : transplant_source : %EAx%7C%60%B1.%BB%A1%25%3E%DFNnH%83%24%3A%AE%9D%3E
---
 static/shared/css/common.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/shared/css/common.css b/static/shared/css/common.css
index c4b969ec4f46..46d8cdad9178 100644
--- a/static/shared/css/common.css
+++ b/static/shared/css/common.css
@@ -85,6 +85,12 @@ img {
   background: #d9534f;
 }
 
+.disabled {
+    cursor: not-allowed;
+    pointer-events: none;
+    opacity: 0.65;
+}
+
 /* Alerts */
 .alert {
   background: #eee;

From 49c12d9a4812573d1dfa3e57f770d60c8959786b Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 040/117] Bug 985596 Set up initial desktop window - share some
 of the webapp models and views with the desktop client. r=dmose

--HG--
rename : test/vendor/chai-1.9.0.js => browser/components/loop/test/shared/vendor/chai-1.9.0.js
rename : test/vendor/mocha-1.17.1.css => browser/components/loop/test/shared/vendor/mocha-1.17.1.css
rename : test/vendor/mocha-1.17.1.js => browser/components/loop/test/shared/vendor/mocha-1.17.1.js
rename : test/vendor/sinon-1.9.0.js => browser/components/loop/test/shared/vendor/sinon-1.9.0.js
extra : transplant_source : p%B7/%BA%B8%FAV%D0%8F%ABV%98%DB%AE%28%E6%8C%FA%C6C
---
 .../components/loop/standalone/.jshintignore  |     2 +-
 .../components/loop/test/shared/index.html    |    51 +
 .../loop/test/shared/models_test.js           |   125 +
 .../loop/test/shared}/vendor/chai-1.9.0.js    |     0
 .../loop/test/shared}/vendor/mocha-1.17.1.css |     0
 .../loop/test/shared}/vendor/mocha-1.17.1.js  |     0
 .../loop/test/shared}/vendor/sinon-1.9.0.js   |     0
 .../components/loop/test/shared/views_test.js |    24 +
 static/index.html                             |     2 +
 static/js/webapp.js                           |   176 +-
 static/shared/js/models.js                    |   101 +
 static/shared/js/views.js                     |    92 +
 static/shared/libs/sdk.js                     | 15256 ++++++++++++++++
 test/webapp_test.js                           |    97 +-
 14 files changed, 15668 insertions(+), 258 deletions(-)
 create mode 100644 browser/components/loop/test/shared/index.html
 create mode 100644 browser/components/loop/test/shared/models_test.js
 rename {test => browser/components/loop/test/shared}/vendor/chai-1.9.0.js (100%)
 rename {test => browser/components/loop/test/shared}/vendor/mocha-1.17.1.css (100%)
 rename {test => browser/components/loop/test/shared}/vendor/mocha-1.17.1.js (100%)
 rename {test => browser/components/loop/test/shared}/vendor/sinon-1.9.0.js (100%)
 create mode 100644 browser/components/loop/test/shared/views_test.js
 create mode 100644 static/shared/js/models.js
 create mode 100644 static/shared/js/views.js
 create mode 100644 static/shared/libs/sdk.js

diff --git a/browser/components/loop/standalone/.jshintignore b/browser/components/loop/standalone/.jshintignore
index feeabf52a72a..a8f602076302 100644
--- a/browser/components/loop/standalone/.jshintignore
+++ b/browser/components/loop/standalone/.jshintignore
@@ -1,4 +1,4 @@
 node_modules
 static/shared/libs
-test/vendor
+test/shared/vendor
 
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
new file mode 100644
index 000000000000..04e412c9ca59
--- /dev/null
+++ b/browser/components/loop/test/shared/index.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>Loop mocha tests</title>
+  <link rel="stylesheet" media="all" href="vendor/mocha-1.17.1.css">
+  <link rel="prefetch" type="application/l10n" href="../../static/l10n/data.ini">
+</head>
+
+<body>
+
+  <div id="mocha">
+    <p><a href=".">Index</a></p>
+  </div>
+  <div id="messages"></div>
+  <div id="fixtures"></div>
+
+  <!-- libs -->
+  <script src="../../static/shared/libs/webl10n-20130617.js"></script>
+  <script src="../../static/shared/libs/jquery-2.1.0.js"></script>
+  <script src="../../static/shared/libs/lodash-2.4.1.js"></script>
+  <script src="../../static/shared/libs/backbone-1.1.2.js"></script>
+
+  <!-- test dependencies -->
+  <script src="vendor/mocha-1.17.1.js"></script>
+  <script src="vendor/chai-1.9.0.js"></script>
+  <script src="vendor/sinon-1.9.0.js"></script>
+  <script>
+    chai.Assertion.includeStack = true;
+    mocha.setup('bdd');
+  </script>
+
+  <!-- App scripts -->
+  <script src="../../static/shared/js/models.js"></script>
+  <script src="../../static/shared/js/views.js"></script>
+
+  <!-- Test scripts -->
+  <script src="models_test.js"></script>
+  <script src="views_test.js"></script>
+  <script>
+    mocha.run(function () {
+      $("#mocha").append("<p>Complete.</p>");
+    });
+  </script>
+
+</body>
+</html>
diff --git a/browser/components/loop/test/shared/models_test.js b/browser/components/loop/test/shared/models_test.js
new file mode 100644
index 000000000000..153ccde804f8
--- /dev/null
+++ b/browser/components/loop/test/shared/models_test.js
@@ -0,0 +1,125 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop, sinon */
+
+var expect = chai.expect;
+
+describe("loop.shared.models", function() {
+  "use strict";
+
+  var sandbox, fakeXHR, requests = [];
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    fakeXHR = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+    // https://github.com/cjohansen/Sinon.JS/issues/393
+    fakeXHR.xhr.onCreate = function(xhr) {
+      requests.push(xhr);
+    };
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("ConversationModel", function() {
+    var conversation, fakeSessionData, fakeBaseServerUrl;
+
+    beforeEach(function() {
+      conversation = new loop.shared.models.ConversationModel();
+      fakeSessionData = {
+        sessionId:    "sessionId",
+        sessionToken: "sessionToken",
+        apiKey:       "apiKey"
+      };
+      fakeBaseServerUrl = "http://fakeBaseServerUrl";
+    });
+
+    describe("#initiate", function() {
+
+      it("should throw an Error if no baseServerUrl argument is passed",
+        function () {
+          expect(function() {
+            conversation.initiate();
+          }).to.Throw(Error, /baseServerUrl/);
+        });
+
+      it("should prevent launching a conversation when token is missing",
+        function() {
+          expect(function() {
+            conversation.initiate(fakeBaseServerUrl);
+          }).to.Throw(Error, /missing required attribute loopToken/);
+        });
+
+      it("should make one ajax POST to a correctly constructed URL",
+        function() {
+          conversation.set("loopToken", "fakeToken");
+
+          conversation.initiate(fakeBaseServerUrl);
+
+          expect(requests).to.have.length.of(1);
+          expect(requests[0].method.toLowerCase()).to.equal("post");
+          expect(requests[0].url).to.match(
+            new RegExp("^" + fakeBaseServerUrl + "/calls/fakeToken"));
+        });
+
+      it("should update conversation session information from server data",
+        function() {
+          conversation.set("loopToken", "fakeToken");
+
+          conversation.initiate(fakeBaseServerUrl);
+          requests[0].respond(200, {"Content-Type": "application/json"},
+                                   JSON.stringify(fakeSessionData));
+
+          expect(conversation.get("sessionId")).eql("sessionId");
+          expect(conversation.get("sessionToken")).eql("sessionToken");
+          expect(conversation.get("apiKey")).eql("apiKey");
+        });
+
+      it("should trigger session:ready without fetching session data over "+
+         "HTTP when already set", function(done) {
+          sandbox.stub(jQuery, "ajax");
+          conversation.set("loopToken", "fakeToken");
+          conversation.set(fakeSessionData);
+
+          conversation.on("session:ready", function() {
+            sinon.assert.notCalled($.ajax);
+            done();
+          }).initiate(fakeBaseServerUrl);
+        });
+
+      it("should trigger a `session:error` on failure", function(done) {
+        conversation.set("loopToken", "fakeToken");
+        conversation.initiate(fakeBaseServerUrl);
+
+        conversation.on("session:error", function(err) {
+          expect(err.message).to.match(/failed: HTTP 400 Bad Request; fake/);
+          done();
+        });
+
+        requests[0].respond(400, {"Content-Type": "application/json"},
+                                  JSON.stringify({error: "fake"}));
+      });
+    });
+
+    describe("#setReady", function() {
+      it("should update conversation session information", function() {
+        conversation.setReady(fakeSessionData);
+
+        expect(conversation.get("sessionId")).eql("sessionId");
+        expect(conversation.get("sessionToken")).eql("sessionToken");
+        expect(conversation.get("apiKey")).eql("apiKey");
+      });
+
+      it("should trigger a `session:ready` event", function(done) {
+        conversation.on("session:ready", function() {
+          done();
+        }).setReady(fakeSessionData);
+      });
+    });
+  });
+});
+
diff --git a/test/vendor/chai-1.9.0.js b/browser/components/loop/test/shared/vendor/chai-1.9.0.js
similarity index 100%
rename from test/vendor/chai-1.9.0.js
rename to browser/components/loop/test/shared/vendor/chai-1.9.0.js
diff --git a/test/vendor/mocha-1.17.1.css b/browser/components/loop/test/shared/vendor/mocha-1.17.1.css
similarity index 100%
rename from test/vendor/mocha-1.17.1.css
rename to browser/components/loop/test/shared/vendor/mocha-1.17.1.css
diff --git a/test/vendor/mocha-1.17.1.js b/browser/components/loop/test/shared/vendor/mocha-1.17.1.js
similarity index 100%
rename from test/vendor/mocha-1.17.1.js
rename to browser/components/loop/test/shared/vendor/mocha-1.17.1.js
diff --git a/test/vendor/sinon-1.9.0.js b/browser/components/loop/test/shared/vendor/sinon-1.9.0.js
similarity index 100%
rename from test/vendor/sinon-1.9.0.js
rename to browser/components/loop/test/shared/vendor/sinon-1.9.0.js
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
new file mode 100644
index 000000000000..74b94bb40cc2
--- /dev/null
+++ b/browser/components/loop/test/shared/views_test.js
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global sinon */
+
+describe("loop.shared.views", function() {
+  "use strict";
+
+  var sandbox;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("ConversationView", function() {
+    it("should be tested");
+  });
+});
+
diff --git a/static/index.html b/static/index.html
index 87ba077e563f..2a413c2e4fcb 100644
--- a/static/index.html
+++ b/static/index.html
@@ -54,6 +54,8 @@
     <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
 
     <!-- app scripts -->
+    <script type="text/javascript" src="shared/js/models.js"></script>
+    <script type="text/javascript" src="shared/js/views.js"></script>
     <script type="text/javascript" src="js/webapp.js"></script>
 
     <script>
diff --git a/static/js/webapp.js b/static/js/webapp.js
index bdb23c66dc53..33ce96607e3f 100644
--- a/static/js/webapp.js
+++ b/static/js/webapp.js
@@ -25,121 +25,14 @@ loop.webapp = (function($, TB) {
 
   /**
    * Current conversation model instance.
-   * @type {loop.webapp.ConversationModel}
+   * @type {loop.shared.models.ConversationModel}
    */
   var conversation;
 
-  /**
-   * Conversation model.
-   */
-  var ConversationModel = Backbone.Model.extend({
-    defaults: {
-      loopToken:    undefined, // Loop conversation token
-      sessionId:    undefined, // TB session id
-      sessionToken: undefined, // TB session token
-      apiKey:       undefined  // TB api key
-    },
-
-    /**
-     * Initiates a conversation, requesting call session information to the Loop
-     * server and updates appropriately the current model attributes with the
-     * data.
-     *
-     * Triggered events:
-     *
-     * - `session:ready` when the session information have been succesfully
-     *   retrieved from the server;
-     * - `session:error` when the request failed.
-     *
-     * @param  {Object} options Conversation options.
-     * @throws {Error} If no conversation token is set
-     */
-    initiate: function(options) {
-      options = options || {};
-
-      if (!this.get("loopToken")) {
-        throw new Error("missing required attribute loopToken");
-      }
-
-      // Check if the session is already set
-      if (this.isSessionReady()) {
-        return this.trigger("session:ready", this);
-      }
-
-      var request = $.ajax({
-        url:         baseApiUrl + "/calls/" + this.get("loopToken"),
-        method:      "POST",
-        contentType: "application/json",
-        data:        JSON.stringify({}),
-        dataType:    "json"
-      });
-
-      request.done(this.setReady.bind(this));
-
-      request.fail(function(xhr, _, statusText) {
-        var serverError = xhr.status + " " + statusText;
-        if (typeof xhr.responseJSON === "object" && xhr.responseJSON.error) {
-          serverError += "; " + xhr.responseJSON.error;
-        }
-        this.trigger("session:error", new Error(
-          "Retrieval of session information failed: HTTP " + serverError));
-      }.bind(this));
-    },
-
-    /**
-     * Checks that the session is ready.
-     *
-     * @return {Boolean}
-     */
-    isSessionReady: function() {
-      return !!this.get("sessionId");
-    },
-
-    /**
-     * Sets session information and triggers the `session:ready` event.
-     *
-     * @param {Object} sessionData Conversation session information.
-     */
-    setReady: function(sessionData) {
-      // Explicit property assignment to prevent later "surprises"
-      this.set({
-        sessionId:    sessionData.sessionId,
-        sessionToken: sessionData.sessionToken,
-        apiKey:       sessionData.apiKey
-      }).trigger("session:ready", this);
-      return this;
-    }
-  });
-
-  /**
-   * Base Backbone view.
-   */
-  var BaseView = Backbone.View.extend({
-    /**
-     * Hides view element.
-     *
-     * @return {BaseView}
-     */
-    hide: function() {
-      this.$el.hide();
-      return this;
-    },
-
-    /**
-     * Shows view element.
-     *
-     * @return {BaseView}
-     */
-    show: function() {
-      this.$el.show();
-      return this;
-    }
-  });
-
   /**
    * Homepage view.
    */
-  var HomeView = BaseView.extend({
+  var HomeView = loop.shared.views.BaseView.extend({
     el: "#home"
   });
 
@@ -147,7 +40,7 @@ loop.webapp = (function($, TB) {
    * Conversation launcher view. A ConversationModel is associated and attached
    * as a `model` property.
    */
-  var ConversationFormView = BaseView.extend({
+  var ConversationFormView = loop.shared.views.BaseView.extend({
     el: "#conversation-form",
 
     events: {
@@ -164,58 +57,7 @@ loop.webapp = (function($, TB) {
 
     initiate: function(event) {
       event.preventDefault();
-      this.model.initiate();
-    }
-  });
-
-  /**
-   * Conversation view.
-   */
-  var ConversationView = BaseView.extend({
-    el: "#conversation",
-
-    /**
-     * Establishes webrtc communication using TB sdk.
-     */
-    initialize: function() {
-      this.videoStyles = { width: "100%", height: "100%" };
-      // XXX: this feels like to be moved to the ConversationModel, but as it's
-      // tighly coupled with the DOM (element ids to receive streams), we'd need
-      // an abstraction we probably don't want yet.
-      this.session   = TB.initSession(this.model.get("sessionId"));
-      this.publisher = TB.initPublisher(this.model.get("apiKey"), "outgoing",
-                                        this.videoStyles);
-
-      this.session.connect(this.model.get("apiKey"),
-                           this.model.get("sessionToken"));
-
-      this.listenTo(this.session, "sessionConnected", this._sessionConnected);
-      this.listenTo(this.session, "streamCreated", this._streamCreated);
-      this.listenTo(this.session, "connectionDestroyed", this._sessionEnded);
-    },
-
-    _sessionConnected: function(event) {
-      this.session.publish(this.publisher);
-      this._subscribeToStreams(event.streams);
-    },
-
-    _streamCreated: function(event) {
-      this._subscribeToStreams(event.streams);
-    },
-
-    _sessionEnded: function(event) {
-      // XXX: better end user notification
-      alert("Your session has ended. Reason: " + event.reason);
-      this.model.trigger("session:ended");
-    },
-
-    _subscribeToStreams: function(streams) {
-      streams.forEach(function(stream) {
-        if (stream.connection.connectionId !==
-            this.session.connection.connectionId) {
-          this.session.subscribe(stream, "incoming", this.videoStyles);
-        }
-      }.bind(this));
+      this.model.initiate(baseApiUrl);
     }
   });
 
@@ -265,7 +107,7 @@ loop.webapp = (function($, TB) {
     /**
      * Loads and render current active view.
      *
-     * @param {BaseView} view View.
+     * @param {loop.shared.BaseView} view View.
      */
     loadView : function(view) {
       if (this.activeView) {
@@ -306,7 +148,8 @@ loop.webapp = (function($, TB) {
           return this.navigate("home", {trigger: true});
         }
       }
-      this.loadView(new ConversationView({model: this._conversation}));
+      this.loadView(
+        new loop.shared.views.ConversationView({model: this._conversation}));
     }
   });
 
@@ -314,16 +157,13 @@ loop.webapp = (function($, TB) {
    * App initialization.
    */
   function init() {
-    conversation = new ConversationModel();
+    conversation = new loop.shared.models.ConversationModel();
     router = new Router({conversation: conversation});
     Backbone.history.start();
   }
 
   return {
-    BaseView: BaseView,
     ConversationFormView: ConversationFormView,
-    ConversationModel: ConversationModel,
-    ConversationView: ConversationView,
     HomeView: HomeView,
     init: init,
     Router: Router
diff --git a/static/shared/js/models.js b/static/shared/js/models.js
new file mode 100644
index 000000000000..437c90c26911
--- /dev/null
+++ b/static/shared/js/models.js
@@ -0,0 +1,101 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.models = (function() {
+  "use strict";
+
+  /**
+   * Conversation model.
+   */
+  var ConversationModel = Backbone.Model.extend({
+    defaults: {
+      loopToken:    undefined, // Loop conversation token
+      sessionId:    undefined, // TB session id
+      sessionToken: undefined, // TB session token
+      apiKey:       undefined  // TB api key
+    },
+
+    /**
+     * Initiates a conversation, requesting call session information to the Loop
+     * server and updates appropriately the current model attributes with the
+     * data.
+     *
+     * Triggered events:
+     *
+     * - `session:ready` when the session information have been successfully
+     *   retrieved from the server;
+     * - `session:error` when the request failed.
+     *
+     * @param  {Object} baseServerUrl The server URL
+     * @throws {Error} If no baseServerUrl is given
+     * @throws {Error} If no conversation token is set
+     */
+    initiate: function(baseServerUrl) {
+
+      if (!baseServerUrl) {
+        throw new Error("baseServerUrl arg must be passed to initiate()");
+      }
+
+      if (!this.get("loopToken")) {
+        throw new Error("missing required attribute loopToken");
+      }
+
+      // Check if the session is already set
+      if (this.isSessionReady()) {
+        return this.trigger("session:ready", this);
+      }
+
+      var request = $.ajax({
+        url:         baseServerUrl + "/calls/" + this.get("loopToken"),
+        method:      "POST",
+        contentType: "application/json",
+        data:        JSON.stringify({}),
+        dataType:    "json"
+      });
+
+      request.done(this.setReady.bind(this));
+
+      request.fail(function(xhr, _, statusText) {
+        var serverError = xhr.status + " " + statusText;
+        if (typeof xhr.responseJSON === "object" && xhr.responseJSON.error) {
+          serverError += "; " + xhr.responseJSON.error;
+        }
+        this.trigger("session:error", new Error(
+          "Retrieval of session information failed: HTTP " + serverError));
+      }.bind(this));
+    },
+
+    /**
+     * Checks that the session is ready.
+     *
+     * @return {Boolean}
+     */
+    isSessionReady: function() {
+      return !!this.get("sessionId");
+    },
+
+    /**
+     * Sets session information and triggers the `session:ready` event.
+     *
+     * @param {Object} sessionData Conversation session information.
+     */
+    setReady: function(sessionData) {
+      // Explicit property assignment to prevent later "surprises"
+      this.set({
+        sessionId:    sessionData.sessionId,
+        sessionToken: sessionData.sessionToken,
+        apiKey:       sessionData.apiKey
+      }).trigger("session:ready", this);
+      return this;
+    }
+  });
+
+  return {
+    ConversationModel: ConversationModel
+  };
+})();
diff --git a/static/shared/js/views.js b/static/shared/js/views.js
new file mode 100644
index 000000000000..01e35aa6538e
--- /dev/null
+++ b/static/shared/js/views.js
@@ -0,0 +1,92 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+// XXX This file needs unit tests.
+
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.views = (function(TB) {
+  "use strict";
+
+  /**
+   * Base Backbone view.
+   */
+  var BaseView = Backbone.View.extend({
+    /**
+     * Hides view element.
+     *
+     * @return {BaseView}
+     */
+    hide: function() {
+      this.$el.hide();
+      return this;
+    },
+
+    /**
+     * Shows view element.
+     *
+     * @return {BaseView}
+     */
+    show: function() {
+      this.$el.show();
+      return this;
+    }
+  });
+
+  /**
+   * Conversation view.
+   */
+  var ConversationView = BaseView.extend({
+    el: "#conversation",
+
+    initialize: function() {
+      this.videoStyles = { width: "100%", height: "100%" };
+
+      // XXX this feels like to be moved to the ConversationModel, but as it's
+      // tighly coupled with the DOM (element ids to receive streams), we'd need
+      // an abstraction we probably don't want yet.
+      this.session   = TB.initSession(this.model.get("sessionId"));
+      this.publisher = TB.initPublisher(this.model.get("apiKey"), "outgoing",
+                                        this.videoStyles);
+
+      this.session.connect(this.model.get("apiKey"),
+                           this.model.get("sessionToken"));
+
+      this.listenTo(this.session, "sessionConnected", this._sessionConnected);
+      this.listenTo(this.session, "streamCreated", this._streamCreated);
+      this.listenTo(this.session, "connectionDestroyed", this._sessionEnded);
+    },
+
+    _sessionConnected: function(event) {
+      this.session.publish(this.publisher);
+      this._subscribeToStreams(event.streams);
+    },
+
+    _streamCreated: function(event) {
+      this._subscribeToStreams(event.streams);
+    },
+
+    _sessionEnded: function(event) {
+      // XXX: better end user notification
+      alert("Your session has ended. Reason: " + event.reason);
+      this.model.trigger("session:ended");
+    },
+
+    _subscribeToStreams: function(streams) {
+      streams.forEach(function(stream) {
+        if (stream.connection.connectionId !==
+            this.session.connection.connectionId) {
+          this.session.subscribe(stream, "incoming", this.videoStyles);
+        }
+      }.bind(this));
+    }
+  });
+
+  return {
+    BaseView: BaseView,
+    ConversationView: ConversationView
+  };
+})(window.TB);
diff --git a/static/shared/libs/sdk.js b/static/shared/libs/sdk.js
new file mode 100644
index 000000000000..3acbd56c76ec
--- /dev/null
+++ b/static/shared/libs/sdk.js
@@ -0,0 +1,15256 @@
+/**
+ * @license  OpenTok JavaScript Library v2.0.18.1
+ * http://www.tokbox.com/
+ *
+ * Copyright (c) 2013 TokBox, Inc.
+ *
+ * Date: March 18 06:20:17 2014
+ */
+
+(function(window) {
+if (!window.OT) window.OT = {};
+
+OT.properties = {
+  version: "v2.0.18.1",         // The current version (eg. v2.0.4) (This is replaced by gradle)
+  build: "7333ca3",    // The current build hash (This is replaced by gradle)
+
+  debug: "false",      // Whether or not to turn on debug logging by default
+  websiteURL: "http://www.tokbox.com",      // The URL of the tokbox website
+
+  cdnURL: "http://static.opentok.com",        // The URL of the CDN
+  loggingURL: "http://hlg.tokbox.com/prod",   // The URL to use for logging
+  apiURL: "http://anvil.opentok.com",          // The anvil API URL
+
+  messagingProtocol: "wss",         // What protocol to use when connecting to the rumor web socket
+  messagingPort: 443,               // What port to use when connection to the rumor web socket
+
+  supportSSL: "true",           // If this environment supports SSL
+  cdnURLSSL: "https://static.opentok.com",         // The CDN to use if we're using SSL
+  loggingURLSSL: "https://hlg.tokbox.com/prod",    // The loggging URL to use if we're using SSL
+  apiURLSSL: "https://anvil.opentok.com"             // The anvil API URL to use if we're using SSL
+};
+
+})(window);
+/**
+ * @license  Common JS Helpers on OpenTok 0.1.0 628a0b9 master
+ * http://www.tokbox.com/
+ *
+ * Copyright (c) 2014 TokBox, Inc.
+ *
+ * Date: January 08 04:13:37 2014
+ *
+ */
+
+// OT Helper Methods
+//
+// helpers.js                           <- the root file
+// helpers/lib/{helper topic}.js        <- specialised helpers for specific tasks/topics
+//                                          (i.e. video, dom, etc)
+//
+// @example Getting a DOM element by it's id
+//  var element = OTHelpers('domId');
+//
+// @example Testing for web socket support
+//  if (OT.supportsWebSockets()) {
+//      // do some stuff with websockets
+//  }
+//
+
+/*jshint browser:true, smarttabs:true*/
+
+!(function(window, undefined) {
+
+
+var OTHelpers = function(domId) {
+    return document.getElementById(domId);
+};
+
+var previousOTHelpers = window.OTHelpers;
+
+window.OTHelpers = OTHelpers;
+
+OTHelpers.noConflict = function() {
+  OTHelpers.noConflict = function() {
+    return OTHelpers;
+  };
+  window.OTHelpers = previousOTHelpers;
+  return OTHelpers;
+};
+
+
+OTHelpers.isEmpty = function(obj) {
+  if (obj === null || obj === undefined) return true;
+  if (Array.isArray(obj) || typeof(obj) === 'string') return obj.length === 0;
+
+  // Objects without enumerable owned properties are empty.
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) return false;
+  }
+
+  return true;
+};
+
+OTHelpers.isNone = function(obj) {
+  return obj === undefined || obj === null;
+};
+
+OTHelpers.isObject = function(obj) {
+  return obj === Object(obj);
+};
+
+
+OTHelpers.isFunction = function(obj) {
+    return typeof obj === 'function';
+};
+
+// Extend a target object with the properties from one or
+// more source objects
+//
+// @example:
+//    dest = OTHelpers.extend(dest, source1, source2, source3);
+//
+OTHelpers.extend = function(/* dest, source1[, source2, ..., , sourceN]*/) {
+    var sources = Array.prototype.slice.call(arguments),
+        dest = sources.shift();
+
+    sources.forEach(function(source) {
+        for (var key in source) {
+            dest[key] = source[key];
+        }
+    });
+
+    return dest;
+};
+
+// Ensures that the target object contains certain defaults.
+//
+// @example
+//   var options = OTHelpers.defaults(options, {
+//     loading: true     // loading by default
+//   });
+//
+OTHelpers.defaults = function(/* dest, defaults1[, defaults2, ..., , defaultsN]*/) {
+    var sources = Array.prototype.slice.call(arguments),
+        dest = sources.shift();
+
+    sources.forEach(function(source) {
+        for (var key in source) {
+            if (dest[key] === void 0) dest[key] = source[key];
+        }
+    });
+
+    return dest;
+};
+
+//
+OTHelpers.clone = function(obj) {
+    if (!OTHelpers.isObject(obj)) return obj;
+    return Array.isArray(obj) ? obj.slice() : OTHelpers.extend({}, obj);
+};
+
+
+
+// Handy do nothing function
+OTHelpers.noop = function() {};
+
+// Returns true if the client supports WebSockets, false otherwise.
+OTHelpers.supportsWebSockets = function() {
+    return 'WebSocket' in window;
+};
+
+// Returns the number of millisceonds since the the UNIX epoch, this is functionally
+// equivalent to executing new Date().getTime().
+//
+// Where available, we use 'performance.now' which is more accurate and reliable,
+// otherwise we default to new Date().getTime().
+OTHelpers.now = (function() {
+    var performance = window.performance || {},
+        navigationStart,
+        now =  performance.now       ||
+               performance.mozNow    ||
+               performance.msNow     ||
+               performance.oNow      ||
+               performance.webkitNow;
+
+    if (now) {
+        now = now.bind(performance);
+        navigationStart = performance.timing.navigationStart;
+
+        return  function() { return navigationStart + now(); };
+    }
+    else {
+        return function() { return new Date().getTime(); };
+    }
+})();
+
+OTHelpers.browser = function() {
+    var userAgent = window.navigator.userAgent.toLowerCase(),
+        navigatorVendor,
+        browser = 'Unknown';
+
+    if (userAgent.indexOf('firefox') > -1)   {
+        browser = 'Firefox';
+    }
+    if (userAgent.indexOf('opera') > -1)   {
+        browser = 'Opera';
+    }
+    else if (userAgent.indexOf("msie") > -1) {
+        browser = "IE";
+    }
+    else if (userAgent.indexOf("chrome") > -1) {
+        browser = "Chrome";
+    }
+
+    if ((navigatorVendor = window.navigator.vendor) && navigatorVendor.toLowerCase().indexOf("apple") > -1) {
+        browser = "Safari";
+    }
+
+    userAgent = null;
+    OTHelpers.browser = function() { return browser; };
+    return browser;
+};
+
+
+OTHelpers.canDefineProperty = true;
+
+try {
+    Object.defineProperty({}, 'x', {});
+} catch (err) {
+    OTHelpers.canDefineProperty = false;
+}
+
+// A helper for defining a number of getters at once.
+//
+// @example: from inside an object
+//   OTHelpers.defineGetters(this, {
+//     apiKey: function() { return _apiKey; },
+//     token: function() { return _token; },
+//     connected: function() { return this.is('connected'); },
+//     connection: function() { return _socket && _socket.id ? this.connections.get(_socket.id) : null; },
+//     capabilities: function() { return _socket.capabilities; },
+//     sessionId: function() { return _sessionId; },
+//     id: function() { return _sessionId; }
+//   });
+//
+OTHelpers.defineGetters = function(self, getters, enumerable) {
+  var propsDefinition = {};
+
+  if (enumerable === void 0) enumerable = false;
+
+  for (var key in getters) {
+    propsDefinition[key] = {
+      get: getters[key],
+      enumerable: enumerable
+    };
+  }
+
+  Object.defineProperties(self, propsDefinition);
+};
+
+
+// Polyfill Object.create for IE8
+//
+// See https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/create
+//
+if (!Object.create) {
+    Object.create = function (o) {
+        if (arguments.length > 1) {
+            throw new Error('Object.create implementation only accepts the first parameter.');
+        }
+        function F() {}
+        F.prototype = o;
+        return new F();
+    };
+}
+
+OTHelpers.setCookie = function(key, value) {
+  try {
+    localStorage.setItem(key, value);
+  } catch (err) {
+    // Store in browser cookie
+    var date = new Date();
+    date.setTime(date.getTime()+(365*24*60*60*1000));
+    var expires = "; expires="+date.toGMTString();
+    document.cookie = key+"="+value+expires+"; path=/";
+  }
+};
+
+OTHelpers.getCookie = function(key) {
+    var value;
+
+    try {
+      value = localStorage.getItem("opentok_client_id");
+      return value;
+    } catch (err) {
+      // Check browser cookies
+      var nameEQ = key + "=";
+      var ca = document.cookie.split(';');
+      for(var i=0;i < ca.length;i++) {
+        var c = ca[i];
+        while (c.charAt(0)==' ') c = c.substring(1,c.length);
+        if (c.indexOf(nameEQ) === 0) {
+          value = c.substring(nameEQ.length,c.length);
+        }
+      }
+
+      if (value) {
+        return value;
+      }
+    }
+
+    return null;
+};
+
+
+/// Stolen from Underscore, this needs replacing
+
+
+  // Invert the keys and values of an object. The values must be serializable.
+  OTHelpers.invert = function(obj) {
+    var result = {};
+    for (var key in obj) if (obj.hasOwnProperty(key)) result[obj[key]] = key;
+    return result;
+  };
+
+
+  // List of HTML entities for escaping.
+  var entityMap = {
+    escape: {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#x27;',
+      '/': '&#x2F;'
+    }
+  };
+  entityMap.unescape = OTHelpers.invert(entityMap.escape);
+
+  // Regexes containing the keys and values listed immediately above.
+  var entityRegexes = {
+    escape:   new RegExp('[' + Object.keys(entityMap.escape).join('') + ']', 'g'),
+    unescape: new RegExp('(' + Object.keys(entityMap.unescape).join('|') + ')', 'g')
+  };
+
+  // Functions for escaping and unescaping strings to/from HTML interpolation.
+  ['escape', 'unescape'].forEach(function(method) {
+    OTHelpers[method] = function(string) {
+      if (string === null || string === undefined) return '';
+      return ('' + string).replace(entityRegexes[method], function(match) {
+        return entityMap[method][match];
+      });
+    };
+  });
+
+// By default, Underscore uses ERB-style template delimiters, change the
+// following template settings to use alternative delimiters.
+OTHelpers.templateSettings = {
+  evaluate    : /<%([\s\S]+?)%>/g,
+  interpolate : /<%=([\s\S]+?)%>/g,
+  escape      : /<%-([\s\S]+?)%>/g
+};
+
+// When customizing `templateSettings`, if you don't want to define an
+// interpolation, evaluation or escaping regex, we need one that is
+// guaranteed not to match.
+var noMatch = /(.)^/;
+
+// Certain characters need to be escaped so that they can be put into a
+// string literal.
+var escapes = {
+  "'":      "'",
+  '\\':     '\\',
+  '\r':     'r',
+  '\n':     'n',
+  '\t':     't',
+  '\u2028': 'u2028',
+  '\u2029': 'u2029'
+};
+
+var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+
+// JavaScript micro-templating, similar to John Resig's implementation.
+// Underscore templating handles arbitrary delimiters, preserves whitespace,
+// and correctly escapes quotes within interpolated code.
+OTHelpers.template = function(text, data, settings) {
+  var render;
+  settings = OTHelpers.defaults({}, settings, OTHelpers.templateSettings);
+
+  // Combine delimiters into one regular expression via alternation.
+  var matcher = new RegExp([
+    (settings.escape || noMatch).source,
+    (settings.interpolate || noMatch).source,
+    (settings.evaluate || noMatch).source
+  ].join('|') + '|$', 'g');
+
+  // Compile the template source, escaping string literals appropriately.
+  var index = 0;
+  var source = "__p+='";
+  text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+    source += text.slice(index, offset)
+      .replace(escaper, function(match) { return '\\' + escapes[match]; });
+
+    if (escape) {
+      source += "'+\n((__t=(" + escape + "))==null?'':OTHelpers.escape(__t))+\n'";
+    }
+    if (interpolate) {
+      source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+    }
+    if (evaluate) {
+      source += "';\n" + evaluate + "\n__p+='";
+    }
+    index = offset + match.length;
+    return match;
+  });
+  source += "';\n";
+
+  // If a variable is not specified, place data values in local scope.
+  if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+  source = "var __t,__p='',__j=Array.prototype.join," +
+    "print=function(){__p+=__j.call(arguments,'');};\n" +
+    source + "return __p;\n";
+
+
+  try {
+    // evil is necessary for the new Function line
+    /*jshint evil:true */
+    render = new Function(settings.variable || 'obj', source);
+  } catch (e) {
+    e.source = source;
+    throw e;
+  }
+
+  if (data) return render(data);
+  var template = function(data) {
+    return render.call(this, data);
+  };
+
+  // Provide the compiled function source as a convenience for precompilation.
+  template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
+
+  return template;
+};
+
+})(window);
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../../helpers.js')
+
+(function(window, OTHelpers, undefined) {
+
+OTHelpers.statable = function(self, possibleStates, initialState, stateChanged, stateChangedFailed) {
+  var previousState,
+      currentState = initialState;
+
+  var setState = function(state) {
+    if (currentState !== state) {
+        if (possibleStates.indexOf(state) === -1) {
+          if (stateChangedFailed && OTHelpers.isFunction(stateChangedFailed)) stateChangedFailed('invalidState', state);
+          return;
+        }
+
+        previousState = currentState;
+        currentState = state;
+        if (stateChanged && OTHelpers.isFunction(stateChanged)) stateChanged(state, previousState);
+    }
+  };
+
+
+  // Returns a number of states and returns true if the current state
+  // is any of them.
+  //
+  // @example
+  // if (this.is('connecting', 'connected')) {
+  //   // do some stuff
+  // }
+  //
+  self.is = function (/* state0:String, state1:String, ..., stateN:String */) {
+    return Array.prototype.indexOf.call(arguments, currentState) !== -1;
+  };
+
+
+  // Returns a number of states and returns true if the current state
+  // is none of them.
+  //
+  // @example
+  // if (this.isNot('connecting', 'connected')) {
+  //   // do some stuff
+  // }
+  //
+  self.isNot = function (/* state0:String, state1:String, ..., stateN:String */) {
+    return Array.prototype.indexOf.call(arguments, currentState) === -1;
+  };
+
+  Object.defineProperties(self, {
+    state: {
+      get: function() { return currentState; }
+    },
+
+    previousState: {
+      get: function() { return previousState; }
+    }
+  });
+
+  return setState;
+};
+
+})(window, window.OTHelpers);
+/*!
+ *  This is a modified version of Robert Kieffer awesome uuid.js library.
+ *  The only modifications we've made are to remove the Node.js specific
+ *  parts of the code and the UUID version 1 generator (which we don't
+ *  use). The original copyright notice is below.
+ *
+ *     node-uuid/uuid.js
+ *
+ *     Copyright (c) 2010 Robert Kieffer
+ *     Dual licensed under the MIT and GPL licenses.
+ *     Documentation and details at https://github.com/broofa/node-uuid
+ */
+// tb_require('../helpers.js')
+
+/*global crypto:true, Uint32Array:true, Buffer:true */
+/*jshint browser:true, smarttabs:true*/
+
+(function(window, OTHelpers, undefined) {
+
+  // Unique ID creation requires a high quality random # generator, but
+  // Math.random() does not guarantee "cryptographic quality".  So we feature
+  // detect for more robust APIs, normalizing each method to return 128-bits
+  // (16 bytes) of random data.
+  var mathRNG, whatwgRNG;
+
+  // Math.random()-based RNG.  All platforms, very fast, unknown quality
+  var _rndBytes = new Array(16);
+  mathRNG = function() {
+    var r, b = _rndBytes, i = 0;
+
+    for (i = 0; i < 16; i++) {
+      if ((i & 0x03) === 0) r = Math.random() * 0x100000000;
+      b[i] = r >>> ((i & 0x03) << 3) & 0xff;
+    }
+
+    return b;
+  };
+
+  // WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
+  // WebKit only (currently), moderately fast, high quality
+  if (window.crypto && crypto.getRandomValues) {
+    var _rnds = new Uint32Array(4);
+    whatwgRNG = function() {
+      crypto.getRandomValues(_rnds);
+
+      for (var c = 0 ; c < 16; c++) {
+        _rndBytes[c] = _rnds[c >> 2] >>> ((c & 0x03) * 8) & 0xff;
+      }
+      return _rndBytes;
+    };
+  }
+
+  // Select RNG with best quality
+  var _rng = whatwgRNG || mathRNG;
+
+  // Buffer class to use
+  var BufferClass = typeof(Buffer) == 'function' ? Buffer : Array;
+
+  // Maps for number <-> hex string conversion
+  var _byteToHex = [];
+  var _hexToByte = {};
+  for (var i = 0; i < 256; i++) {
+    _byteToHex[i] = (i + 0x100).toString(16).substr(1);
+    _hexToByte[_byteToHex[i]] = i;
+  }
+
+  // **`parse()` - Parse a UUID into it's component bytes**
+  function parse(s, buf, offset) {
+    var i = (buf && offset) || 0, ii = 0;
+
+    buf = buf || [];
+    s.toLowerCase().replace(/[0-9a-f]{2}/g, function(oct) {
+      if (ii < 16) { // Don't overflow!
+        buf[i + ii++] = _hexToByte[oct];
+      }
+    });
+
+    // Zero out remaining bytes if string was short
+    while (ii < 16) {
+      buf[i + ii++] = 0;
+    }
+
+    return buf;
+  }
+
+  // **`unparse()` - Convert UUID byte array (ala parse()) into a string**
+  function unparse(buf, offset) {
+    var i = offset || 0, bth = _byteToHex;
+    return  bth[buf[i++]] + bth[buf[i++]] +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] +
+            bth[buf[i++]] + bth[buf[i++]] +
+            bth[buf[i++]] + bth[buf[i++]];
+  }
+
+  // **`v4()` - Generate random UUID**
+
+  // See https://github.com/broofa/node-uuid for API details
+  function v4(options, buf, offset) {
+    // Deprecated - 'format' argument, as supported in v1.2
+    var i = buf && offset || 0;
+
+    if (typeof(options) == 'string') {
+      buf = options == 'binary' ? new BufferClass(16) : null;
+      options = null;
+    }
+    options = options || {};
+
+    var rnds = options.random || (options.rng || _rng)();
+
+    // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+    rnds[6] = (rnds[6] & 0x0f) | 0x40;
+    rnds[8] = (rnds[8] & 0x3f) | 0x80;
+
+    // Copy bytes to buffer, if provided
+    if (buf) {
+      for (var ii = 0; ii < 16; ii++) {
+        buf[i + ii] = rnds[ii];
+      }
+    }
+
+    return buf || unparse(rnds);
+  }
+
+  // Export public API
+  var uuid = v4;
+  uuid.v4 = v4;
+  uuid.parse = parse;
+  uuid.unparse = unparse;
+  uuid.BufferClass = BufferClass;
+
+  // Export RNG options
+  uuid.mathRNG = mathRNG;
+  uuid.whatwgRNG = whatwgRNG;
+
+  OTHelpers.uuid = uuid;
+
+}(window, window.OTHelpers));
+// AJAX helpers
+
+/*jshint browser:true, smarttabs:true*/
+/*global ActiveXObject:true*/
+
+// tb_require('../helpers.js')
+
+(function(window, OTHelpers, undefined) {
+
+// Shim up XML support for IE8
+function shimXMLForIE8(xml) {
+    // https://developer.mozilla.org/en/DOM/Element.firstElementChild
+    Object.defineProperty(xml.prototype, "firstElementChild", {
+        "get" : function() {
+            var node = this;
+            node = node.firstChild;
+            while(node && node.nodeType != 1) node = node.nextSibling;
+            return node;
+        }
+    });
+
+    // https://developer.mozilla.org/En/DOM/Element.lastElementChild
+    Object.defineProperty(xml.prototype, "lastElementChild", {
+        "get" : function() {
+            var node = this;
+            node = node.lastChild;
+            while(node && node.nodeType != 1) node = node.previousSibling;
+            return node;
+        }
+    });
+
+    // https://developer.mozilla.org/En/DOM/Element.nextElementSibling
+    Object.defineProperty(xml.prototype, "nextElementSibling", {
+        "get" : function() {
+            var node = this;
+            while(!OTHelpers.isNone(node = node.nextSibling)) {
+                if(node.nodeType == 1) break;
+            }
+
+            return node;
+        }
+    });
+
+    // https://developer.mozilla.org/En/DOM/Element.previousElementSibling
+    Object.defineProperty(xml.prototype, "previousElementSibling", {
+        "get" : function() {
+            var node = this;
+            while(!OTHelpers.isNone(node = node.previousSibling)) {
+                if(node.nodeType == 1) break;
+            }
+            return node;
+        }
+    });
+}
+
+OTHelpers.parseXML = function(xmlString) {
+    var root, xml;
+
+    if (window.DOMParser) { // Standard IE9 + everyone else
+        xml = (new DOMParser()).parseFromString(xmlString, "text/xml");
+    } else { // <= IE8
+        xml = new ActiveXObject("Microsoft.XMLDOM");
+        xml.async = "false";
+        xml.loadXML(xmlString);
+
+        shimXMLForIE8(xml);
+    }
+
+    root = xml.documentElement;
+
+    if (!root || !root.nodeName || root.nodeName === "parsererror") {
+        // Badly formed XML
+        return null;
+    }
+
+    return xml;
+};
+
+})(window, window.OTHelpers);
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+
+(function(window, OTHelpers, undefined) {
+
+OTHelpers.useLogHelpers = function(on){
+
+    // Log levels for OTLog.setLogLevel
+    on.DEBUG    = 5;
+    on.LOG      = 4;
+    on.INFO     = 3;
+    on.WARN     = 2;
+    on.ERROR    = 1;
+    on.NONE     = 0;
+
+    var _logLevel = on.NONE,
+        _logs = [];
+
+    // Generates a logging method for a particular method and log level.
+    //
+    // Attempts to handle the following cases:
+    // * the desired log method doesn't exist, call fallback (if available) instead
+    // * the console functionality isn't available because the developer tools (in IE)
+    // aren't open, call fallback (if available)
+    // * attempt to deal with weird IE hosted logging methods as best we can.
+    //
+    function generateLoggingMethod(method, level, fallback) {
+        return function() {
+            if (on.shouldLog(level)) {
+                var cons = window.console;
+
+                // In IE, window.console may not exist if the developer tools aren't open
+                if (cons && cons[method]) {
+                    // the desired console method isn't a real object, which means
+                    // that we can't use apply on it. We force it to be a real object
+                    // using Function.bind, assuming that's available.
+                    if (cons[method].apply || Function.prototype.bind) {
+                        if (!cons[method].apply) {
+                            cons[method] = Function.prototype.bind.call(cons[method], cons);
+                        }
+
+                        cons[method].apply(cons, arguments);
+                    }
+                    else {
+                        // This isn't the same result as the above, but it's better
+                        // than nothing.
+                        cons[method](
+                            Array.prototype.slice.apply(arguments).join(' ')
+                        );
+                    }
+                }
+                else if (fallback) {
+                    fallback.apply(on, arguments);
+                }
+
+                appendToLogs(method, arguments);
+            }
+        };
+    }
+
+
+    on.log = generateLoggingMethod('log', on.LOG);
+
+    // Generate debug, info, warn, and error logging methods, these all fallback to on.log
+    on.debug = generateLoggingMethod('debug', on.DEBUG, on.log);
+    on.info = generateLoggingMethod('info', on.INFO, on.log);
+    on.warn = generateLoggingMethod('warn', on.WARN, on.log);
+    on.error = generateLoggingMethod('error', on.ERROR, on.log);
+
+
+    on.setLogLevel = function(level) {
+        _logLevel = typeof(level) === 'number' ? level : 0;
+        on.debug("TB.setLogLevel(" + _logLevel + ")");
+        return _logLevel;
+    };
+
+    on.getLogs = function() {
+        return _logs;
+    };
+
+    // Determine if the level is visible given the current logLevel.
+    on.shouldLog = function(level) {
+        return _logLevel >= level;
+    };
+
+    // Format the current time nicely for logging. Returns the current
+    // local time.
+    function formatDateStamp() {
+        var now = new Date();
+        return now.toLocaleTimeString() + now.getMilliseconds();
+    }
+
+
+    // Append +args+ to logs, along with the current log level and the a date stamp.
+    function appendToLogs(level, args) {
+        if (!args) return;
+
+        var message;
+
+        try {
+            message = JSON.stringify(args);
+        } catch(e) {
+            message = args.toString();
+        }
+
+        if (message.length <= 2) return;
+
+        _logs.push(
+            [level, formatDateStamp(), message]
+        );
+    }
+
+};
+
+OTHelpers.useLogHelpers(OTHelpers);
+OTHelpers.setLogLevel(OTHelpers.ERROR);
+
+})(window, window.OTHelpers);
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+
+(function(window, OTHelpers, undefined) {
+
+OTHelpers.castToBoolean = function(value, defaultValue) {
+    if (value === undefined) return defaultValue;
+    return value === 'true' || value === true;
+};
+
+OTHelpers.roundFloat = function(value, places) {
+    return Number(value.toFixed(places));
+};
+
+})(window, window.OTHelpers);
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('../vendor/uuid.js')
+
+(function(window, OTHelpers, undefined) {
+
+var timeouts = [],
+    messageName = "OTHelpers." + OTHelpers.uuid.v4() + ".zero-timeout";
+
+var handleMessage = function(event) {
+// XXX In chrome windows, event.source is not defined, so the full check
+// doesn't work. I'm not even convinced they need the window check anyway.
+//    if (event.source == window && event.data == messageName) {
+    if (event.data == messageName) {
+        event.stopPropagation();
+        if (timeouts.length > 0) {
+            var args = timeouts.shift(),
+                fn = args.shift();
+
+            fn.apply(null, args);
+        }
+    }
+};
+
+window.addEventListener("message", handleMessage, true);
+
+// Calls the function +fn+ asynchronously with the current execution.
+// This is most commonly used to execute something straight after
+// the current function.
+//
+// Any arguments in addition to +fn+ will be passed to +fn+ when it's
+// called.
+//
+// You would use this inplace of setTimeout(fn, 0) type constructs. callAsync
+// is preferable as it executes in a much more predictable time window,
+// unlike setTimeout which could execute anywhere from 2ms to several thousand
+// depending on the browser/context.
+//
+OTHelpers.callAsync = function (/* fn, [arg1, arg2, ..., argN] */) {
+    timeouts.push(Array.prototype.slice.call(arguments));
+    window.postMessage(messageName, "*");
+};
+
+
+// Wraps +handler+ in a function that will execute it asynchronously
+// so that it doesn't interfere with it's exceution context if it raises
+// an exception.
+OTHelpers.createAsyncHandler = function(handler) {
+    return function() {
+        var args = Array.prototype.slice.call(arguments);
+
+        OTHelpers.callAsync(function() {
+          handler.apply(null, args);
+        });
+    };
+};
+
+})(window, window.OTHelpers);
+/*jshint browser:true, smarttabs:true*/
+/*global jasmine:true*/
+
+// tb_require('../../helpers.js')
+// tb_require('../callbacks.js')
+
+
+(function(window, OTHelpers, undefined) {
+
+/**
+* This base class defines the <code>addEventListener()</code> and <code>removeEventListner()</code> methods of objects
+* that can dispatch events.
+*
+* @class EventDispatcher
+*/
+OTHelpers.eventing = function(self, syncronous) {
+  var _events = {};
+
+
+  // Call the defaultAction, passing args
+  function executeDefaultAction(defaultAction, args) {
+    if (!defaultAction) return;
+
+    defaultAction.apply(null, args.slice());
+  }
+
+  // Execute each handler in +listeners+ with +args+.
+  //
+  // Each handler will be executed async. On completion the defaultAction
+  // handler will be executed with the args.
+  //
+  // @param [Array] listeners
+  //    An array of functions to execute. Each will be passed args.
+  //
+  // @param [Array] args
+  //    An array of arguments to execute each function in  +listeners+ with.
+  //
+  // @param [String] name
+  //    The name of this event.
+  //
+  // @param [Function, Null, Undefined] defaultAction
+  //    An optional function to execute after every other handler. This will execute even
+  //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
+  //    handler would.
+  //
+  // @return Undefined
+  //
+  function executeListenersAsyncronously(name, args, defaultAction) {
+    var listeners = _events[name];
+    if (!listeners || listeners.length === 0) return;
+
+    var listenerAcks = listeners.length;
+
+    listeners.forEach(function(listener) { // , index
+      function filterHandlerAndContext(_listener) {
+        return _listener.context === listener.context && _listener.handler === listener.handler;
+      }
+
+      // We run this asynchronously so that it doesn't interfere with execution if an error happens
+      OTHelpers.callAsync(function() {
+        try {
+          // have to check if the listener has not been removed
+          if (_events[name] && _events[name].some(filterHandlerAndContext)) {
+            (listener.closure || listener.handler).apply(listener.context || null, args);
+          }
+        }
+        finally {
+          listenerAcks--;
+
+          if (listenerAcks === 0) {
+            executeDefaultAction(defaultAction, args);
+          }
+        }
+      });
+    });
+  }
+
+
+  // This is identical to executeListenersAsyncronously except that handlers will
+  // be executed syncronously.
+  //
+  // On completion the defaultAction handler will be executed with the args.
+  //
+  // @param [Array] listeners
+  //    An array of functions to execute. Each will be passed args.
+  //
+  // @param [Array] args
+  //    An array of arguments to execute each function in  +listeners+ with.
+  //
+  // @param [String] name
+  //    The name of this event.
+  //
+  // @param [Function, Null, Undefined] defaultAction
+  //    An optional function to execute after every other handler. This will execute even
+  //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
+  //    handler would.
+  //
+  // @return Undefined
+  //
+  function executeListenersSyncronously(name, args) { // defaultAction is not used
+    var listeners = _events[name];
+    if (!listeners || listeners.length === 0) return;
+
+    listeners.forEach(function(listener) { // index
+      (listener.closure || listener.handler).apply(listener.context || null, args);
+    });
+  }
+
+  var executeListeners = syncronous === true ? executeListenersSyncronously : executeListenersAsyncronously;
+
+
+  var removeAllListenersNamed = function (eventName, context) {
+    if (_events[eventName]) {
+      if (context) {
+        // We are removing by context, get only events that don't
+        // match that context
+        _events[eventName] = _events[eventName].filter(function(listener){
+          return listener.context !== context;
+        });
+      }
+      else {
+        delete _events[eventName];
+      }
+    }
+  };
+
+  var addListeners = function (eventNames, handler, context, closure) {
+    var listener = {handler: handler};
+    if (context) listener.context = context;
+    if (closure) listener.closure = closure;
+
+    eventNames.forEach(function(name) {
+      if (!_events[name]) _events[name] = [];
+      _events[name].push(listener);
+    });
+  }.bind(self);
+
+
+  var removeListeners = function (eventNames, handler, context) {
+    function filterHandlerAndContext(listener) {
+      return !(listener.handler === handler && listener.context === context);
+    }
+
+    eventNames.forEach(function(name) {
+      if (_events[name]) {
+        _events[name] = _events[name].filter(filterHandlerAndContext);
+        if (_events[name].length === 0) delete _events[name];
+      }
+    });
+  }.bind(self);
+
+
+  // Execute any listeners bound to the +event+ Event.
+  //
+  // Each handler will be executed async. On completion the defaultAction
+  // handler will be executed with the args.
+  //
+  // @param [Event] event
+  //    An Event object.
+  //
+  // @param [Function, Null, Undefined] defaultAction
+  //    An optional function to execute after every other handler. This will execute even
+  //    if there are listeners bound to this event. +defaultAction+ will be passed
+  //    args as a normal handler would.
+  //
+  // @return this
+  //
+  self.dispatchEvent = function(event, defaultAction) {
+    if (!event.type) {
+      OTHelpers.error("OTHelpers.Eventing.dispatchEvent: Event has no type");
+      OTHelpers.error(event);
+
+      throw new Error("OTHelpers.Eventing.dispatchEvent: Event has no type");
+    }
+
+    if (!event.target) {
+      event.target = this;
+    }
+
+    if (!_events[event.type] || _events[event.type].length === 0) {
+      executeDefaultAction(defaultAction, [event]);
+      return;
+    }
+
+    executeListeners(event.type, [event], defaultAction);
+
+    return this;
+  };
+
+  // Execute each handler for the event called +name+.
+  //
+  // Each handler will be executed async, and any exceptions that they throw will
+  // be caught and logged
+  //
+  // How to pass these?
+  //  * defaultAction
+  //
+  // @example
+  //  foo.on('bar', function(name, message) {
+  //    alert("Hello " + name + ": " + message);
+  //  });
+  //
+  //  foo.trigger('OpenTok', 'asdf');     // -> Hello OpenTok: asdf
+  //
+  //
+  // @param [String] eventName
+  //    The name of this event.
+  //
+  // @param [Array] arguments
+  //    Any additional arguments beyond +eventName+ will be passed to the handlers.
+  //
+  // @return this
+  //
+  self.trigger = function(eventName) {
+    if (!_events[eventName] || _events[eventName].length === 0) {
+      return;
+    }
+
+    var args = Array.prototype.slice.call(arguments);
+
+    // Remove the eventName arg
+    args.shift();
+
+    executeListeners(eventName, args);
+
+    return this;
+  };
+
+  self.on = function(eventNames, handler_or_context, context) {
+    if (typeof(eventNames) === "string" && handler_or_context) {
+      addListeners(eventNames.split(' '), handler_or_context, context);
+    }
+    else {
+      for (var name in eventNames) {
+        if (eventNames.hasOwnProperty(name)) {
+          addListeners([name], eventNames[name], handler_or_context);
+        }
+      }
+    }
+
+    return this;
+  };
+
+ self.off = function(eventNames, handler_or_context, context) {
+    if (typeof(eventNames) === "string") {
+      if (handler_or_context && OTHelpers.isFunction(handler_or_context)) {
+        removeListeners(eventNames.split(' '), handler_or_context, context);
+      }
+      else {
+        eventNames.split(' ').forEach(function(name) {
+          removeAllListenersNamed(name, handler_or_context);
+        }, this);
+      }
+    }
+    else if (!eventNames) {
+      // remove all bound events
+      _events = {};
+    }
+    else {
+      for (var name in eventNames) {
+        if (eventNames.hasOwnProperty(name)) {
+          removeListeners([name], eventNames[name], handler_or_context);
+        }
+      }
+    }
+
+    return this;
+  };
+
+
+  self.once = function(eventNames, handler, context) {
+    var names = eventNames.split(' '),
+        fun = function() {
+          var result = handler.apply(context || null, arguments);
+          removeListeners(names, handler, context);
+
+          return result;
+        }.bind(this);
+
+    addListeners(names, handler, context, fun);
+    return this;
+  };
+
+
+  /**
+  * This method registers a method as an event listener for a specific event.
+  * <p>
+  *
+  * <p>
+  *   If a handler is not registered for an event, the event is ignored locally. If the event listener function does not exist,
+  *   the event is ignored locally.
+  * </p>
+  * <p>
+  *   Throws an exception if the <code>listener</code> name is invalid.
+  * </p>
+  *
+  * @param {String} type The string identifying the type of event.
+  *
+  * @param {Function} listener The function to be invoked when the object dispatches the event.
+  *
+  * @memberOf EventDispatcher
+  * @method #addEventListener
+  * @see <a href="#events">Events</a>
+  */
+  // See 'on' for usage.
+  // @depreciated will become a private helper function in the future.
+  self.addEventListener = function(eventName, handler, context) {
+    addListeners([eventName], handler, context);
+  };
+
+
+  /**
+  * Removes an event listener for a specific event.
+  * <p>
+  *
+  * <p>
+  *   Throws an exception if the <code>listener</code> name is invalid.
+  * </p>
+  *
+  * @param {String} type The string identifying the type of event.
+  *
+  * @param {Function} listener The event listener function to remove.
+  *
+  * @memberOf EventDispatcher
+  * @method #removeEventListener
+  * @see <a href="#events">Events</a>
+  */
+  // See 'off' for usage.
+  // @depreciated will become a private helper function in the future.
+  self.removeEventListener = function(eventName, handler, context) {
+    removeListeners([eventName], handler, context);
+  };
+
+
+
+
+
+  return self;
+};
+
+OTHelpers.eventing.Event = function() {
+
+    return function (type, cancelable) {
+        this.type = type;
+        this.cancelable = cancelable !== undefined ? cancelable : true;
+
+        var _defaultPrevented = false,
+            _target = null;
+
+        this.preventDefault = function() {
+            if (this.cancelable) {
+                _defaultPrevented = true;
+            } else {
+                OTHelpers.warn("Event.preventDefault :: Trying to preventDefault on an Event that isn't cancelable");
+            }
+        };
+
+        this.isDefaultPrevented = function() {
+            return _defaultPrevented;
+        };
+
+        if (OTHelpers.canDefineProperty) {
+            Object.defineProperty(this, 'target', {
+                set: function(target) {
+                    _target = target;
+                },
+
+                get: function() {
+                    return _target;
+                }
+            });
+        }
+    };
+
+};
+})(window, window.OTHelpers);
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./callbacks.js')
+
+// DOM helpers
+(function(window, OTHelpers, undefined) {
+
+// Returns true if the client supports element.classList
+OTHelpers.supportsClassList = function() {
+    var hasSupport = typeof(document !== "undefined") && ("classList" in document.createElement("a"));
+    OTHelpers.supportsClassList = function() { return hasSupport; };
+
+    return hasSupport;
+};
+
+OTHelpers.removeElement = function(element) {
+    if (element && element.parentNode) {
+        element.parentNode.removeChild(element);
+    }
+};
+
+OTHelpers.removeElementById = function(elementId) {
+    this.removeElement(OTHelpers(elementId));
+};
+
+OTHelpers.removeElementsByType = function(parentElem, type) {
+    if (!parentElem) return;
+
+    var elements = parentElem.getElementsByTagName(type);
+
+    // elements is a "live" NodesList collection. Meaning that the collection
+    // itself will be mutated as we remove elements from the DOM. This means
+    // that "while there are still elements" is safer than "iterate over each
+    // element" as the collection length and the elements indices will be modified
+    // with each iteration.
+    while (elements.length) {
+        parentElem.removeChild(elements[0]);
+    }
+};
+
+OTHelpers.emptyElement = function(element) {
+    while (element.firstChild) {
+        element.removeChild(element.firstChild);
+    }
+    return element;
+};
+
+OTHelpers.createElement = function(nodeName, attributes, innerHTML) {
+    var element = document.createElement(nodeName);
+
+    if (attributes) {
+        for (var name in attributes) {
+            if (typeof(attributes[name]) === 'object') {
+                if (!element[name]) element[name] = {};
+
+                var subAttrs = attributes[name];
+                for (var n in subAttrs) {
+                    element[name][n] = subAttrs[n];
+                }
+            }
+            else if (name === 'className') {
+                element.className = attributes[name];
+            }
+            else {
+                element.setAttribute(name, attributes[name]);
+            }
+        }
+    }
+
+    if (innerHTML) {
+        element.innerHTML = innerHTML;
+    }
+
+    return element;
+};
+
+OTHelpers.createButton = function(innerHTML, attributes, events) {
+    var button = OTHelpers.createElement('button', attributes, innerHTML);
+
+    if (events) {
+        for (var name in events) {
+            if (events.hasOwnProperty(name)) {
+                OTHelpers.on(button, name, events[name]);
+            }
+        }
+
+        button._boundEvents = events;
+    }
+
+    return button;
+};
+
+// Helper function for adding event listeners to dom elements.
+// WARNING: This doesn't preserve event types, your handler could be getting all kinds of different
+// parameters depending on the browser. You also may have different scopes depending on the browser
+// and bubbling and cancelable are not supported.
+OTHelpers.on = function(element, eventName,  handler) {
+    if (element.addEventListener) {
+        element.addEventListener(eventName, handler, false);
+    } else if (element.attachEvent) {
+        element.attachEvent("on" + eventName, handler);
+    } else {
+        var oldHandler = element["on"+eventName];
+        element["on"+eventName] = function() {
+          handler.apply(this, arguments);
+          if (oldHandler) oldHandler.apply(this, arguments);
+        };
+    }
+};
+
+// Helper function for removing event listeners from dom elements.
+OTHelpers.off = function(element, eventName, handler) {
+    if (element.removeEventListener) {
+        element.removeEventListener (eventName, handler,false);
+    }
+    else if (element.detachEvent) {
+        element.detachEvent("on" + eventName, handler);
+    }
+};
+
+
+// Detects when an element is not part of the document flow because it or one of it's ancesters has display:none.
+OTHelpers.isDisplayNone = function(element) {
+    if ( (element.offsetWidth === 0 || element.offsetHeight === 0) && OTHelpers.css(element, 'display') === 'none') return true;
+    if (element.parentNode && element.parentNode.style) return OTHelpers.isDisplayNone(element.parentNode);
+    return false;
+};
+
+OTHelpers.findElementWithDisplayNone = function(element) {
+    if ( (element.offsetWidth === 0 || element.offsetHeight === 0) && OTHelpers.css(element, 'display') === 'none') return element;
+    if (element.parentNode && element.parentNode.style) return OTHelpers.findElementWithDisplayNone(element.parentNode);
+    return null;
+};
+
+function objectHasProperties(obj) {
+    for (var key in obj) {
+        if (obj.hasOwnProperty(key)) return true;
+    }
+    return false;
+}
+
+
+// Allows an +onChange+ callback to be triggered when specific style properties
+// of +element+ are notified. The callback accepts a single parameter, which is
+// a hash where the keys are the style property that changed and the values are
+// an array containing the old and new values ([oldValue, newValue]).
+//
+// Width and Height changes while the element is display: none will not be
+// fired until such time as the element becomes visible again.
+//
+// This function returns the MutationObserver itself. Once you no longer wish
+// to observe the element you should call disconnect on the observer.
+//
+// Observing changes:
+//  // observe changings to the width and height of object
+//  dimensionsObserver = OTHelpers.observeStyleChanges(object, ['width', 'height'], function(changeSet) {
+//      OT.debug("The new width and height are " + changeSet.width[1] + ',' + changeSet.height[1]);
+//  });
+//
+// Cleaning up
+//  // stop observing changes
+//  dimensionsObserver.disconnect();
+//  dimensionsObserver = null;
+//
+OTHelpers.observeStyleChanges = function(element, stylesToObserve, onChange) {
+    var oldStyles = {};
+
+    var getStyle = function getStyle(style) {
+            switch (style) {
+            case 'width':
+                return OTHelpers.width(element);
+
+            case 'height':
+                return OTHelpers.height(element);
+
+            default:
+                return OTHelpers.css(element);
+            }
+        };
+
+    // get the inital values
+    stylesToObserve.forEach(function(style) {
+        oldStyles[style] = getStyle(style);
+    });
+
+    var observer = new MutationObserver(function(mutations) {
+        var changeSet = {};
+
+        mutations.forEach(function(mutation) {
+            if (mutation.attributeName !== 'style') return;
+
+            var isHidden = OTHelpers.isDisplayNone(element);
+
+            stylesToObserve.forEach(function(style) {
+                if(isHidden && (style == 'width' || style == 'height')) return;
+
+                var newValue = getStyle(style);
+
+                if (newValue !== oldStyles[style]) {
+                    // OT.debug("CHANGED " + style + ": " + oldStyles[style] + " -> " + newValue);
+
+                    changeSet[style] = [oldStyles[style], newValue];
+                    oldStyles[style] = newValue;
+                }
+            });
+        });
+
+        if (objectHasProperties(changeSet)) {
+            // Do this after so as to help avoid infinite loops of mutations.
+            OTHelpers.callAsync(function() {
+                onChange.call(null, changeSet);
+            });
+        }
+    });
+
+    observer.observe(element, {
+        attributes:true,
+        attributeFilter: ['style'],
+        childList:false,
+        characterData:false,
+        subtree:false
+    });
+
+    return observer;
+};
+
+
+// trigger the +onChange+ callback whenever
+// 1. +element+ is removed
+// 2. or an immediate child of +element+ is removed.
+//
+// This function returns the MutationObserver itself. Once you no longer wish
+// to observe the element you should call disconnect on the observer.
+//
+// Observing changes:
+//  // observe changings to the width and height of object
+//  nodeObserver = OTHelpers.observeNodeOrChildNodeRemoval(object, function(removedNodes) {
+//      OT.debug("Some child nodes were removed");
+//      removedNodes.forEach(function(node) {
+//          OT.debug(node);
+//      });
+//  });
+//
+// Cleaning up
+//  // stop observing changes
+//  nodeObserver.disconnect();
+//  nodeObserver = null;
+//
+OTHelpers.observeNodeOrChildNodeRemoval = function(element, onChange) {
+    var observer = new MutationObserver(function(mutations) {
+        var removedNodes = [];
+
+        mutations.forEach(function(mutation) {
+            if (mutation.removedNodes.length) {
+                removedNodes = removedNodes.concat(Array.prototype.slice.call(mutation.removedNodes));
+            }
+        });
+
+        if (removedNodes.length) {
+            // Do this after so as to help avoid infinite loops of mutations.
+            OTHelpers.callAsync(function() {
+                onChange(removedNodes);
+            });
+        }
+    });
+
+    observer.observe(element, {
+        attributes:false,
+        childList:true,
+        characterData:false,
+        subtree:true
+    });
+
+    return observer;
+};
+
+})(window, window.OTHelpers);
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./dom.js')
+
+(function(window, OTHelpers, undefined) {
+
+OTHelpers.Modal = function(title, body) {
+    /*jshint multistr:true*/
+    var tmpl = "\
+        <header>\
+            <h1><%= title %></h1>\
+        </header>\
+        <div class='OT_dialog-body'>\
+            <%= body %>\
+        </div>\
+    ";
+
+    this.el = OTHelpers.createElement("section", {
+            className: "OT_root OT_dialog OT_modal"
+        },
+        OTHelpers.template(tmpl, {
+            title: title,
+            body: body
+        })
+    );
+
+    // We're going to center the element in the window. We need to add the
+    // element to the body before we do, otherwise we can't calculate the dialog's
+    // widths and heights. This means we need to hide the element first.
+    this.el.style.display = 'none';
+    document.body.appendChild(this.el);
+    OTHelpers.centerElement(this.el);
+    OTHelpers.show(this.el);
+
+    this.close = function() {
+        OTHelpers.removeElement(this.el);
+        this.el = null;
+        return this;
+    };
+};
+
+// Custom alert dialog
+OTHelpers.tbAlert = function(title, message) {
+    var modal = new OTHelpers.Modal(title, "<div>" + message + "</div>");
+    OTHelpers.addClass(modal.el, "OT_tbalert");
+
+    var closeBtn = OTHelpers.createElement("input", {
+            className: "OT_closeButton",
+            type: "button",
+            value: "close"
+    });
+    modal.el.appendChild(closeBtn);
+
+    closeBtn.onclick = function() {
+        if (modal) modal.close();
+        modal = null;
+    };
+};
+
+})(window, window.OTHelpers);
+
+// DOM Attribute helpers helpers
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./dom.js')
+
+(function(window, OTHelpers, undefined) {
+
+OTHelpers.addClass = function(element, value) {
+    // Only bother targeting Element nodes, ignore Text Nodes, CDATA, etc
+    if (element.nodeType !== 1) {
+        return;
+    }
+
+    var classNames = value.trim().split(/\s+/),
+        i, l;
+
+    if (OTHelpers.supportsClassList()) {
+        for (i=0, l=classNames.length; i<l; ++i) {
+            element.classList.add(classNames[i]);
+        }
+
+        return;
+    }
+
+    // Here's our fallback to browsers that don't support element.classList
+
+    if (!element.className && classNames.length === 1) {
+        element.className = value;
+    }
+    else {
+        var setClass = " " + element.className + " ";
+
+        for (i=0, l=classNames.length; i<l; ++i) {
+            if ( !~setClass.indexOf( " " + classNames[i] + " ")) {
+                setClass += classNames[i] + " ";
+            }
+        }
+
+        element.className = setClass.trim();
+    }
+
+    return this;
+};
+
+OTHelpers.removeClass = function(element, value) {
+    if (!value) return;
+
+    // Only bother targeting Element nodes, ignore Text Nodes, CDATA, etc
+    if (element.nodeType !== 1) {
+        return;
+    }
+
+    var newClasses = value.trim().split(/\s+/),
+        i, l;
+
+    if (OTHelpers.supportsClassList()) {
+        for (i=0, l=newClasses.length; i<l; ++i) {
+            element.classList.remove(newClasses[i]);
+        }
+
+        return;
+    }
+
+    var className = (" " + element.className + " ").replace(/[\s+]/, ' ');
+
+    for (i=0,l=newClasses.length; i<l; ++i) {
+        className = className.replace(' ' + newClasses[i] + ' ', ' ');
+    }
+
+    element.className = className.trim();
+
+    return this;
+};
+
+
+/**
+ * Methods to calculate element widths and heights.
+ */
+
+var _width = function(element) {
+        if (element.offsetWidth > 0) {
+            return element.offsetWidth + 'px';
+        }
+
+        return OTHelpers.css(element, 'width');
+    },
+
+    _height = function(element) {
+        if (element.offsetHeight > 0) {
+            return element.offsetHeight + 'px';
+        }
+
+        return OTHelpers.css(element, 'height');
+    };
+
+OTHelpers.width = function(element, newWidth) {
+    if (newWidth) {
+        OTHelpers.css(element, 'width', newWidth);
+        return this;
+    }
+    else {
+        if (OTHelpers.isDisplayNone(element)) {
+            // We can't get the width, probably since the element is hidden.
+            return OTHelpers.makeVisibleAndYield(element, function() {
+                return _width(element);
+            });
+        }
+        else {
+            return _width(element);
+        }
+    }
+};
+
+OTHelpers.height = function(element, newHeight) {
+    if (newHeight) {
+        OTHelpers.css(element, 'height', newHeight);
+        return this;
+    }
+    else {
+        if (OTHelpers.isDisplayNone(element)) {
+            // We can't get the height, probably since the element is hidden.
+            return OTHelpers.makeVisibleAndYield(element, function() {
+                return _height(element);
+            });
+        }
+        else {
+            return _height(element);
+        }
+    }
+};
+
+// Centers +element+ within the window. You can pass through the width and height
+// if you know it, if you don't they will be calculated for you.
+OTHelpers.centerElement = function(element, width, height) {
+    if (!width) width = parseInt(OTHelpers.width(element), 10);
+    if (!height) height = parseInt(OTHelpers.height(element), 10);
+
+    var marginLeft = -0.5 * width + "px";
+    var marginTop = -0.5 * height + "px";
+    OTHelpers.css(element, "margin", marginTop + " 0 0 " + marginLeft);
+    OTHelpers.addClass(element, "OT_centered");
+};
+
+})(window, window.OTHelpers);
+// CSS helpers helpers
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./dom.js')
+
+(function(window, OTHelpers, undefined) {
+
+var displayStateCache = {},
+    defaultDisplays = {};
+
+var defaultDisplayValueForElement = function(element) {
+    if (defaultDisplays[element.ownerDocument] && defaultDisplays[element.ownerDocument][element.nodeName]) {
+        return defaultDisplays[element.ownerDocument][element.nodeName];
+    }
+
+    if (!defaultDisplays[element.ownerDocument]) defaultDisplays[element.ownerDocument] = {};
+
+    // We need to know what display value to use for this node. The easiest way
+    // is to actually create a node and read it out.
+    var testNode = element.ownerDocument.createElement(element.nodeName),
+        defaultDisplay;
+
+    element.ownerDocument.body.appendChild(testNode);
+    defaultDisplay = defaultDisplays[element.ownerDocument][element.nodeName] = OTHelpers.css(testNode, 'display');
+
+    OTHelpers.removeElement(testNode);
+    testNode = null;
+
+    return defaultDisplay;
+};
+
+var isHidden = function(element) {
+    var computedStyle = element.ownerDocument.defaultView.getComputedStyle(element, null);
+    return computedStyle.getPropertyValue('display') === 'none';
+};
+
+OTHelpers.show = function(element) {
+    var display = element.style.display;
+        //,
+        // computedStyle = element.ownerDocument.defaultView.getComputedStyle(element, null),
+        // computedDisplay = computedStyle.getPropertyValue('display');
+
+    if (display === '' || display === 'none') {
+        element.style.display = displayStateCache[element] || '';
+        delete displayStateCache[element];
+    }
+
+    if (isHidden(element)) {
+        // It's still hidden so there's probably a stylesheet that declares this
+        // element as display:none;
+        displayStateCache[element] = 'none';
+
+        element.style.display = defaultDisplayValueForElement(element);
+    }
+
+    return this;
+};
+
+OTHelpers.hide = function(element) {
+    if (element.style.display === 'none') return;
+
+    displayStateCache[element] = element.style.display;
+    element.style.display = 'none';
+
+    return this;
+};
+
+OTHelpers.css = function(element, nameOrHash, value) {
+    if (typeof(nameOrHash) !== 'string') {
+        var style = element.style;
+
+        for (var cssName in nameOrHash) {
+            style[cssName] = nameOrHash[cssName];
+        }
+
+        return this;
+    }
+    else if (value !== undefined) {
+        element.style[nameOrHash] = value;
+        return this;
+    }
+    else {
+        // Normalise vendor prefixes from the form MozTranform to -moz-transform
+        // except for ms extensions, which are weird...
+        var name = nameOrHash.replace( /([A-Z]|^ms)/g, "-$1" ).toLowerCase(),
+            computedStyle = element.ownerDocument.defaultView.getComputedStyle(element, null),
+            currentValue = computedStyle.getPropertyValue(name);
+
+        if (currentValue === '') {
+            currentValue = element.style[name];
+        }
+
+        return currentValue;
+    }
+};
+
+
+// Apply +styles+ to +element+ while executing +callback+, restoring the previous
+// styles after the callback executes.
+OTHelpers.applyCSS = function(element, styles, callback) {
+    var oldStyles = {},
+        name,
+        ret;
+
+    // Backup the old styles
+    for (name in styles) {
+        if (styles.hasOwnProperty(name)) {
+            // We intentionally read out of style here, instead of using the css
+            // helper. This is because the css helper uses querySelector and we
+            // only want to pull values out of the style (domeElement.style) hash.
+            oldStyles[name] = element.style[name];
+
+            OTHelpers.css(element, name, styles[name]);
+        }
+    }
+
+    ret = callback();
+
+    // Restore the old styles
+    for (name in styles) {
+        if (styles.hasOwnProperty(name)) {
+            OTHelpers.css(element, name, oldStyles[name] || '');
+        }
+    }
+
+    return ret;
+};
+
+// Make +element+ visible while executing +callback+.
+OTHelpers.makeVisibleAndYield = function(element, callback) {
+    // find whether it's the element or an ancester that's display none and
+    // then apply to whichever it is
+    var targetElement = OTHelpers.findElementWithDisplayNone(element);
+    if (!targetElement) return;
+
+    return OTHelpers.applyCSS(targetElement, {
+            display: "block",
+            visibility: "hidden"
+        },
+        callback
+    );
+};
+
+})(window, window.OTHelpers);
+// AJAX helpers
+
+/*jshint browser:true, smarttabs:true*/
+
+// tb_require('../helpers.js')
+// tb_require('./xml.js')
+
+(function(window, OTHelpers, undefined) {
+
+function formatPostData(data) { //, contentType
+    // If it's a string, we assume it's properly encoded
+    if (typeof(data) === 'string') return data;
+
+    var queryString = [];
+
+    for (var key in data) {
+        queryString.push(
+            encodeURIComponent(key) + '=' + encodeURIComponent(data[key])
+        );
+    }
+
+    return queryString.join('&').replace(/\+/g, "%20");
+}
+
+OTHelpers.getXML = function(url, options) {
+    var callerSuccessCb = options && options.success,
+
+        isValidXMLDocument = function(xmlDocument) {
+            var root;
+
+            if (!xmlDocument) {
+                // Badly formed XML
+                return false;
+            }
+
+            // If we got some XML back, attempt to infer if the XML is badly formed
+            root = xmlDocument.documentElement;
+
+            if (!root || !root.nodeName || root.nodeName === "parsererror") {
+                // Badly formed XML
+                return false;
+            }
+
+            return true;
+        },
+
+        onSuccess = function(event) {
+            var response = event.target.responseXML;
+
+            if (isValidXMLDocument(response)) {
+                if (callerSuccessCb) callerSuccessCb(response, event, event.target);
+            }
+            else if (options && options.error) {
+                options.error(event, event.target);
+            }
+        };
+
+    var extendedHeaders = OTHelpers.extend(options.headers || {}, {
+            'Content-Type': 'application/xml'
+        });
+
+    OTHelpers.get(url, OTHelpers.extend(options || {}, {
+        success: onSuccess,
+        headers: extendedHeaders
+    }));
+};
+
+OTHelpers.getJSON = function(url, options) {
+    var callerSuccessCb = options && options.success,
+        onSuccess = function(event) {
+            var response;
+
+            try {
+                response = JSON.parse(event.target.responseText);
+            } catch(e) {
+                // Badly formed JSON
+                if (options && options.error) options.error(event, event.target);
+                return;
+            }
+
+            if (callerSuccessCb) callerSuccessCb(response, event, event.target);
+        };
+
+    OTHelpers.get(url, OTHelpers.extend(options || {}, {
+        success: onSuccess,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    }));
+};
+
+OTHelpers.get = function(url, options) {
+    var request = new XMLHttpRequest(),
+        _options = options || {};
+
+    bindToSuccessAndErrorCallbacks(request, _options.success, _options.error);
+    if (_options.process) request.addEventListener("progress", _options.progress, false);
+    if (_options.cancelled) request.addEventListener("abort", _options.cancelled, false);
+
+
+    request.open('GET', url, true);
+
+    if (!_options.headers) _options.headers = {};
+
+    for (var name in _options.headers) {
+        request.setRequestHeader(name, _options.headers[name]);
+    }
+
+    request.send();
+};
+
+OTHelpers.post = function(url, options) {
+    var request = new XMLHttpRequest(),
+        _options = options || {};
+
+    bindToSuccessAndErrorCallbacks(request, _options.success, _options.error);
+
+    if (_options.process) request.addEventListener("progress", _options.progress, false);
+    if (_options.cancelled) request.addEventListener("abort", _options.cancelled, false);
+
+    request.open('POST', url, true);
+
+    if (!_options.headers) _options.headers = {};
+
+    for (var name in _options.headers) {
+        request.setRequestHeader(name, _options.headers[name]);
+    }
+
+    request.send(formatPostData(_options.data));
+};
+
+OTHelpers.postFormData = function(url, data, options) {
+    if (!data) {
+        throw new Error("OTHelpers.postFormData must be passed a data options.");
+    }
+
+    var formData = new FormData();
+
+    for (var key in data) {
+        formData.append(key, data[key]);
+    }
+
+    OTHelpers.post(url, OTHelpers.extend(options || {}, {
+        data: formData
+    }));
+};
+
+
+// Make a GET request via JSONP.
+//
+// @example Make a request to 'http://tokbox.com:9999/session/foo' with success and error callbacks
+//
+//  OTHelpers.getJSONP('http://tokbox.com:9999/session/foo', {
+//      success: successCallback,
+//      error: errorCallback
+//  });
+//
+OTHelpers.getJSONP = function(url, options) {
+    var _loadTimeout = 30000,
+        _script,
+        _head = document.head || document.getElementsByTagName('head')[0],
+        _waitUntilTimeout,
+        _urlWithCallback = url,
+        _options = OTHelpers.extend(options || {}, {
+            callbackParameter: 'callback'
+        }),
+
+        _clearTimeout = function() {
+            if (_waitUntilTimeout) {
+                clearTimeout(_waitUntilTimeout);
+                _waitUntilTimeout = null;
+            }
+        },
+
+        _cleanup = function() {
+            _clearTimeout();
+
+            if (_script) {
+                _script.onload = _script.onreadystatechange = null;
+
+                OTHelpers.removeElement( _script );
+
+                _script = undefined;
+            }
+        },
+
+        _onLoad = function() {
+            if (_script.readyState && !/loaded|complete/.test( _script.readyState )) {
+                // Yeah, we're not ready yet...
+                return;
+            }
+
+            _clearTimeout();
+        },
+
+        _onLoadTimeout = function() {
+            _cleanup();
+
+            OTHelpers.error("The JSONP request to " + _urlWithCallback + " timed out after " + _loadTimeout + "ms.");
+            if (_options.error) _options.error("The JSONP request to " + url + " timed out after " + _loadTimeout + "ms.", _urlWithCallback,  _options);
+        },
+
+        _generateCallbackName = function() {
+            return 'jsonp_callback_' + (+new Date());
+        };
+
+
+    _options.callbackName = _generateCallbackName();
+    this.jsonp_callbacks[_options.callbackName] = function(response) {
+        _cleanup();
+
+        if (_options.success) _options.success(response);
+    };
+
+    // This doesn't handle URLs like "http://www.google.com?blah=1#something". The callback name
+    // will be incorrectly appended after the #.
+    _urlWithCallback += ((/\?/).test(_urlWithCallback) ? "&" : "?") + _options.callbackParameter + '=' + _options.callbackName;
+
+    _script = OTHelpers.createElement('script', {
+        async: 'async',
+        src: _urlWithCallback,
+        onload: _onLoad,
+        onreadystatechange: _onLoad
+    });
+    _head.appendChild(_script);
+
+    _waitUntilTimeout = setTimeout(function() { _onLoadTimeout(); }, _loadTimeout);
+};
+
+// Private helper method used (by OTHelpers.get and OTHelpers.post among others) to setup
+// callbacks to correctly respond to success and error callbacks. This includes
+// interpreting the responses HTTP status, which XmlHttpRequest seems to ignore
+// by default.
+var bindToSuccessAndErrorCallbacks = function(request, success, error) {
+    request.addEventListener("load", function(event) {
+        var status = event.target.status;
+
+        // We need to detect things that XMLHttpRequest considers a success,
+        // but we consider to be failures.
+        if ( status >= 200 && status < 300 || status === 304 ) {
+            if (success) success.apply(null, arguments);
+        }
+        else if (error) {
+            error(event);
+        }
+    }, false);
+
+
+    if (error) {
+        request.addEventListener("error", error, false);
+    }
+};
+
+})(window, window.OTHelpers);
+!(function(window) {
+
+if (!window.OT) window.OT = {};
+
+// Bring OTHelpers in as OT.$
+OT.$ = OTHelpers.noConflict();
+
+// Allow events to be bound on OT
+OT.$.eventing(OT);
+
+// OT.$.Modal was OT.Modal before the great common-js-helpers move
+OT.Modal = OT.$.Modal;
+
+// Add logging methods
+OT.$.useLogHelpers(OT);
+var _debugHeaderLogged = false;
+var _setLogLevel = OT.setLogLevel;
+
+// On the first time log level is set to DEBUG (or higher) show version info.
+OT.setLogLevel = function(level) {
+    // Set OT.$ to the same log level
+    OT.$.setLogLevel(level);
+    var retVal = _setLogLevel.call(OT, level);
+    if (OT.shouldLog(OT.DEBUG) && !_debugHeaderLogged) {
+        OT.debug("OpenTok JavaScript library " + OT.properties.version);
+        OT.debug("Release notes: " + OT.properties.websiteURL  +"/opentok/webrtc/docs/js/release-notes.html");
+        OT.debug("Known issues: " + OT.properties.websiteURL + "/opentok/webrtc/docs/js/release-notes.html#knownIssues");
+        _debugHeaderLogged = true;
+    }
+    OT.debug("TB.setLogLevel(" + retVal + ")");
+    return retVal;
+};
+
+OT.setLogLevel(OT.properties.debug ? OT.DEBUG : OT.ERROR);
+
+/**
+* Sets the API log level.
+* <p>
+* Calling <code>TB.setLogLevel()</code> sets the log level for runtime log messages that are the OpenTok library generates.
+* The default value for the log level is <code>TB.ERROR</code>.
+* </p>
+* <p>
+* The OpenTok JavaScript library displays log messages in the debugger console (such as Firebug), if one exists.
+* </p>
+* <p>
+* The following example logs the session ID to the console, by calling <code>TB.log()</code>. The code also logs
+* an error message when it attempts to publish a stream before the Session object dispatches a
+* <code>sessionConnected</code> event.
+* </p>
+* <pre>
+* TB.setLogLevel(TB.LOG);
+* session = TB.initSession(sessionId);
+* TB.log(sessionId);
+* publisher = TB.initPublisher(API_KEY, "publishContainer");
+* session.publish(publisher);
+* </pre>
+*
+* @param {Number} logLevel The degree of logging desired by the developer:
+*
+* <p>
+* <ul>
+*   <li>
+*     <code>TB.NONE</code> &#151; API logging is disabled.
+*   </li>
+*   <li>
+*     <code>TB.ERROR</code> &#151; Logging of errors only.
+*   </li>
+*   <li>
+*     <code>TB.WARN</code> &#151; Logging of warnings and errors.
+*   </li>
+*   <li>
+*     <code>TB.INFO</code> &#151; Logging of other useful information, in addition to warnings and errors.
+*   </li>
+*   <li>
+*     <code>TB.LOG</code> &#151; Logging of <code>TB.log()</code> messages, in addition to OpenTok info, warning,
+*     and error messages.
+*   </li>
+*   <li>
+*     <code>TB.DEBUG</code> &#151; Fine-grained logging of all API actions, as well as <code>TB.log()</code> messages.
+*   </li>
+* </ul>
+* </p>
+*
+* @name TB.setLogLevel
+* @memberof TB
+* @function
+* @see <a href="#log">TB.log()</a>
+*/
+
+/**
+* Sends a string to the the debugger console (such as Firebug), if one exists. However, the function
+* only logs to the console if you have set the log level to <code>TB.LOG</code> or <code>TB.DEBUG</code>,
+* by calling <code>TB.setLogLevel(TB.LOG)</code> or <code>TB.setLogLevel(TB.DEBUG)</code>.
+*
+* @param {String} message The string to log.
+*
+* @name TB.log
+* @memberof TB
+* @function
+* @see <a href="#setLogLevel">TB.setLogLevel()</a>
+*/
+
+})(window);
+(function(window) {
+
+// IMPORTANT This file should be included straight after helpers.js
+if (!window.OT) window.OT = {};
+
+if (!OT.properties) {
+	throw new Error("OT.properties does not exist, please ensure that you include a valid properties file.");
+}
+
+// Consumes and overwrites OT.properties. Makes it better and stronger!
+OT.properties = function(properties) {
+    var props = OT.$.clone(properties);
+
+    props.debug = properties.debug === 'true' || properties.debug === true;
+    props.supportSSL = properties.supportSSL === 'true' || properties.supportSSL === true;
+
+    if (props.supportSSL && (window.location.protocol.indexOf("https") >= 0 || window.location.protocol.indexOf("chrome-extension") >= 0)) {
+        props.assetURL = props.cdnURLSSL + "/webrtc/" + props.version;
+        props.loggingURL = props.loggingURLSSL;
+        props.apiURL = props.apiURLSSL;
+    } else {
+        props.assetURL = props.cdnURL + "/webrtc/" + props.version;
+    }
+
+    props.configURL = props.assetURL + "/js/dynamic_config.min.js";
+    props.cssURL = props.assetURL + "/css/ot.min.css";
+
+    return props;
+}(OT.properties);
+
+})(window);
+(function(window) {
+
+//--------------------------------------
+// JS Dynamic Config
+//--------------------------------------
+
+
+OT.Config = (function() {
+    var _loaded = false,
+        _global = {},
+        _partners = {},
+        _script,
+        _head = document.head || document.getElementsByTagName('head')[0],
+        _loadTimer,
+
+        _clearTimeout = function() {
+            if (_loadTimer) {
+                clearTimeout(_loadTimer);
+                _loadTimer = null;
+            }
+        },
+
+        _cleanup = function() {
+            _clearTimeout();
+
+            if (_script) {
+                _script.onload = _script.onreadystatechange = null;
+
+                if ( _head && _script.parentNode ) {
+                    _head.removeChild( _script );
+                }
+
+                _script = undefined;
+            }
+        },
+
+        _onLoad = function() {
+            // Only IE and Opera actually support readyState on Script elements.
+            if (_script.readyState && !/loaded|complete/.test( _script.readyState )) {
+                // Yeah, we're not ready yet...
+                return;
+            }
+
+            _clearTimeout();
+
+            if (!_loaded) {
+                // Our config script is loaded but there is not config (as
+                // replaceWith wasn't called). Something went wrong. Possibly
+                // the file we loaded wasn't actually a valid config file.
+                _this._onLoadTimeout();
+            }
+        },
+
+        _getModule = function(moduleName, apiKey) {
+            if (apiKey && _partners[apiKey] && _partners[apiKey][moduleName]) {
+                return _partners[apiKey][moduleName];
+            }
+
+            return _global[moduleName];
+        },
+
+        _this = {
+            // In ms
+            loadTimeout: 4000,
+
+            load: function(configUrl) {
+                if (!configUrl) throw new Error("You must pass a valid configUrl to Config.load");
+
+                _loaded = false;
+
+                setTimeout(function() {
+                    _script = document.createElement( "script" );
+                    _script.async = "async";
+                    _script.src = configUrl;
+                    _script.onload = _script.onreadystatechange = _onLoad.bind(this);
+                    _head.appendChild(_script);
+                },1);
+
+                _loadTimer = setTimeout(function() {
+                    _this._onLoadTimeout();
+                }, this.loadTimeout);
+            },
+
+            _onLoadTimeout: function() {
+                _cleanup();
+
+                OT.warn("TB DynamicConfig failed to load in " + _this.loadTimeout + " ms");
+                this.trigger('dynamicConfigLoadFailed');
+            },
+
+            isLoaded: function() {
+                return _loaded;
+            },
+
+            reset: function() {
+                _cleanup();
+                _loaded = false;
+                _global = {};
+                _partners = {};
+            },
+
+            // This is public so that the dynamic config file can load itself.
+            // Using it for other purposes is discouraged, but not forbidden.
+            replaceWith: function(config) {
+                _cleanup();
+
+                if (!config) config = {};
+
+                _global = config.global || {};
+                _partners = config.partners || {};
+
+                if (!_loaded) _loaded = true;
+                this.trigger('dynamicConfigChanged');
+            },
+
+            // @example Get the value that indicates whether exceptionLogging is enabled
+            //  OT.Config.get('exceptionLogging', 'enabled');
+            //
+            // @example Get a key for a specific partner, fallback to the default if there is
+            // no key for that partner
+            //  OT.Config.get('exceptionLogging', 'enabled', 'apiKey');
+            //
+            get: function(moduleName, key, apiKey) {
+                var module = _getModule(moduleName, apiKey);
+                return module ? module[key] : null;
+            }
+        };
+
+    OT.$.eventing(_this);
+
+    return _this;
+})();
+
+})(window);
+(function(window) {
+
+var defaultAspectRatio = 4.0/3.0;
+
+// This code positions the video element so that we don't get any letterboxing.
+// It will take into consideration aspect ratios other than 4/3 but only when
+// the video element is first created. If the aspect ratio changes at a later point
+// this calculation will become incorrect.
+function fixAspectRatio(element, width, height, desiredAspectRatio, rotated) {
+    if (!width) width = parseInt(OT.$.width(element.parentNode), 10);
+    else width = parseInt(width, 10);
+
+    if (!height) height = parseInt(OT.$.height(element.parentNode), 10);
+    else height = parseInt(height, 10);
+
+    if (width === 0 || height === 0) return;
+
+    if (!desiredAspectRatio) desiredAspectRatio = defaultAspectRatio;
+
+    var actualRatio = (width + 0.0)/height,
+        props = {
+            width: '100%',
+            height: '100%',
+            left: 0,
+            top: 0
+        };
+
+    if (actualRatio > desiredAspectRatio) {
+        // Width is largest so we blow up the height so we don't have letterboxing
+        var newHeight = (actualRatio / desiredAspectRatio) * 100;
+
+        props.height = newHeight + '%';
+        props.top = '-' + ((newHeight - 100) / 2) + '%';
+    } else if (actualRatio < desiredAspectRatio) {
+        // Height is largest, blow up the width
+        var newWidth = (desiredAspectRatio / actualRatio) * 100;
+
+        props.width = newWidth + '%';
+        props.left = '-' + ((newWidth - 100) / 2) + '%';
+    }
+
+    OT.$.css(element, props);
+
+    var video = element.querySelector('video');
+    if(video) {
+        if(rotated) {
+            var w = element.offsetWidth,
+                h = element.offsetHeight,
+                props = { width: h + 'px', height: w + 'px', marginTop: '', marginLeft: '' },
+                diff = w - h;
+                props.marginLeft = (diff / 2) + 'px';
+                props.marginTop = -(diff / 2) + 'px';
+                OT.$.css(video, props);
+        } else {
+            OT.$.css(video, { width: '', height: '', marginTop: '', marginLeft: ''});
+        }
+    }
+
+}
+
+var getOrCreateContainer = function getOrCreateContainer(elementOrDomId, insertMode) {
+    var container,
+        domId;
+
+    if (elementOrDomId && elementOrDomId.nodeName) {
+        // It looks like we were given a DOM element. Grab the id or generate
+        // one if it doesn't have one.
+        container = elementOrDomId;
+        if (!container.getAttribute('id') || container.getAttribute('id').length === 0) {
+            container.setAttribute('id', 'OT_' + OT.$.uuid());
+        }
+
+        domId = container.getAttribute('id');
+    }
+    else {
+        // We may have got an id, try and get it's DOM element.
+        container = OT.$(elementOrDomId);
+        domId = elementOrDomId || ('OT_' + OT.$.uuid());
+    }
+
+    if (!container) {
+        container = OT.$.createElement('div', {id: domId});
+        container.style.backgroundColor = "#000000";
+        document.body.appendChild(container);
+    }
+    else {
+        OT.$.emptyElement(container);
+    }
+
+    if(!(insertMode == null || insertMode == 'replace')) {
+      var placeholder = document.createElement('div');
+      placeholder.id = ('OT_' + OT.$.uuid());
+      if(insertMode == 'append') {
+        container.appendChild(placeholder);
+        container = placeholder;
+      } else if(insertMode == 'before') {
+        container.parentNode.insertBefore(placeholder, container);
+        container = placeholder;
+      } else if(insertMode == 'after') {
+        container.parentNode.insertBefore(placeholder, container.nextSibling);
+        container = placeholder;
+      }
+    }
+
+    return container;
+};
+
+// Creates the standard container that the Subscriber and Publisher use to hold
+// their video element and other chrome.
+OT.WidgetView = function(targetElement, properties) {
+    var container = getOrCreateContainer(targetElement, properties && properties.insertMode),
+        videoContainer = document.createElement('div'),
+        oldContainerStyles = {},
+        dimensionsObserver,
+        videoElement,
+        videoObserver,
+        posterContainer,
+        loadingContainer,
+        loading = true;
+
+    if (properties) {
+        width = properties.width;
+        height = properties.height;
+
+        if (width) {
+            if (typeof(width) == "number") {
+                width = width + "px";
+            }
+        }
+
+        if (height) {
+            if (typeof(height) == "number") {
+                height = height + "px";
+            }
+        }
+
+        container.style.width = width ? width : "264px";
+        container.style.height = height ? height : "198px";
+        container.style.overflow = "hidden";
+
+        if (properties.mirror === undefined || properties.mirror) OT.$.addClass(container, 'OT_mirrored');
+    }
+
+    if (properties.classNames) OT.$.addClass(container, properties.classNames);
+    OT.$.addClass(container, 'OT_loading');
+
+
+    OT.$.addClass(videoContainer, 'OT_video-container');
+    videoContainer.style.width = container.style.width;
+    videoContainer.style.height = container.style.height;
+    container.appendChild(videoContainer);
+    fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight);
+
+    loadingContainer = document.createElement("div");
+    OT.$.addClass(loadingContainer, "OT_video-loading");
+    videoContainer.appendChild(loadingContainer);
+
+    posterContainer = document.createElement("div");
+    OT.$.addClass(posterContainer, "OT_video-poster");
+    videoContainer.appendChild(posterContainer);
+
+    oldContainerStyles.width = container.offsetWidth;
+    oldContainerStyles.height = container.offsetHeight;
+
+    // Observe changes to the width and height and update the aspect ratio
+    dimensionsObserver = OT.$.observeStyleChanges(container, ['width', 'height'], function(changeSet) {
+        var width = changeSet.width ? changeSet.width[1] : container.offsetWidth,
+            height = changeSet.height ? changeSet.height[1] : container.offsetHeight;
+
+        fixAspectRatio(videoContainer, width, height, videoElement ? videoElement.aspectRatio : null);
+    });
+
+
+    // @todo observe if the video container or the video element get removed, if they do we should do some cleanup
+    videoObserver = OT.$.observeNodeOrChildNodeRemoval(container, function(removedNodes) {
+        if (!videoElement) return;
+
+        // This assumes a video element being removed is the main video element. This may
+        // not be the case.
+        var videoRemoved = removedNodes.some(function(node) { return node === videoContainer || node.nodeName === 'VIDEO'; });
+
+        if (videoRemoved) {
+            videoElement.destroy();
+            videoElement = null;
+        }
+
+        if (videoContainer) {
+            OT.$.removeElement(videoContainer);
+            videoContainer = null;
+        }
+
+        if (dimensionsObserver) {
+            dimensionsObserver.disconnect();
+            dimensionsObserver = null;
+        }
+
+        if (videoObserver) {
+            videoObserver.disconnect();
+            videoObserver = null;
+        }
+    });
+
+    this.destroy = function() {
+        if (dimensionsObserver) {
+            dimensionsObserver.disconnect();
+            dimensionsObserver = null;
+        }
+
+        if (videoObserver) {
+            videoObserver.disconnect();
+            videoObserver = null;
+        }
+
+        if (videoElement) {
+            videoElement.destroy();
+            videoElement = null;
+        }
+
+        if (container) {
+            OT.$.removeElement(container);
+            container = null;
+        }
+    };
+
+    Object.defineProperties(this, {
+
+        showPoster: {
+            get: function() {
+                return !OT.$.isDisplayNone(posterContainer);
+            },
+            set: function(shown) {
+                if(shown) {
+                    OT.$.show(posterContainer);
+                }
+                else {
+                    OT.$.hide(posterContainer);
+                }
+            }
+        },
+
+        poster: {
+            get: function() {
+                return OT.$.css(posterContainer, "backgroundImage");
+            },
+            set: function(src) {
+                OT.$.css(posterContainer, "backgroundImage", "url(" + src + ")");
+            }
+        },
+
+        loading: {
+            get: function() { return loading; },
+            set: function(l) {
+                loading = l;
+
+                if (loading) {
+                    OT.$.addClass(container, 'OT_loading');
+                }
+                else {
+                    OT.$.removeClass(container, 'OT_loading');
+                }
+            }
+        },
+
+        video: {
+            get: function() { return videoElement; },
+            set: function(video) {
+                // remove the old video element if it exists
+                // @todo this might not be safe, publishers/subscribers use this as well...
+                if (videoElement) videoElement.destroy();
+
+                video.appendTo(videoContainer);
+                videoElement = video;
+
+                videoElement.on({
+                    orientationChanged: function(){
+                        fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight, videoElement.aspectRatio, videoElement.isRotated);
+                    }
+                });
+
+                fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight, videoElement ? videoElement.aspectRatio : null, videoElement ? videoElement.isRotated : null);
+            }
+        },
+
+        domElement: {
+            get: function() { return container; }
+        },
+
+        domId: {
+          get: function() { return container.getAttribute('id'); }
+        }
+    });
+
+    this.addError = function(errorMsg) {
+        container.innerHTML = "<p>" + errorMsg + "<p>";
+        OT.$.addClass(container, "OT_subscriber_error");
+    };
+};
+
+})(window);
+// Web OT Helpers
+(function(window) {
+
+// Handy cross-browser getUserMedia shim. Inspired by some code from Adam Barth
+var getUserMedia = (function() {
+    if (navigator.getUserMedia) {
+        return navigator.getUserMedia.bind(navigator);
+    } else if (navigator.mozGetUserMedia) {
+        return navigator.mozGetUserMedia.bind(navigator);
+    } else if (navigator.webkitGetUserMedia) {
+        return navigator.webkitGetUserMedia.bind(navigator);
+    }
+})();
+
+
+if (navigator.webkitGetUserMedia) {
+    // Stub for getVideoTracks for Chrome < 26
+    if (!webkitMediaStream.prototype.getVideoTracks) {
+        webkitMediaStream.prototype.getVideoTracks = function() {
+            return this.videoTracks;
+        };
+    }
+
+    // Stubs for getAudioTracks for Chrome < 26
+    if (!webkitMediaStream.prototype.getAudioTracks) {
+        webkitMediaStream.prototype.getAudioTracks = function() {
+            return this.audioTracks;
+        };
+    }
+
+    if (!webkitRTCPeerConnection.prototype.getLocalStreams) {
+        webkitRTCPeerConnection.prototype.getLocalStreams = function() {
+          return this.localStreams;
+        };
+    }
+
+    if (!webkitRTCPeerConnection.prototype.getRemoteStreams) {
+        webkitRTCPeerConnection.prototype.getRemoteStreams = function() {
+          return this.remoteStreams;
+        };
+    }
+}
+else if (navigator.mozGetUserMedia) {
+    // Firefox < 23 doesn't support get Video/Audio tracks, we'll just stub them out for now.
+    if (!MediaStream.prototype.getVideoTracks) {
+        MediaStream.prototype.getVideoTracks = function() {
+            return [];
+        };
+    }
+
+    if (!MediaStream.prototype.getAudioTracks) {
+        MediaStream.prototype.getAudioTracks = function() {
+            return [];
+        };
+    }
+
+    // This won't work as mozRTCPeerConnection is a weird internal Firefox
+    // object (a wrapped native object I think).
+    // if (!window.mozRTCPeerConnection.prototype.getLocalStreams) {
+    //     window.mozRTCPeerConnection.prototype.getLocalStreams = function() {
+    //         return this.localStreams;
+    //     };
+    // }
+
+    // This won't work as mozRTCPeerConnection is a weird internal Firefox
+    // object (a wrapped native object I think).
+    // if (!window.mozRTCPeerConnection.prototype.getRemoteStreams) {
+    //     window.mozRTCPeerConnection.prototype.getRemoteStreams = function() {
+    //         return this.remoteStreams;
+    //     };
+    // }
+}
+
+
+// Mozilla error strings and the equivalent W3C names. NOT_SUPPORTED_ERROR does not
+// exist in the spec right now, so we'll include Mozilla's error description.
+var mozToW3CErrors = {
+    PERMISSION_DENIED: 'PERMISSION_DENIED',
+    NOT_SUPPORTED_ERROR: "A constraint specified is not supported by the browser.",
+    MANDATORY_UNSATISFIED_ERROR: 'CONSTRAINT_NOT_SATISFIED'
+};
+
+// Chrome only seems to expose a single error with a code of 1 right now.
+var chromeToW3CErrors = {
+    1: 'PERMISSION_DENIED'
+};
+
+
+var gumNamesToMessages = {
+    PERMISSION_DENIED: "User denied permission for scripts from this origin to access the media device.",
+    CONSTRAINT_NOT_SATISFIED: "One of the mandatory constraints could not be satisfied."
+};
+
+// Map vendor error strings to names and messages
+var mapVendorErrorName = function mapVendorErrorName (vendorErrorName, vendorErrors) {
+    var errorName = vendorErrors[vendorErrorName],
+        errorMessage = gumNamesToMessages[errorName];
+
+    if (!errorMessage) {
+        // This doesn't map to a known error from the Media Capture spec, it's
+        // probably a custom vendor error message.
+        errorMessage = eventName;
+        errorName = vendorErrorName;
+    }
+
+    return {
+        name: errorName,
+        message: errorMessage
+    };
+};
+
+// Parse and normalise a getUserMedia error event from Chrome or Mozilla
+//
+// @ref http://dev.w3.org/2011/webrtc/editor/getusermedia.html#idl-def-NavigatorUserMediaError
+//
+var parseErrorEvent = function parseErrorObject (event) {
+    var error;
+
+    if (OT.$.isObject(event) && event.name) {
+        error = {
+            name: event.name,
+            message: event.message,
+            constraintName: event.constraintName
+        };
+    }
+    else if (OT.$.isObject(event)) {
+        error = mapVendorErrorName(event.code, chromeToW3CErrors);
+
+        // message and constraintName are probably missing if the
+        // property is also omitted, but just in case they aren't.
+        if (event.message) error.message = event.message;
+        if (event.constraintName) error.constraintName = event.constraintName;
+    }
+    else if (event && mozToW3CErrors.hasOwnProperty(event)) {
+        error = mapVendorErrorName(event, mozToW3CErrors);
+    }
+    else {
+        error = {
+            message: "Unknown Error while getting user media"
+        };
+    }
+
+
+    return error;
+};
+
+
+
+// Validates a Hash of getUserMedia constraints. Currently we only
+// check to see if there is at least one non-false constraint.
+var areInvalidConstraints = function(constraints) {
+    if (!constraints || !OT.$.isObject(constraints)) return true;
+
+    for (var key in constraints) {
+        if (constraints[key]) return false;
+    }
+
+    return true;
+};
+
+
+
+
+
+// Returns true if the client supports Web RTC, false otherwise.
+//
+// Chrome Issues:
+// * The explicit prototype.addStream check is because webkitRTCPeerConnection was
+// partially implemented, but not functional, in Chrome 22.
+//
+// Firefox Issues:
+// * No real support before Firefox 19
+// * Firefox 19 has issues with generating Offers.
+// * Firefox 20 doesn't interoperate with Chrome.
+//
+OT.$.supportsWebRTC = function() {
+    var _supportsWebRTC = false;
+
+    if (navigator.webkitGetUserMedia) {
+        _supportsWebRTC = typeof(webkitRTCPeerConnection) === 'function' && !!webkitRTCPeerConnection.prototype.addStream;
+    }
+    else if (navigator.mozGetUserMedia) {
+        var firefoxVersion = window.navigator.userAgent.toLowerCase().match(/Firefox\/([0-9\.]+)/i);
+        _supportsWebRTC = typeof(mozRTCPeerConnection) === 'function' && (firefoxVersion !== null && parseFloat(firefoxVersion[1], 10) > 20.0);
+        if (_supportsWebRTC) {
+            try {
+                new mozRTCPeerConnection();
+                _supportsWebRTC = true;
+            } catch (err) {
+                _supportsWebRTC = false;
+            }
+        }
+    }
+
+    OT.$.supportsWebRTC = function() {
+        return _supportsWebRTC;
+    };
+
+    return _supportsWebRTC;
+};
+
+// Returns a String representing the supported WebRTC crypto scheme. The possible
+// values are SDES_SRTP, DTLS_SRTP, and NONE;
+//
+// Broadly:
+// * Firefox only supports DTLS
+// * Older versions of Chrome (<= 24) only support SDES
+// * Newer versions of Chrome (>= 25) support DTLS and SDES
+//
+OT.$.supportedCryptoScheme = function() {
+    if (!OT.$.supportsWebRTC()) return 'NONE';
+
+    var chromeVersion = window.navigator.userAgent.toLowerCase().match(/chrome\/([0-9\.]+)/i);
+    return chromeVersion && parseFloat(chromeVersion[1], 10) < 25 ? 'SDES_SRTP' : 'DTLS_SRTP';
+};
+
+// Returns true if the browser supports bundle
+//
+// Broadly:
+// * Firefox doesn't support bundle
+// * Chrome support bundle
+//
+OT.$.supportsBundle = function() {
+    return OT.$.supportsWebRTC() && OT.$.browser() === 'Chrome';
+};
+
+// Returns true if the browser supports rtcp mux
+//
+// Broadly:
+// * Older versions of Firefox (<= 25) don't support rtcp mux
+// * Older versions of Firefox (>= 26) support rtcp mux (not tested yet)
+// * Chrome support bundle
+//
+OT.$.supportsRtcpMux = function() {
+    return OT.$.supportsWebRTC() && OT.$.browser() === 'Chrome';
+};
+
+// A wrapper for the builtin navigator.getUserMedia. In addition to the usual
+// getUserMedia behaviour, this helper method also accepts a accessDialogOpened
+// and accessDialogClosed callback.
+//
+// @memberof TB.$
+// @private
+//
+// @param {Object} constraints
+//      A dictionary of constraints to pass to getUserMedia. See <a href='http://dev.w3.org/2011/webrtc/editor/getusermedia.html#idl-def-MediaStreamConstraints'>MediaStreamConstraints</a> in the Media Capture and Streams spec for more info.
+//
+// @param {function} success
+//      Called when getUserMedia completes successfully. The callback will be passed a WebRTC Stream object.
+//
+// @param {function} failure
+//      Called when getUserMedia fails to access a user stream. It will be passed an object with a code property representing the error that occurred.
+//
+// @param {function} accessDialogOpened
+//      Called when the access allow/deny dialog is opened.
+//
+// @param {function} accessDialogClosed
+//      Called when the access allow/deny dialog is closed.
+//
+// @param {function} accessDenied
+//      Called when access is denied to the camera/mic. This will be either because
+//      the user has clicked deny or because a particular origin is permanently denied.
+//
+OT.$.getUserMedia = function(constraints, success, failure, accessDialogOpened, accessDialogClosed, accessDenied) {
+    // All constraints are false, we don't allow this. This may be valid later
+    // depending on how/if we integrate data channels.
+    if (areInvalidConstraints(constraints)) {
+        OT.error("Couldn't get UserMedia: All constraints were false");
+        // Using a ugly dummy-code for now.
+        failure.call(null, {
+            name: 'NO_VALID_CONSTRAINTS',
+            message: "Video and Audio was disabled, you need to enabled at least one"
+        });
+
+        return;
+    }
+
+    var triggerOpenedTimer = null,
+        displayedPermissionDialog = false,
+
+        finaliseAccessDialog = function() {
+            if (triggerOpenedTimer) {
+                clearTimeout(triggerOpenedTimer);
+            }
+
+            if (displayedPermissionDialog && accessDialogClosed) accessDialogClosed();
+        },
+
+        triggerOpened = function() {
+            triggerOpenedTimer = null;
+            displayedPermissionDialog = true;
+
+            if (accessDialogOpened) accessDialogOpened();
+        },
+
+        onStream = function(stream) {
+            finaliseAccessDialog();
+            success.call(null, stream);
+        },
+
+        onError = function(event) {
+            finaliseAccessDialog();
+            var error = parseErrorEvent(event);
+
+            if (error.name === 'PERMISSION_DENIED' || error.name === 'PermissionDeniedError') {
+                accessDenied.call(null, error);
+            }
+            else {
+                failure.call(null, error);
+            }
+        };
+
+    try {
+        getUserMedia(constraints, onStream, onError);
+    } catch (e) {
+        OT.error("Couldn't get UserMedia: " + e.toString());
+        onError();
+        return;
+    }
+
+    // The "remember me" functionality of WebRTC only functions over HTTPS, if
+    // we aren't on HTTPS then we should definitely be displaying the access
+    // dialog.
+    //
+    // If we are on HTTPS, we'll wait 500ms to see if we get a stream
+    // immediately. If we do then the user had clicked "remember me". Otherwise
+    // we assume that the accessAllowed dialog is visible.
+    //
+    // @todo benchmark and see if 500ms is a reasonable number. It seems like
+    // we should know a lot quicker.
+    //
+    if (location.protocol.indexOf('https') === -1) {
+        // Execute after, this gives the client a chance to bind to the
+        // accessDialogOpened event.
+        triggerOpenedTimer = setTimeout(triggerOpened, 100);
+    }
+    else {
+        // wait a second and then trigger accessDialogOpened
+        triggerOpenedTimer = setTimeout(triggerOpened, 500);
+    }
+};
+
+OT.$.createPeerConnection = function (config, options) {
+  var NativeRTCPeerConnection = (window.webkitRTCPeerConnection || window.mozRTCPeerConnection);
+  return new NativeRTCPeerConnection(config, options);
+};
+
+
+})(window);
+(function(window) {
+
+OT.VideoOrientation = {
+    ROTATED_NORMAL: "OTVideoOrientationRotatedNormal",
+    ROTATED_LEFT: "OTVideoOrientationRotatedLeft",
+    ROTATED_RIGHT: "OTVideoOrientationRotatedRight",
+    ROTATED_UPSIDE_DOWN: "OTVideoOrientationRotatedUpsideDown"
+};
+
+//
+//
+//   var _videoElement = new OT.VideoElement({
+//     fallbackText: 'blah'
+//   });
+//
+//   _videoElement.on({
+//     streamBound: function() {...},
+//     loadError: function() {...},
+//     error: function() {...}
+//   });
+//
+//   _videoElement.bindToStream(webRtcStream);      // => VideoElement
+//   _videoElement.appendTo(DOMElement)             // => VideoElement
+//
+//   _videoElement.stream                           // => Web RTC stream
+//   _videoElement.domElement                       // => DomNode
+//   _videoElement.parentElement                    // => DomNode
+//
+//   _videoElement.imgData                          // => PNG Data string
+//
+//   _videoElement.orientation = OT.VideoOrientation.ROTATED_LEFT;
+//
+//   _videoElement.unbindStream();
+//   _videoElement.destroy()                        // => Completely cleans up and removes the video element
+//
+//
+OT.VideoElement = function(options) {
+    var _stream,
+        _domElement,
+        _parentElement,
+        _streamBound = false,
+        _videoElementMovedWarning = false,
+        _options = OT.$.defaults(options || {}, {
+            fallbackText: 'Sorry, Web RTC is not available in your browser'
+        });
+
+
+    OT.$.eventing(this);
+
+    /// Private API
+    var _onVideoError = function(event) {
+            var reason = "There was an unexpected problem with the Video Stream: " + videoElementErrorCodeToStr(event.target.error.code);
+            this.trigger('error', null, reason, this);
+        }.bind(this),
+
+        _onStreamBound = function() {
+            _streamBound = true;
+            _domElement.addEventListener('error', _onVideoError, false);
+            this.trigger('streamBound', this);
+        }.bind(this),
+
+        _onStreamBoundError = function(reason) {
+            this.trigger('loadError', OT.ExceptionCodes.P2P_CONNECTION_FAILED, reason, this);
+        }.bind(this),
+
+        // The video element pauses itself when it's reparented, this is
+        // unfortunate. This function plays the video again and is triggered
+        // on the pause event.
+        _playVideoOnPause = function() {
+            if(!_videoElementMovedWarning) {
+                OT.warn("Video element paused, auto-resuming. If you intended to do this, use publishVideo(false) or subscribeToVideo(false) instead.");
+                _videoElementMovedWarning = true;
+            }
+            _domElement.play();
+        };
+
+
+    _domElement = createVideoElement(_options.fallbackText, _options.attributes);
+
+    _domElement.addEventListener('pause', _playVideoOnPause);
+
+    /// Public Properties
+    Object.defineProperties(this, {
+        stream: {get: function() {return _stream; }},
+        domElement: {get: function() {return _domElement; }},
+        parentElement: {get: function() {return _parentElement; }},
+        isBoundToStream: {get: function() { return _streamBound; }},
+        poster: {
+            get: function() { return _domElement.getAttribute('poster'); },
+            set: function(src) { _domElement.setAttribute('poster', src); }
+        }
+    });
+
+
+    /// Public methods
+
+    // Append the Video DOM element to a parent node
+    this.appendTo = function(parentDomElement) {
+        _parentElement = parentDomElement;
+        _parentElement.appendChild(_domElement);
+
+        return this;
+    };
+
+    // Bind a stream to the video element.
+    this.bindToStream = function(webRtcStream) {
+        _streamBound = false;
+        _stream = webRtcStream;
+
+        bindStreamToVideoElement(_domElement, _stream, _onStreamBound, _onStreamBoundError);
+
+        return this;
+    };
+
+    // Unbind the currently bound stream from the video element.
+    this.unbindStream = function() {
+        if (!_stream) return this;
+
+        if (_domElement) {
+            if (!navigator.mozGetUserMedia) {
+                // The browser would have released this on unload anyway, but
+                // we're being a good citizen.
+                window.URL.revokeObjectURL(_domElement.src);
+            }
+            else {
+                _domElement.mozSrcObject = null;
+            }
+        }
+
+        _stream = null;
+
+        return this;
+    };
+
+    this.setAudioVolume = function(value) {
+        if (_domElement) _domElement.volume = OT.$.roundFloat(value / 100, 2);
+    };
+
+    this.getAudioVolume = function() {
+        // Return the actual volume of the DOM element
+        if (_domElement) return parseInt(_domElement.volume * 100, 10);
+        return 50;
+    };
+
+    this.whenTimeIncrements = function(callback, context) {
+        if(_domElement) {
+            var lastTime, handler = function() {
+                if(!lastTime || lastTime >= _domElement.currentTime) {
+                    lastTime = _domElement.currentTime;
+                } else {
+                    _domElement.removeEventListener('timeupdate', handler, false);
+                    callback.call(context, this);
+                }
+            }.bind(this);
+            _domElement.addEventListener('timeupdate', handler, false);
+        }
+    };
+
+    this.destroy = function() {
+        // unbind all events so they don't fire after the object is dead
+        this.off();
+
+        this.unbindStream();
+
+        if (_domElement) {
+            // Unbind this first, otherwise it will trigger when the
+            // video element is removed from the DOM.
+            _domElement.removeEventListener('pause', _playVideoOnPause);
+
+            OT.$.removeElement(_domElement);
+            _domElement = null;
+        }
+
+        _parentElement = null;
+
+        return undefined;
+    };
+};
+
+
+// Checking for window.defineProperty for IE compatibility, just so we don't throw exceptions when the script is included
+if (OT.$.canDefineProperty) {
+    // Extracts a snapshot from a video element and returns it's as a PNG Data string.
+    Object.defineProperties(OT.VideoElement.prototype, {
+        imgData: {
+            get: function() {
+                var canvas = OT.$.createElement('canvas', {
+                        width: this.domElement.videoWidth,
+                        height: this.domElement.videoHeight,
+                        style: {
+                            display: 'none'
+                        }
+                    });
+
+                document.body.appendChild(canvas);
+                try {
+                    canvas.getContext('2d').drawImage(this.domElement, 0, 0, canvas.width, canvas.height);
+                } catch(err) {
+                    OT.warn("Cannot get image data yet");
+                    return null;
+                }
+                var imgData = canvas.toDataURL('image/png');
+
+                OT.$.removeElement(canvas);
+
+                return imgData.replace("data:image/png;base64,", "").trim();
+            }
+        },
+
+        videoWidth: {
+            get: function() {
+                if(this._orientation && this._orientation.width) {
+                    return this._orientation.width;
+                }
+                return this.domElement['video' + (this.isRotated ? 'Height' : 'Width')];
+            }
+        },
+
+        videoHeight: {
+            get: function() {
+                if(this._orientation && this._orientation.height) {
+                    return this._orientation.height;
+                }
+                return this.domElement['video' + (this.isRotated ? 'Width' : 'Height')];
+            }
+        },
+
+        aspectRatio: {
+            get: function() {
+                return (this.videoWidth + 0.0) / this.videoHeight;
+            }
+        },
+
+        isRotated: {
+            get: function() {
+                return this._orientation && (this._orientation.videoOrientation == 'OTVideoOrientationRotatedLeft' || this._orientation.videoOrientation == 'OTVideoOrientationRotatedRight');
+            }
+        }
+    });
+}
+
+
+var VideoOrientationTransforms = {
+    OTVideoOrientationRotatedNormal: "rotate(0deg)",
+    OTVideoOrientationRotatedLeft: "rotate(90deg)",
+    OTVideoOrientationRotatedRight: "rotate(-90deg)",
+    OTVideoOrientationRotatedUpsideDown: "rotate(180deg)"
+};
+
+// Checking for window.defineProperty for IE compatibility, just so we don't throw exceptions when the script is included
+if (OT.$.canDefineProperty) {
+    Object.defineProperty(OT.VideoElement.prototype,'orientation', {
+        get: function() {
+            return this._orientation;
+        },
+        set: function(orientation) {
+            this._orientation = orientation;
+
+            var transform = VideoOrientationTransforms[orientation.videoOrientation] || VideoOrientationTransforms.ROTATED_NORMAL;
+
+            switch(OT.$.browser()) {
+                case 'Chrome':
+                case 'Safari':
+                    this.domElement.style.webkitTransform = transform;
+                    break;
+
+                case 'IE':
+                    this.domElement.style.msTransform = transform;
+                    break;
+
+                default:
+                    // The standard version, just Firefox, Opera, and IE > 9
+                    this.domElement.style.transform = transform;
+            }
+
+            this.trigger('orientationChanged');
+        }
+    });
+}
+
+
+
+/// Private Helper functions
+
+function createVideoElement(fallbackText, attributes) {
+    var videoElement = document.createElement('video');
+    videoElement.setAttribute('autoplay', '');
+    videoElement.innerHTML = fallbackText;
+
+    if (attributes) {
+        if (attributes.muted === true) {
+            delete attributes.muted;
+            videoElement.muted = 'true';
+        }
+
+        for (var key in attributes) {
+            videoElement.setAttribute(key, attributes[key]);
+        }
+    }
+
+    return videoElement;
+}
+
+
+// See http://www.w3.org/TR/2010/WD-html5-20101019/video.html#error-codes
+var _videoErrorCodes = {};
+// Checking for window.MediaError for IE compatibility, just so we don't throw exceptions when the script is included
+if (window.MediaError) {
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_ABORTED] = "The fetching process for the media resource was aborted by the user agent at the user's request.";
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_NETWORK] = "A network error of some description caused the user agent to stop fetching the media resource, after the resource was established to be usable.";
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_DECODE] = "An error of some description occurred while decoding the media resource, after the resource was established to be usable.";
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED] = "The media resource indicated by the src attribute was not suitable. ";
+}
+
+function videoElementErrorCodeToStr(errorCode) {
+    return _videoErrorCodes[parseInt(errorCode, 10)] || "An unknown error occurred.";
+}
+
+
+function bindStreamToVideoElement(videoElement, webRTCStream, onStreamBound, onStreamBoundError) {
+    // Note: onloadedmetadata doesn't fire in Chrome for audio only crbug.com/110938
+    if (navigator.mozGetUserMedia || (webRTCStream.getVideoTracks().length > 0 && webRTCStream.getVideoTracks()[0].enabled)) {
+
+        var cleanup = function cleanup () {
+                clearTimeout(timeout);
+                videoElement.removeEventListener('loadedmetadata', onLoad, false);
+                videoElement.removeEventListener('error', onError, false);
+            },
+
+            onLoad = function onLoad (event) {
+                cleanup();
+                onStreamBound();
+            },
+
+            onError = function onError (event) {
+                cleanup();
+                onStreamBoundError("There was an unexpected problem with the Video Stream: " + videoElementErrorCodeToStr(event.target.error.code));
+            },
+
+            onStoppedLoading = function onStoppedLoading () {
+                // The stream ended before we fully bound it. Maybe the other end called
+                // stop on it or something else went wrong.
+                cleanup();
+                onStreamBoundError("Stream ended while trying to bind it to a video element.");
+            },
+
+            // Timeout if it takes too long
+            timeout = setTimeout(function() {
+                if (videoElement.currentTime === 0) {
+                    onStreamBoundError("The video stream failed to connect. Please notify the site owner if this continues to happen.");
+                } else {
+                    // This should never happen
+                    OT.warn("Never got the loadedmetadata event but currentTime > 0");
+                    onStreamBound();
+                }
+            }.bind(this), 30000);
+
+
+        videoElement.addEventListener('loadedmetadata', onLoad, false);
+        videoElement.addEventListener('error', onError, false);
+        webRTCStream.onended = onStoppedLoading;
+    } else {
+        onStreamBound();
+    }
+
+    // The official spec way is 'srcObject', we are slowly converging there.
+    if (videoElement.srcObject !== void 0) {
+        videoElement.srcObject = webRTCStream;
+    }
+    else if (videoElement.mozSrcObject !== void 0) {
+        videoElement.mozSrcObject = webRTCStream;
+    }
+    else {
+        videoElement.src = window.URL.createObjectURL(webRTCStream);
+    }
+
+    videoElement.play();
+}
+
+
+})(window);
+(function(window) {
+
+// Singleton interval
+var logQueue = [],
+    queueRunning = false;
+
+
+OT.Analytics = function() {
+
+    var endPoint = OT.properties.loggingURL + "/logging/ClientEvent",
+        endPointQos = OT.properties.loggingURL + "/logging/ClientQos",
+
+        reportedErrors = {},
+
+        // Map of camel-cased keys to underscored
+        camelCasedKeys = {
+            payloadType: 'payload_type',
+            partnerId: 'partner_id',
+            streamId: 'stream_id',
+            sessionId: 'session_id',
+            connectionId: 'connection_id',
+            widgetType: 'widget_type',
+            widgetId: 'widget_id',
+            avgAudioBitrate: 'avg_audio_bitrate',
+            avgVideoBitrate: 'avg_video_bitrate',
+            localCandidateType: 'local_candidate_type',
+            remoteCandidateType: 'remote_candidate_type',
+            transportType: 'transport_type'
+        },
+
+        send = function(data, isQos, onSuccess, onError) {
+            OT.$.post(isQos ? endPointQos : endPoint, {
+                success: onSuccess,
+                error: onError,
+                data: data,
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                }
+            });
+        },
+
+        throttledPost = function() {
+            // Throttle logs so that they only happen 1 at a time
+            if (!queueRunning && logQueue.length > 0) {
+                queueRunning = true;
+                var curr = logQueue[0];
+
+                // Remove the current item and send the next log
+                var processNextItem = function() {
+                    logQueue.shift();
+                    queueRunning = false;
+                    throttledPost();
+                };
+
+                if (curr) {
+                    send(curr.data, curr.isQos, function() {
+                        curr.onComplete();
+                        setTimeout(processNextItem, 50);
+                    }, function() {
+                        OT.debug("Failed to send ClientEvent, moving on to the next item.");
+
+                        // There was an error, move onto the next item
+                        setTimeout(processNextItem, 50);
+                    });
+                }
+            }
+        },
+
+        post = function(data, onComplete, isQos) {
+            logQueue.push({
+                data: data,
+                onComplete: onComplete,
+                isQos: isQos
+            });
+
+            throttledPost();
+        },
+
+        shouldThrottleError = function(code, type, partnerId) {
+            if (!partnerId) return false;
+
+            var errKey = [partnerId, type, code].join('_'),
+                //msgLimit = DynamicConfig.get('exceptionLogging', 'messageLimitPerPartner', partnerId);
+                msgLimit = 100;
+            if (msgLimit === null || msgLimit === undefined) return false;
+
+            return (reportedErrors[errKey] || 0) <= msgLimit;
+        };
+
+        // Log an error via ClientEvents.
+        //
+        // @param [String] code
+        // @param [String] type
+        // @param [String] message
+        // @param [Hash] details additional error details
+        //
+        // @param [Hash] options the options to log the client event with.
+        // @option options [String] action The name of the Event that we are logging. E.g. "TokShowLoaded". Required.
+        // @option options [String] variation Usually used for Split A/B testing, when you have multiple variations of the +_action+.
+        // @option options [String] payloadType A text description of the payload. Required.
+        // @option options [String] payload The payload. Required.
+        // @option options [String] sessionId The active OpenTok session, if there is one
+        // @option options [String] connectionId The active OpenTok connectionId, if there is one
+        // @option options [String] partnerId
+        // @option options [String] guid ...
+        // @option options [String] widgetId ...
+        // @option options [String] streamId ...
+        // @option options [String] section ...
+        // @option options [String] build ...
+        //
+        // Reports will be throttled to X reports (see exceptionLogging.messageLimitPerPartner
+        // from the dynamic config for X) of each error type for each partner. Reports can be
+        // disabled/enabled globally or on a per partner basis (per partner settings
+        // take precedence) using exceptionLogging.enabled.
+        //
+        this.logError = function(code, type, message, details, options) {
+            if (!options) options = {};
+            var partnerId = options.partnerId;
+
+            if (OT.Config.get('exceptionLogging', 'enabled', partnerId) !== true) {
+                return;
+            }
+
+            if (shouldThrottleError(code, type, partnerId)) {
+                //OT.log("ClientEvents.error has throttled an error of type " + type + "." + code + " for partner " + (partnerId || 'No Partner Id'));
+                return;
+            }
+
+            var errKey = [partnerId, type, code].join('_'),
+
+                payload = this.escapePayload(OT.$.extend(details || {}, {
+                    message: payload,
+                    userAgent: navigator.userAgent
+                }));
+
+
+            reportedErrors[errKey] = typeof(reportedErrors[errKey]) !== 'undefined' ?
+                                            reportedErrors[errKey] + 1 :
+                                            1;
+
+            return this.logEvent(OT.$.extend(options, {
+                action: type + '.' + code,
+                payloadType: payload[0],
+                payload: payload[1]
+            }));
+        };
+
+        // Log a client event to the analytics backend.
+        //
+        // @example Logs a client event called 'foo'
+        //  OT.ClientEvents.log({
+        //      action: 'foo',
+        //      payload_type: "foo's payload",
+        //      payload: 'bar',
+        //      session_id: sessionId,
+        //      connection_id: connectionId
+        //  })
+        //
+        // @param [Hash] options the options to log the client event with.
+        // @option options [String] action The name of the Event that we are logging. E.g. "TokShowLoaded". Required.
+        // @option options [String] variation Usually used for Split A/B testing, when you have multiple variations of the +_action+.
+        // @option options [String] payloadType A text description of the payload. Required.
+        // @option options [String] payload The payload. Required.
+        // @option options [String] session_id The active OpenTok session, if there is one
+        // @option options [String] connection_id The active OpenTok connectionId, if there is one
+        // @option options [String] partner_id
+        // @option options [String] guid ...
+        // @option options [String] widget_id ...
+        // @option options [String] stream_id ...
+        // @option options [String] section ...
+        // @option options [String] build ...
+        //
+        this.logEvent = function(options) {
+            var partnerId = options.partnerId;
+
+            if (!options) options = {};
+
+            // Set a bunch of defaults
+            var data = OT.$.extend({
+                    "variation" : "",
+                    'guid' : this.getClientGuid(),
+                    'widget_id' : "",
+                    'session_id': '',
+                    'connection_id': '',
+                    'stream_id' : "",
+                    'partner_id' : partnerId,
+                    'source' : window.location.href,
+                    'section' : "",
+                    'build' : ""
+                }, options),
+
+                onComplete = function(){
+                //  OT.log("logged: " + "{action: " + data["action"] + ", variation: " + data["variation"] + ", payload_type: " + data["payload_type"] + ", payload: " + data["payload"] + "}");
+                };
+
+            // We camel-case our names, but the ClientEvents backend wants them
+            // underscored...
+            for (var key in camelCasedKeys) {
+                if (camelCasedKeys.hasOwnProperty(key) && data[key]) {
+                    data[camelCasedKeys[key]] = data[key];
+                    delete data[key];
+                }
+            }
+
+            post(data, onComplete, false);
+        };
+
+        // Log a client QOS to the analytics backend.
+        //
+        this.logQOS = function(options) {
+            var partnerId = options.partnerId;
+
+            if (!options) options = {};
+
+            // Set a bunch of defaults
+            var data = OT.$.extend({
+                    'guid' : this.getClientGuid(),
+                    'widget_id' : "",
+                    'session_id': '',
+                    'connection_id': '',
+                    'stream_id' : "",
+                    'partner_id' : partnerId,
+                    'source' : window.location.href,
+                    'build' : "",
+                    'duration' : 0 //in milliseconds
+                }, options),
+
+                onComplete = function(){
+                    //OT.log("logged: " + "{action: " + data["action"] + ", variation: " + data["variation"] + ", payload_type: " + data["payload_type"] + ", payload: " + data["payload"] + "}");
+                };
+
+            // We camel-case our names, but the ClientEvents backend wants them
+            // underscored...
+            for (var key in camelCasedKeys) {
+                if (camelCasedKeys.hasOwnProperty(key) && data[key]) {
+                    data[camelCasedKeys[key]] = data[key];
+                    delete data[key];
+                }
+            }
+
+            post(data, onComplete, true);
+        };
+
+        // Converts +payload+ to two pipe seperated strings. Doesn't currently handle
+        // edgecases, e.g. escaping "\\|" will break stuff.
+        //
+        // *Note:* It strip any keys that have null values.
+        this.escapePayload = function(payload) {
+            var escapedPayload = [],
+                escapedPayloadDesc = [];
+
+            for (var key in payload) {
+                if (payload.hasOwnProperty(key) && payload[key] !== null && payload[key] !== undefined) {
+                    escapedPayload.push( payload[key] ? payload[key].toString().replace('|', '\\|') : '' );
+                    escapedPayloadDesc.push( key.toString().replace('|', '\\|') );
+                }
+            }
+
+            return [
+                escapedPayloadDesc.join('|'),
+                escapedPayload.join('|')
+            ];
+        };
+        // Uses HTML5 local storage to save a client ID.
+        this.getClientGuid = function() {
+            var  guid = OT.$.getCookie("opentok_client_id");
+            if (!guid) {
+                guid = OT.$.uuid();
+                OT.$.setCookie("opentok_client_id", guid);
+            }
+            return guid;
+        };
+}
+
+})(window);
+(function(window) {
+
+// This is not obvious, so to prevent end-user frustration we'll let them know
+// explicitly rather than failing with a bunch of permission errors. We don't
+// handle this using an OT Exception as it's really only a development thing.
+if (location.protocol === 'file:') {
+  alert("You cannot test a page using WebRTC through the file system due to browser permissions. You must run it over a web server.");
+}
+
+if (!window.OT) window.OT = {};
+
+if (!window.URL && window.webkitURL) {
+    window.URL = window.webkitURL;
+}
+
+var _publisherCount = 0,
+
+    // Global parameters used by upgradeSystemRequirements
+    _intervalId,
+    _lastHash = document.location.hash,
+
+    // Cached DeviceManager
+    _deviceManager;
+
+
+/**
+* The first step in using the OpenTok API is to call the <code>TB.initSession()</code> method. Other methods of the TB object
+* check for system requirements and set up error logging.
+*
+* @class TB
+*/
+
+/**
+* <p class="mSummary">
+* Initializes and returns the local session object for a specified session ID.
+* </p>
+* <p>
+* You connect to an OpenTok session using the <code>connect()</code> method
+* of the Session object returned by the <code>TB.initSession()</code> method.
+* Note that calling <code>TB.initSession()</code> does not initiate communications
+* with the cloud. It simply initializes the Session object that you can use to
+* connect (and to perform other operations once connected).
+* </p>
+*
+*  <p>
+*    For an example, see <a href="Session.html#connect">Session.connect()</a>.
+*  </p>
+*
+* @method TB.initSession
+* @memberof TB
+* @param {String} sessionId The session ID identifying the OpenTok session. For more information, see
+* <a href="/opentok/tutorials/create-session/">Session creation</a>.
+* @returns {Session} The session object through which all further interactions with the session will occur.
+*/
+OT.initSession = function(sessionId) {
+    var session = OT.sessions.get(sessionId);
+
+    if (!session) {
+        session = new OT.Session(sessionId);
+        OT.sessions.add(session);
+    }
+
+    return session;
+};
+
+/**
+* <p class="mSummary">
+*   Initializes and returns a Publisher object. You can then pass this Publisher
+*   object to <code>Session.publish()</code> to publish a stream to a session.
+* </p>
+* <p>
+*   <i>Note:</i> If you intend to reuse a Publisher object created using <code>TB.initPublisher()</code>
+*   to publish to different sessions sequentially, call either <code>Session.disconnect()</code> or
+*   <code>Session.unpublish()</code>. Do not call both. Then call the <code>preventDefault()</code> method
+*   of the <code>streamDestroyed</code> or <code>sessionDisconnected</code> event object to prevent the
+*   Publisher object from being removed from the page.
+* </p>
+* @param {String} apiKey The API key that TokBox provided you when you
+* <a href="https://dashboard.tokbox.com/users/sign_in">signed up</a> for an OpenTok account.
+* @param {String} targetElement The
+* <code>id</code> attribute of the existing DOM element that the Publisher video replaces.
+* If you do not specify a <code>targetElement</code>, the application
+* appends a new DOM element to the HTML <code>body</code>.
+*
+* <p>
+*       The application throws an error if an element with an ID set to the <code>targetElement</code>
+*       value does not exist in the HTML DOM.
+* </p>
+*
+* @param {Object} properties This is
+* an <em>optional</em> object that contains the following properties (each of which are optional):
+* </p>
+* <ul>
+* <li>
+*   <strong>height</strong> (Number) &#151; The desired height, in pixels, of the
+*   displayed Publisher video stream (default: 198). <i>Note:</i> Use the
+*   <code>height</code> and <code>width</code> properties to set the dimensions
+*   of the publisher video; do not set the height and width of the DOM element
+*   (using CSS).
+* </li>
+* <li>
+*   <strong>mirror</strong> (Boolean) &#151; Whether the publisher's video image
+*   is mirrored in the publisher's page<. The default value is <code>true</code>
+*   (the video image is mirrored). This property does not affect the display
+*   on other subscribers' web pages.
+* </li>
+* <li>
+*   <strong>name</strong> (String) &#151; The name for this stream. The name appears at the bottom of
+*   Subscriber videos. The default value is "" (an empty string). Setting this to a string longer than
+*   1000 characters results in an runtime exception.
+* </li>
+* <li>
+*   <strong>publishAudio</strong> (Boolean) &#151; Whether to initially publish audio
+*   for the stream (default: <code>true</code>). This setting applies when you pass
+*   the Publisher object in a call to the <code>Session.publish()</code> method.
+* </li>
+* <li>
+*   <strong>publishVideo</strong> (Boolean) &#151; Whether to initially publish video
+*   for the stream (default: <code>true</code>). This setting applies when you pass
+*   the Publisher object in a call to the <code>Session.publish()</code> method.
+* </li>
+* <li>
+*   <strong>style</strong> (Object) &#151; An object containing properties that define the initial
+*   appearance of user interface controls of the Publisher. Currently, the <code>style</code> object
+*   includes one property: <code>nameDisplayMode</code>. Possible values for the <code>style.nameDisplayMode</code>
+*   property are: <code>"auto"</code> (the name is displayed when the stream is first displayed
+*   and when the user mouses over the display), <code>"off"</code> (the name is not displayed),
+*   and <code>"on"</code> (the name is displayed).</li>
+* </li>
+* <li>
+*   <strong>width</strong> (Number) &#151; The desired width, in pixels, of the
+*   displayed Publisher video stream (default: 264). <i>Note:</i> Use the
+*   <code>height</code> and <code>width</code> properties to set the dimensions
+*   of the publisher video; do not set the height and width of the DOM element
+*   (using CSS).
+* </li>
+* </ul>
+*
+* @returns {Publisher} The Publisher object.
+* @see Session#publish
+* @method TB.initPublisher
+* @memberof TB
+*/
+OT.initPublisher = function(apiKey, targetElement, properties, completionHandler) {
+    OT.debug("TB.initPublisher("+targetElement+")");
+
+    var publisher = new OT.Publisher();;
+    OT.publishers.add(publisher);
+
+    if (completionHandler && OT.$.isFunction(completionHandler)) {
+        var removeHandlersAndCallComplete = function removeHandlersAndCallComplete (error) {
+            publisher.off('initSuccess', removeHandlersAndCallComplete);
+            publisher.off('publishComplete', removeHandlersAndCallComplete);
+
+            completionHandler.apply(null, arguments);
+        };
+
+        publisher.once('initSuccess', removeHandlersAndCallComplete);
+        publisher.once('publishComplete', removeHandlersAndCallComplete);
+    }
+
+    publisher.publish(targetElement, properties);
+
+    return publisher;
+};
+
+
+
+/**
+* Checks if the system supports OpenTok for WebRTC.
+* @return {Number} Whether the system supports OpenTok for WebRTC (1) or not (0).
+* @see <a href="#upgradeSystemRequirements">TB.upgradeSystemRequirements()</a>
+* @method TB.checkSystemRequirements
+* @memberof TB
+*/
+OT.checkSystemRequirements = function() {
+    OT.debug("TB.checkSystemRequirements()");
+
+    var systemRequirementsMet = OT.$.supportsWebSockets() && OT.$.supportsWebRTC() ? this.HAS_REQUIREMENTS : this.NOT_HAS_REQUIREMENTS;
+
+    OT.checkSystemRequirements = function() {
+      OT.debug("TB.checkSystemRequirements()");
+      return systemRequirementsMet;
+    };
+
+    return systemRequirementsMet;
+};
+
+
+/**
+* Displays information about system requirments for OpenTok for WebRTC. This information is displayed
+* in an iframe element that fills the browser window.
+* <p>
+* <i>Note:</i> this information is displayed automatically when you call the <code>TB.initSession()</code>
+* or the <code>TB.initPublisher()</code> method if the client does not support OpenTok for WebRTC.
+* </p>
+* @see <a href="#checkSystemRequirements">TB.checkSystemRequirements()</a>
+* @method TB.upgradeSystemRequirements
+* @memberof TB
+*/
+OT.upgradeSystemRequirements = function(){
+    // trigger after the TB environment has loaded
+    OT.onLoad( function() {
+        var id = '_upgradeFlash';
+
+         // Load the iframe over the whole page.
+         document.body.appendChild((function(){
+             var d = document.createElement('iframe');
+             d.id = id;
+             d.style.position = 'absolute';
+             d.style.position = 'fixed';
+             d.style.height = '100%';
+             d.style.width = '100%';
+             d.style.top = '0px';
+             d.style.left = '0px';
+             d.style.right = '0px';
+             d.style.bottom = '0px';
+             d.style.zIndex = 1000;
+             try {
+                 d.style.backgroundColor = "rgba(0,0,0,0.2)";
+             } catch (err) {
+                 // Old IE browsers don't support rgba and we still want to show the upgrade message
+                 // but we just make the background of the iframe completely transparent.
+                 d.style.backgroundColor = "transparent";
+                 d.setAttribute("allowTransparency", "true");
+             }
+             d.setAttribute("frameBorder", "0");
+             d.frameBorder = "0";
+             d.scrolling = "no";
+             d.setAttribute("scrolling", "no");
+             d.src = OT.properties.assetURL + "/html/upgradeFlash.html#"+encodeURIComponent(document.location.href);
+             return d;
+         })());
+
+         // Now we need to listen to the event handler if the user closes this dialog.
+         // Since this is from an IFRAME within another domain we are going to listen to hash changes.
+         // The best cross browser solution is to poll for a change in the hashtag.
+         if (_intervalId) clearInterval(_intervalId);
+         _intervalId = setInterval(function(){
+             var hash = document.location.hash,
+                 re = /^#?\d+&/;
+             if (hash !== _lastHash && re.test(hash)) {
+                 _lastHash = hash;
+                 if( hash.replace(re, '') === 'close_window'){
+                     document.body.removeChild(document.getElementById(id));
+                     document.location.hash = '';
+                 }
+             }
+         }, 100);
+    });
+};
+
+
+OT.reportIssue = function(){
+    OT.warn("ToDo: haven't yet implemented TB.reportIssue");
+};
+
+OT.components = {};
+OT.sessions = {};
+
+// namespaces
+OT.rtc = {};
+
+// Define the APIKEY this is a global parameter which should not change
+OT.APIKEY = (function(){
+    // Script embed
+    var script_src = (function(){
+        var s = document.getElementsByTagName('script');
+        s = s[s.length - 1];
+        s = s.getAttribute('src') || s.src;
+        return s;
+    })();
+
+    var m = script_src.match(/[\?\&]apikey=([^&]+)/i);
+    return m ? m[1] : '';
+})();
+
+OT.HAS_REQUIREMENTS = 1;
+OT.NOT_HAS_REQUIREMENTS = 0;
+
+/**
+* Registers a method as an event listener for a specific event. Note that this is a static method of the TB class.
+*
+* <p>
+* The TB object dispatches one type of event &#151; an <code>exception</code> event. The following code adds an event
+* listener for the <code>exception</code> event:
+* </p>
+*
+* <pre>
+* TB.addEventListener("exception", exceptionHandler);
+*
+* function exceptionHandler(event) {
+*    alert("exception event. \n  code == " + event.code + "\n  message == " + event.message);
+* }
+* </pre>
+*
+* <p>
+* 	If a handler is not registered for an event, the event is ignored locally. If the event listener function does not exist,
+* 	the event is ignored locally.
+* </p>
+* <p>
+* 	Throws an exception if the <code>listener</code> name is invalid.
+* </p>
+*
+* @param {String} type The string identifying the type of event.
+*
+* @param {Function} listener The function to be invoked when the TB object dispatches the event.
+* @memberOf TB
+* @method addEventListener
+*/
+
+/**
+* Removes an event listener for a specific event. Note that this is a static method of the TB class.
+*
+* <p>
+* 	Throws an exception if the <code>listener</code> name is invalid.
+* </p>
+*
+* @param {String} type The string identifying the type of event.
+*
+* @param {Function} listener The event listener function to remove.
+*
+* @memberOf TB
+* @method removeEventListener
+*/
+
+/**
+ * Dispatched by the TB class when the app encounters an exception.
+ * Note that you set up an event handler for the <code>exception</code> event by calling the
+ * <code>TB.addEventListener()</code> method, which is a <i>static</i> method.
+ *
+ * @name exception
+ * @event
+ * @borrows ExceptionEvent#message as this.message
+ * @memberof TB
+ * @see ExceptionEvent
+ */
+
+if (!window.OT) window.OT = OT;
+if (!window.TB) window.TB = OT;
+
+})(window);
+(function(global) {
+
+OT.Collection = function(idField) {
+  var _models = [],
+      _byId = {},
+      _idField = idField || 'id';
+
+  OT.$.eventing(this, true);
+
+  var onModelUpdate = function onModelUpdate (event) {
+        this.trigger('update', event);
+        this.trigger('update:'+event.target.id, event);
+      }.bind(this),
+
+      onModelIdUpdate = function onModelIdUpdate (oldId, newId) {
+        if (_byId[oldId] === void 0) return;
+
+        // Match their old index to their new id and remove any
+        // reference to the old one.
+        var index = _byId[oldId];
+        delete _byId[oldId];
+        _byId[newId] = index;
+      }.bind(this),
+
+      onModelDestroy = function onModelDestroyed (event) {
+        this.remove(event.target, event.reason);
+      }.bind(this);
+
+
+  this.reset = function() {
+    // Stop listening on the models, they are no longer our problem
+    _models.forEach(function(model) {
+      model.off('updated', onModelUpdate, this);
+      model.off('destroyed', onModelDestroy, this)
+      model.off('idUpdated', onModelIdUpdate, this);
+    }, this);
+
+    _models = [];
+    _byId = {};
+  };
+
+  this.destroy = function() {
+    _models.forEach(function(model) {
+      model.destroy(void 0, true);
+    });
+
+    this.reset();
+    this.off();
+  };
+
+  this.get = function(id) { return id && _byId[id] !== void 0 ? _models[_byId[id]] : void 0; };
+  this.has = function(id) { return id && _byId[id] !== void 0; };
+
+  this.toString = function() { return _models.toString(); };
+
+  // Return only models filtered by either a dict of properties
+  // or a filter function.
+  //
+  // @example Return all publishers with a streamId of 1
+  //   OT.publishers.where({streamId: 1})
+  //
+  // @example The same thing but filtering using a filter function
+  //   OT.publishers.where(function(publisher) {
+  //     return publisher.stream.id === 4;
+  //   });
+  //
+  // @example The same thing but filtering using a filter function
+  //          executed with a specific this
+  //   OT.publishers.where(function(publisher) {
+  //     return publisher.stream.id === 4;
+  //   }, self);
+  //
+  this.where = function(attrsOrFilterFn, context) {
+    if (OT.$.isFunction(attrsOrFilterFn)) return _models.filter(attrsOrFilterFn, context);
+
+    return _models.filter(function(model) {
+      for (var key in attrsOrFilterFn) {
+        if (model[key] !== attrsOrFilterFn[key]) return false;
+      }
+
+      return true;
+    });
+  };
+
+  // Similar to where in behaviour, except that it only returns
+  // the first match.
+  this.find = function(attrsOrFilterFn, context) {
+    var filterFn;
+
+    if (OT.$.isFunction(attrsOrFilterFn)) {
+      filterFn = attrsOrFilterFn;
+    }
+    else {
+      filterFn = function(model) {
+        for (var key in attrsOrFilterFn) {
+          if (model[key] !== attrsOrFilterFn[key]) return false;
+        }
+
+        return true;
+      };
+    }
+
+    filterFn = filterFn.bind(context);
+
+    for (var i=0; i<_models.length; ++i) {
+      if (filterFn(_models[i]) === true) return _models[i];
+    }
+
+    return null;
+  };
+
+  this.add = function(model) {
+    var id = model[_idField];
+
+    if (this.has(id)) {
+      OT.warn("Model " + id + ' is already in the collection', _models);
+      return this;
+    }
+
+    _byId[id] = _models.push(model) - 1;
+
+    model.on('updated', onModelUpdate, this);
+    model.on('destroyed', onModelDestroy, this)
+    model.on('idUpdated', onModelIdUpdate, this);
+
+    this.trigger('add', model);
+    this.trigger('add:'+id, model);
+
+    return this;
+  };
+
+  this.remove = function(model, reason) {
+    var id = model[_idField];
+
+    _models.splice(_byId[id], 1);
+
+    // Shuffle everyone down one
+    for (var i=_byId[id]; i<_models.length; ++i) {
+      _byId[_models[i][_idField]] = i
+    }
+
+    delete _byId[id];
+
+    model.off('updated', onModelUpdate, this);
+    model.off('destroyed', onModelDestroy, this)
+    model.off('idUpdated', onModelIdUpdate, this);
+
+    this.trigger('remove', model, reason);
+    this.trigger('remove:'+id, model, reason);
+
+    return this;
+  };
+
+  OT.$.defineGetters(this, {
+    length: function() { return _models.length; }
+  });
+};
+
+}(this));
+(function(window) {
+
+/**
+ * The Event object defines the basic OpenTok event object that is passed to
+ * event listeners. Other OpenTok event classes implement the properties and methods of
+ * the Event object.</p>
+ *
+ * <p>For example, the Stream object dispatches a <code>streamPropertyChanged</code> event when
+ * the stream's properties are updated. You register an event listener using the <code>addEventListener()</code>
+ * method of the Stream object:</p>
+ *
+ * <pre>
+ * stream.addEventListener("streamPropertyChanged", streamPropertyChangedHandler);
+ *
+ * function streamPropertyChangedHandler(event) {
+ *     alert("Properties changed for stream " + event.target.streamId);
+ * }</pre>
+ *
+ * @class Event
+ * @property {Boolean} cancelable Whether the event has a default behavior that is cancelable (<code>true</code>)
+ * or not (<code>false</code>). You can cancel the default behavior by calling the <code>preventDefault()</code> method
+ * of the Event object in the event listener function. (See <a href="#preventDefault">preventDefault()</a>.)
+ *
+ * @property {Object} target The object that dispatched the event.
+ *
+ * @property {String} type  The type of event.
+ */
+OT.Event = OT.$.eventing.Event();
+/**
+* Prevents the default behavior associated with the event from taking place.
+*
+* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of the event object. </p>
+*
+* <p>Call the <code>preventDefault()</code> method in the event listener function for the event.</p>
+*
+* <p>The following events have default behaviors:</p>
+*
+* <ul>
+*
+*   <li><code>sessionDisconnect</code> &#151; See <a href="SessionDisconnectEvent.html#preventDefault">
+*   SessionDisconnectEvent.preventDefault()</a>.</li>
+*
+*   <li><code>streamDestroyed</code> &#151; See <a href="StreamEvent.html#preventDefault">
+*   StreamEvent.preventDefault()</a>.</li>
+*
+* </ul>
+*
+* @method #preventDefault
+* @memberof Event
+*/
+/**
+* Whether the default event behavior has been prevented via a call to <code>preventDefault()</code> (<code>true</code>)
+* or not (<code>false</code>). See <a href="#preventDefault">preventDefault()</a>.
+* @method #isDefaultPrevented
+* @return {Boolean}
+* @memberof Event
+*/
+
+// Event names lookup
+OT.Event.names = {
+    // Activity Status for cams/mics
+    ACTIVE: "active",
+    INACTIVE: "inactive",
+    UNKNOWN: "unknown",
+
+    // Archive types
+    PER_SESSION: "perSession",
+    PER_STREAM: "perStream",
+
+    // TB Events
+    EXCEPTION: "exception",
+    ISSUE_REPORTED: "issueReported",
+
+    // Session Events
+    SESSION_CONNECTED: "sessionConnected",
+    SESSION_DISCONNECTED: "sessionDisconnected",
+    STREAM_CREATED: "streamCreated",
+    STREAM_DESTROYED: "streamDestroyed",
+    CONNECTION_CREATED: "connectionCreated",
+    CONNECTION_DESTROYED: "connectionDestroyed",
+    SIGNAL: "signal",
+    STREAM_PROPERTY_CHANGED: "streamPropertyChanged",
+    MICROPHONE_LEVEL_CHANGED: "microphoneLevelChanged",
+
+
+    // Publisher Events
+    RESIZE: "resize",
+    SETTINGS_BUTTON_CLICK: "settingsButtonClick",
+    DEVICE_INACTIVE: "deviceInactive",
+    INVALID_DEVICE_NAME: "invalidDeviceName",
+    ACCESS_ALLOWED: "accessAllowed",
+    ACCESS_DENIED: "accessDenied",
+    ACCESS_DIALOG_OPENED: 'accessDialogOpened',
+    ACCESS_DIALOG_CLOSED: 'accessDialogClosed',
+    ECHO_CANCELLATION_MODE_CHANGED: "echoCancellationModeChanged",
+    PUBLISHER_DESTROYED: 'destroyed',
+
+    // Subscriber Events
+    SUBSCRIBER_DESTROYED: 'destroyed',
+
+    // DeviceManager Events
+    DEVICES_DETECTED: "devicesDetected",
+
+    // DevicePanel Events
+    DEVICES_SELECTED: "devicesSelected",
+    CLOSE_BUTTON_CLICK: "closeButtonClick",
+
+    MICLEVEL : 'microphoneActivityLevel',
+    MICGAINCHANGED : 'microphoneGainChanged',
+
+    // Environment Loader
+    ENV_LOADED: 'envLoaded'
+};
+
+OT.ValueEvent = function (type,value){
+    OT.Event.call(this, type);
+    this.value = value;
+
+};
+
+OT.ExceptionCodes = {
+  JS_EXCEPTION: 2000,
+  AUTHENTICATION_ERROR: 1004,
+  INVALID_SESSION_ID: 1005,
+  CONNECT_FAILED: 1006,
+  CONNECT_REJECTED: 1007,
+  CONNECTION_TIMEOUT: 1008,
+  NOT_CONNECTED: 1010,
+  P2P_CONNECTION_FAILED: 1013,
+  API_RESPONSE_FAILURE: 1014,
+  UNABLE_TO_PUBLISH: 1500,
+  UNABLE_TO_SIGNAL: 1510,
+  UNABLE_TO_FORCE_DISCONNECT: 1520,
+  UNABLE_TO_FORCE_UNPUBLISH: 1530
+};
+
+/**
+* The {@link TB} class dispatches <code>exception</code> events when the OpenTok API encounters
+* an exception (error). The ExceptionEvent object defines the properties of the event
+* object that is dispatched.
+*
+* <p>Note that you set up an event handler for the <code>exception</code> event by calling the
+* <code>TB.addEventListener()</code> method, which is a <i>static</i> method.</p>
+*
+* @class ExceptionEvent
+* @property {Number} code The error code. The following is a list of error codes:</p>
+*
+* <table class="docs_table">
+*  <tbody><tr>
+*   <td>
+*   <b>code</b>
+*
+*   </td>
+*   <td>
+*   <b>title</b>
+*   </td>
+*  </tr>
+*  <tr>
+*   <td>
+*   1000
+*
+*   </td>
+*   <td>
+*   Failed To Load
+*   </td>
+*  </tr>
+*
+*  <tr>
+*   <td>
+*   1004
+*
+*   </td>
+*   <td>
+*   Authentication error
+*   </td>
+*  </tr>
+*
+*  <tr>
+*   <td>
+*   1005
+*
+*   </td>
+*   <td>
+*   Invalid Session ID
+*   </td>
+*  </tr>
+*  <tr>
+*   <td>
+*   1006
+*
+*   </td>
+*   <td>
+*   Connect Failed
+*   </td>
+*  </tr>
+*  <tr>
+*   <td>
+*   1007
+*
+*   </td>
+*   <td>
+*   Connect Rejected
+*   </td>
+*  </tr>
+*  <tr>
+*   <td>
+*   1008
+*
+*   </td>
+*   <td>
+*   Connect Time-out
+*   </td>
+*  </tr>
+*  <tr>
+*   <td>
+*   1009
+*
+*   </td>
+*   <td>
+*   Security Error
+*   </td>
+*  </tr>
+*   <tr>
+*    <td>
+*    1010
+*
+*    </td>
+*    <td>
+*    Not Connected
+*    </td>
+*   </tr>
+*   <tr>
+*    <td>
+*    1011
+*
+*    </td>
+*    <td>
+*    Invalid Parameter
+*    </td>
+*   </tr>
+*   <tr>
+*    <td>
+*    1013
+*    </td>
+*    <td>
+*    Connection Failed
+*    </td>
+*   </tr>
+*   <tr>
+*    <td>
+*    1014
+*    </td>
+*    <td>
+*    API Response Failure
+*    </td>
+*   </tr>
+*
+*  <tr>
+*    <td>
+*    1500
+*    </td>
+*    <td>
+*    Unable to Publish
+*    </td>
+*   </tr>
+*
+*  <tr>
+*    <td>
+*    1510
+*    </td>
+*    <td>
+*    Unable to Signal
+*    </td>
+*   </tr>
+*
+*  <tr>
+*    <td>
+*    1520
+*    </td>
+*    <td>
+*    Unable to Force Disconnect
+*    </td>
+*   </tr>
+*
+*  <tr>
+*    <td>
+*    1530
+*    </td>
+*    <td>
+*    Unable to Force Unpublish
+*    </td>
+*   </tr>
+*  <tr>
+*    <td>
+*    1535
+*    </td>
+*    <td>
+*    Force Unpublish on Invalid Stream
+*    </td>
+*   </tr>
+*
+*  <tr>
+*    <td>
+*    2000
+*
+*    </td>
+*    <td>
+*    Internal Error
+*    </td>
+*  </tr>
+*
+*  <tr>
+*    <td>
+*    2010
+*
+*    </td>
+*    <td>
+*    Report Issue Failure
+*    </td>
+*  </tr>
+*
+*
+*  </tbody></table>
+*
+*  <p>Check the <code>message</code> property for more details about the error.</p>
+*
+* @property {String} message The error message.
+* @property {String} title The error title.
+* @augments Event
+*/
+OT.ExceptionEvent = function (type, message, title, code, component, target) {
+    OT.Event.call(this, type);
+
+    this.message = message;
+    this.title = title;
+    this.code = code;
+    this.component = component;
+    this.target = target;
+};
+
+
+OT.IssueReportedEvent = function (type, issueId) {
+    OT.Event.call(this, type);
+
+    this.issueId = issueId;
+};
+
+// Triggered when the JS dynamic config and the DOM have loaded.
+OT.EnvLoadedEvent = function (type) {
+    OT.Event.call(this, type);
+};
+
+
+/**
+ * The Session object dispatches a ConnectionEvent object when a connection is created or destroyed.
+ *
+ * <h5><a href="example"></a>Example</h5>
+ *
+ * <p>The following code keeps a running total of the number of connections to a session
+ * by monitoring the <code>connections</code> property of the <code>sessionConnect</code>,
+ * <code>connectionCreated</code> and <code>connectionDestroyed</code> events:</p>
+ *
+ * <pre>var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+ * var sessionID = ""; // Replace with your own session ID.
+ *                     // See https://dashboard.tokbox.com/projects
+ * var token = ""; // Replace with a generated token that has been assigned the moderator role.
+ *                 // See https://dashboard.tokbox.com/projects
+ * var connectionCount = 0;
+ *
+ * var session = TB.initSession(sessionID);
+ * session.addEventListener("sessionConnected", sessionConnectedHandler);
+ * session.addEventListener("connectionCreated", connectionCreatedHandler);
+ * session.addEventListener("connectionDestroyed", connectionDestroyedHandler);
+ * session.connect(apiKey, token);
+ *
+ * function sessionConnectedHandler(event) {
+ *    connectionCount = event.connections.length;
+ *    displayConnectionCount();
+ * }
+ *
+ * function connectionCreatedHandler(event) {
+ *    connectionCount += event.connections.length;
+ *    displayConnectionCount();
+ * }
+ *
+ * function connectionDestroyedHandler(event) {
+ *    connectionCount -= event.connections.length;
+ *    displayConnectionCount();
+ * }
+ *
+ * function displayConnectionCount() {
+ *     document.getElementById("connectionCountField").value = connectionCount.toString();
+ * }</pre>
+ *
+ * <p>This example assumes that there is an input text field in the HTML DOM
+ * with the <code>id</code> set to <code>"connectionCountField"</code>:</p>
+ *
+ * <pre>&lt;input type="text" id="connectionCountField" value="0"&gt;&lt;/input&gt;</pre>
+ *
+ *
+ * @property {Array} connections An array of Connection objects for the connections that were created or deleted.
+ * You can compare the <code>connectionId</code> property to that of the <code>connection</code> property of the
+ * Session object to see if a connection refers to the local web page.
+ *
+ * @property {String} reason For a <code>connectionDestroyed</code> event,
+ *  a description of why the connection ended. This property can have two values:
+ * </p>
+ * <ul>
+ *  <li><code>"clientDisconnected"</code> &#151; A client disconnected from the session by calling
+ *     the <code>disconnect()</code> method of the Session object or by closing the browser.
+ *     (See <a href="Session.html#disconnect">Session.disconnect()</a>.)</li>
+ *
+ *  <li><code>"forceDisconnected"</code> &#151; A moderator has disconnected the publisher from the session,
+ *      by calling the <code>forceDisconnect()</code> method of the Session object.
+ *      (See <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
+ *
+ *  <li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly (for example,
+ *      the client lost their internet connection).</li>
+ * </ul>
+ *
+ * <p>Depending on the context, this description may allow the developer to refine
+ * the course of action they take in response to an event.</p>
+ *
+ * <p>For a <code>connectionCreated</code> event, this string is undefined.</p>
+ *
+ * @class ConnectionEvent
+ * @augments Event
+ */
+OT.ConnectionEvent = function (type, connections, reason) {
+    OT.Event.call(this, type);
+
+    this.connections = connections;
+    this.reason = reason;
+};
+
+/**
+ * StreamEvent is an event that can have type "streamCreated" or "streamDestroyed". These events are dispatched when a client
+ * starts or stops publishing to a {@link Session}. This includes remote clients publishing on the session as well as the local
+ * client publishing to the session.
+ *
+ * <h4><a href="example_streamCreated"></a>Example &#151; streamCreated event</h4>
+ *  <p>The following code initializes a session and sets up an event listener for when
+ *    a stream is created:</p>
+ *
+ * <pre>var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+ * var sessionID = ""; // Replace with your own session ID.
+ *                     // See https://dashboard.tokbox.com/projects
+ * var token = ""; // Replace with a generated token that has been assigned the moderator role.
+ *                 // See https://dashboard.tokbox.com/projects
+ *
+ * var session = TB.initSession(sessionID);
+ * session.addEventListener("streamCreated", streamCreatedHandler);
+ * session.connect(apiKey, token);
+ *
+ * function streamCreatedHandler(event) {
+ *     for (var i = 0; i &lt; event.streams.length; i++) {
+ *         // Only display others' streams, not those that the client publishes.
+ *         if (event.streams[i].connection.connectionId != event.target.connection.connectionId) {
+ *                displayStream(stream);
+ *         }
+ *     }
+ * }
+ *
+ * function displayStream(stream) {
+ *     var div = document.createElement('div');
+ *     div.setAttribute('id', 'stream' + stream.streamId);
+ *
+ *     var streamsContainer = document.getElementById('streamsContainer');
+ *     streamsContainer.appendChild(div);
+ *
+ *     subscriber = session.subscribe(stream, 'stream' + stream.streamId);
+ * }</pre>
+ *
+ *  <p>For this example, in addition to the event handler for the <code>streamCreated</code>
+ *  event, you would probably want to create an event handler for the <code>sessionConnected</code>
+ *  event. This event handler can display the streams that are present when the session first
+ *  connects. See {@link SessionConnectEvent}.</p>
+ *
+ *  <h4><a href="example_streamDestroyed"></a>Example &#151; streamDestroyed event</h4>
+ *
+ *    <p>The following code initializes a session and sets up an event listener for when a
+ *       stream ends:</p>
+ *
+ * <pre>var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+ * var sessionID = ""; // Replace with your own session ID.
+ *                     // See https://dashboard.tokbox.com/projects
+ * var token = ""; // Replace with a generated token that has been assigned the moderator role.
+ *                 // See https://dashboard.tokbox.com/projects
+ *
+ * var session = TB.initSession(sessionID);
+ * session.addEventListener("streamDestroyed", streamDestroyedHandler);
+ * session.connect(apiKey, token);
+ *
+ * function streamDestroyedHandler(event) {
+ *     for (var i = 0; i &lt; event.streams.length; i++) {
+ *         var stream = event.streams[i];
+ *         alert("Stream " + stream.name + " ended. " + event.reason);
+ *     }
+ * }</pre>
+ *
+ * @class StreamEvent
+ * @property {Array} streams An array of Stream objects
+ * corresponding to the streams to which this event refers. This is usually an array containing only
+ * one Stream object, corresponding to the stream that was added (in the case of a <code>streamCreated</code>
+ * event) or deleted (in the case of a <code>streamDestroyed</code> event). However, the array may contain
+ * multiple Stream objects if multiple streams were added or deleted. A stream may be published by the local client
+ * or another client connected to the session.
+ *
+ * @property {String} reason For a <code>streamDestroyed</code> event,
+ *  a description of why the session disconnected. This property can have one of the following values:
+ * </p>
+ * <ul>
+ *  <li><code>"clientDisconnected"</code> &#151; A client disconnected from the session by calling
+ *     the <code>disconnect()</code> method of the Session object or by closing the browser.
+ *     (See <a href="Session.html#disconnect">Session.disconnect()</a>.)</li>
+ *
+ *  <li><code>"forceDisconnected"</code> &#151; A moderator has disconnected the publisher of the
+ *   	stream from the session, by calling the <code>forceDisconnect()</code> method of the Session object.
+ *      (See <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
+ *
+ *  <li><code>"forceUnpublished"</code> &#151; A moderator has forced the publisher of the stream to stop
+ *   	publishing the stream, by calling the <code>forceUnpublish()</code> method of the Session object.
+ *      (See <a href="Session.html#forceUnpublish">Session.forceUnpublish()</a>.)</li>
+ *
+ *  <li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly (for example,
+ *      the client lost their internet connection).</li>
+ *
+ * </ul>
+ *
+ * <p>Depending on the context, this description may allow the developer to refine
+ * the course of action they take in response to an event.</p>
+ *
+ * <p>For a <code>streamCreated</code> event, this string is undefined.</p>
+ *
+ *
+ * @property {Boolean} cancelable 	Whether the event has a default behavior that is cancelable (<code>true</code>) or not (<code>false</code>).
+ *  You can cancel the default behavior by calling the <code>preventDefault()</code> method of
+ *  the StreamEvent object in the event listener function. The <code>streamDestroyed</code>
+ *  event is cancelable. (See <a href="#preventDefault">preventDefault()</a>.)
+ * @augments Event
+ */
+OT.StreamEvent = function (type, streams, reason, cancelable) {
+    OT.Event.call(this, type, cancelable);
+
+    this.streams = streams;
+    this.reason = reason;
+};
+
+/**
+* Prevents the default behavior associated with the event from taking place.
+*
+* <p>For the <code>streamDestroyed</code> event, if the <code>reason</code> is set to <code>"forceDisconnected"</code>
+* or <code>networkDisconnected</code>, the default behavior is that all Subscriber objects that are
+* subscribed to the stream are unsubscribed (and removed from the HTML DOM). If you call the <code>preventDefault()</code>
+* method in the event listener for the <code>streamDestroyed</code> event, the default behavior is prevented and
+* you can, optionally, clean up Subscriber objects using your own code. See
+* <a href="Session.html#getSubscribersForStream">Session.getSubscribersForStream()</a>.</p>
+*
+* <p>If the <code>reason</code> property is set to <code>"forceUnpublished"</code>, the default behavior
+* is that the associated Subscriber or Publisher objects corresponding with the stream are unsubscribed
+* or unpublished (and removed from the HTML DOM). If you call the <code>preventDefault()</code> method in the
+* event listener for the <code>streamDestroyed</code> event, the default behavior is prevented and
+* you can, optionally, clean up Subscriber or Publisher objects using your own code. See
+* <a href="Session.html#getPublisherForStream">Session.getPublisherForStream()</a> and
+* <a href="Session.html#getSubscribersForStream">Session.getSubscribersForStream()</a>.</p>
+*
+* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of the event object. </p>
+*
+* <p>Call the <code>preventDefault()</code> method in the event listener function for the event.</p>
+*
+* @method #preventDefault
+* @memberof StreamEvent
+*/
+
+
+/**
+ * The Session object dispatches SessionConnectEvent object when a session has successfully connected in response to a call to
+ * the <code>connect()</code> method of the Session object.
+ *
+ *  <p>
+ *  For an example, see <a href="Session.html#connect">Session.connect()</a>.
+ *  </p>
+ *
+ * @class SessionConnectEvent
+ * @property {Array} connections An array of Connection objects, representing connections to the session.
+ * (Note that each connection can publish multiple streams.)
+ * @property {Array} streams An array of Stream objects corresponding to the streams currently available in the session that has connected.
+ * @augments Event
+ */
+OT.SessionConnectEvent = function (type, connections, streams, archives) {
+    OT.Event.call(this, type);
+
+    this.connections = connections;
+    this.streams = streams;
+    this.archives = archives;
+    this.groups = []; // Deprecated in OpenTok v0.91.48
+};
+
+/**
+ * The Session object dispatches SessionDisconnectEvent object when a session has disconnected. This event may be dispatched asynchronously in
+ * response to a successful call to the <code>disconnect()</code> method of the session object.
+ *
+ *  <h4>
+ *  	<a href="example"></a>Example
+ *  </h4>
+ *  <p>
+ *  	The following code initializes a session and sets up an event listener for when a session is disconnected.
+ *  </p>
+ * <pre>var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+ *  var sessionID = ""; // Replace with your own session ID.
+ *                      // See https://dashboard.tokbox.com/projects
+ *  var token = ""; // Replace with a generated token that has been assigned the moderator role.
+ *                  // See https://dashboard.tokbox.com/projects
+ *
+ *  var session = TB.initSession(sessionID);
+ *  session.addEventListener("sessionDisconnected", sessionDisconnectedHandler);
+ *  session.connect(apiKey, token);
+ *
+ *  function sessionDisConnectedHandler(event) {
+ *      alert("The session disconnected. " + event.reason);
+ *  }
+ *  </pre>
+ *
+ * @property {String} reason A description of why the session disconnected.
+ *   This property can have two values:
+ *  </p>
+ *  <ul>
+ *  	<li><code>"clientDisconnected"</code> &#151; A client disconnected from the session by calling
+ *  	 the <code>disconnect()</code> method of the Session object or by closing the browser.
+ *      ( See <a href="Session.html#disconnect">Session.disconnect()</a>.)</li>
+ *  	<li><code>"forceDisconnected"</code> &#151; A moderator has disconnected you from the session
+ *   	 by calling the <code>forceDisconnect()</code> method of the Session object. (See
+ *       <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
+ *  	<li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly (for example,
+ *       the client lost their internet connection).</li>
+ *  </ul>
+ *
+ * @class SessionDisconnectEvent
+ * @augments Event
+ */
+OT.SessionDisconnectEvent = function (type, reason, cancelable) {
+    OT.Event.call(this, type, cancelable);
+
+    this.reason = reason;
+};
+
+/**
+* Prevents the default behavior associated with the event from taking place.
+*
+* <p>For the <code>sessionDisconnectEvent</code>, the default behavior is: all Subscriber objects are unsubscribed,
+* and Publisher objects are destroyed. If you call the <code>preventDefault()</code> method in the
+* event listener for the <code>sessionDisconnect</code> event, the default behavior is prevented (and
+* you can, optionally, clean up Subscriber and Publisher objects using your own code).
+*
+* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of the event object. </p>
+*
+* <p>Call the <code>preventDefault()</code> method in the event listener function for the event.</p>
+*
+* @method #preventDefault
+* @memberof SessionDisconnectEvent
+*/
+
+OT.VolumeEvent = function (type, streamId, volume) {
+    OT.Event.call(this, type);
+
+    this.streamId = streamId;
+    this.volume = volume;
+};
+
+
+OT.DeviceEvent = function (type, camera, microphone) {
+    OT.Event.call(this, type);
+
+    this.camera = camera;
+    this.microphone = microphone;
+};
+
+OT.DeviceStatusEvent = function (type, cameras, microphones, selectedCamera, selectedMicrophone) {
+    OT.Event.call(this, type);
+
+    this.cameras = cameras;
+    this.microphones = microphones;
+    this.selectedCamera = selectedCamera;
+    this.selectedMicrophone = selectedMicrophone;
+};
+
+OT.ResizeEvent = function (type, widthFrom, widthTo, heightFrom, heightTo) {
+    OT.Event.call(this, type);
+
+    this.widthFrom = widthFrom;
+    this.widthTo = widthTo;
+    this.heightFrom = heightFrom;
+    this.heightTo = heightTo;
+};
+
+/**
+ * The Session object dispatches a <code>streamPropertyChanged</code> event in the following circumstances:
+ *
+ * <ul>
+ *
+ * 	<li>When a publisher starts or stops publishing audio or video. This change causes the <code>hasAudio</code>
+ * 	or <code>hasVideo</code> property of the Stream object to change. This change results from a call to the
+ * 	<code>publishAudio()</code> or <code>publishVideo()</code> methods of the Publish object.</li>
+ *
+ * 	<li>When the <code>videoDimensions</code> property of a stream changes. For more information,
+ * 	see <a href="Stream.html#properties">Stream.videoDimensions</a>.</li>
+ *
+ * </ul>
+ *
+ * @class StreamPropertyChangedEvent
+ * @property {String} changedProperty The property of the stream that changed. This value is either <code>"hasAudio"</code>,
+ * <code>"hasVideo"</code>, or <code>"videoDimensions"</code>.
+ * @property {Stream} stream The Stream object for which a property has changed.
+ * @property {Object} newValue The new value of the property (after the change).
+ * @property {Object} oldValue The old value of the property (before the change).
+ *
+ * @see <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a></p>
+ * @see <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a></p>
+ * @see <a href="Stream.html#properties">Stream.videoDimensions</a></p>
+ * @augments Event
+ */
+OT.StreamPropertyChangedEvent = function (type, stream, changedProperty, oldValue, newValue) {
+    OT.Event.call(this, type);
+
+    this.type = type;
+    this.stream = stream;
+    this.changedProperty = changedProperty;
+    this.oldValue = oldValue;
+    this.newValue = newValue;
+};
+
+OT.ArchiveEvent = function (type, archives) {
+    OT.Event.call(this, type);
+
+    this.archives = archives;
+};
+
+OT.ArchiveStreamEvent = function (type, archive, streams) {
+    OT.Event.call(this, type);
+
+    this.archive = archive;
+    this.streams = streams;
+};
+
+OT.StateChangedEvent = function (type, changedValues) {
+    OT.Event.call(this, type);
+
+    this.changedValues = changedValues;
+};
+
+OT.ChangeFailedEvent = function (type, reasonCode, reason, failedValues) {
+    OT.Event.call(this, type);
+
+    this.reasonCode = reasonCode;
+    this.reason = reason;
+    this.failedValues = failedValues;
+};
+
+/**
+ * The Session object dispatches a signal event when the client receives a signal from the session.
+ *
+ * @class SignalEvent
+ * @property {String} type The type assigned to the signal (if there is one). Use the type to filter signals
+ * received (by adding an event handler for signal:type1 or signal:type2, etc.)
+ * @property {Object} data The data payload sent with the signal (if there is one).
+ * @property {Connection} from The Connection corresponding to the client that sent with the signal.
+ *
+ * @see <a href="Session.html#signal">Session.signal()</a></p>
+ * @see <a href="Session.html#events">Session events (signal and signal:type)</a></p>
+ * @augments Event
+ */
+OT.SignalEvent = function(type, data, from) {
+    OT.Event.call(this, type ? "signal:" + type : OT.Event.names.SIGNAL, false);
+
+    this.data = data;
+    this.from = from;
+};
+
+
+OT.StreamUpdatedEvent = function (stream, key, oldValue, newValue) {
+    OT.Event.call(this, 'updated');
+
+    this.target = stream;
+    this.changedProperty = key;
+    this.oldValue = oldValue;
+    this.newValue = newValue;
+};
+
+OT.DestroyedEvent = function(type, target, reason) {
+    OT.Event.call(this, type, false);
+
+    this.target = target;
+    this.reason = reason;
+};
+
+
+})(window);
+// https://code.google.com/p/stringencoding/
+// An implementation of http://encoding.spec.whatwg.org/#api
+//
+(function(global) {
+  'use strict';
+
+  if ( (global.TextEncoder !== void 0) && (global.TextDecoder !== void 0))  {
+    // defer to the native ones
+    // @todo is this a good idea?
+    return;
+  }
+
+  //
+  // Utilities
+  //
+
+  /**
+   * @param {number} a The number to test.
+   * @param {number} min The minimum value in the range, inclusive.
+   * @param {number} max The maximum value in the range, inclusive.
+   * @return {boolean} True if a >= min and a <= max.
+   */
+  function inRange(a, min, max) {
+    return min <= a && a <= max;
+  }
+
+  /**
+   * @param {number} n The numerator.
+   * @param {number} d The denominator.
+   * @return {number} The result of the integer division of n by d.
+   */
+  function div(n, d) {
+    return Math.floor(n / d);
+  }
+
+
+  //
+  // Implementation of Encoding specification
+  // http://dvcs.w3.org/hg/encoding/raw-file/tip/Overview.html
+  //
+
+  //
+  // 3. Terminology
+  //
+
+  //
+  // 4. Encodings
+  //
+
+  /** @const */ var EOF_byte = -1;
+  /** @const */ var EOF_code_point = -1;
+
+  /**
+   * @constructor
+   * @param {Uint8Array} bytes Array of bytes that provide the stream.
+   */
+  function ByteInputStream(bytes) {
+    /** @type {number} */
+    var pos = 0;
+
+    /** @return {number} Get the next byte from the stream. */
+    this.get = function() {
+      return (pos >= bytes.length) ? EOF_byte : Number(bytes[pos]);
+    };
+
+    /** @param {number} n Number (positive or negative) by which to
+     *      offset the byte pointer. */
+    this.offset = function(n) {
+      pos += n;
+      if (pos < 0) {
+        throw new Error('Seeking past start of the buffer');
+      }
+      if (pos > bytes.length) {
+        throw new Error('Seeking past EOF');
+      }
+    };
+
+    /**
+     * @param {Array.<number>} test Array of bytes to compare against.
+     * @return {boolean} True if the start of the stream matches the test
+     *     bytes.
+     */
+    this.match = function(test) {
+      if (test.length > pos + bytes.length) {
+        return false;
+      }
+      var i;
+      for (i = 0; i < test.length; i += 1) {
+        if (Number(bytes[pos + i]) !== test[i]) {
+          return false;
+        }
+      }
+      return true;
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {Array.<number>} bytes The array to write bytes into.
+   */
+  function ByteOutputStream(bytes) {
+    /** @type {number} */
+    var pos = 0;
+
+    /**
+     * @param {...number} var_args The byte or bytes to emit into the stream.
+     * @return {number} The last byte emitted.
+     */
+    this.emit = function(var_args) {
+      /** @type {number} */
+      var last = EOF_byte;
+      var i;
+      for (i = 0; i < arguments.length; ++i) {
+        last = Number(arguments[i]);
+        bytes[pos++] = last;
+      }
+      return last;
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {string} string The source of code units for the stream.
+   */
+  function CodePointInputStream(string) {
+    /**
+     * @param {string} string Input string of UTF-16 code units.
+     * @return {Array.<number>} Code points.
+     */
+    function stringToCodePoints(string) {
+      /** @type {Array.<number>} */
+      var cps = [];
+      // Based on http://www.w3.org/TR/WebIDL/#idl-DOMString
+      var i = 0, n = string.length;
+      while (i < string.length) {
+        var c = string.charCodeAt(i);
+        if (!inRange(c, 0xD800, 0xDFFF)) {
+          cps.push(c);
+        } else if (inRange(c, 0xDC00, 0xDFFF)) {
+          cps.push(0xFFFD);
+        } else { // (inRange(cu, 0xD800, 0xDBFF))
+          if (i === n - 1) {
+            cps.push(0xFFFD);
+          } else {
+            var d = string.charCodeAt(i + 1);
+            if (inRange(d, 0xDC00, 0xDFFF)) {
+              var a = c & 0x3FF;
+              var b = d & 0x3FF;
+              i += 1;
+              cps.push(0x10000 + (a << 10) + b);
+            } else {
+              cps.push(0xFFFD);
+            }
+          }
+        }
+        i += 1;
+      }
+      return cps;
+    }
+
+    /** @type {number} */
+    var pos = 0;
+    /** @type {Array.<number>} */
+    var cps = stringToCodePoints(string);
+
+    /** @param {number} n The number of bytes (positive or negative)
+     *      to advance the code point pointer by.*/
+    this.offset = function(n) {
+      pos += n;
+      if (pos < 0) {
+        throw new Error('Seeking past start of the buffer');
+      }
+      if (pos > cps.length) {
+        throw new Error('Seeking past EOF');
+      }
+    };
+
+
+    /** @return {number} Get the next code point from the stream. */
+    this.get = function() {
+      if (pos >= cps.length) {
+        return EOF_code_point;
+      }
+      return cps[pos];
+    };
+  }
+
+  /**
+   * @constructor
+   */
+  function CodePointOutputStream() {
+    /** @type {string} */
+    var string = '';
+
+    /** @return {string} The accumulated string. */
+    this.string = function() {
+      return string;
+    };
+
+    /** @param {number} c The code point to encode into the stream. */
+    this.emit = function(c) {
+      if (c <= 0xFFFF) {
+        string += String.fromCharCode(c);
+      } else {
+        c -= 0x10000;
+        string += String.fromCharCode(0xD800 + ((c >> 10) & 0x3ff));
+        string += String.fromCharCode(0xDC00 + (c & 0x3ff));
+      }
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {string} message Description of the error.
+   */
+  function EncodingError(message) {
+    this.name = 'EncodingError';
+    this.message = message;
+    this.code = 0;
+  }
+  EncodingError.prototype = Error.prototype;
+
+  /**
+   * @param {boolean} fatal If true, decoding errors raise an exception.
+   * @param {number=} opt_code_point Override the standard fallback code point.
+   * @return {number} The code point to insert on a decoding error.
+   */
+  function decoderError(fatal, opt_code_point) {
+    if (fatal) {
+      throw new EncodingError('Decoder error');
+    }
+    return opt_code_point || 0xFFFD;
+  }
+
+  /**
+   * @param {number} code_point The code point that could not be encoded.
+   */
+  function encoderError(code_point) {
+    throw new EncodingError('The code point ' + code_point +
+                            ' could not be encoded.');
+  }
+
+  /**
+   * @param {string} label The encoding label.
+   * @return {?{name:string,labels:Array.<string>}}
+   */
+  function getEncoding(label) {
+    label = String(label).trim().toLowerCase();
+    if (Object.prototype.hasOwnProperty.call(label_to_encoding, label)) {
+      return label_to_encoding[label];
+    }
+    return null;
+  }
+
+  /** @type {Array.<{encodings: Array.<{name:string,labels:Array.<string>}>,
+   *      heading: string}>} */
+  var encodings = [
+    {
+      'encodings': [
+        {
+          'labels': [
+            'unicode-1-1-utf-8',
+            'utf-8',
+            'utf8'
+          ],
+          'name': 'utf-8'
+        }
+      ],
+      'heading': 'The Encoding'
+    },
+    {
+      'encodings': [
+        {
+          'labels': [
+            'cp864',
+            'ibm864'
+          ],
+          'name': 'ibm864'
+        },
+        {
+          'labels': [
+            'cp866',
+            'ibm866'
+          ],
+          'name': 'ibm866'
+        },
+        {
+          'labels': [
+            'csisolatin2',
+            'iso-8859-2',
+            'iso-ir-101',
+            'iso8859-2',
+            'iso_8859-2',
+            'l2',
+            'latin2'
+          ],
+          'name': 'iso-8859-2'
+        },
+        {
+          'labels': [
+            'csisolatin3',
+            'iso-8859-3',
+            'iso_8859-3',
+            'iso-ir-109',
+            'l3',
+            'latin3'
+          ],
+          'name': 'iso-8859-3'
+        },
+        {
+          'labels': [
+            'csisolatin4',
+            'iso-8859-4',
+            'iso_8859-4',
+            'iso-ir-110',
+            'l4',
+            'latin4'
+          ],
+          'name': 'iso-8859-4'
+        },
+        {
+          'labels': [
+            'csisolatincyrillic',
+            'cyrillic',
+            'iso-8859-5',
+            'iso_8859-5',
+            'iso-ir-144'
+          ],
+          'name': 'iso-8859-5'
+        },
+        {
+          'labels': [
+            'arabic',
+            'csisolatinarabic',
+            'ecma-114',
+            'iso-8859-6',
+            'iso_8859-6',
+            'iso-ir-127'
+          ],
+          'name': 'iso-8859-6'
+        },
+        {
+          'labels': [
+            'csisolatingreek',
+            'ecma-118',
+            'elot_928',
+            'greek',
+            'greek8',
+            'iso-8859-7',
+            'iso_8859-7',
+            'iso-ir-126'
+          ],
+          'name': 'iso-8859-7'
+        },
+        {
+          'labels': [
+            'csisolatinhebrew',
+            'hebrew',
+            'iso-8859-8',
+            'iso-8859-8-i',
+            'iso-ir-138',
+            'iso_8859-8',
+            'visual'
+          ],
+          'name': 'iso-8859-8'
+        },
+        {
+          'labels': [
+            'csisolatin6',
+            'iso-8859-10',
+            'iso-ir-157',
+            'iso8859-10',
+            'l6',
+            'latin6'
+          ],
+          'name': 'iso-8859-10'
+        },
+        {
+          'labels': [
+            'iso-8859-13'
+          ],
+          'name': 'iso-8859-13'
+        },
+        {
+          'labels': [
+            'iso-8859-14',
+            'iso8859-14'
+          ],
+          'name': 'iso-8859-14'
+        },
+        {
+          'labels': [
+            'iso-8859-15',
+            'iso_8859-15'
+          ],
+          'name': 'iso-8859-15'
+        },
+        {
+          'labels': [
+            'iso-8859-16'
+          ],
+          'name': 'iso-8859-16'
+        },
+        {
+          'labels': [
+            'koi8-r',
+            'koi8_r'
+          ],
+          'name': 'koi8-r'
+        },
+        {
+          'labels': [
+            'koi8-u'
+          ],
+          'name': 'koi8-u'
+        },
+        {
+          'labels': [
+            'csmacintosh',
+            'mac',
+            'macintosh',
+            'x-mac-roman'
+          ],
+          'name': 'macintosh'
+        },
+        {
+          'labels': [
+            'iso-8859-11',
+            'tis-620',
+            'windows-874'
+          ],
+          'name': 'windows-874'
+        },
+        {
+          'labels': [
+            'windows-1250',
+            'x-cp1250'
+          ],
+          'name': 'windows-1250'
+        },
+        {
+          'labels': [
+            'windows-1251',
+            'x-cp1251'
+          ],
+          'name': 'windows-1251'
+        },
+        {
+          'labels': [
+            'ascii',
+            'ansi_x3.4-1968',
+            'csisolatin1',
+            'iso-8859-1',
+            'iso8859-1',
+            'iso_8859-1',
+            'l1',
+            'latin1',
+            'us-ascii',
+            'windows-1252'
+          ],
+          'name': 'windows-1252'
+        },
+        {
+          'labels': [
+            'cp1253',
+            'windows-1253'
+          ],
+          'name': 'windows-1253'
+        },
+        {
+          'labels': [
+            'csisolatin5',
+            'iso-8859-9',
+            'iso-ir-148',
+            'l5',
+            'latin5',
+            'windows-1254'
+          ],
+          'name': 'windows-1254'
+        },
+        {
+          'labels': [
+            'cp1255',
+            'windows-1255'
+          ],
+          'name': 'windows-1255'
+        },
+        {
+          'labels': [
+            'cp1256',
+            'windows-1256'
+          ],
+          'name': 'windows-1256'
+        },
+        {
+          'labels': [
+            'windows-1257'
+          ],
+          'name': 'windows-1257'
+        },
+        {
+          'labels': [
+            'cp1258',
+            'windows-1258'
+          ],
+          'name': 'windows-1258'
+        },
+        {
+          'labels': [
+            'x-mac-cyrillic',
+            'x-mac-ukrainian'
+          ],
+          'name': 'x-mac-cyrillic'
+        }
+      ],
+      'heading': 'Legacy single-byte encodings'
+    },
+    {
+      'encodings': [
+        {
+          'labels': [
+            'chinese',
+            'csgb2312',
+            'csiso58gb231280',
+            'gb2312',
+            'gbk',
+            'gb_2312',
+            'gb_2312-80',
+            'iso-ir-58',
+            'x-gbk'
+          ],
+          'name': 'gbk'
+        },
+        {
+          'labels': [
+            'gb18030'
+          ],
+          'name': 'gb18030'
+        },
+        {
+          'labels': [
+            'hz-gb-2312'
+          ],
+          'name': 'hz-gb-2312'
+        }
+      ],
+      'heading': 'Legacy multi-byte Chinese (simplified) encodings'
+    },
+    {
+      'encodings': [
+        {
+          'labels': [
+            'big5',
+            'big5-hkscs',
+            'cn-big5',
+            'csbig5',
+            'x-x-big5'
+          ],
+          'name': 'big5'
+        }
+      ],
+      'heading': 'Legacy multi-byte Chinese (traditional) encodings'
+    },
+    {
+      'encodings': [
+        {
+          'labels': [
+            'cseucpkdfmtjapanese',
+            'euc-jp',
+            'x-euc-jp'
+          ],
+          'name': 'euc-jp'
+        },
+        {
+          'labels': [
+            'csiso2022jp',
+            'iso-2022-jp'
+          ],
+          'name': 'iso-2022-jp'
+        },
+        {
+          'labels': [
+            'csshiftjis',
+            'ms_kanji',
+            'shift-jis',
+            'shift_jis',
+            'sjis',
+            'windows-31j',
+            'x-sjis'
+          ],
+          'name': 'shift_jis'
+        }
+      ],
+      'heading': 'Legacy multi-byte Japanese encodings'
+    },
+    {
+      'encodings': [
+        {
+          'labels': [
+            'cseuckr',
+            'csksc56011987',
+            'euc-kr',
+            'iso-ir-149',
+            'korean',
+            'ks_c_5601-1987',
+            'ks_c_5601-1989',
+            'ksc5601',
+            'ksc_5601',
+            'windows-949'
+          ],
+          'name': 'euc-kr'
+        },
+        {
+          'labels': [
+            'csiso2022kr',
+            'iso-2022-kr'
+          ],
+          'name': 'iso-2022-kr'
+        }
+      ],
+      'heading': 'Legacy multi-byte Korean encodings'
+    },
+    {
+      'encodings': [
+        {
+          'labels': [
+            'utf-16',
+            'utf-16le'
+          ],
+          'name': 'utf-16'
+        },
+        {
+          'labels': [
+            'utf-16be'
+          ],
+          'name': 'utf-16be'
+        }
+      ],
+      'heading': 'Legacy utf-16 encodings'
+    }
+  ];
+
+  var name_to_encoding = {};
+  var label_to_encoding = {};
+  encodings.forEach(function(category) {
+    category.encodings.forEach(function(encoding) {
+      name_to_encoding[encoding.name] = encoding;
+      encoding.labels.forEach(function(label) {
+        label_to_encoding[label] = encoding;
+      });
+    });
+  });
+
+  //
+  // 5. Indexes
+  //
+
+  /**
+   * @param {number} pointer The |pointer| to search for.
+   * @param {Array.<?number>} index The |index| to search within.
+   * @return {?number} The code point corresponding to |pointer| in |index|,
+   *     or null if |code point| is not in |index|.
+   */
+  function indexCodePointFor(pointer, index) {
+    return (index || [])[pointer] || null;
+  }
+
+  /**
+   * @param {number} code_point The |code point| to search for.
+   * @param {Array.<?number>} index The |index| to search within.
+   * @return {?number} The first pointer corresponding to |code point| in
+   *     |index|, or null if |code point| is not in |index|.
+   */
+  function indexPointerFor(code_point, index) {
+    var pointer = index.indexOf(code_point);
+    return pointer === -1 ? null : pointer;
+  }
+
+  /** @type {Object.<string, (Array.<number>|Array.<Array.<number>>)>} */
+  var indexes = global['encoding-indexes'] || {};
+
+  /**
+   * @param {number} pointer The |pointer| to search for in the gb18030 index.
+   * @return {?number} The code point corresponding to |pointer| in |index|,
+   *     or null if |code point| is not in the gb18030 index.
+   */
+  function indexGB18030CodePointFor(pointer) {
+    if ((pointer > 39419 && pointer < 189000) || (pointer > 1237575)) {
+      return null;
+    }
+    var /** @type {number} */ offset = 0,
+        /** @type {number} */ code_point_offset = 0,
+        /** @type {Array.<Array.<number>>} */ index = indexes['gb18030'];
+    var i;
+    for (i = 0; i < index.length; ++i) {
+      var entry = index[i];
+      if (entry[0] <= pointer) {
+        offset = entry[0];
+        code_point_offset = entry[1];
+      } else {
+        break;
+      }
+    }
+    return code_point_offset + pointer - offset;
+  }
+
+  /**
+   * @param {number} code_point The |code point| to locate in the gb18030 index.
+   * @return {number} The first pointer corresponding to |code point| in the
+   *     gb18030 index.
+   */
+  function indexGB18030PointerFor(code_point) {
+    var /** @type {number} */ offset = 0,
+        /** @type {number} */ pointer_offset = 0,
+        /** @type {Array.<Array.<number>>} */ index = indexes['gb18030'];
+    var i;
+    for (i = 0; i < index.length; ++i) {
+      var entry = index[i];
+      if (entry[1] <= code_point) {
+        offset = entry[1];
+        pointer_offset = entry[0];
+      } else {
+        break;
+      }
+    }
+    return pointer_offset + code_point - offset;
+  }
+
+  //
+  // 7. The encoding
+  //
+
+  // 7.1 utf-8
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function UTF8Decoder(options) {
+    var fatal = options.fatal;
+    var /** @type {number} */ utf8_code_point = 0,
+        /** @type {number} */ utf8_bytes_needed = 0,
+        /** @type {number} */ utf8_bytes_seen = 0,
+        /** @type {number} */ utf8_lower_boundary = 0;
+
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte) {
+        if (utf8_bytes_needed !== 0) {
+          return decoderError(fatal);
+        }
+        return EOF_code_point;
+      }
+      byte_pointer.offset(1);
+
+      if (utf8_bytes_needed === 0) {
+        if (inRange(bite, 0x00, 0x7F)) {
+          return bite;
+        }
+        if (inRange(bite, 0xC2, 0xDF)) {
+          utf8_bytes_needed = 1;
+          utf8_lower_boundary = 0x80;
+          utf8_code_point = bite - 0xC0;
+        } else if (inRange(bite, 0xE0, 0xEF)) {
+          utf8_bytes_needed = 2;
+          utf8_lower_boundary = 0x800;
+          utf8_code_point = bite - 0xE0;
+        } else if (inRange(bite, 0xF0, 0xF4)) {
+          utf8_bytes_needed = 3;
+          utf8_lower_boundary = 0x10000;
+          utf8_code_point = bite - 0xF0;
+        } else {
+          return decoderError(fatal);
+        }
+        utf8_code_point = utf8_code_point * Math.pow(64, utf8_bytes_needed);
+        return null;
+      }
+      if (!inRange(bite, 0x80, 0xBF)) {
+        utf8_code_point = 0;
+        utf8_bytes_needed = 0;
+        utf8_bytes_seen = 0;
+        utf8_lower_boundary = 0;
+        byte_pointer.offset(-1);
+        return decoderError(fatal);
+      }
+      utf8_bytes_seen += 1;
+      utf8_code_point = utf8_code_point + (bite - 0x80) *
+          Math.pow(64, utf8_bytes_needed - utf8_bytes_seen);
+      if (utf8_bytes_seen !== utf8_bytes_needed) {
+        return null;
+      }
+      var code_point = utf8_code_point;
+      var lower_boundary = utf8_lower_boundary;
+      utf8_code_point = 0;
+      utf8_bytes_needed = 0;
+      utf8_bytes_seen = 0;
+      utf8_lower_boundary = 0;
+      if (inRange(code_point, lower_boundary, 0x10FFFF) &&
+          !inRange(code_point, 0xD800, 0xDFFF)) {
+        return code_point;
+      }
+      return decoderError(fatal);
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function UTF8Encoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0xD800, 0xDFFF)) {
+        return encoderError(code_point);
+      }
+      if (inRange(code_point, 0x0000, 0x007f)) {
+        return output_byte_stream.emit(code_point);
+      }
+      var count, offset;
+      if (inRange(code_point, 0x0080, 0x07FF)) {
+        count = 1;
+        offset = 0xC0;
+      } else if (inRange(code_point, 0x0800, 0xFFFF)) {
+        count = 2;
+        offset = 0xE0;
+      } else if (inRange(code_point, 0x10000, 0x10FFFF)) {
+        count = 3;
+        offset = 0xF0;
+      }
+      var result = output_byte_stream.emit(
+          div(code_point, Math.pow(64, count)) + offset);
+      while (count > 0) {
+        var temp = div(code_point, Math.pow(64, count - 1));
+        result = output_byte_stream.emit(0x80 + (temp % 64));
+        count -= 1;
+      }
+      return result;
+    };
+  }
+
+  name_to_encoding['utf-8'].getEncoder = function(options) {
+    return new UTF8Encoder(options);
+  };
+  name_to_encoding['utf-8'].getDecoder = function(options) {
+    return new UTF8Decoder(options);
+  };
+
+  //
+  // 8. Legacy single-byte encodings
+  //
+
+  /**
+   * @constructor
+   * @param {Array.<number>} index The encoding index.
+   * @param {{fatal: boolean}} options
+   */
+  function SingleByteDecoder(index, options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte) {
+        return EOF_code_point;
+      }
+      byte_pointer.offset(1);
+      if (inRange(bite, 0x00, 0x7F)) {
+        return bite;
+      }
+      var code_point = index[bite - 0x80];
+      if (code_point === null) {
+        return decoderError(fatal);
+      }
+      return code_point;
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {Array.<?number>} index The encoding index.
+   * @param {{fatal: boolean}} options
+   */
+  function SingleByteEncoder(index, options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      var pointer = indexPointerFor(code_point, index);
+      if (pointer === null) {
+        encoderError(code_point);
+      }
+      return output_byte_stream.emit(pointer + 0x80);
+    };
+  }
+
+  (function() {
+    ['ibm864', 'ibm866', 'iso-8859-2', 'iso-8859-3', 'iso-8859-4',
+     'iso-8859-5', 'iso-8859-6', 'iso-8859-7', 'iso-8859-8', 'iso-8859-10',
+     'iso-8859-13', 'iso-8859-14', 'iso-8859-15', 'iso-8859-16', 'koi8-r',
+     'koi8-u', 'macintosh', 'windows-874', 'windows-1250', 'windows-1251',
+     'windows-1252', 'windows-1253', 'windows-1254', 'windows-1255',
+     'windows-1256', 'windows-1257', 'windows-1258', 'x-mac-cyrillic'
+    ].forEach(function(name) {
+      var encoding = name_to_encoding[name];
+      var index = indexes[name];
+      encoding.getDecoder = function(options) {
+        return new SingleByteDecoder(index, options);
+      };
+      encoding.getEncoder = function(options) {
+        return new SingleByteEncoder(index, options);
+      };
+    });
+  }());
+
+  //
+  // 9. Legacy multi-byte Chinese (simplified) encodings
+  //
+
+  // 9.1 gbk
+
+  /**
+   * @constructor
+   * @param {boolean} gb18030 True if decoding gb18030, false otherwise.
+   * @param {{fatal: boolean}} options
+   */
+  function GBKDecoder(gb18030, options) {
+    var fatal = options.fatal;
+    var /** @type {number} */ gbk_first = 0x00,
+        /** @type {number} */ gbk_second = 0x00,
+        /** @type {number} */ gbk_third = 0x00;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte && gbk_first === 0x00 &&
+          gbk_second === 0x00 && gbk_third === 0x00) {
+        return EOF_code_point;
+      }
+      if (bite === EOF_byte &&
+          (gbk_first !== 0x00 || gbk_second !== 0x00 || gbk_third !== 0x00)) {
+        gbk_first = 0x00;
+        gbk_second = 0x00;
+        gbk_third = 0x00;
+        decoderError(fatal);
+      }
+      byte_pointer.offset(1);
+      var code_point;
+      if (gbk_third !== 0x00) {
+        code_point = null;
+        if (inRange(bite, 0x30, 0x39)) {
+          code_point = indexGB18030CodePointFor(
+              (((gbk_first - 0x81) * 10 + (gbk_second - 0x30)) * 126 +
+               (gbk_third - 0x81)) * 10 + bite - 0x30);
+        }
+        gbk_first = 0x00;
+        gbk_second = 0x00;
+        gbk_third = 0x00;
+        if (code_point === null) {
+          byte_pointer.offset(-3);
+          return decoderError(fatal);
+        }
+        return code_point;
+      }
+      if (gbk_second !== 0x00) {
+        if (inRange(bite, 0x81, 0xFE)) {
+          gbk_third = bite;
+          return null;
+        }
+        byte_pointer.offset(-2);
+        gbk_first = 0x00;
+        gbk_second = 0x00;
+        return decoderError(fatal);
+      }
+      if (gbk_first !== 0x00) {
+        if (inRange(bite, 0x30, 0x39) && gb18030) {
+          gbk_second = bite;
+          return null;
+        }
+        var lead = gbk_first;
+        var pointer = null;
+        gbk_first = 0x00;
+        var offset = bite < 0x7F ? 0x40 : 0x41;
+        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0x80, 0xFE)) {
+          pointer = (lead - 0x81) * 190 + (bite - offset);
+        }
+        code_point = pointer === null ? null :
+            indexCodePointFor(pointer, indexes['gbk']);
+        if (pointer === null) {
+          byte_pointer.offset(-1);
+        }
+        if (code_point === null) {
+          return decoderError(fatal);
+        }
+        return code_point;
+      }
+      if (inRange(bite, 0x00, 0x7F)) {
+        return bite;
+      }
+      if (bite === 0x80) {
+        return 0x20AC;
+      }
+      if (inRange(bite, 0x81, 0xFE)) {
+        gbk_first = bite;
+        return null;
+      }
+      return decoderError(fatal);
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {boolean} gb18030 True if decoding gb18030, false otherwise.
+   * @param {{fatal: boolean}} options
+   */
+  function GBKEncoder(gb18030, options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      var pointer = indexPointerFor(code_point, indexes['gbk']);
+      if (pointer !== null) {
+        var lead = div(pointer, 190) + 0x81;
+        var trail = pointer % 190;
+        var offset = trail < 0x3F ? 0x40 : 0x41;
+        return output_byte_stream.emit(lead, trail + offset);
+      }
+      if (pointer === null && !gb18030) {
+        return encoderError(code_point);
+      }
+      pointer = indexGB18030PointerFor(code_point);
+      var byte1 = div(div(div(pointer, 10), 126), 10);
+      pointer = pointer - byte1 * 10 * 126 * 10;
+      var byte2 = div(div(pointer, 10), 126);
+      pointer = pointer - byte2 * 10 * 126;
+      var byte3 = div(pointer, 10);
+      var byte4 = pointer - byte3 * 10;
+      return output_byte_stream.emit(byte1 + 0x81,
+                                     byte2 + 0x30,
+                                     byte3 + 0x81,
+                                     byte4 + 0x30);
+    };
+  }
+
+  name_to_encoding['gbk'].getEncoder = function(options) {
+    return new GBKEncoder(false, options);
+  };
+  name_to_encoding['gbk'].getDecoder = function(options) {
+    return new GBKDecoder(false, options);
+  };
+
+  // 9.2 gb18030
+  name_to_encoding['gb18030'].getEncoder = function(options) {
+    return new GBKEncoder(true, options);
+  };
+  name_to_encoding['gb18030'].getDecoder = function(options) {
+    return new GBKDecoder(true, options);
+  };
+
+  // 9.3 hz-gb-2312
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function HZGB2312Decoder(options) {
+    var fatal = options.fatal;
+    var /** @type {boolean} */ hzgb2312 = false,
+        /** @type {number} */ hzgb2312_lead = 0x00;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte && hzgb2312_lead === 0x00) {
+        return EOF_code_point;
+      }
+      if (bite === EOF_byte && hzgb2312_lead !== 0x00) {
+        hzgb2312_lead = 0x00;
+        return decoderError(fatal);
+      }
+      byte_pointer.offset(1);
+      if (hzgb2312_lead === 0x7E) {
+        hzgb2312_lead = 0x00;
+        if (bite === 0x7B) {
+          hzgb2312 = true;
+          return null;
+        }
+        if (bite === 0x7D) {
+          hzgb2312 = false;
+          return null;
+        }
+        if (bite === 0x7E) {
+          return 0x007E;
+        }
+        if (bite === 0x0A) {
+          return null;
+        }
+        byte_pointer.offset(-1);
+        return decoderError(fatal);
+      }
+      if (hzgb2312_lead !== 0x00) {
+        var lead = hzgb2312_lead;
+        hzgb2312_lead = 0x00;
+        var code_point = null;
+        if (inRange(bite, 0x21, 0x7E)) {
+          code_point = indexCodePointFor((lead - 1) * 190 +
+                                         (bite + 0x3F), indexes['gbk']);
+        }
+        if (bite === 0x0A) {
+          hzgb2312 = false;
+        }
+        if (code_point === null) {
+          return decoderError(fatal);
+        }
+        return code_point;
+      }
+      if (bite === 0x7E) {
+        hzgb2312_lead = 0x7E;
+        return null;
+      }
+      if (hzgb2312) {
+        if (inRange(bite, 0x20, 0x7F)) {
+          hzgb2312_lead = bite;
+          return null;
+        }
+        if (bite === 0x0A) {
+          hzgb2312 = false;
+        }
+        return decoderError(fatal);
+      }
+      if (inRange(bite, 0x00, 0x7F)) {
+        return bite;
+      }
+      return decoderError(fatal);
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function HZGB2312Encoder(options) {
+    var fatal = options.fatal;
+    var hzgb2312 = false;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x007F) && hzgb2312) {
+        code_point_pointer.offset(-1);
+        hzgb2312 = false;
+        return output_byte_stream.emit(0x7E, 0x7D);
+      }
+      if (code_point === 0x007E) {
+        return output_byte_stream.emit(0x7E, 0x7E);
+      }
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      if (!hzgb2312) {
+        code_point_pointer.offset(-1);
+        hzgb2312 = true;
+        return output_byte_stream.emit(0x7E, 0x7B);
+      }
+      var pointer = indexPointerFor(code_point, indexes['gbk']);
+      if (pointer === null) {
+        return encoderError(code_point);
+      }
+      var lead = div(pointer, 190) + 1;
+      var trail = pointer % 190 - 0x3F;
+      if (!inRange(lead, 0x21, 0x7E) || !inRange(trail, 0x21, 0x7E)) {
+        return encoderError(code_point);
+      }
+      return output_byte_stream.emit(lead, trail);
+    };
+  }
+
+  name_to_encoding['hz-gb-2312'].getEncoder = function(options) {
+    return new HZGB2312Encoder(options);
+  };
+  name_to_encoding['hz-gb-2312'].getDecoder = function(options) {
+    return new HZGB2312Decoder(options);
+  };
+
+  //
+  // 10. Legacy multi-byte Chinese (traditional) encodings
+  //
+
+  // 10.1 big5
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function Big5Decoder(options) {
+    var fatal = options.fatal;
+    var /** @type {number} */ big5_lead = 0x00,
+        /** @type {?number} */ big5_pending = null;
+
+    /**
+     * @param {ByteInputStream} byte_pointer The byte steram to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      // NOTE: Hack to support emitting two code points
+      if (big5_pending !== null) {
+        var pending = big5_pending;
+        big5_pending = null;
+        return pending;
+      }
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte && big5_lead === 0x00) {
+        return EOF_code_point;
+      }
+      if (bite === EOF_byte && big5_lead !== 0x00) {
+        big5_lead = 0x00;
+        return decoderError(fatal);
+      }
+      byte_pointer.offset(1);
+      if (big5_lead !== 0x00) {
+        var lead = big5_lead;
+        var pointer = null;
+        big5_lead = 0x00;
+        var offset = bite < 0x7F ? 0x40 : 0x62;
+        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0xA1, 0xFE)) {
+          pointer = (lead - 0x81) * 157 + (bite - offset);
+        }
+        if (pointer === 1133) {
+          big5_pending = 0x0304;
+          return 0x00CA;
+        }
+        if (pointer === 1135) {
+          big5_pending = 0x030C;
+          return 0x00CA;
+        }
+        if (pointer === 1164) {
+          big5_pending = 0x0304;
+          return 0x00EA;
+        }
+        if (pointer === 1166) {
+          big5_pending = 0x030C;
+          return 0x00EA;
+        }
+        var code_point = (pointer === null) ? null :
+            indexCodePointFor(pointer, indexes['big5']);
+        if (pointer === null) {
+          byte_pointer.offset(-1);
+        }
+        if (code_point === null) {
+          return decoderError(fatal);
+        }
+        return code_point;
+      }
+      if (inRange(bite, 0x00, 0x7F)) {
+        return bite;
+      }
+      if (inRange(bite, 0x81, 0xFE)) {
+        big5_lead = bite;
+        return null;
+      }
+      return decoderError(fatal);
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function Big5Encoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      var pointer = indexPointerFor(code_point, indexes['big5']);
+      if (pointer === null) {
+        return encoderError(code_point);
+      }
+      var lead = div(pointer, 157) + 0x81;
+      //if (lead < 0xA1) {
+      //  return encoderError(code_point);
+      //}
+      var trail = pointer % 157;
+      var offset = trail < 0x3F ? 0x40 : 0x62;
+      return output_byte_stream.emit(lead, trail + offset);
+    };
+  }
+
+  name_to_encoding['big5'].getEncoder = function(options) {
+    return new Big5Encoder(options);
+  };
+  name_to_encoding['big5'].getDecoder = function(options) {
+    return new Big5Decoder(options);
+  };
+
+
+  //
+  // 11. Legacy multi-byte Japanese encodings
+  //
+
+  // 11.1 euc.jp
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function EUCJPDecoder(options) {
+    var fatal = options.fatal;
+    var /** @type {number} */ eucjp_first = 0x00,
+        /** @type {number} */ eucjp_second = 0x00;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte) {
+        if (eucjp_first === 0x00 && eucjp_second === 0x00) {
+          return EOF_code_point;
+        }
+        eucjp_first = 0x00;
+        eucjp_second = 0x00;
+        return decoderError(fatal);
+      }
+      byte_pointer.offset(1);
+
+      var lead, code_point;
+      if (eucjp_second !== 0x00) {
+        lead = eucjp_second;
+        eucjp_second = 0x00;
+        code_point = null;
+        if (inRange(lead, 0xA1, 0xFE) && inRange(bite, 0xA1, 0xFE)) {
+          code_point = indexCodePointFor((lead - 0xA1) * 94 + bite - 0xA1,
+                                         indexes['jis0212']);
+        }
+        if (!inRange(bite, 0xA1, 0xFE)) {
+          byte_pointer.offset(-1);
+        }
+        if (code_point === null) {
+          return decoderError(fatal);
+        }
+        return code_point;
+      }
+      if (eucjp_first === 0x8E && inRange(bite, 0xA1, 0xDF)) {
+        eucjp_first = 0x00;
+        return 0xFF61 + bite - 0xA1;
+      }
+      if (eucjp_first === 0x8F && inRange(bite, 0xA1, 0xFE)) {
+        eucjp_first = 0x00;
+        eucjp_second = bite;
+        return null;
+      }
+      if (eucjp_first !== 0x00) {
+        lead = eucjp_first;
+        eucjp_first = 0x00;
+        code_point = null;
+        if (inRange(lead, 0xA1, 0xFE) && inRange(bite, 0xA1, 0xFE)) {
+          code_point = indexCodePointFor((lead - 0xA1) * 94 + bite - 0xA1,
+                                         indexes['jis0208']);
+        }
+        if (!inRange(bite, 0xA1, 0xFE)) {
+          byte_pointer.offset(-1);
+        }
+        if (code_point === null) {
+          return decoderError(fatal);
+        }
+        return code_point;
+      }
+      if (inRange(bite, 0x00, 0x7F)) {
+        return bite;
+      }
+      if (bite === 0x8E || bite === 0x8F || (inRange(bite, 0xA1, 0xFE))) {
+        eucjp_first = bite;
+        return null;
+      }
+      return decoderError(fatal);
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function EUCJPEncoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      if (code_point === 0x00A5) {
+        return output_byte_stream.emit(0x5C);
+      }
+      if (code_point === 0x203E) {
+        return output_byte_stream.emit(0x7E);
+      }
+      if (inRange(code_point, 0xFF61, 0xFF9F)) {
+        return output_byte_stream.emit(0x8E, code_point - 0xFF61 + 0xA1);
+      }
+
+      var pointer = indexPointerFor(code_point, indexes['jis0208']);
+      if (pointer === null) {
+        return encoderError(code_point);
+      }
+      var lead = div(pointer, 94) + 0xA1;
+      var trail = pointer % 94 + 0xA1;
+      return output_byte_stream.emit(lead, trail);
+    };
+  }
+
+  name_to_encoding['euc-jp'].getEncoder = function(options) {
+    return new EUCJPEncoder(options);
+  };
+  name_to_encoding['euc-jp'].getDecoder = function(options) {
+    return new EUCJPDecoder(options);
+  };
+
+  // 11.2 iso-2022-jp
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function ISO2022JPDecoder(options) {
+    var fatal = options.fatal;
+    /** @enum */
+    var state = {
+      ASCII: 0,
+      escape_start: 1,
+      escape_middle: 2,
+      escape_final: 3,
+      lead: 4,
+      trail: 5,
+      Katakana: 6
+    };
+    var /** @type {number} */ iso2022jp_state = state.ASCII,
+        /** @type {boolean} */ iso2022jp_jis0212 = false,
+        /** @type {number} */ iso2022jp_lead = 0x00;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite !== EOF_byte) {
+        byte_pointer.offset(1);
+      }
+      switch (iso2022jp_state) {
+        default:
+        case state.ASCII:
+          if (bite === 0x1B) {
+            iso2022jp_state = state.escape_start;
+            return null;
+          }
+          if (inRange(bite, 0x00, 0x7F)) {
+            return bite;
+          }
+          if (bite === EOF_byte) {
+            return EOF_code_point;
+          }
+          return decoderError(fatal);
+
+        case state.escape_start:
+          if (bite === 0x24 || bite === 0x28) {
+            iso2022jp_lead = bite;
+            iso2022jp_state = state.escape_middle;
+            return null;
+          }
+          if (bite !== EOF_byte) {
+            byte_pointer.offset(-1);
+          }
+          iso2022jp_state = state.ASCII;
+          return decoderError(fatal);
+
+        case state.escape_middle:
+          var lead = iso2022jp_lead;
+          iso2022jp_lead = 0x00;
+          if (lead === 0x24 && (bite === 0x40 || bite === 0x42)) {
+            iso2022jp_jis0212 = false;
+            iso2022jp_state = state.lead;
+            return null;
+          }
+          if (lead === 0x24 && bite === 0x28) {
+            iso2022jp_state = state.escape_final;
+            return null;
+          }
+          if (lead === 0x28 && (bite === 0x42 || bite === 0x4A)) {
+            iso2022jp_state = state.ASCII;
+            return null;
+          }
+          if (lead === 0x28 && bite === 0x49) {
+            iso2022jp_state = state.Katakana;
+            return null;
+          }
+          if (bite === EOF_byte) {
+            byte_pointer.offset(-1);
+          } else {
+            byte_pointer.offset(-2);
+          }
+          iso2022jp_state = state.ASCII;
+          return decoderError(fatal);
+
+        case state.escape_final:
+          if (bite === 0x44) {
+            iso2022jp_jis0212 = true;
+            iso2022jp_state = state.lead;
+            return null;
+          }
+          if (bite === EOF_byte) {
+            byte_pointer.offset(-2);
+          } else {
+            byte_pointer.offset(-3);
+          }
+          iso2022jp_state = state.ASCII;
+          return decoderError(fatal);
+
+        case state.lead:
+          if (bite === 0x0A) {
+            iso2022jp_state = state.ASCII;
+            return decoderError(fatal, 0x000A);
+          }
+          if (bite === 0x1B) {
+            iso2022jp_state = state.escape_start;
+            return null;
+          }
+          if (bite === EOF_byte) {
+            return EOF_code_point;
+          }
+          iso2022jp_lead = bite;
+          iso2022jp_state = state.trail;
+          return null;
+
+        case state.trail:
+          iso2022jp_state = state.lead;
+          if (bite === EOF_byte) {
+            return decoderError(fatal);
+          }
+          var code_point = null;
+          var pointer = (iso2022jp_lead - 0x21) * 94 + bite - 0x21;
+          if (inRange(iso2022jp_lead, 0x21, 0x7E) &&
+              inRange(bite, 0x21, 0x7E)) {
+            code_point = (iso2022jp_jis0212 === false) ?
+                indexCodePointFor(pointer, indexes['jis0208']) :
+                indexCodePointFor(pointer, indexes['jis0212']);
+          }
+          if (code_point === null) {
+            return decoderError(fatal);
+          }
+          return code_point;
+
+        case state.Katakana:
+          if (bite === 0x1B) {
+            iso2022jp_state = state.escape_start;
+            return null;
+          }
+          if (inRange(bite, 0x21, 0x5F)) {
+            return 0xFF61 + bite - 0x21;
+          }
+          if (bite === EOF_byte) {
+            return EOF_code_point;
+          }
+          return decoderError(fatal);
+      }
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function ISO2022JPEncoder(options) {
+    var fatal = options.fatal;
+    /** @enum */
+    var state = {
+      ASCII: 0,
+      lead: 1,
+      Katakana: 2
+    };
+    var /** @type {number} */ iso2022jp_state = state.ASCII;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if ((inRange(code_point, 0x0000, 0x007F) ||
+           code_point === 0x00A5 || code_point === 0x203E) &&
+          iso2022jp_state !== state.ASCII) {
+        code_point_pointer.offset(-1);
+        iso2022jp_state = state.ASCII;
+        return output_byte_stream.emit(0x1B, 0x28, 0x42);
+      }
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      if (code_point === 0x00A5) {
+        return output_byte_stream.emit(0x5C);
+      }
+      if (code_point === 0x203E) {
+        return output_byte_stream.emit(0x7E);
+      }
+      if (inRange(code_point, 0xFF61, 0xFF9F) &&
+          iso2022jp_state !== state.Katakana) {
+        code_point_pointer.offset(-1);
+        iso2022jp_state = state.Katakana;
+        return output_byte_stream.emit(0x1B, 0x28, 0x49);
+      }
+      if (inRange(code_point, 0xFF61, 0xFF9F)) {
+        return output_byte_stream.emit(code_point - 0xFF61 - 0x21);
+      }
+      if (iso2022jp_state !== state.lead) {
+        code_point_pointer.offset(-1);
+        iso2022jp_state = state.lead;
+        return output_byte_stream.emit(0x1B, 0x24, 0x42);
+      }
+      var pointer = indexPointerFor(code_point, indexes['jis0208']);
+      if (pointer === null) {
+        return encoderError(code_point);
+      }
+      var lead = div(pointer, 94) + 0x21;
+      var trail = pointer % 94 + 0x21;
+      return output_byte_stream.emit(lead, trail);
+    };
+  }
+
+  name_to_encoding['iso-2022-jp'].getEncoder = function(options) {
+    return new ISO2022JPEncoder(options);
+  };
+  name_to_encoding['iso-2022-jp'].getDecoder = function(options) {
+    return new ISO2022JPDecoder(options);
+  };
+
+  // 11.3 shift_jis
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function ShiftJISDecoder(options) {
+    var fatal = options.fatal;
+    var /** @type {number} */ shiftjis_lead = 0x00;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte && shiftjis_lead === 0x00) {
+        return EOF_code_point;
+      }
+      if (bite === EOF_byte && shiftjis_lead !== 0x00) {
+        shiftjis_lead = 0x00;
+        return decoderError(fatal);
+      }
+      byte_pointer.offset(1);
+      if (shiftjis_lead !== 0x00) {
+        var lead = shiftjis_lead;
+        shiftjis_lead = 0x00;
+        if (inRange(bite, 0x40, 0x7E) || inRange(bite, 0x80, 0xFC)) {
+          var offset = (bite < 0x7F) ? 0x40 : 0x41;
+          var lead_offset = (lead < 0xA0) ? 0x81 : 0xC1;
+          var code_point = indexCodePointFor((lead - lead_offset) * 188 +
+                                             bite - offset, indexes['jis0208']);
+          if (code_point === null) {
+            return decoderError(fatal);
+          }
+          return code_point;
+        }
+        byte_pointer.offset(-1);
+        return decoderError(fatal);
+      }
+      if (inRange(bite, 0x00, 0x80)) {
+        return bite;
+      }
+      if (inRange(bite, 0xA1, 0xDF)) {
+        return 0xFF61 + bite - 0xA1;
+      }
+      if (inRange(bite, 0x81, 0x9F) || inRange(bite, 0xE0, 0xFC)) {
+        shiftjis_lead = bite;
+        return null;
+      }
+      return decoderError(fatal);
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function ShiftJISEncoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x0080)) {
+        return output_byte_stream.emit(code_point);
+      }
+      if (code_point === 0x00A5) {
+        return output_byte_stream.emit(0x5C);
+      }
+      if (code_point === 0x203E) {
+        return output_byte_stream.emit(0x7E);
+      }
+      if (inRange(code_point, 0xFF61, 0xFF9F)) {
+        return output_byte_stream.emit(code_point - 0xFF61 + 0xA1);
+      }
+      var pointer = indexPointerFor(code_point, indexes['jis0208']);
+      if (pointer === null) {
+        return encoderError(code_point);
+      }
+      var lead = div(pointer, 188);
+      var lead_offset = lead < 0x1F ? 0x81 : 0xC1;
+      var trail = pointer % 188;
+      var offset = trail < 0x3F ? 0x40 : 0x41;
+      return output_byte_stream.emit(lead + lead_offset, trail + offset);
+    };
+  }
+
+  name_to_encoding['shift_jis'].getEncoder = function(options) {
+    return new ShiftJISEncoder(options);
+  };
+  name_to_encoding['shift_jis'].getDecoder = function(options) {
+    return new ShiftJISDecoder(options);
+  };
+
+  //
+  // 12. Legacy multi-byte Korean encodings
+  //
+
+  // 12.1 euc-kr
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function EUCKRDecoder(options) {
+    var fatal = options.fatal;
+    var /** @type {number} */ euckr_lead = 0x00;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte && euckr_lead === 0) {
+        return EOF_code_point;
+      }
+      if (bite === EOF_byte && euckr_lead !== 0) {
+        euckr_lead = 0x00;
+        return decoderError(fatal);
+      }
+      byte_pointer.offset(1);
+      if (euckr_lead !== 0x00) {
+        var lead = euckr_lead;
+        var pointer = null;
+        euckr_lead = 0x00;
+
+        if (inRange(lead, 0x81, 0xC6)) {
+          var temp = (26 + 26 + 126) * (lead - 0x81);
+          if (inRange(bite, 0x41, 0x5A)) {
+            pointer = temp + bite - 0x41;
+          } else if (inRange(bite, 0x61, 0x7A)) {
+            pointer = temp + 26 + bite - 0x61;
+          } else if (inRange(bite, 0x81, 0xFE)) {
+            pointer = temp + 26 + 26 + bite - 0x81;
+          }
+        }
+
+        if (inRange(lead, 0xC7, 0xFD) && inRange(bite, 0xA1, 0xFE)) {
+          pointer = (26 + 26 + 126) * (0xC7 - 0x81) + (lead - 0xC7) * 94 +
+              (bite - 0xA1);
+        }
+
+        var code_point = (pointer === null) ? null :
+            indexCodePointFor(pointer, indexes['euc-kr']);
+        if (pointer === null) {
+          byte_pointer.offset(-1);
+        }
+        if (code_point === null) {
+          return decoderError(fatal);
+        }
+        return code_point;
+      }
+
+      if (inRange(bite, 0x00, 0x7F)) {
+        return bite;
+      }
+
+      if (inRange(bite, 0x81, 0xFD)) {
+        euckr_lead = bite;
+        return null;
+      }
+
+      return decoderError(fatal);
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function EUCKREncoder(options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      var pointer = indexPointerFor(code_point, indexes['euc-kr']);
+      if (pointer === null) {
+        return encoderError(code_point);
+      }
+      var lead, trail;
+      if (pointer < ((26 + 26 + 126) * (0xC7 - 0x81))) {
+        lead = div(pointer, (26 + 26 + 126)) + 0x81;
+        trail = pointer % (26 + 26 + 126);
+        var offset = trail < 26 ? 0x41 : trail < 26 + 26 ? 0x47 : 0x4D;
+        return output_byte_stream.emit(lead, trail + offset);
+      }
+      pointer = pointer - (26 + 26 + 126) * (0xC7 - 0x81);
+      lead = div(pointer, 94) + 0xC7;
+      trail = pointer % 94 + 0xA1;
+      return output_byte_stream.emit(lead, trail);
+    };
+  }
+
+  name_to_encoding['euc-kr'].getEncoder = function(options) {
+    return new EUCKREncoder(options);
+  };
+  name_to_encoding['euc-kr'].getDecoder = function(options) {
+    return new EUCKRDecoder(options);
+  };
+
+  // 12.2 iso-2022-kr
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function ISO2022KRDecoder(options) {
+    var fatal = options.fatal;
+    /** @enum */
+    var state = {
+      ASCII: 0,
+      escape_start: 1,
+      escape_middle: 2,
+      escape_end: 3,
+      lead: 4,
+      trail: 5
+    };
+    var /** @type {number} */ iso2022kr_state = state.ASCII,
+        /** @type {number} */ iso2022kr_lead = 0x00;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite !== EOF_byte) {
+        byte_pointer.offset(1);
+      }
+      switch (iso2022kr_state) {
+        default:
+        case state.ASCII:
+          if (bite === 0x0E) {
+            iso2022kr_state = state.lead;
+            return null;
+          }
+          if (bite === 0x0F) {
+            return null;
+          }
+          if (bite === 0x1B) {
+            iso2022kr_state = state.escape_start;
+            return null;
+          }
+          if (inRange(bite, 0x00, 0x7F)) {
+            return bite;
+          }
+          if (bite === EOF_byte) {
+            return EOF_code_point;
+          }
+          return decoderError(fatal);
+        case state.escape_start:
+          if (bite === 0x24) {
+            iso2022kr_state = state.escape_middle;
+            return null;
+          }
+          if (bite !== EOF_byte) {
+            byte_pointer.offset(-1);
+          }
+          iso2022kr_state = state.ASCII;
+          return decoderError(fatal);
+        case state.escape_middle:
+          if (bite === 0x29) {
+            iso2022kr_state = state.escape_end;
+            return null;
+          }
+          if (bite === EOF_byte) {
+            byte_pointer.offset(-1);
+          } else {
+            byte_pointer.offset(-2);
+          }
+          iso2022kr_state = state.ASCII;
+          return decoderError(fatal);
+        case state.escape_end:
+          if (bite === 0x43) {
+            iso2022kr_state = state.ASCII;
+            return null;
+          }
+          if (bite === EOF_byte) {
+            byte_pointer.offset(-2);
+          } else {
+            byte_pointer.offset(-3);
+          }
+          iso2022kr_state = state.ASCII;
+          return decoderError(fatal);
+        case state.lead:
+          if (bite === 0x0A) {
+            iso2022kr_state = state.ASCII;
+            return decoderError(fatal, 0x000A);
+          }
+          if (bite === 0x0E) {
+            return null;
+          }
+          if (bite === 0x0F) {
+            iso2022kr_state = state.ASCII;
+            return null;
+          }
+          if (bite === EOF_byte) {
+            return EOF_code_point;
+          }
+          iso2022kr_lead = bite;
+          iso2022kr_state = state.trail;
+          return null;
+        case state.trail:
+          iso2022kr_state = state.lead;
+          if (bite === EOF_byte) {
+            return decoderError(fatal);
+          }
+          var code_point = null;
+          if (inRange(iso2022kr_lead, 0x21, 0x46) &&
+              inRange(bite, 0x21, 0x7E)) {
+            code_point = indexCodePointFor((26 + 26 + 126) *
+                (iso2022kr_lead - 1) +
+                26 + 26 + bite - 1,
+                indexes['euc-kr']);
+          } else if (inRange(iso2022kr_lead, 0x47, 0x7E) &&
+              inRange(bite, 0x21, 0x7E)) {
+            code_point = indexCodePointFor((26 + 26 + 126) * (0xC7 - 0x81) +
+                (iso2022kr_lead - 0x47) * 94 +
+                (bite - 0x21),
+                indexes['euc-kr']);
+          }
+          if (code_point !== null) {
+            return code_point;
+          }
+          return decoderError(fatal);
+      }
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {{fatal: boolean}} options
+   */
+  function ISO2022KREncoder(options) {
+    var fatal = options.fatal;
+    /** @enum */
+    var state = {
+      ASCII: 0,
+      lead: 1
+    };
+    var /** @type {boolean} */ iso2022kr_initialization = false,
+        /** @type {number} */ iso2022kr_state = state.ASCII;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      if (!iso2022kr_initialization) {
+        iso2022kr_initialization = true;
+        output_byte_stream.emit(0x1B, 0x24, 0x29, 0x43);
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0x0000, 0x007F) &&
+          iso2022kr_state !== state.ASCII) {
+        code_point_pointer.offset(-1);
+        iso2022kr_state = state.ASCII;
+        return output_byte_stream.emit(0x0F);
+      }
+      if (inRange(code_point, 0x0000, 0x007F)) {
+        return output_byte_stream.emit(code_point);
+      }
+      if (iso2022kr_state !== state.lead) {
+        code_point_pointer.offset(-1);
+        iso2022kr_state = state.lead;
+        return output_byte_stream.emit(0x0E);
+      }
+      var pointer = indexPointerFor(code_point, indexes['euc-kr']);
+      if (pointer === null) {
+        return encoderError(code_point);
+      }
+      var lead, trail;
+      if (pointer < (26 + 26 + 126) * (0xC7 - 0x81)) {
+        lead = div(pointer, (26 + 26 + 126)) + 1;
+        trail = pointer % (26 + 26 + 126) - 26 - 26 + 1;
+        if (!inRange(lead, 0x21, 0x46) || !inRange(trail, 0x21, 0x7E)) {
+          return encoderError(code_point);
+        }
+        return output_byte_stream.emit(lead, trail);
+      }
+      pointer = pointer - (26 + 26 + 126) * (0xC7 - 0x81);
+      lead = div(pointer, 94) + 0x47;
+      trail = pointer % 94 + 0x21;
+      if (!inRange(lead, 0x47, 0x7E) || !inRange(trail, 0x21, 0x7E)) {
+        return encoderError(code_point);
+      }
+      return output_byte_stream.emit(lead, trail);
+    };
+  }
+
+  name_to_encoding['iso-2022-kr'].getEncoder = function(options) {
+    return new ISO2022KREncoder(options);
+  };
+  name_to_encoding['iso-2022-kr'].getDecoder = function(options) {
+    return new ISO2022KRDecoder(options);
+  };
+
+
+  //
+  // 13. Legacy utf-16 encodings
+  //
+
+  // 13.1 utf-16
+
+  /**
+   * @constructor
+   * @param {boolean} utf16_be True if big-endian, false if little-endian.
+   * @param {{fatal: boolean}} options
+   */
+  function UTF16Decoder(utf16_be, options) {
+    var fatal = options.fatal;
+    var /** @type {?number} */ utf16_lead_byte = null,
+        /** @type {?number} */ utf16_lead_surrogate = null;
+    /**
+     * @param {ByteInputStream} byte_pointer The byte stream to decode.
+     * @return {?number} The next code point decoded, or null if not enough
+     *     data exists in the input stream to decode a complete code point.
+     */
+    this.decode = function(byte_pointer) {
+      var bite = byte_pointer.get();
+      if (bite === EOF_byte && utf16_lead_byte === null &&
+          utf16_lead_surrogate === null) {
+        return EOF_code_point;
+      }
+      if (bite === EOF_byte && (utf16_lead_byte !== null ||
+                                utf16_lead_surrogate !== null)) {
+        return decoderError(fatal);
+      }
+      byte_pointer.offset(1);
+      if (utf16_lead_byte === null) {
+        utf16_lead_byte = bite;
+        return null;
+      }
+      var code_point;
+      if (utf16_be) {
+        code_point = (utf16_lead_byte << 8) + bite;
+      } else {
+        code_point = (bite << 8) + utf16_lead_byte;
+      }
+      utf16_lead_byte = null;
+      if (utf16_lead_surrogate !== null) {
+        var lead_surrogate = utf16_lead_surrogate;
+        utf16_lead_surrogate = null;
+        if (inRange(code_point, 0xDC00, 0xDFFF)) {
+          return 0x10000 + (lead_surrogate - 0xD800) * 0x400 +
+              (code_point - 0xDC00);
+        }
+        byte_pointer.offset(-2);
+        return decoderError(fatal);
+      }
+      if (inRange(code_point, 0xD800, 0xDBFF)) {
+        utf16_lead_surrogate = code_point;
+        return null;
+      }
+      if (inRange(code_point, 0xDC00, 0xDFFF)) {
+        return decoderError(fatal);
+      }
+      return code_point;
+    };
+  }
+
+  /**
+   * @constructor
+   * @param {boolean} utf16_be True if big-endian, false if little-endian.
+   * @param {{fatal: boolean}} options
+   */
+  function UTF16Encoder(utf16_be, options) {
+    var fatal = options.fatal;
+    /**
+     * @param {ByteOutputStream} output_byte_stream Output byte stream.
+     * @param {CodePointInputStream} code_point_pointer Input stream.
+     * @return {number} The last byte emitted.
+     */
+    this.encode = function(output_byte_stream, code_point_pointer) {
+      function convert_to_bytes(code_unit) {
+        var byte1 = code_unit >> 8;
+        var byte2 = code_unit & 0x00FF;
+        if (utf16_be) {
+          return output_byte_stream.emit(byte1, byte2);
+        }
+        return output_byte_stream.emit(byte2, byte1);
+      }
+      var code_point = code_point_pointer.get();
+      if (code_point === EOF_code_point) {
+        return EOF_byte;
+      }
+      code_point_pointer.offset(1);
+      if (inRange(code_point, 0xD800, 0xDFFF)) {
+        encoderError(code_point);
+      }
+      if (code_point <= 0xFFFF) {
+        return convert_to_bytes(code_point);
+      }
+      var lead = div((code_point - 0x10000), 0x400) + 0xD800;
+      var trail = ((code_point - 0x10000) % 0x400) + 0xDC00;
+      convert_to_bytes(lead);
+      return convert_to_bytes(trail);
+    };
+  }
+
+  name_to_encoding['utf-16'].getEncoder = function(options) {
+    return new UTF16Encoder(false, options);
+  };
+  name_to_encoding['utf-16'].getDecoder = function(options) {
+    return new UTF16Decoder(false, options);
+  };
+
+  // 13.2 utf-16be
+  name_to_encoding['utf-16be'].getEncoder = function(options) {
+    return new UTF16Encoder(true, options);
+  };
+  name_to_encoding['utf-16be'].getDecoder = function(options) {
+    return new UTF16Decoder(true, options);
+  };
+
+
+  // NOTE: currently unused
+  /**
+   * @param {string} label The encoding label.
+   * @param {ByteInputStream} input_stream The byte stream to test.
+   */
+  function detectEncoding(label, input_stream) {
+    if (input_stream.match([0xFF, 0xFE])) {
+      input_stream.offset(2);
+      return 'utf-16';
+    }
+    if (input_stream.match([0xFE, 0xFF])) {
+      input_stream.offset(2);
+      return 'utf-16be';
+    }
+    if (input_stream.match([0xEF, 0xBB, 0xBF])) {
+      input_stream.offset(3);
+      return 'utf-8';
+    }
+    return label;
+  }
+
+  /**
+   * @param {string} label The encoding label.
+   * @param {ByteInputStream} input_stream The byte stream to test.
+   */
+  function consumeBOM(label, input_stream) {
+    if (input_stream.match([0xFF, 0xFE]) && label === 'utf-16') {
+      input_stream.offset(2);
+      return;
+    }
+    if (input_stream.match([0xFE, 0xFF]) && label == 'utf-16be') {
+      input_stream.offset(2);
+      return;
+    }
+    if (input_stream.match([0xEF, 0xBB, 0xBF]) && label == 'utf-8') {
+      input_stream.offset(3);
+      return;
+    }
+  }
+
+  //
+  // Implementation of Text Encoding Web API
+  //
+
+  /** @const */ var DEFAULT_ENCODING = 'utf-8';
+
+  /**
+   * @constructor
+   * @param {string=} opt_encoding The label of the encoding;
+   *     defaults to 'utf-8'.
+   * @param {{fatal: boolean}=} options
+   */
+  function TextEncoder(opt_encoding, options) {
+    if (!this || this === global) {
+      return new TextEncoder(opt_encoding, options);
+    }
+    opt_encoding = opt_encoding ? String(opt_encoding) : DEFAULT_ENCODING;
+    options = Object(options);
+    /** @private */
+    this._encoding = getEncoding(opt_encoding);
+    if (this._encoding === null || (this._encoding.name !== 'utf-8' &&
+                                    this._encoding.name !== 'utf-16' &&
+                                    this._encoding.name !== 'utf-16be'))
+      throw new TypeError('Unknown encoding: ' + opt_encoding);
+    /* @private @type {boolean} */
+    this._streaming = false;
+    /** @private */
+    this._encoder = null;
+    /* @private @type {{fatal: boolean}=} */
+    this._options = { fatal: Boolean(options.fatal) };
+
+    if (Object.defineProperty) {
+      Object.defineProperty(
+          this, 'encoding',
+          { get: function() { return this._encoding.name; } });
+    } else {
+      this.encoding = this._encoding.name;
+    }
+
+    return this;
+  }
+
+  TextEncoder.prototype = {
+    /**
+     * @param {string=} opt_string The string to encode.
+     * @param {{stream: boolean}=} options
+     */
+    encode: function encode(opt_string, options) {
+      opt_string = opt_string ? String(opt_string) : '';
+      options = Object(options);
+      // TODO: any options?
+      if (!this._streaming) {
+        this._encoder = this._encoding.getEncoder(this._options);
+      }
+      this._streaming = Boolean(options.stream);
+
+      var bytes = [];
+      var output_stream = new ByteOutputStream(bytes);
+      var input_stream = new CodePointInputStream(opt_string);
+      while (input_stream.get() !== EOF_code_point) {
+        this._encoder.encode(output_stream, input_stream);
+      }
+      if (!this._streaming) {
+        var last_byte;
+        do {
+          last_byte = this._encoder.encode(output_stream, input_stream);
+        } while (last_byte !== EOF_byte);
+        this._encoder = null;
+      }
+      return new Uint8Array(bytes);
+    }
+  };
+
+
+  /**
+   * @constructor
+   * @param {string=} opt_encoding The label of the encoding;
+   *     defaults to 'utf-8'.
+   * @param {{fatal: boolean}=} options
+   */
+  function TextDecoder(opt_encoding, options) {
+    if (!this || this === global) {
+      return new TextDecoder(opt_encoding, options);
+    }
+    opt_encoding = opt_encoding ? String(opt_encoding) : DEFAULT_ENCODING;
+    options = Object(options);
+    /** @private */
+    this._encoding = getEncoding(opt_encoding);
+    if (this._encoding === null)
+      throw new TypeError('Unknown encoding: ' + opt_encoding);
+
+    /* @private @type {boolean} */
+    this._streaming = false;
+    /** @private */
+    this._decoder = null;
+    /* @private @type {{fatal: boolean}=} */
+    this._options = { fatal: Boolean(options.fatal) };
+
+    if (Object.defineProperty) {
+      Object.defineProperty(
+          this, 'encoding',
+          { get: function() { return this._encoding.name; } });
+    } else {
+      this.encoding = this._encoding.name;
+    }
+
+    return this;
+  }
+
+  // TODO: Issue if input byte stream is offset by decoder
+  // TODO: BOM detection will not work if stream header spans multiple calls
+  // (last N bytes of previous stream may need to be retained?)
+  TextDecoder.prototype = {
+    /**
+     * @param {ArrayBufferView=} opt_view The buffer of bytes to decode.
+     * @param {{stream: boolean}=} options
+     */
+    decode: function decode(opt_view, options) {
+      if (opt_view && !('buffer' in opt_view && 'byteOffset' in opt_view &&
+                        'byteLength' in opt_view)) {
+        throw new TypeError('Expected ArrayBufferView');
+      } else if (!opt_view) {
+        opt_view = new Uint8Array(0);
+      }
+      options = Object(options);
+
+      if (!this._streaming) {
+        this._decoder = this._encoding.getDecoder(this._options);
+      }
+      this._streaming = Boolean(options.stream);
+
+      var bytes = new Uint8Array(opt_view.buffer,
+                                 opt_view.byteOffset,
+                                 opt_view.byteLength);
+      var input_stream = new ByteInputStream(bytes);
+
+      if (!this._BOMseen) {
+        // TODO: Don't do this until sufficient bytes are present
+        this._BOMseen = true;
+        consumeBOM(this._encoding.name, input_stream);
+      }
+
+      var output_stream = new CodePointOutputStream(), code_point;
+      while (input_stream.get() !== EOF_byte) {
+        code_point = this._decoder.decode(input_stream);
+        if (code_point !== null && code_point !== EOF_code_point) {
+          output_stream.emit(code_point);
+        }
+      }
+      if (!this._streaming) {
+        do {
+          code_point = this._decoder.decode(input_stream);
+          if (code_point !== null && code_point !== EOF_code_point) {
+            output_stream.emit(code_point);
+          }
+        } while (code_point !== EOF_code_point &&
+                 input_stream.get() != EOF_byte);
+        this._decoder = null;
+      }
+      return output_stream.string();
+    }
+  };
+
+  global['TextEncoder'] = global['TextEncoder'] || TextEncoder;
+  global['TextDecoder'] = global['TextDecoder'] || TextDecoder;
+}(this));
+(function(global) {
+
+// Rumor Messaging for JS
+//
+// https://tbwiki.tokbox.com/index.php/Rumor_:_Messaging_FrameWork
+//
+// @todo Rumor {
+//     Add error codes for all the error cases
+//     Add Dependability commands
+// }
+
+OT.Rumor = {
+  MessageType: {
+    // This is used to subscribe to address/addresses. The address/addresses the
+    // client specifies here is registered on the server. Once any message is sent to
+    // that address/addresses, the client receives that message.
+    SUBSCRIBE: 0,
+
+    // This is used to unsubscribe to address / addresses. Once the client unsubscribe
+    // to an address, it will stop getting messages sent to that address.
+    UNSUBSCRIBE: 1,
+
+    // This is used to send messages to arbitrary address/ addresses. Messages can be
+    // anything and Rumor will not care about what is included.
+    MESSAGE: 2,
+
+    // This will be the first message that the client sends to the server. It includes
+    // the uniqueId for that client connection and a disconnect_notify address that will
+    // be notified once the client disconnects.
+    CONNECT: 3,
+
+    // This will be the message used by the server to notify an address that a client disconnected.
+    DISCONNECT: 4,
+
+    //Enhancements to support Keepalives
+    PING: 7,
+    PONG: 8,
+    STATUS: 9
+  }
+};
+
+}(this));
+(function(global) {
+
+var BUFFER_DRAIN_INTERVAL = 100,        // The interval between polling the websocket's send buffer
+    BUFFER_DRAIN_MAX_RETRIES = 10,      // The total number of times to retest the websocket's send buffer
+    WEB_SOCKET_KEEP_ALIVE_INTERVAL = 9000,
+
+    // Magic Connectivity Timeout Constant: We wait 3*the keep alive interval,
+    // on the third keep alive we trigger the timeout if we haven't received the
+    // server pong.
+    WEB_SOCKET_CONNECTIVITY_TIMEOUT = 5*WEB_SOCKET_KEEP_ALIVE_INTERVAL - 100
+
+
+
+// https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent#Close_codes
+// http://docs.oracle.com/javaee/7/api/javax/websocket/CloseReason.CloseCodes.html
+var wsCloseErrorCodes = {
+  1002:  "The endpoint is terminating the connection due to a protocol error. (CLOSE_PROTOCOL_ERROR)",
+  1003:  "The connection is being terminated because the endpoint received data of a type it cannot accept (for example, a text-only endpoint received binary data). (CLOSE_UNSUPPORTED)",
+  1004:  "The endpoint is terminating the connection because a data frame was received that is too large. (CLOSE_TOO_LARGE)",
+  1005:  "Indicates that no status code was provided even though one was expected. (CLOSE_NO_STATUS)",
+  1006:  "Used to indicate that a connection was closed abnormally (that is, with no close frame being sent) when a status code is expected. (CLOSE_ABNORMAL)",
+  1007: "Indicates that an endpoint is terminating the connection because it has received data within a message that was not consistent with the type of the message (e.g., non-UTF-8 [RFC3629] data within a text message)",
+  1008: "Indicates that an endpoint is terminating the connection because it has received a message that violates its policy.  This is a generic status code that can be returned when there is no other more suitable status code (e.g., 1003 or 1009) or if there is a need to hide specific details about the policy",
+  1009: "Indicates that an endpoint is terminating the connection because it has received a message that is too big for it to process",
+  1011: "Indicates that a server is terminating the connection because it encountered an unexpected condition that prevented it from fulfilling the request",
+
+  // .... codes in the 4000-4999 range are available for use by applications.
+  4001:   "Connectivity loss was detected as it was too long since the socket received the last PONG message"
+};
+
+OT.Rumor.SocketError = function(code, message) {
+  this.code = code;
+  this.message = message;
+};
+
+// The NativeSocket bit is purely to make testing simpler, it defaults to WebSocket
+// so in normal operation you would omit it.
+OT.Rumor.Socket = function(messagingServer, notifyDisconnectAddress, NativeSocket) {
+  var server = messagingServer,
+      webSocket,
+      id,
+      onOpen,
+      onError,
+      onClose,
+      onMessage,
+      connectCallback,
+      bufferDrainTimeout,           // Timer to poll whether th send buffer has been drained
+      connectTimeout,
+      lastMessageTimestamp,         // The timestamp of the last message received
+      keepAliveTimer;               // Timer for the connectivity checks
+
+
+  //// Private API
+  var stateChanged = function(newState) {
+        switch (newState) {
+          case 'disconnected':
+          case 'error':
+            webSocket = null;
+            if (onClose) {
+              var error;
+              if(hasLostConnectivity()) {
+                error = new Error(wsCloseErrorCodes[4001]);
+                error.code = 4001;
+              }
+              onClose(error);
+            }
+            break;
+        }
+      },
+
+      setState = OT.$.statable(this, ['disconnected',  'error', 'connected', 'connecting', 'disconnecting'], 'disconnected', stateChanged),
+
+      validateCallback = function validateCallback (name, callback) {
+        if (callback === null || !OT.$.isFunction(callback) ) {
+          throw new Error("The Rumor.Socket " + name + " callback must be a valid function or null");
+        }
+      },
+
+      error = function error (errorMessage) {
+        OT.error("Rumor.Socket: " + errorMessage);
+
+        var error = new OT.Rumor.SocketError(null, errorMessage || "Unknown Socket Error");
+
+        if (connectTimeout) clearTimeout(connectTimeout);
+
+        setState('error');
+
+        if (this.previousState === 'connecting' && connectCallback) {
+          connectCallback(error, null);
+          connectCallback = null;
+        }
+
+        if (onError) onError(error);
+      }.bind(this),
+
+      // Immediately close the socket, only used by disconnectWhenSendBufferIsDrained
+      close = function close() {
+        setState('disconnecting');
+
+        if (bufferDrainTimeout) {
+          clearTimeout(bufferDrainTimeout);
+          bufferDrainTimeout = null;
+        }
+        console.info("CALLED CLOSE ON WEBSOCKET");
+        webSocket.close();
+      },
+
+      // Ensure that the WebSocket send buffer is fully drained before disconnecting
+      // the socket. If the buffer doesn't drain after a certain length of time
+      // we give up and close it anyway.
+      disconnectWhenSendBufferIsDrained = function disconnectWhenSendBufferIsDrained (bufferDrainRetries) {
+        if (!webSocket) return;
+
+        if (bufferDrainRetries === void 0) bufferDrainRetries = 0;
+        if (bufferDrainTimeout) clearTimeout(bufferDrainTimeout);
+
+        if (webSocket.bufferedAmount > 0 && (bufferDrainRetries + 1) <= BUFFER_DRAIN_MAX_RETRIES) {
+          bufferDrainTimeout = setTimeout(disconnectWhenSendBufferIsDrained, BUFFER_DRAIN_INTERVAL, bufferDrainRetries+1);
+        }
+        else {
+          close();
+        }
+      },
+
+      hasLostConnectivity = function hasLostConnectivity () {
+        if (!lastMessageTimestamp) return false;
+
+        return (OT.$.now() - lastMessageTimestamp) >= WEB_SOCKET_CONNECTIVITY_TIMEOUT;
+      },
+
+      sendKeepAlive = function sendKeepAlive () {
+        if (!this.is('connected')) return;
+
+        if ( hasLostConnectivity() ) {
+          webSocketDisconnected({code: 4001});
+        }
+        else  {
+          webSocket.send(OT.Rumor.Message.Ping().serialize());
+          keepAliveTimer = setTimeout(sendKeepAlive.bind(this), WEB_SOCKET_KEEP_ALIVE_INTERVAL);
+        }
+      }.bind(this);
+
+
+  //// Private Event Handlers
+  var webSocketConnected = function webSocketConnected () {
+        if (connectTimeout) clearTimeout(connectTimeout);
+
+        // Connect to Rumor by registering our connection id and the
+        // app server address to notify if we disconnect.
+        //
+        // We don't need to wait for a reply to this message.
+        webSocket.send(OT.Rumor.Message.Connect(id, notifyDisconnectAddress).serialize());
+
+        setState('connected');
+        if (connectCallback) {
+          connectCallback(null, id);
+          connectCallback = null;
+        }
+
+        if (onOpen) onOpen(id);
+
+        setTimeout(function() {
+          lastMessageTimestamp = OT.$.now();
+          sendKeepAlive();
+        }, WEB_SOCKET_KEEP_ALIVE_INTERVAL);
+      },
+
+      webSocketConnectTimedOut = function webSocketConnectTimedOut () {
+        error("Timed out while waiting for the Rumor socket to connect.");
+      },
+
+      webSocketError = function webSocketError (errorEvent) {
+        var errorMessage = "Unknown Socket Error";      // @fixme We MUST be able to do better than this!
+
+        // All errors seem to result in disconnecting the socket, the close event
+        // has a close reason and code which gives some error context. This,
+        // combined with the fact that the errorEvent argument contains no
+        // error info at all, means we'll delay triggering the error handlers
+        // until the socket is closed.
+        // error(errorMessage);
+      },
+
+      webSocketDisconnected = function webSocketDisconnected (closeEvent) {
+        if (connectTimeout) clearTimeout(connectTimeout);
+        if (keepAliveTimer) clearTimeout(keepAliveTimer);
+
+        if (closeEvent.code !== 1000 && closeEvent.code !== 1001) {
+          var reason = closeEvent.reason || closeEvent.message;
+          if (!reason && wsCloseErrorCodes.hasOwnProperty(closeEvent.code)) reason = wsCloseErrorCodes[closeEvent.code];
+
+          error("Rumor Socket Disconnected: " + reason);
+        }
+
+        if (this.isNot('error')) setState('disconnected');
+      }.bind(this),
+
+      webSocketReceivedMessage = function webSocketReceivedMessage (message) {
+        lastMessageTimestamp = OT.$.now();
+
+        if (onMessage) {
+          var msg = OT.Rumor.Message.deserialize(message.data);
+
+          if (msg.type !== OT.Rumor.MessageType.PONG) {
+            onMessage(msg.toAddress, msg.data);
+          }
+        }
+      };
+
+
+  //// Public API
+
+  this.publish = function (topics, message) {
+    webSocket.send(OT.Rumor.Message.Publish(topics, message).serialize());
+  };
+
+  this.subscribe = function(topics) {
+    webSocket.send(OT.Rumor.Message.Subscribe(topics).serialize());
+  };
+
+  this.unsubscribe = function(topics) {
+    webSocket.send(OT.Rumor.Message.Unsubscribe(topics).serialize());
+  };
+
+  this.connect = function (connectionId, complete) {
+    if (this.is('connecting', 'connected')) {
+      complete(new OT.Rumor.SocketError(null, "Rumor.Socket cannot connect when it is already connecting or connected."));
+      return;
+    }
+
+    id = connectionId;
+    connectCallback = complete;
+
+    try {
+      setState('connecting');
+
+      webSocket = new (NativeSocket || WebSocket)(server);
+      webSocket.binaryType = 'arraybuffer';
+
+      webSocket.onopen = webSocketConnected;
+      webSocket.onclose = webSocketDisconnected;
+      webSocket.onerror = webSocketError;
+      webSocket.onmessage = webSocketReceivedMessage;
+
+      connectTimeout = setTimeout(webSocketConnectTimedOut, OT.Rumor.Socket.CONNECT_TIMEOUT);
+    }
+    catch(e) {
+      OT.error(e);
+
+      // @todo add an actual error message
+      error("Could not connect to the Rumor socket, possibly because of a blocked port.")
+    }
+  };
+
+  this.disconnect = function() {
+    if (connectTimeout) clearTimeout(connectTimeout);
+    if (keepAliveTimer) clearTimeout(keepAliveTimer);
+
+    if (!webSocket) {
+      if (this.isNot('error')) setState('disconnected');
+      return;
+    }
+
+    if (webSocket.readyState === 3/* CLOSED */) {
+      if (this.isNot('error')) setState('disconnected');
+    }
+    else {
+      if (this.is('connected')) {
+        // Look! We are nice to the rumor server ;-)
+        webSocket.send(OT.Rumor.Message.Disconnect().serialize());
+      }
+
+      // Wait until the socket is ready to close
+      disconnectWhenSendBufferIsDrained();
+    }
+  };
+
+
+
+  Object.defineProperties(this, {
+    id: {
+      get: function() { return id; }
+    },
+
+    onOpen: {
+      set: function(callback) {
+        validateCallback('onOpen', callback);
+        onOpen = callback;
+      },
+
+      get: function() { return onOpen; }
+    },
+
+    onError: {
+      set: function(callback) {
+        validateCallback('onError', callback);
+        onError = callback;
+      },
+
+      get: function() { return onError; }
+    },
+
+    onClose: {
+      set: function(callback) {
+        validateCallback('onClose', callback);
+        onClose = callback;
+      },
+
+      get: function() { return onClose; }
+    },
+
+    onMessage: {
+      set: function(callback) {
+        validateCallback('onMessage', callback);
+        onMessage = callback;
+      },
+
+      get: function() { return onMessage; }
+    }
+  });
+};
+
+// The number of ms to wait for the websocket to connect
+OT.Rumor.Socket.CONNECT_TIMEOUT = 15000;
+
+}(this));
+(function(global) {
+
+//
+//
+// @references
+// * https://tbwiki.tokbox.com/index.php/Rumor_Message_Packet
+// * https://tbwiki.tokbox.com/index.php/Rumor_Protocol
+//
+OT.Rumor.Message = function (type, toAddress, headers, data) {
+  this.type = type;
+  this.toAddress = toAddress;
+  this.headers = headers;
+  this.data = data;
+};
+
+
+OT.Rumor.Message.prototype.serialize = function () {
+  var bitStream = '',
+      str = "",
+      offset = 8,
+      cBuf = 7,
+      address = new Array(this.toAddress.length),
+      headerKey = new Array(this.headers.length),
+      headerVal = new Array(this.headers.length),
+      dataView;
+
+  // The number of addresses
+  cBuf++;
+
+  // Write out the address.
+  for (var i = 0; i < this.toAddress.length; i++) {
+    address[i] = new TextEncoder('utf-8').encode(this.toAddress[i]);
+    cBuf += 2;
+    cBuf += address[i].length;
+  }
+
+  // The number of parameters
+  cBuf++;
+
+  // Write out the params
+  for (var i = 0; i < this.headers.length; i++) {
+    headerKey[i] = new TextEncoder('utf-8').encode(this.headers[i].key);
+    headerVal[i] = new TextEncoder('utf-8').encode(this.headers[i].val);
+    cBuf += 4;
+    cBuf += headerKey[i].length;
+    cBuf += headerVal[i].length;
+  }
+
+  dataView = new TextEncoder('utf-8').encode(this.data);
+  cBuf += dataView.length;
+
+  // Let's allocate a binary blob of this size
+  var buffer = new ArrayBuffer(cBuf);
+  var uint8View = new Uint8Array(buffer, 0, cBuf);
+
+  // We don't include the header in the lenght.
+  cBuf -= 4;
+
+  // Write out size (in network order)
+  uint8View[0] = (cBuf & 0xFF000000) >>> 24;
+  uint8View[1] = (cBuf & 0x00FF0000) >>> 16;
+  uint8View[2] = (cBuf & 0x0000FF00) >>>  8;
+  uint8View[3] = (cBuf & 0x000000FF) >>>  0;
+
+  // Write out reserved bytes
+  uint8View[4] = 0;
+  uint8View[5] = 0;
+
+  // Write out message type
+  uint8View[6] = this.type;
+  uint8View[7] = this.toAddress.length;
+
+  // Now just copy over the encoded values..
+  for (var i = 0; i < address.length; i++) {
+    strArray = address[i];
+    uint8View[offset++] = strArray.length >> 8 & 0xFF;
+    uint8View[offset++] = strArray.length >> 0 & 0xFF;
+    for (var j = 0; j < strArray.length; j++) {
+      uint8View[offset++] = strArray[j];
+    }
+  }
+
+  uint8View[offset++] = headerKey.length;
+
+  // Write out the params
+  for (var i = 0; i < headerKey.length; i++) {
+    strArray = headerKey[i];
+    uint8View[offset++] = strArray.length >> 8 & 0xFF;
+    uint8View[offset++] = strArray.length >> 0 & 0xFF;
+    for (var j = 0; j < strArray.length; j++) {
+      uint8View[offset++] = strArray[j];
+    }
+
+    strArray = headerVal[i];
+    uint8View[offset++] = strArray.length >> 8 & 0xFF;
+    uint8View[offset++] = strArray.length >> 0 & 0xFF;
+    for (var j = 0; j < strArray.length; j++) {
+      uint8View[offset++] = strArray[j];
+    }
+  }
+
+  // And finally the data
+  for (var i = 0; i < dataView.length; i++) {
+    uint8View[offset++] = dataView[i];
+  }
+
+  return buffer;
+};
+
+OT.Rumor.Message.deserialize = function (buffer) {
+  var cBuf = 0;
+  var type;
+  var offset = 8;
+  var uint8View = new Uint8Array(buffer);
+
+  // Write out size (in network order)
+  cBuf += uint8View[0] << 24;
+  cBuf += uint8View[1] << 16;
+  cBuf += uint8View[2] <<  8;
+  cBuf += uint8View[3] <<  0;
+
+  type = uint8View[6];
+  var address = [];
+
+  for (var i = 0; i < uint8View[7]; i++) {
+    length = uint8View[offset++] << 8;
+    length += uint8View[offset++];
+    var strView = new Uint8Array(buffer, offset, length);
+    address[i] = new TextDecoder('utf-8').decode(strView);
+    offset += length;
+  }
+
+  var headerlen = uint8View[offset++];
+  var headers = [];
+
+  for (var i = 0; i < headerlen; i++) {
+    length = uint8View[offset++] << 8;
+    length += uint8View[offset++];
+    var strView = new Uint8Array(buffer, offset, length);
+    var keyStr = new TextDecoder('utf-8').decode(strView);
+    offset += length;
+
+    length = uint8View[offset++] << 8;
+    length += uint8View[offset++];
+    strView = new Uint8Array(buffer, offset, length);
+    var valStr = new TextDecoder('utf-8').decode(strView);
+    headers[i] =  { key : keyStr, val : valStr };
+    offset += length;
+  }
+
+  var dataView = new Uint8Array(buffer, offset);
+  var data = new TextDecoder('utf-8').decode(dataView);
+
+ return new OT.Rumor.Message(type, address, headers, data);
+};
+
+
+OT.Rumor.Message.Connect = function (uniqueId, notifyDisconnectAddress) {
+  var headers = [
+    {key: 'uniqueId', val: uniqueId},
+    {key: 'notifyDisconnectAddress', val: notifyDisconnectAddress}
+  ];
+
+  return new OT.Rumor.Message(OT.Rumor.MessageType.CONNECT, [], headers, "");
+};
+
+OT.Rumor.Message.Disconnect = function () {
+  return new OT.Rumor.Message(OT.Rumor.MessageType.DISCONNECT, [], [], "");
+};
+
+OT.Rumor.Message.Subscribe = function(topics) {
+  return new OT.Rumor.Message(OT.Rumor.MessageType.SUBSCRIBE, topics, [], "");
+};
+
+OT.Rumor.Message.Unsubscribe = function(topics) {
+  return new OT.Rumor.Message(OT.Rumor.MessageType.UNSUBSCRIBE, topics, [], "");
+};
+
+OT.Rumor.Message.Publish = function(topics, message, headers) {
+  return new OT.Rumor.Message(OT.Rumor.MessageType.MESSAGE, topics, [], message);
+};
+
+// This message is used to implement keepalives on the persistent
+// socket connection between the client and server. Every time the
+// client sends a PING to the server, the server will respond with
+// a PONG.
+OT.Rumor.Message.Ping = function() {
+  return new OT.Rumor.Message(OT.Rumor.MessageType.PING, [], [], "");
+};
+
+}(this));
+(function(global) {
+
+// Rumor Messaging for JS
+//
+// https://tbwiki.tokbox.com/index.php/Raptor_Messages_(Sent_as_a_RumorMessage_payload_in_JSON)
+//
+// @todo Raptor {
+//     Look at disconnection cleanup: i.e. subscriber + publisher cleanup
+//     Add error codes for all the error cases
+//     Write unit tests for SessionInfo
+//     Write unit tests for Session
+//     Make use of the new DestroyedEvent
+//     Move Analytics out of Raptor into Session
+//     Remove dependency on OT.properties
+//     OT.Capabilities must be part of the Raptor namespace
+//     Add Dependability commands
+//     Think about noConflict, or whether we should just use the OT namespace
+//     Think about how to expose OT.publishers, OT.subscribers, and OT.sessions if messaging was
+//        being included as a component
+//     Another solution to the problem of having publishers/subscribers/etc would be to make
+//        Raptor Socket a separate component from Dispatch (dispatch being more business logic)
+//     Look at the coupling of OT.sessions to OT.Raptor.Socket
+// }
+//
+// @todo Raptor Docs {
+//   Document payload formats for incoming messages (what are the payloads for STREAM CREATED/MODIFIED for example)
+//   Document how keepalives work
+//   Document all the Raptor actions and types
+//   Document the session connect flow (including error cases)
+// }
+
+
+OT.Raptor = {
+  Actions: {
+    //General
+    CONNECT: 100,
+    CREATE: 101,
+    UPDATE: 102,
+    DELETE: 103,
+    STATE: 104,
+
+    //Moderation
+    FORCE_DISCONNECT: 105,
+    FORCE_UNPUBLISH: 106,
+    SIGNAL: 107,
+
+    //Archives
+    CREATE_ARCHIVE: 108,
+    CLOSE_ARCHIVE: 109,
+    START_RECORDING_SESSION: 110,
+    STOP_RECORDING_SESSION: 111,
+    START_RECORDING_STREAM: 112,
+    STOP_RECORDING_STREAM: 113,
+    LOAD_ARCHIVE: 114,
+    START_PLAYBACK: 115,
+    STOP_PLAYBACK: 116,
+
+    //AppState
+    APPSTATE_PUT: 117,
+    APPSTATE_DELETE: 118,
+
+    // JSEP
+    OFFER: 119,
+    ANSWER: 120,
+    PRANSWER: 121,
+    CANDIDATE: 122,
+    SUBSCRIBE: 123,
+    UNSUBSCRIBE: 124,
+    QUERY: 125,
+    SDP_ANSWER: 126,
+
+    //KeepAlive
+    PONG: 127,
+    REGISTER: 128, //Used for registering streams.
+
+    QUALITY_CHANGED: 129
+  },
+
+  Types: {
+      //RPC
+      RPC_REQUEST: 100,
+      RPC_RESPONSE: 101,
+
+      //EVENT
+      STREAM: 102,
+      ARCHIVE: 103,
+      CONNECTION: 104,
+      APPSTATE: 105,
+      CONNECTIONCOUNT: 106,
+      MODERATION: 107,
+      SIGNAL: 108,
+      SUBSCRIBER: 110,
+
+      //JSEP Protocol
+      JSEP: 109
+  }
+};
+
+
+}(this));
+(function(global) {
+
+//// Some helper functions that are used for debugging and logging
+
+var typeToName = {},
+    actionToName = {};
+
+// Create a lookup table of Raptor message types (integer) to a human readable strings
+var messageTypes = OT.Raptor.Types;
+for (var name in messageTypes) {
+  typeToName[messageTypes[name]] = name;
+}
+
+// Create a lookup table of  Raptor message actions (integer) to a human readable strings
+var messageActions = OT.Raptor.Actions;
+for (var name in messageActions) {
+  actionToName[messageActions[name]] = name;
+}
+
+
+OT.Raptor.serializeMessage = function (message) {
+    return JSON.stringify(message);
+};
+
+
+// Deserialising a Raptor message mainly means doing a JSON.parse on it.
+// We do decorate the final message with a few extra helper properies though.
+//
+// These include:
+// * typeName: A human readable version of the Raptor type. E.g. STREAM instead of 102
+// * actionName: A human readable version of the Raptor action. E.g. CREATE instead of 101
+// * signature: typeName and actionName combined. This is mainly for debugging. E.g. A type
+//    of 102 and an action of 101 would result in a signature of "STREAM:CREATE"
+//
+OT.Raptor.deserializeMessage = function (msg) {
+  var message = JSON.parse(msg);
+
+  if (message.type) {
+    message.type = parseInt(message.type, 10);
+    message.typeName = typeToName[message.type] || null;
+  }
+
+  if (message.action) {
+    message.action = parseInt(message.action, 10);
+    message.actionName = actionToName[message.action] || null;
+  }
+
+  message.signature = message.typeName + ':' + message.actionName;
+
+  return message;
+};
+
+
+OT.Raptor.Message = {};
+OT.Raptor.Message.connect = function (widgetId, connectionId, sessionId, apiKey, token, p2pEnabled) {
+  var payload = {
+        credentials: {
+          connectionId: connectionId,
+          soAccessState: 2,
+          supportsWebRTC: true,
+          p2pEnabled: p2pEnabled,
+          GUID: widgetId,
+          widgetId: widgetId,
+          partnerId: apiKey
+        },
+        sessionId: sessionId,
+        params: {
+            tokenPermissions: {
+                apiKey: apiKey
+            },
+            token: token
+        },
+        uniqueId: connectionId
+      };
+
+  return OT.Raptor.serializeMessage({
+    id: OT.$.uuid(),
+    type: OT.Raptor.Types.RPC_REQUEST,
+    action: OT.Raptor.Actions.CONNECT,
+    payload: payload,
+    replyTo: connectionId
+  });
+};
+
+
+OT.Raptor.Message.getSessionState = function (connectionId, sessionId, connectionsRequired) {
+  return OT.Raptor.serializeMessage({
+    id: OT.$.uuid(),
+    type: OT.Raptor.Types.RPC_REQUEST,
+    action: OT.Raptor.Actions.STATE,
+    payload: {
+      sessionId: sessionId,
+      connectionsRequired: connectionsRequired || true
+    },
+    replyTo: connectionId
+  });
+};
+
+
+OT.Raptor.Message.forceDisconnect = function (fromConnectionId, connectionIdToDisconnect, sessionId) {
+  return OT.Raptor.serializeMessage({
+    id: fromConnectionId,
+    type: OT.Raptor.Types.RPC_REQUEST,
+    action: OT.Raptor.Actions.FORCE_DISCONNECT,
+    payload: {
+      connectionId: connectionIdToDisconnect,
+      sessionId: sessionId
+    },
+    replyTo: fromConnectionId
+  });
+};
+
+
+
+OT.Raptor.Message.streamCreate = function (connectionId, sessionId, publisherId, name, videoOrientation, videoWidth, videoHeight, hasAudio, hasVideo, p2pEnabled) {
+  var payload = {
+    key: sessionId,
+    value: {
+      p2pEnabled: p2pEnabled || false,
+      publisherId: publisherId,
+      connection: {
+          connectionId: connectionId
+      },
+      type: "WebRTC",
+      name: name || '',
+      creationTime: Date.now(),   // Unix timestamp, time in milliseconds since 1970 UTC
+      orientation: {
+          width: videoWidth,
+          height: videoHeight,
+          videoOrientation: videoOrientation || "OTVideoOrientationRotatedNormal"
+      },
+      hasAudio: hasAudio !== void 0 ? hasAudio : true,
+      hasVideo: hasVideo !== void 0 ? hasVideo : true
+    }
+  };
+
+  return OT.Raptor.serializeMessage({
+    id: connectionId, // HACK until buf fixed in symphony
+    type: OT.Raptor.Types.STREAM,
+    action: OT.Raptor.Actions.CREATE,
+    payload: payload,
+    replyTo: ''
+  });
+};
+
+
+OT.Raptor.Message.streamDestroy = function (connectionId, sessionId, streamId) {
+  return OT.Raptor.serializeMessage({
+    id: connectionId,
+    type: OT.Raptor.Types.STREAM,
+    action: OT.Raptor.Actions.DELETE,
+    payload: {
+      key: sessionId + "/STREAMS/" + streamId
+    },
+    replyTo: connectionId
+  });
+};
+
+
+OT.Raptor.Message.streamModify = function (connectionId, sessionId, streamId, key, value) {
+  return OT.Raptor.serializeMessage({
+    id: connectionId,
+    type: OT.Raptor.Types.STREAM,
+    action: OT.Raptor.Actions.UPDATE,
+    payload: {
+      key: [sessionId, 'STREAMS', streamId, key].join('/'),
+      value: value
+    },
+    replyTo: connectionId
+  });
+};
+
+OT.Raptor.Message.forceUnpublish = function (fromConnectionId, sessionId, streamIdToUnpublish) {
+  return OT.Raptor.serializeMessage({
+    id: fromConnectionId,
+    type: OT.Raptor.Types.RPC_REQUEST,
+    action: OT.Raptor.Actions.FORCE_UNPUBLISH,
+    payload: {
+      sessionId: sessionId,
+      connectionId: fromConnectionId,
+      streamId: streamIdToUnpublish,
+      webRTCStream: true
+    },
+    replyTo: fromConnectionId
+  });
+};
+
+
+OT.Raptor.Message.jsepOffer = function (fromConnectionId, toConnectionId, streamId, sdp) {
+  return OT.Raptor.serializeMessage({
+    id: fromConnectionId,
+    type: OT.Raptor.Types.JSEP,
+    action: OT.Raptor.Actions.OFFER,
+    payload: {
+      fromAddress: fromConnectionId,
+      toAddresses: toConnectionId,
+      sdp: sdp,
+      streamId: streamId
+    },
+    replyTo: fromConnectionId
+  });
+};
+
+
+OT.Raptor.Message.jsepAnswer = function (fromConnectionId, toConnectionId, streamId, sdp) {
+  return OT.Raptor.serializeMessage({
+    id: fromConnectionId,
+    type: OT.Raptor.Types.JSEP,
+    action: OT.Raptor.Actions.ANSWER,
+    payload: {
+      fromAddress: fromConnectionId,
+      toAddresses: toConnectionId,
+      sdp: sdp,
+      streamId: streamId
+    },
+    replyTo: fromConnectionId
+  });
+};
+
+OT.Raptor.Message.jsepSubscribe = function (fromConnectionId, toConnectionId, streamId, subscribeToVideo, subscribeToAudio) {
+  return OT.Raptor.serializeMessage({
+    id: fromConnectionId,
+    type: OT.Raptor.Types.JSEP,
+    action: OT.Raptor.Actions.SUBSCRIBE,
+    payload: {
+      keyManagemenMethod: OT.$.supportedCryptoScheme(),
+      bundleSupport: OT.$.supportsBundle(),
+      rtcpMuxSupport: OT.$.supportsRtcpMux(),
+      fromAddress: fromConnectionId,
+      toAddresses: toConnectionId,
+      streamId: streamId,
+      hasVideo: subscribeToVideo,
+      hasAudio: subscribeToAudio
+    },
+    replyTo: fromConnectionId
+  });
+};
+
+
+
+OT.Raptor.Message.jsepUnsubscribe = function (fromConnectionId, toConnectionId, streamId) {
+  return OT.Raptor.serializeMessage({
+    id: fromConnectionId,
+    type: OT.Raptor.Types.JSEP,
+    action: OT.Raptor.Actions.UNSUBSCRIBE,
+    payload: {
+      fromAddress: fromConnectionId,
+      toAddresses: toConnectionId,
+      streamId: streamId
+    },
+    replyTo: fromConnectionId
+  });
+};
+
+OT.Raptor.Message.jsepCandidate = function (fromConnectionId, toConnectionId, streamId, candidate) {
+  return OT.Raptor.serializeMessage({
+    id: fromConnectionId,
+    type: OT.Raptor.Types.JSEP,
+    action: OT.Raptor.Actions.CANDIDATE,
+    payload: {
+      fromAddress: fromConnectionId,
+      toAddresses: toConnectionId,
+      candidate: candidate,
+      streamId: streamId
+    },
+    replyTo: fromConnectionId
+  });
+};
+
+OT.Raptor.Message.subscriberModify = function (connectionId, sessionId, streamId, subscriberId, key, value) {
+  return OT.Raptor.serializeMessage({
+    id: OT.$.uuid(),
+    type: OT.Raptor.Types.SUBSCRIBER,
+    action: OT.Raptor.Actions.UPDATE,
+    payload: {
+      key: [sessionId, 'SUBSCRIBER', streamId, connectionId, key].join('/'),
+      value: value
+    },
+    replyTo: connectionId
+  });
+};
+
+
+OT.Raptor.Message.signal = function(connectionId, sessionId, type, to, data) {
+  var payload = {
+    id: OT.$.uuid(),
+    fromAddress: connectionId
+  };
+
+  // Massage the to field into an array and default it to the session id
+  // if we're sending to no one
+  if (to && !Array.isArray(to)) {
+    payload.toAddresses = [to];
+  }
+  else if (!to || to.length === 0) {
+    // if it was omitted then we'll send the signal to the entire session.
+    payload.toAddresses = [sessionId];
+  }
+  else {
+    payload.toAddresses = to;
+  }
+
+  if (type !== void 0) payload.type = type;
+  if (data !== void 0) payload.data = data;
+
+  return OT.Raptor.serializeMessage({
+    id: connectionId,
+    type: OT.Raptor.Types.SIGNAL,
+    action: OT.Raptor.Actions.SIGNAL,
+    payload: payload,
+    replyTo: connectionId
+  });
+};
+
+}(this));
+(function(global) {
+
+var MAX_SIGNAL_DATA_LENGTH = 8192;
+var MAX_SIGNAL_TYPE_LENGTH = 128;
+
+//
+// Error Codes:
+// 413 - Type too long
+// 400 - Type is invalid
+// 413 - Data too long
+// 400 - Data is invalid (can't be parsed as JSON)
+// 429 - Rate limit exceeded
+// 500 - Websocket connection is down
+// 404 - To connection does not exist
+// 400 - To is invalid
+//
+OT.Signal = function(sessionId, fromConnectionId, options) {
+  var isInvalidType = function(type) {
+      // Our format matches the unreserved characters from the URI RFC: http://www.ietf.org/rfc/rfc3986
+      return !/^[a-zA-Z0-9\-\._~]+$/.exec(type);
+    },
+
+    validateTo = function(toAddress) {
+      if (!toAddress) {
+        return {code: 400, reason: "The signal type was null or an empty String. Either set it to a non-empty String value or omit it"};
+      }
+      else if ( !Array.isArray(toAddress) ) {
+        return {code: 400, reason: "The To field was invalid"};
+      }
+
+      for (var i=0; i<toAddress.length; i++) {
+        if ( !(toAddress[i] instanceof OT.Connection || toAddress[i] instanceof OT.Session) ) {
+          return {code: 400, reason: "The To field was invalid"};
+        }
+      }
+
+      return null;
+    },
+
+    validateType = function(type) {
+      var error = null;
+
+      if (type === null || type === void 0) {
+        error = {code: 400, reason: "The signal type was null or undefined. Either set it to a String value or omit it"};
+      }
+      else if (type.length > MAX_SIGNAL_TYPE_LENGTH) {
+        error = {code: 413, reason: "The signal type was too long, the maximum length of it is " + MAX_SIGNAL_TYPE_LENGTH + " characters"};
+      }
+      else if ( isInvalidType(type) ) {
+        error = {code: 400, reason: "The signal type was invalid, it can only contain letters, numbers, '-', '_', and '~'."};
+      }
+
+      return error;
+    },
+
+    validateData = function(data) {
+      var error = null;
+      if (data === null || data === void 0) {
+        error = {code: 400, reason: "The signal data was null or undefined. Either set it to a String value or omit it"};
+      }
+      else {
+        try {
+          if (JSON.stringify(data).length > MAX_SIGNAL_DATA_LENGTH) {
+            error = {code: 413, reason: "The data field was too long, the maximum size of it is " + MAX_SIGNAL_DATA_LENGTH + " characters"};
+          }
+        }
+        catch(e) {
+          error = {code: 400, reason: "The data field was not valid JSON"};
+        }
+      }
+
+      return error;
+    };
+
+
+  this.toRaptorMessage = function() {
+    var to;
+
+    if (this.to) {
+      to = this.to.map(function(thing) {
+        return typeof(thing) === 'string' ? thing : thing.id;
+      });
+    }
+
+    return OT.Raptor.Message.signal(fromConnectionId, sessionId, this.type, to, this.data);
+  };
+
+  this.toHash = function() {
+    var h = OT.$.clone(options);
+    if (h.to === void 0) h.to = null;
+    if (h.data === void 0) h.data = null;
+
+    return h;
+  };
+
+
+  this.error = null;
+
+  if (options) {
+    if (options.hasOwnProperty('data')) {
+      this.data = OT.$.clone(options.data);
+      this.error = validateData(this.data);
+    }
+
+    if (options.hasOwnProperty('to')) {
+      if (!Array.isArray(options.to)) {
+        this.to = [options.to];
+      }
+      else {
+        this.to = OT.$.clone(options.to);
+      }
+
+      if (!this.error) this.error = validateTo(this.to)
+    }
+
+    if (options.hasOwnProperty('type')) {
+      if (!this.error) this.error = validateType(options.type)
+      this.type = options.type;
+    }
+  }
+
+  this.valid = this.error === null;
+};
+
+}(this));
+(function(global) {
+
+
+function SignalError(code, reason, signal) {
+    this.code = code;
+    this.reason = reason;
+    this.signal = signal;
+}
+
+// The Dispatcher bit is purely to make testing simpler, it defaults to OT.Raptor.Dispatcher
+// so in normal operation you would omit it. Note: it takes a constructor, not an instance.
+OT.Raptor.Socket = function(widgetId, messagingServer, Dispatcher) {
+  var _socketUrl = OT.properties.messagingProtocol + "://" + messagingServer + ":" + OT.properties.messagingPort + "/rumorwebsocketsv2",
+      _symphony = "symphony." + messagingServer,
+      _sessionId,
+      _rumor,
+      _dispatcher,
+      _completion,
+      _capabilities = new OT.Capabilities([]),
+      _analytics = new OT.Analytics();
+
+
+  //// Private API
+  var setState = OT.$.statable(this, ['disconnected', 'connecting', 'connected', 'error', 'disconnecting'], 'disconnected'),
+
+      logAnalyticsEvent = function logAnalyticsEvent (variation, payloadType, payload, options) {
+        var event = {
+          action: 'Connect',
+          variation: variation,
+          payload_type: payloadType,
+          payload: payload,
+          session_id: _sessionId,
+          partner_id: OT.APIKEY,
+          widget_id: widgetId,
+          widget_type: 'Controller'
+        };
+
+        if (options) event = OT.$.extend(options, event);
+        _analytics.logEvent(event);
+      },
+
+      onConnectComplete = function onConnectComplete (error, sessionState, prefix) {
+        if (error) {
+          logAnalyticsEvent('Failure', "reason|webSocketServerUrl", prefix + error.code + ':' + error.message + '|' + _socketUrl);
+
+          setState('error');
+        }
+        else {
+          logAnalyticsEvent('Success', "webSocketServerUrl", _socketUrl, {connectionId: _rumor.id});
+
+          setState('connected');
+          _capabilities = new OT.Capabilities(sessionState.permissions);
+        }
+
+        _completion.apply(null, arguments);
+      },
+
+      onClose = function onClose (err) {
+        var session = OT.sessions.get(_sessionId),
+            connection = session.connection,
+            reason = this.is('disconnecting') ? "clientDisconnected" : "networkDisconnected";
+
+        if(err && err.code == 4001) {
+          reason = "networkTimedout";
+        }
+
+        setState('disconnected');
+
+        if (!connection) return;
+
+        if (connection.destroyedReason) {
+          console.debug("OT.Raptor.Socket: Socket was closed but the connection had already been destroyed. Reason: " + connection.destroyedReason);
+          return;
+        }
+
+        connection.destroy( reason );
+      }.bind(this),
+
+      onError = function onError () {
+        // @todo what does having an error mean? Are they always fatal? Are we disconnected now?
+      };
+
+
+  //// Public API
+
+
+  // Check whether this socket connection has permissions to perform a particular
+  // action.
+  this.permittedTo = function (action) {
+      return _capabilities[action] === 1;
+  };
+
+  this.connect = function (token, sessionInfo, completion) {
+    if (!this.is('disconnected', 'error')) {
+      OT.warn("Cannot connect the Raptor Socket as it is currently connected. You should disconnect first.");
+      return;
+    }
+
+    setState('connecting');
+    _sessionId = sessionInfo.sessionId;
+    _completion = completion;
+
+    var connectionId = OT.$.uuid(),
+        session = OT.sessions.get(_sessionId);
+
+
+    var analyticsPayload = [_socketUrl, navigator.userAgent, OT.properties.version, window.externalHost ? "yes" : "no"];
+    logAnalyticsEvent(
+      'Attempt',
+      "webSocketServerUrl|userAgent|sdkVersion|chromeFrame",
+      analyticsPayload.map(function(e) { return e.replace('|', '\\|'); }).join('|')
+    );
+
+    _rumor = new OT.Rumor.Socket(_socketUrl, _symphony);
+    _rumor.onClose = onClose;
+    _rumor.onMessage = _dispatcher.dispatch.bind(_dispatcher);
+
+    _rumor.connect(connectionId, function(error) {
+      if (error) {
+        onConnectComplete(error, null, "RumorConnection:");
+        return;
+      }
+
+      // we do this here to avoid getting connect errors twice
+      _rumor.onError = onError;
+
+      OT.debug("Raptor Socket connected to " + _sessionId + " on " + messagingServer);
+
+      _rumor.subscribe([_sessionId]);
+
+      //connect to session
+      var connectMessage = OT.Raptor.Message.connect(widgetId, _rumor.id, _sessionId, OT.APIKEY, token, sessionInfo.p2pEnabled);
+      this.publish(connectMessage);
+    }.bind(this));
+  };
+
+
+  this.disconnect = function () {
+    if (this.is('disconnected')) return;
+
+    setState('disconnecting');
+    _rumor.disconnect();
+  };
+
+  // Publishs +message+ to the Symphony app server.
+  this.publish = function (message) {
+    if (_rumor.isNot('connected')) {
+      OT.error("OT.Raptor.Socket: cannot publish until the socket is connected." + message);
+      return;
+    }
+
+    OT.debug("OT.Raptor.Socket Publish: " + message);
+    _rumor.publish([_symphony], message);
+  };
+
+  // Register a new stream against _sessionId
+  this.createStream = function(publisherId, name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo) {
+    var session = OT.sessions.get(_sessionId),
+        message = OT.Raptor.Message.streamCreate( _rumor.id,
+                                                  _sessionId,
+                                                  publisherId,
+                                                  name,
+                                                  orientation,
+                                                  encodedWidth,
+                                                  encodedHeight,
+                                                  hasAudio,
+                                                  hasVideo,
+                                                  session.sessionInfo.p2pEnabled );
+
+    this.publish(message);
+  };
+
+  this.updateStream = function(streamId, key, value) {
+    this.publish( OT.Raptor.Message.streamModify(_rumor.id, _sessionId, streamId, key, value) );
+  };
+
+  this.destroyStream = function(streamId) {
+    this.publish( OT.Raptor.Message.streamDestroy(_rumor.id, _sessionId, streamId) );
+  };
+
+  this.modifySubscriber = function(subscriber, key, value) {
+    this.publish( OT.Raptor.Message.subscriberModify(_rumor.id, _sessionId, subscriber.streamId, subscriber.widgetId, key, value) );
+  };
+
+  this.forceDisconnect = function(connectionIdToDisconnect) {
+    this.publish( OT.Raptor.Message.forceDisconnect(_rumor.id, connectionIdToDisconnect, _sessionId) );
+  };
+
+  this.forceUnpublish = function(streamId) {
+    this.publish( OT.Raptor.Message.forceUnpublish(_rumor.id, _sessionId, streamId) );
+  };
+
+  this.jsepSubscribe = function(toConnectionId, streamId, subscribeToVideo, subscribeToAudio) {
+    this.publish( OT.Raptor.Message.jsepSubscribe(_rumor.id, toConnectionId, streamId, subscribeToVideo, subscribeToAudio) );
+  };
+
+  this.jsepUnsubscribe = function(toConnectionId, streamId) {
+    this.publish( OT.Raptor.Message.jsepUnsubscribe(_rumor.id, toConnectionId, streamId) );
+  };
+
+  this.jsepCandidate = function(toConnectionId, streamId, candidate) {
+    this.publish( OT.Raptor.Message.jsepCandidate(_rumor.id, toConnectionId, streamId, candidate) );
+  };
+
+  this.jsepOffer = function(toConnectionId, streamId, offerSDP) {
+    this.publish( OT.Raptor.Message.jsepOffer(_rumor.id, toConnectionId, streamId, offerSDP) );
+  };
+
+  this.jsepAnswer = function(toConnectionId, streamId, answerSDP) {
+    this.publish( OT.Raptor.Message.jsepAnswer(_rumor.id, toConnectionId, streamId, answerSDP) );
+  };
+
+
+  this.signal = function(options, completion) {
+    var signal = new OT.Signal(_sessionId, _rumor.id, options || {});
+
+    if (!signal.valid) {
+      if (completion && OT.$.isFunction(completion)) {
+        completion( new SignalError(signal.error.code, signal.error.reason, signal.toHash()) );
+      }
+
+      return;
+    }
+
+    this.publish( signal.toRaptorMessage() );
+    if (completion && OT.$.isFunction(completion)) completion(null, signal.toHash());
+  };
+
+  OT.$.defineGetters(this, {
+    id: function() { return _rumor.id; },
+    capabilities: function() { return _capabilities; },
+    sessionId: function() { return _sessionId; }
+  });
+
+  _dispatcher = new (Dispatcher || OT.Raptor.Dispatcher)(this, function (error, sessionState) {
+    onConnectComplete.call(this, error, sessionState, "ConnectToSession:");
+  });
+};
+
+
+}(this));
+(function(global) {
+
+// Connect error codes and reasons that Raptor can return.
+var connectErrorReasons = {
+  409: "This P2P session already has 2 participants.",
+  410: "The session already has four participants.",
+  1004: "The token passed is invalid."
+};
+
+
+// @todo hide these
+OT.publishers = new OT.Collection('guid');          // Publishers are id'd by their guid
+OT.subscribers = new OT.Collection('widgetId');     // Subscribers are id'd by their widgetId
+OT.sessions = new OT.Collection();
+
+function parseStream(dict, session) {
+  var stream = new OT.Stream( dict.streamId,
+                              session.connections.get(dict.connection.connectionId),
+                              dict.name,
+                              dict.streamData,
+                              dict.type,
+                              dict.creationTime,
+                              dict.hasAudio,
+                              dict.hasVideo,
+                              dict.orientation ? dict.orientation.videoOrientation : null,
+                              dict.peerId,
+                              dict.quality,
+                              dict.orientation ? dict.orientation.width : null,
+                              dict.orientation ? dict.orientation.height : null );
+
+  // This is a code smell, but it's necessary for now as the part of the code
+  // that re-parents streams to publishers is in a different object that cannot
+  // access the raw stream packet
+  if (dict.publisherId) {
+    stream.publisherId = dict.publisherId;
+  }
+
+  return stream;
+}
+
+function parseAndAddStreamToSession(dict, session) {
+  if (session.streams.has(dict.streamId)) return;
+
+  var stream = parseStream(dict, session);
+  session.streams.add( stream );
+
+  return stream;
+}
+
+
+OT.Raptor.Dispatcher = function (socket, connectionCompletion) {
+  this.socket = socket;
+  this.connectionCompletion = connectionCompletion;
+};
+
+OT.Raptor.Dispatcher.prototype.dispatch = function(addresses, encodedMessage) {
+  var message = OT.Raptor.deserializeMessage(encodedMessage);
+
+  if (!message.typeName) {
+    OT.error("OT.Raptor.dispatch: Invalid message type (" + message.type + ")");
+    return;
+  }
+
+  if (!message.actionName) {
+    OT.error("OT.Raptor.dispatch: Invalid action (" + message.action + ") for " + message.typeName);
+    OT.error(message);
+    return;
+  }
+
+  OT.debug("OT.Raptor.dispatch " + message.signature + ": " + encodedMessage);
+
+  switch(message.type) {
+    case OT.Raptor.Types.RPC_RESPONSE:
+      this.dispatchRPCResponse(message);
+      break;
+
+    case OT.Raptor.Types.CONNECTION:
+      this.dispatchConnection(message);
+      break;
+
+    case OT.Raptor.Types.CONNECTIONCOUNT:
+      this.dispatchConnectionCount(message);
+      break;
+
+    case OT.Raptor.Types.STREAM:
+      this.dispatchStream(message);
+      break;
+
+    case OT.Raptor.Types.SUBSCRIBER:
+      this.dispatchSubscriber(message);
+      break;
+
+    case OT.Raptor.Types.MODERATION:
+      this.dispatchModeration(message);
+      break;
+
+    case OT.Raptor.Types.JSEP:
+      this.dispatchJsep(message);
+      break;
+
+    case OT.Raptor.Types.SIGNAL:
+      this.dispatchSignal(message);
+      break;
+
+
+
+    default:
+      OT.warn("OT.Raptor.dispatch: Type " + message.typeName + " is not currently implemented");
+  }
+};
+
+
+OT.Raptor.Dispatcher.prototype.dispatchRPCResponse = function (message) {
+  switch (message.action) {
+    case OT.Raptor.Actions.CONNECT:
+      if (message.payload.connectSuccess == false) {
+        var error = new OT.Error(OT.ExceptionCodes.CONNECT_REJECTED, connectErrorReasons[message.payload.reason] || "Failed to connect");
+        this.connectionCompletion.call(null, error);
+      }
+      else {
+        this.socket.publish(OT.Raptor.Message.getSessionState(this.socket.id, message.payload.sessionId, true));
+      }
+      break;
+
+
+    case OT.Raptor.Actions.STATE:
+      var state = message.payload.value,
+          session = OT.sessions.get(message.payload.key),
+          connection;
+
+      state.streams = [];
+      state.connections = [];
+      state.archives = [];
+
+      if (state.hasOwnProperty("CONNECTIONS")) {
+        for (var id in state.CONNECTIONS) {
+          var connection = OT.Connection.fromHash(state.CONNECTIONS[id]);
+          state.connections.push(connection);
+          session.connections.add(connection)
+        }
+
+        delete state.CONNECTIONS;
+      }
+
+      if (state.hasOwnProperty("STREAMS")) {
+        for (var id in state.STREAMS) {
+          state.streams.push( parseAndAddStreamToSession(state.STREAMS[id], session) );
+        }
+
+        delete state.STREAMS;
+      }
+
+
+      this.connectionCompletion.call(null, null, state);
+      break;
+
+
+    default:
+      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+  }
+};
+
+
+OT.Raptor.Dispatcher.prototype.dispatchConnection = function (message) {
+  var session = OT.sessions.get(message.payload.value.sessionId),
+      connection;
+
+  if (!session) {
+    OT.error("OT.Raptor.dispatch: Unable to determine session for " + message.payload.value.sessionId + ' on ' + message.signature + " message!");
+    // @todo error
+    return;
+  }
+
+  switch (message.action) {
+    case OT.Raptor.Actions.CREATE:
+      connection = OT.Connection.fromHash(message.payload.value);
+      if (session.connection && connection.id !== session.connection.id) session.connections.add( connection );
+      break;
+
+
+    case OT.Raptor.Actions.DELETE:
+      connection = session.connections.get(message.payload.value.connectionId);
+      connection.destroy(message.payload.reason);
+      break;
+
+
+    default:
+      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+  }
+};
+
+OT.Raptor.Dispatcher.prototype.dispatchConnectionCount = function (message) {
+  // Note: we don't use any of this in the client right now.
+
+  // switch (message.action) {
+  //   case OT.Raptor.Actions.UPDATE:
+  //     connectionCount = message.payload.value;
+  //     OT.debug("OT.Raptor.dispatch: Connection count: " + connectionCount);
+  //     break;
+
+
+  //   default:
+  //     OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+  // }
+};
+
+
+OT.Raptor.Dispatcher.prototype.dispatchStream = function (message) {
+  var key = message.payload.key.split('/'),
+      sessionId = key[0],
+      session,
+      stream;
+
+
+  if (sessionId) session = OT.sessions.get(sessionId);
+
+  if (!session) {
+    OT.error("OT.Raptor.dispatch: Unable to determine sessionId, or the session does not exist, for " + message.signature + " message!");
+    // @todo error
+    return;
+  }
+
+  switch (message.action) {
+    case OT.Raptor.Actions.REGISTER:
+      stream = parseStream(message.payload.value, session);
+
+      // @todo refactor this later
+      if (stream.publisherId) {
+        var publisher = OT.publishers.get(stream.publisherId);
+
+        if (publisher) {
+          publisher._.streamRegisteredHandler(stream);
+        }
+        else {
+          OT.warn("OT.Raptor.dispatch: Could find a publisher " + stream.publisherId + " for " + message.signature);
+        }
+      }
+      break;
+
+
+    case OT.Raptor.Actions.CREATE:
+      parseAndAddStreamToSession(message.payload.value, session)
+      break;
+
+
+    case OT.Raptor.Actions.UPDATE:
+      if (key[1]) stream = session.streams.get(key[1]);
+
+      if (!stream) {
+        OT.error("OT.Raptor.dispatch: Unable to determine streamId, or the stream does not exist, for " + message.signature + " message!");
+        // @todo error
+        return;
+      }
+
+      stream.update(key[2], message.payload.value);
+      break;
+
+
+    case OT.Raptor.Actions.DELETE:
+      if (key[2]) stream = session.streams.get(key[2]);
+
+      if (!stream) {
+        OT.error("OT.Raptor.dispatch: Unable to determine streamId, or the stream does not exist, for " + message.signature + " message!");
+        // @todo error
+        return;
+      }
+
+      stream.destroy(message.payload.reason);
+      break;
+
+
+    default:
+      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+  }
+};
+
+
+
+OT.Raptor.Dispatcher.prototype.dispatchModeration = function (message) {
+  // Force disconnect and unpublish are handled in CONNECTION:DELETE and STREAM:DELETE respectively.
+  return;
+
+  // var session = OT.sessions.get(this.socket.sessionId);
+
+  // if (!session) {
+  //     OT.error("OT.Raptor.dispatch: " + message.signature + " ERROR - sessionId must be provided and be valid");
+  //     return;
+  // }
+
+  // switch (message.action) {
+  //   case OT.Raptor.Actions.FORCE_DISCONNECT:
+  //     if (!message.payload.connectionId) {
+  //         OT.error("OT.Raptor.dispatch: " + message.signature + " ERROR - connectionId must be provided");
+  //         return;
+  //     }
+
+  //     var connection = session.connections.get(message.payload.connectionId);
+  //     connection.destroy("forceDisconnected");
+  //     break;
+
+
+  //   case OT.Raptor.Actions.FORCE_UNPUBLISH:
+  //     if (!message.payload.streamId) {
+  //         OT.error("OT.Raptor.dispatch " + message.signature + " ERROR - streamId must be provided");
+  //         return;
+  //     }
+
+  //     var stream = session.streams.get(message.payload.streamId);
+  //     stream.destroy("forceUnpublished");
+  //     break;
+
+
+  //   default:
+  //     OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+  // }
+};
+
+
+
+OT.Raptor.Dispatcher.prototype.dispatchJsep = function (message) {
+  var fromConnection,
+      streamId = message.payload.streamId,
+      actors;
+
+  switch (message.action) {
+    // Messages for Subscribers
+    case OT.Raptor.Actions.OFFER:
+      actors = [];
+      var subscriber = OT.subscribers.find({streamId: streamId});
+      if (subscriber) actors.push(subscriber);
+      break;
+
+
+    // Messages for Publishers
+    case OT.Raptor.Actions.ANSWER:
+    case OT.Raptor.Actions.PRANSWER:
+    case OT.Raptor.Actions.SUBSCRIBE:
+    case OT.Raptor.Actions.UNSUBSCRIBE:
+      actors = OT.publishers.where({streamId: streamId});
+      break;
+
+
+    // Messages for Publishers and Subscribers
+    case OT.Raptor.Actions.CANDIDATE:
+      // send to whichever of your publisher or subscribers are subscribing/publishing that stream
+      actors = OT.publishers.where({streamId: streamId}).concat(OT.subscribers.where({streamId: streamId}));
+      break;
+
+
+    default:
+      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+      return;
+  }
+
+  if (actors.length) {
+    // This is a bit hacky. We don't have the session in the message so we iterate
+    // until we find the actor that the message relates to this stream, and then
+    // we grab the session from it.
+    fromConnection = actors[0].session.connections.get(message.payload.fromAddress);
+    if(!fromConnection && message.payload.fromAddress.match(/^symphony\./)) {
+      fromConnection = new OT.Connection(message.payload.fromAddress,
+          Date.now(), null, { supportsWebRTC: true });
+      actors[0].session.connections.add(fromConnection);
+    } else if(!fromConnection) {
+      OT.warn("Messsage comes from a connection (" + message.payload.fromAddress + ") that we do not know about.");
+    }
+  }
+
+  actors.forEach(function(actor) {
+    actor.processMessage(message.action, fromConnection, message.payload);
+  });
+};
+
+
+// The payload is:
+//    key:    "{session_id}}/SUBSCRIBER/{stream_id}/{subscriber_id}"
+//    value:  Integer                 { Value between 0 and some non-zero max ( Max not decided yet )  }*
+//
+// * The complete range need not be used but this provision is just so that future facing we might need to have more granularity.
+//
+OT.Raptor.Dispatcher.prototype.dispatchSubscriber = function (message) {
+  var key = message.payload.key.split('/'),
+      session = OT.sessions.get(key[0]),
+      subscriber,
+      stream;
+
+  if (!session) {
+    OT.error("OT.Raptor.dispatch: Unable to determine sessionId, or the session does not exist, for " + message.signature + " message!");
+    // @todo error
+    return;
+  }
+
+  stream = key[2] ? session.streams.get(key[2]) : null;
+
+  if (!stream) {
+    OT.error("OT.Raptor.dispatch: Unable to determine streamId, or the stream does not exist, for " + message.signature + " message!");
+    // @todo error
+    return;
+  }
+
+  // Find the subscriber that matches this stream, connection, and session
+  subscriber = OT.subscribers.find(function(subscriber) {
+                  return subscriber.streamId === stream.id
+                          && subscriber.session.id === session.id
+                });
+
+  if (!subscriber) {
+    OT.error("OT.Raptor.dispatch: Unable to determine subscriberId, or the subscriber does not exist, for " + message.signature + " message!");
+    // @todo error
+    return;
+  }
+
+
+  switch (message.action) {
+    case OT.Raptor.Actions.QUALITY_CHANGED:
+      subscriber.updateQuality(parseInt(message.payload.value, 10));
+      break;
+
+
+    default:
+      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+  }
+};
+
+
+OT.Raptor.Dispatcher.prototype.dispatchSignal = function (message) {
+  if (message.action !== OT.Raptor.Actions.SIGNAL) {
+    OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
+    return;
+  }
+
+  var session = OT.sessions.get(this.socket.sessionId);
+
+  if (!session) {
+      OT.error("OT.Raptor.dispatch: " + message.signature + " ERROR - sessionId must be provided and be valid");
+      return;
+  }
+
+  session._.dispatchSignal( session.connections.get(message.payload.fromAddress),
+                            message.payload.type,
+                            message.payload.data);
+};
+
+}(this));
+(function(window) {
+
+// Helper to synchronise several startup tasks and then dispatch a unified
+// 'envLoaded' event.
+//
+// This depends on:
+// * OT
+// * OT.Config
+//
+function EnvironmentLoader() {
+    var _configReady = false,
+        _domReady = false,
+
+        isReady = function() {
+            return _domReady && _configReady;
+        },
+
+        onLoaded = function() {
+            if (isReady()) {
+                OT.dispatchEvent(new OT.EnvLoadedEvent(OT.Event.names.ENV_LOADED));
+            }
+        },
+
+        onDomReady = function() {
+            _domReady = true;
+
+            // This is making an assumption about there being only one "window"
+            // that we care about.
+            OT.$.on(window, "unload", function() {
+                OT.publishers.destroy();
+                OT.subscribers.destroy();
+                OT.sessions.destroy();
+            });
+
+            // The Dynamic Config won't load until the DOM is ready
+            OT.Config.load(OT.properties.configURL);
+
+            onLoaded();
+        },
+
+        configLoaded = function() {
+            _configReady = true;
+            OT.Config.off('dynamicConfigChanged', configLoaded);
+            OT.Config.off('dynamicConfigLoadFailed', configLoadFailed);
+
+            onLoaded();
+        },
+
+        configLoadFailed = function() {
+            configLoaded();
+        };
+
+    OT.Config.on('dynamicConfigChanged', configLoaded);
+    OT.Config.on('dynamicConfigLoadFailed', configLoadFailed);
+    if (document.readyState == "complete" || (document.readyState == "interactive" && document.body)) {
+        onDomReady();
+    } else {
+        if (document.addEventListener) {
+            document.addEventListener("DOMContentLoaded", onDomReady, false);
+        } else if (document.attachEvent) {
+            // This is so onLoad works in IE, primarily so we can show the upgrade to Chrome popup
+            document.attachEvent("onreadystatechange", function() {
+                if (document.readyState == "complete") onDomReady();
+            });
+        }
+    }
+
+    this.onLoad = function(cb) {
+        if (isReady()) {
+            cb();
+            return;
+        }
+
+        OT.on(OT.Event.names.ENV_LOADED, cb);
+    };
+}
+
+var EnvLoader = new EnvironmentLoader();
+
+OT.onLoad = function(cb, context) {
+    if (!context) {
+        EnvLoader.onLoad(cb);
+    }
+    else {
+        EnvLoader.onLoad(
+            cb.bind(context)
+        );
+    }
+};
+
+})(window);
+(function(window) {
+
+OT.Error = function(code, message) {
+    this.code = code;
+    this.message = message;
+};
+
+var errorsCodesToTitle = {
+    1000: "Failed To Load",
+    1004: "Authentication error",
+    1005: "Invalid Session ID",
+    1006: "Connect Failed",
+    1007: "Connect Rejected",
+    1008: "Connect Time-out",
+    1009: "Security Error",
+    1010: "Not Connected",
+    1011: "Invalid Parameter",
+    1012: "Peer-to-peer Stream Play Failed",
+    1013: "Connection Failed",
+    1014: "API Response Failure",
+    1500: "Unable to Publish",
+    1510: "Unable to Signal",
+    1520: "Unable to Force Disconnect",
+    1530: "Unable to Force Unpublish",
+    1540: "Unable to record archive",
+    1550: "Unable to play back archive",
+    1560: "Unable to create archive",
+    1570: "Unable to load archive",
+    2000: "Internal Error",
+    2001: "Embed Failed",
+    3000: "Archive load exception",
+    3001: "Archive create exception",
+    3002: "Playback stop exception",
+    3003: "Playback start exception",
+    3004: "Record start exception",
+    3005: "Record stop exception",
+    3006: "Archive load exception",
+    3007: "Session recording in progress",
+    3008: "Archive recording internal failure",
+    4000: "WebSocket Connection Failed",
+    4001: "WebSocket Network Disconnected"
+};
+
+var analytics;
+
+function _exceptionHandler(component, msg, errorCode, context) {
+    var title = errorsCodesToTitle[errorCode],
+        contextCopy = context ? OT.$.clone(context) : {};
+
+    OT.error("TB.exception :: title: " + title + " (" + errorCode + ") msg: " + msg);
+
+    if (!contextCopy.partnerId) contextCopy.partnerId = OT.APIKEY;
+
+    try {
+        if (!analytics) analytics = new OT.Analytics();
+        analytics.logError(errorCode, 'tb.exception', title, {details:msg}, contextCopy);
+
+        OT.dispatchEvent(
+            new OT.ExceptionEvent(OT.Event.names.EXCEPTION, msg, title, errorCode, component, component)
+        );
+    } catch(err) {
+        OT.error("TB.exception :: Failed to dispatch exception - " + err.toString());
+        // Don't throw an error because this is asynchronous
+        // don't do an exceptionHandler because that would be recursive
+    }
+}
+
+// @todo redo this when we have time to tidy up
+//
+// @example
+//
+//  TB.handleJsException("Descriptive error message", 2000, {
+//      session: session,
+//      target: stream|publisher|subscriber|session|etc
+//  });
+//
+OT.handleJsException = function(errorMsg, code, options) {
+    options = options || {};
+
+    var context,
+        session = options.session;
+
+    if (session) {
+        context = {
+            sessionId: session.sessionId
+        };
+
+        if (session.connected) context.connectionId = session.connection.connectionId;
+        if (!options.target) options.target = session;
+    }
+    else if (options.sessionId) {
+        context = {
+            sessionId: options.sessionId
+        };
+
+        if (!options.target) options.target = null;
+    }
+
+    _exceptionHandler(options.target, errorMsg, code, context);
+};
+
+
+// @todo redo this when we have time to tidy up
+//
+// Public callback for exceptions from Flash.
+//
+// Called from Flash like:
+//  TB.exceptionHandler('publisher_1234,1234', "Descriptive Error Message", "Error Title", 2000, contextObj)
+//
+OT.exceptionHandler = function(componentId, msg, errorTitle, errorCode, context) {
+    var target;
+
+    if (componentId) {
+        target = OT.components[componentId];
+
+        if (!target) {
+            OT.warn("Could not find the component with component ID " + componentId);
+        }
+    }
+
+    _exceptionHandler(target, msg, errorCode, context);
+};
+
+})(window);
+(function(window) {
+
+OT.ConnectionCapabilities = function(capabilitiesHash) {
+    // Private helper methods
+    var castCapabilities = function(capabilitiesHash) {
+            capabilitiesHash.supportsWebRTC = OT.$.castToBoolean(capabilitiesHash.supportsWebRTC);
+
+            return capabilitiesHash;
+        };
+
+
+    // Private data
+    var _caps = castCapabilities(capabilitiesHash);
+
+
+    this.supportsWebRTC = _caps.supportsWebRTC;
+};
+
+})(window);
+(function(window) {
+
+/**
+ * The Connection object represents a connection to an OpenTok session.
+ * The Session object has a <code>connection</code> property that is a Connection object.
+ * It represents the local client's connection. (A client only has a connection once the
+ * client has successfully called the <code>connect()</code> method of the {@link Session} object.)
+ * The Stream object has a <code>connection</code> property that is a Connection object.
+ * It represents the stream publisher's connection.
+ *
+ * @class Connection
+ * @property {String} id The ID of this connection.
+ * @property {Number} creationTime The timestamp for the creation of the connection. This value is calculated in milliseconds.
+	You can convert this value to a Date object by calling <code>new Date(creationTime)</code>, where <code>creationTime</code>
+	is the <code>creationTime</code> property of the Connection object.
+ * @property {String} data 	A string containing metadata describing the
+	connection. When you generate a user token string pass the connection data string to the
+	<code>generate_token()</code> method of our
+	<a href="/opentok/libraries/server/">server-side libraries</a>. You can also generate a token and define connection data on the
+	<a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
+ */
+OT.Connection = function(id, creationTime, data, capabilitiesHash) {
+    var destroyedReason;
+
+    this.id = this.connectionId = id;
+    this.creationTime = creationTime ? Number(creationTime) : null;
+    this.data = data;
+    this.capabilities = new OT.ConnectionCapabilities(capabilitiesHash);
+    this.quality = null;
+
+    OT.$.eventing(this);
+
+    this.destroy = function(reason, quiet) {
+        destroyedReason = reason || 'clientDisconnected';
+
+        if (quiet !== true) {
+            this.dispatchEvent(
+              new OT.DestroyedEvent(
+                'destroyed',      // This should be OT.Event.names.CONNECTION_DESTROYED, but
+                                  // the value of that is currently shared with Session
+                this,
+                destroyedReason
+              )
+            );
+        }
+    }.bind(this);
+
+    Object.defineProperties(this, {
+        destroyed: {
+            get: function() { return destroyedReason !== void 0; },
+            enumerable: true
+        },
+
+        destroyedReason: {
+            get: function() { return destroyedReason; },
+            enumerable: true
+        }
+    });
+};
+
+OT.Connection.fromHash = function(hash) {
+  return new OT.Connection(hash.connectionId,
+                            hash.creationTime,
+                            hash.data,
+                            { supportsWebRTC: hash.supportsWebRTC } );
+
+};
+
+})(window);
+(function(window) {
+
+var validPropertyNames = ['hasAudio', 'hasVideo', 'quality', 'name', 'videoDimensions', 'orientation'];
+
+
+/**
+ * Specifies a stream. A stream is a representation of a published stream in a session. When a client calls the
+ * <a href="Session.html#publish">Session.publish() method</a>, a new stream is created. Properties of the Stream
+ * object provide information about the stream.
+ *
+ *  <p>When a stream is added to a session, the Session object dispatches a <code>streamCreatedEvent</code>.
+ *  When a stream is destroyed, the Session object dispatches a <code>streamDestroyed</code> event. The
+ *  StreamEvent object, which defines these event objects, has a <code>stream</code> property, which is an
+ *  array of Stream object. For details and a code example, see {@link StreamEvent}.</p>
+ *
+ *  <p>When a connection to a session is made, the Session object dispatches a <code>sessionConnected</code>
+ *  event, defined by the SessionConnectEvent object. The SessionConnectEvent object has a <code>streams</code>
+ *  property, which is an array of Stream objects pertaining to the streams in the session at that time.
+ *  For details and a code example, see {@link SessionConnectEvent}.</p>
+ *
+ * @class Stream
+ * @property {Connection} connection The Connection object corresponding
+ * to the connection that is publishing the stream. You can compare this to to the <code>connection</code>
+ * property of the Session object to see if the stream is being published by the local web page.
+ *
+ * @property {Number} creationTime The timestamp for the creation
+ * of the stream. This value is calculated in milliseconds. You can convert this value to a
+ * Date object by calling <code>new Date(creationTime)</code>, where <code>creationTime</code> is the
+ * <code>creationTime</code> property of the Stream object.
+ *
+ * @property {Boolean} hasAudio Whether the stream has audio. This property can change if the publisher
+ * turns on or off audio (by calling <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a>).
+ * When this occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event
+ * (see {@link StreamPropertyChangedEvent}.)
+ *
+ * @property {Boolean} hasVideo Whether the stream has video. This property can change if the publisher
+ * turns on or off video (by calling <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a>).
+ * When this occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event
+ * (see {@link StreamPropertyChangedEvent}.)
+ *
+ * @property {Object} videoDimensions This object has two properties: <code>width</code> and <code>height</code>. Both are
+ * numbers. The <code>width</code> property is the width of the encoded stream; the <code>height</code> property is the
+ * height of the encoded stream. (These are independent of the actual width of Publisher and Subscriber objects corresponding
+ * to the stream.) This property can change if a stream published from an iOS device resizes, based on a change in the device
+ * orientation. When this occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event (see
+ * {@link StreamPropertyChangedEvent}.)
+ *
+ * @property {String} name The name of the stream. Publishers can specify a name when publishing a stream
+ * (using the <code>publish()</code> method of the publisher's Session object).
+ */
+OT.Stream = function(id, connection, name, data, type, creationTime, hasAudio, hasVideo, orientation, peerId, quality, width, height) {
+  var destroyedReason;
+
+  this.id = this.streamId = id;
+  this.connection = connection;
+  this.name = name;
+  this.data = data;
+  this.type = type || 'basic';
+  this.creationTime = creationTime ? Number(creationTime) : null;
+  this.hasAudio = OT.$.castToBoolean(hasAudio, true);
+  this.hasVideo = OT.$.castToBoolean(hasVideo, true);
+  this.peerId = peerId;
+  this.quality = quality;
+  this.videoDimensions = { width: (width || 640), height: (height || 480), orientation: (orientation || OT.VideoOrientation.ROTATED_NORMAL) };
+
+  OT.$.eventing(this);
+
+  // Confusingly, this should not be called when you want to change
+  // the stream properties. This is used by Raptor dispatch to notify
+  // the stream that it's properies have been successfully updated
+  //
+  // @todo make this sane. Perhaps use setters for the properties that can
+  // send the appropriate Raptor message. This would require that Streams
+  // have access to their session.
+  //
+  this.update = function(key, value) {
+    if (validPropertyNames.indexOf(key) === -1) {
+      OT.warn('Unknown stream property "' + key + '" was modified to "' + value + '".');
+      return;
+    }
+
+    var oldValue = this[key],
+        newValue = value;
+
+    switch(key) {
+      case 'hasAudio':
+      case 'hasVideo':
+        newValue = OT.$.castToBoolean(newValue, true);
+        this[key] = newValue;
+        break;
+
+      case 'quality':
+      case 'name':
+        this[key] = newValue;
+        break;
+
+      case 'orientation':
+        this.videoDimensions = { width: newValue.width, height: newValue.height, orientation: newValue.videoOrientation };
+    }
+
+    // We map the 'orientation' key (that comes from Raptor) to 'videoDimensions' when
+    // dispatching the updated event, as this is actual property that is modified on the stream
+    var event = new OT.StreamUpdatedEvent(this, key, oldValue, newValue);
+    this.dispatchEvent(event);
+  };
+
+  this.destroy = function(reason, quiet) {
+    destroyedReason = reason || 'clientDisconnected';
+
+    if (quiet !== true) {
+        this.dispatchEvent(
+          new OT.DestroyedEvent(
+            'destroyed',      // This should be OT.Event.names.STREAM_DESTROYED, but
+                              // the value of that is currently shared with Session
+            this,
+            destroyedReason
+          )
+        );
+    }
+  };
+
+  Object.defineProperties(this, {
+      destroyed: {
+          get: function() { return destroyedReason !== void 0; },
+          enumerable: true
+      },
+
+      destroyedReason: {
+          get: function() { return destroyedReason; },
+          enumerable: true
+      }
+  });
+};
+
+
+})(window);
+(function(window) {
+
+// Normalise these
+var NativeRTCSessionDescription = (window.mozRTCSessionDescription || window.RTCSessionDescription); // order is very important: "RTCSessionDescription" defined in Firefox Nighly but useless
+var NativeRTCIceCandidate = (window.mozRTCIceCandidate || window.RTCIceCandidate);
+
+// Helper function to forward Ice Candidates via +messageDelegate+
+var iceCandidateForwarder = function(messageDelegate) {
+    return function(event) {
+        OT.debug("IceCandidateForwarder: Ice Candidate");
+
+        if (event.candidate) {
+            messageDelegate(OT.Raptor.Actions.CANDIDATE, event.candidate);
+        }
+        else {
+            OT.debug("IceCandidateForwarder: No more ICE candidates.");
+        }
+    };
+};
+
+
+// Process incoming Ice Candidates from a remote connection (which have been
+// forwarded via iceCandidateForwarder). The Ice Candidates cannot be processed
+// until a PeerConnection is available. Once a PeerConnection becomes available
+// the pending PeerConnections can be processed by calling processPending.
+//
+// @example
+//
+//  var iceProcessor = new IceCandidateProcessor();
+//  iceProcessor.process(iceMessage1);
+//  iceProcessor.process(iceMessage2);
+//  iceProcessor.process(iceMessage3);
+//
+//  iceProcessor.peerConnection = peerConnection;
+//  iceProcessor.processPending();
+//
+var IceCandidateProcessor = function() {
+    var _pendingIceCandidates = [],
+        _peerConnection = null;
+
+
+    Object.defineProperty(this, 'peerConnection', {
+        set: function(peerConnection) {
+            _peerConnection = peerConnection;
+        }
+    });
+
+    this.process = function(message) {
+        var iceCandidate = new NativeRTCIceCandidate(message.candidate);
+
+        if (_peerConnection) {
+            _peerConnection.addIceCandidate(iceCandidate);
+        }
+        else {
+            _pendingIceCandidates.push(iceCandidate);
+        }
+    };
+
+    this.processPending = function() {
+        while(_pendingIceCandidates.length) {
+            _peerConnection.addIceCandidate(_pendingIceCandidates.shift());
+        }
+    };
+};
+
+// Removes all Confort Noise from +sdp+.
+//
+// See https://jira.tokbox.com/browse/OPENTOK-7176
+//
+var removeComfortNoise = function removeComfortNoise (sdp) {
+    // a=rtpmap:<payload type> <encoding name>/<clock rate> [/<encoding parameters>]
+    var matcher = /a=rtpmap:(\d+) CN\/\d+/i,
+        payloadTypes = [],
+        audioMediaLineIndex,
+        sdpLines,
+        match;
+
+    // Icky code. This filter operation has two side effects in addition
+    // to doing the actual filtering:
+    //   1. extract all the payload types from the rtpmap CN lines
+    //   2. find the index of the audio media line
+    //
+    sdpLines = sdp.split("\r\n").filter(function(line, index) {
+        if (line.indexOf('m=audio') !== -1) audioMediaLineIndex = index;
+
+        match = line.match(matcher);
+        if (match !== null) {
+            payloadTypes.push(match[1]);
+
+            // remove this line as it contains CN
+            return false;
+        }
+
+        return true;
+    });
+
+    if (payloadTypes.length && audioMediaLineIndex) {
+        // Remove all CN payload types from the audio media line.
+        sdpLines[audioMediaLineIndex] = sdpLines[audioMediaLineIndex].replace( new RegExp(payloadTypes.join('|'), 'ig') , '').replace(/\s+/g, ' ');
+    }
+
+    return sdpLines.join("\r\n");
+};
+
+// Attempt to completely process +offer+. This will:
+// * set the offer as the remote description
+// * create an answer and
+// * set the new answer as the location description
+//
+// If there are no issues, the +success+ callback will be executed on completion.
+// Errors during any step will result in the +failure+ callback being executed.
+//
+var offerProcessor = function(peerConnection, offer, success, failure) {
+    var generateErrorCallback = function(message) {
+            return function(errorReason) {
+                if (failure) failure(message, errorReason);
+            };
+        },
+
+        setLocalDescription = function(answer) {
+            answer.sdp = removeComfortNoise(answer.sdp);
+
+            peerConnection.setLocalDescription(
+                answer,
+
+                // Success
+                function() {
+                    success(answer);
+                },
+
+                // Failure
+                generateErrorCallback('SetLocalDescription:Error while setting LocalDescription')
+            );
+        },
+
+        createAnswer = function(onSuccess) {
+            peerConnection.createAnswer(
+                // Success
+                setLocalDescription,
+
+                // Failure
+                generateErrorCallback('CreateAnswer:Error while setting createAnswer'),
+
+                null, // MediaConstraints
+                false // createProvisionalAnswer
+            );
+        };
+
+    // Workaround for a Chrome issue. Add in the SDES crypto line into offers
+    // from Firefox
+    if (offer.sdp.indexOf('a=crypto') === -1) {
+        var crypto_line = "a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:FakeFakeFakeFakeFakeFakeFakeFakeFakeFake\\r\\n";
+
+        // insert the fake crypto line for every M line
+        offer.sdp = offer.sdp.replace(/^c=IN(.*)$/gmi, "c=IN$1\r\n"+crypto_line);
+    }
+
+    if (offer.sdp.indexOf('a=rtcp-fb') === -1) {
+        var rtcp_fb_line = "a=rtcp-fb:* ccm fir\r\na=rtcp-fb:* nack ";
+
+        // insert the fake crypto line for every M line
+        offer.sdp = offer.sdp.replace(/^m=video(.*)$/gmi, "m=video$1\r\n"+rtcp_fb_line);
+    }
+
+    peerConnection.setRemoteDescription(
+        offer,
+
+        // Success
+        createAnswer,
+
+        // Failure
+        generateErrorCallback('SetRemoteDescription:Error while setting RemoteDescription')
+    );
+
+};
+
+// Attempt to completely process a subscribe message. This will:
+// * create an Offer
+// * set the new offer as the location description
+//
+// If there are no issues, the +success+ callback will be executed on completion.
+// Errors during any step will result in the +failure+ callback being executed.
+//
+var suscribeProcessor = function(peerConnection, success, failure) {
+    var constraints = {
+            mandatory: {},
+            optional: []
+        },
+
+        generateErrorCallback = function(message) {
+            return function(errorReason) {
+                if (failure) failure(message, errorReason);
+            };
+        },
+
+        setLocalDescription = function(offer) {
+            offer.sdp = removeComfortNoise(offer.sdp);
+
+            peerConnection.setLocalDescription(
+                offer,
+
+                // Success
+                function() {
+                    success(offer);
+                },
+
+                // Failure
+                generateErrorCallback('SetLocalDescription:Error while setting LocalDescription')
+            );
+        };
+
+
+    // For interop with FireFox. Disable Data Channel in createOffer.
+    if (navigator.mozGetUserMedia) {
+        constraints.mandatory.MozDontOfferDataChannel = true;
+    }
+
+    peerConnection.createOffer(
+        // Success
+        setLocalDescription,
+
+        // Failure
+        generateErrorCallback('CreateOffer:Error while creating Offer'),
+
+        constraints
+    );
+};
+
+/**
+ * Negotiates a WebRTC PeerConnection.
+ *
+ * Responsible for:
+ * * offer-answer exchange
+ * * iceCandidates
+ * * notification of remote streams being added/removed
+ *
+ */
+OT.PeerConnection = function(config) {
+    var _peerConnection,
+        _iceProcessor = new IceCandidateProcessor(),
+        _offer,
+        _answer,
+        _state = 'new',
+        _iceCandidatesGathered = false,
+        _messageDelegates = [],
+        _gettingStats,
+        _createTime = OT.$.now();
+
+    OT.$.eventing(this);
+
+    // if ice servers doesn't exist Firefox will throw an exception. Chrome
+    // interprets this as "Use my default STUN servers" whereas FF reads it
+    // as "Don't use STUN at all". *Grumble*
+    if (!config.iceServers) config.iceServers = [];
+
+    // Private methods
+    var delegateMessage = function(type, messagePayload) {
+            if (_messageDelegates.length) {
+                // We actually only ever send to the first delegate. This is because
+                // each delegate actually represents a Publisher/Subscriber that
+                // shares a single PeerConnection. If we sent to all delegates it
+                // would result in each message being processed multiple times by
+                // each PeerConnection.
+                _messageDelegates[0](type, messagePayload);
+            }
+        }.bind(this),
+
+
+        setupPeerConnection = function() {
+            if (!_peerConnection) {
+                try {
+                    OT.debug("Creating peer connection config \"" + JSON.stringify(config) + "\".");
+
+
+                    _peerConnection = OT.$.createPeerConnection(config, {
+                        optional: [
+                            {DtlsSrtpKeyAgreement: true}
+                        ]
+                    });
+                } catch(e) {
+                    triggerError("NewPeerConnection: " + e.message);
+                    return null;
+                }
+
+                _iceProcessor.peerConnection = _peerConnection;
+
+                _peerConnection.onicecandidate = iceCandidateForwarder(delegateMessage);
+                _peerConnection.onaddstream = onRemoteStreamAdded.bind(this);
+                _peerConnection.onremovestream = onRemoteStreamRemoved.bind(this);
+
+                if (_peerConnection.onsignalingstatechange !== undefined) {
+                    _peerConnection.onsignalingstatechange = routeStateChanged.bind(this);
+                } else if (_peerConnection.onstatechange !== undefined) {
+                    _peerConnection.onstatechange = routeStateChanged.bind(this);
+                }
+            }
+
+            return _peerConnection;
+        }.bind(this),
+
+        // Clean up the Peer Connection and trigger the close event.
+        // This function can be called safely multiple times, it will
+        // only trigger the close event once (per PeerConnection object)
+        tearDownPeerConnection = function() {
+            // Our connection is dead, stop processing ICE candidates
+            if (_iceProcessor) _iceProcessor.peerConnection = null;
+
+            if (_peerConnection !== null) {
+                _peerConnection = null;
+                this.trigger('close');
+            }
+        },
+
+        routeStateChanged = function(event) {
+            var newState;
+
+            if (typeof(event) === 'string') {
+                // The newest version of the API
+                newState = event;
+            }
+            else if (event.target && event.target.signalingState) {
+                // The slightly older version
+                newState = event.target.signalingState;
+            }
+            else {
+                // At least six months old version. Positively ancient, yeah?
+                newState = event.target.readyState;
+            }
+
+
+            OT.debug('PeerConnection.stateChange: ' + newState);
+            if (newState && newState.toLowerCase() !== _state) {
+                _state = newState.toLowerCase();
+                OT.debug('PeerConnection.stateChange: ' + _state);
+
+                switch(_state) {
+                    case 'closed':
+                        tearDownPeerConnection.call(this);
+
+                        break;
+                    case 'failed':
+                      triggerError('ICEWorkflow: Ice state failed');
+                      break;
+                }
+            }
+        },
+
+        getLocalStreams = function() {
+            var streams;
+
+            if (_peerConnection.getLocalStreams) {
+                streams = _peerConnection.getLocalStreams();
+            }
+            else if (_peerConnection.localStreams) {
+                streams = _peerConnection.localStreams;
+            }
+            else {
+                throw new Error("Invalid Peer Connection object implements no method for retrieving local streams");
+            }
+
+            // Force streams to be an Array, rather than a "Sequence" object,
+            // which is browser dependent and does not behaviour like an Array
+            // in every case.
+            return Array.prototype.slice.call(streams);
+        },
+
+        getRemoteStreams = function() {
+            var streams;
+
+            if (_peerConnection.getRemoteStreams) {
+                streams = _peerConnection.getRemoteStreams();
+            }
+            else if (_peerConnection.remoteStreams) {
+                streams = _peerConnection.remoteStreams;
+            }
+            else {
+                throw new Error("Invalid Peer Connection object implements no method for retrieving remote streams");
+            }
+
+            // Force streams to be an Array, rather than a "Sequence" object,
+            // which is browser dependent and does not behaviour like an Array
+            // in every case.
+            return Array.prototype.slice.call(streams);
+        },
+
+        generateErrorCallback = function(forMethod, message) {
+            return function(errorReason) {
+                triggerError.call(this, "PeerConnection." + forMethod + ": " + message + ": " + errorReason);
+            }.bind(this);
+        },
+
+        /// PeerConnection signaling
+        onRemoteStreamAdded = function(event) {
+            this.trigger('streamAdded', event.stream);
+        },
+
+        onRemoteStreamRemoved = function(event) {
+            this.trigger('streamRemoved', event.stream);
+        },
+
+        // ICE Negotiation messages
+
+
+        // Relays a SDP payload (+sdp+), that is part of a message of type +messageType+
+        // via the registered message delegators
+        relaySDP = function(messageType, sdp) {
+            delegateMessage(messageType, sdp);
+        },
+
+        // Process an offer that
+        processOffer = function(message) {
+            var offer = new NativeRTCSessionDescription(message.sdp),
+
+                // Relays +answer+ Answer
+                relayAnswer = function(answer) {
+                    relaySDP(OT.Raptor.Actions.ANSWER, answer);
+                },
+
+                reportError = function(message, errorReason) {
+                    triggerError(message + ":" + errorReason + ":PeerConnection.offerProcessor");
+                };
+
+            setupPeerConnection();
+
+            _remoteDescriptionType = offer.type;
+            _remoteDescription = offer;
+
+            offerProcessor(
+                _peerConnection,
+                offer,
+                relayAnswer,
+                reportError
+            );
+        },
+
+        processAnswer = function(message) {
+            if (!message.sdp) {
+                OT.error("PeerConnection.processMessage: Weird message, no SDP.");
+                return;
+            }
+
+            _answer = new NativeRTCSessionDescription(message.sdp);
+
+            _remoteDescriptionType = _answer.type;
+            _remoteDescription = _answer;
+
+            _peerConnection.setRemoteDescription(_answer, function () {
+              OT.debug("setRemoteDescription succeeded");
+            }, function (errReason) {
+              triggerError("SetRemoteDescription:Error while setting RemoteDescription: " + errReason);
+            });
+            _iceProcessor.processPending();
+        },
+
+        processSubscribe = function(message) {
+            OT.debug("PeerConnection.processSubscribe: Sending offer to subscriber.");
+
+            setupPeerConnection();
+
+            suscribeProcessor(
+                _peerConnection,
+
+                // Success: Relay Offer
+                function(offer) {
+                    _offer = offer;
+                    relaySDP(OT.Raptor.Actions.OFFER, _offer);
+                },
+
+                // Failure
+                function(message, errorReason) {
+                    triggerError(message + ":" + errorReason + ": PeerConnection.suscribeProcessor");
+                }
+            );
+        },
+
+        triggerError = function(errorReason) {
+            OT.error(errorReason);
+            this.trigger('error', errorReason);
+        }.bind(this);
+
+    this.addLocalStream = function(webRTCStream) {
+        setupPeerConnection();
+        _peerConnection.addStream(webRTCStream);
+    };
+
+    this.disconnect = function() {
+        _iceProcessor = null;
+
+        if (_peerConnection) {
+            var currentState = (_peerConnection.signalingState || _peerConnection.readyState);
+            if (currentState && currentState.toLowerCase() !== 'closed') _peerConnection.close();
+
+            // In theory, calling close on the PeerConnection should trigger a statechange
+            // event with 'close'. For some reason I'm not seeing this in FF, hence we're
+            // calling it manually below
+            tearDownPeerConnection.call(this);
+        }
+
+        this.off();
+    };
+
+    this.processMessage = function(type, message) {
+        OT.debug("PeerConnection.processMessage: Received " + type + " from " + message.fromAddress);
+        OT.debug(message);
+
+        switch(type) {
+            case OT.Raptor.Actions.SUBSCRIBE:
+                processSubscribe.call(this, message);
+                break;
+
+            case OT.Raptor.Actions.OFFER:
+                processOffer.call(this, message);
+                break;
+
+            case OT.Raptor.Actions.ANSWER:
+            // case OT.Raptor.Actions.PRANSWER:
+                processAnswer.call(this, message);
+                break;
+
+            case OT.Raptor.Actions.CANDIDATE:
+                _iceProcessor.process(message);
+                break;
+
+            default:
+                OT.debug("PeerConnection.processMessage: Received an unexpected message of type " + type + " from " + message.fromAddress + ": " + JSON.stringify(message));
+        }
+
+        return this;
+    };
+
+    this.registerMessageDelegate = function(delegateFn) {
+        return _messageDelegates.push(delegateFn);
+    };
+
+    this.unregisterMessageDelegate = function(delegateFn) {
+        var index = _messageDelegates.indexOf(delegateFn);
+
+        if ( index !== -1 ) {
+            _messageDelegates.splice(index, 1);
+        }
+        return _messageDelegates.length;
+    };
+
+    /**
+     * Retrieves the PeerConnection stats.
+     *
+     * TODO document what the format of the final reports that +callback+ gets is
+     *
+     * @ignore
+     * @private
+     * @memberof PeerConnection
+     * @param callback {Function} this will be triggered once the stats a are ready.
+     * It takes a single argument which is the stats report, which may be undefined
+     * if there is presently no stats.
+     */
+    this.getStats = function(prevStats, callback) {
+        // need to make sure that this isn't called again when in the middle of processing
+        if (_gettingStats == true) {
+            OT.warn("PeerConnection.getStats: Already getting the stats!");
+            return;
+        }
+
+        // locking this function
+        _gettingStats = true;
+
+        // get the previous timestamp (seconds)
+        var now = OT.$.now();
+        var time_difference = (now - prevStats["timeStamp"]) / 1000; // how many seconds has passed
+
+        // now update the date
+        prevStats["timeStamp"] = now;
+
+        /* this parses a result if there it contains the video bitrate */
+        var parseAvgVideoBitrate = function(result) {
+            var last_bytesSent = prevStats["videoBytesTransferred"] || 0;
+
+            if (result.stat("googFrameHeightSent")) {
+                prevStats["videoBytesTransferred"] = result.stat("bytesSent");
+                return Math.round((prevStats["videoBytesTransferred"] - last_bytesSent) * 8 / time_difference);
+            } else if (result.stat("googFrameHeightReceived")) {
+                prevStats["videoBytesTransferred"] = result.stat("bytesReceived");
+                return Math.round((prevStats["videoBytesTransferred"] - last_bytesSent) * 8 / time_difference);
+            } else {
+                return NaN;
+            }
+        };
+
+        /* this parses a result if there it contains the audio bitrate */
+        var parseAvgAudioBitrate = function(result) {
+            var last_bytesSent = prevStats["audioBytesTransferred"] || 0;
+
+            if (result.stat("audioInputLevel")) {
+                prevStats["audioBytesTransferred"] = result.stat("bytesSent");
+                return Math.round((prevStats["audioBytesTransferred"] - last_bytesSent) * 8 / time_difference);
+            } else if (result.stat("audioOutputLevel")) {
+                prevStats["audioBytesTransferred"] = result.stat("bytesReceived");
+                return Math.round((prevStats["audioBytesTransferred"] - last_bytesSent) * 8 / time_difference);
+            } else {
+                return NaN;
+            }
+        };
+
+        var parsed_stats = {};
+        var parseStatsReports = function(stats) {
+            if (stats.result) {
+                var result_list = stats.result();
+                for (var result_index = 0; result_index < result_list.length; result_index++) {
+                    var report = {};
+                    var result = result_list[result_index];
+                    if (result.stat) {
+
+                        if(result.stat("googActiveConnection") === 'true') {
+                            parsed_stats.localCandidateType = result.stat('googLocalCandidateType');
+                            parsed_stats.remoteCandidateType = result.stat('googRemoteCandidateType');
+                            parsed_stats.transportType = result.stat('googTransportType');
+                        }
+
+                        var avgVideoBitrate = parseAvgVideoBitrate(result);
+                        if (!isNaN(avgVideoBitrate)) {
+                            parsed_stats["avgVideoBitrate"] = avgVideoBitrate;
+                        }
+
+                        var avgAudioBitrate = parseAvgAudioBitrate(result);
+                        if (!isNaN(avgAudioBitrate)) {
+                            parsed_stats["avgAudioBitrate"] = avgAudioBitrate;
+                        }
+                    }
+                }
+            }
+
+            _gettingStats = false;
+            callback(parsed_stats);
+        }
+        parsed_stats["duration"] = Math.round(now - _createTime);
+
+        var parseStats = function(stats) {
+            for (var key in stats) {
+                if (stats.hasOwnProperty(key) &&
+                    (stats[key].type === 'outboundrtp' || stats[key].type === 'inboundrtp')) {
+                    var res = stats[key];
+                    // Find the bandwidth info for video
+                    if (res.id.indexOf('video') !== -1) {
+                        var avgVideoBitrate = parseAvgVideoBitrate(res);
+                        if(!isNaN(avgVideoBitrate)) {
+                            parsed_stats.avgVideoBitrate = avgVideoBitrate;
+                        }
+
+                    } else if (res.id.indexOf('audio') !== -1) {
+                        var avgAudioBitrate = parseAvgAudioBitrate(res);
+                        if(!isNaN(avgAudioBitrate)) {
+                            parsed_stats.avgAudioBitrate = avgAudioBitrate;
+                        }
+                    }
+                }
+            }
+
+            _gettingStats = false;
+            callback(parsed_stats);
+        }
+
+
+        var needsNewGetStats = function() {
+            var firefoxVersion = window.navigator.userAgent.toLowerCase()
+            .match(/Firefox\/([0-9\.]+)/i);
+            var needs = (firefoxVersion !== null && parseFloat(firefoxVersion[1], 10) >= 27.0);
+            needsNewGetStats = function() { return needs; };
+            return needs;
+        };
+
+        if (_peerConnection && _peerConnection.getStats) {
+            if(needsNewGetStats()) {
+                _peerConnection.getStats(null, parseStats, function(err) {
+                    OT.warn('Error collecting stats', err);
+                    _gettingStats = false;
+                });
+            } else {
+                _peerConnection.getStats(parseStatsReports);
+            }
+        } else {
+            // there was no peer connection yet or getStats isn't implemented in this enviroment
+            _gettingStats = false;
+            callback(parsed_stats);
+        }
+    };
+
+    Object.defineProperty(this, 'remoteStreams', {
+        get: function() {
+            return _peerConnection ? getRemoteStreams() : [];
+        }
+    });
+};
+
+})(window);
+(function(window) {
+
+var _peerConnections = {};
+
+OT.PeerConnections = {
+    add: function(remoteConnection, stream, config) {
+        var key = remoteConnection.id + "_" + stream.id,
+            ref = _peerConnections[key];
+
+        if (!ref) {
+            ref = _peerConnections[key] = {
+                count: 0,
+                pc: new OT.PeerConnection(config)
+            };
+        }
+
+        // increase the PCs ref count by 1
+        ref.count += 1;
+
+        return ref.pc;
+    },
+
+    remove: function(remoteConnection, stream) {
+        var key = remoteConnection.id + "_" + stream.id,
+            ref = _peerConnections[key];
+
+        if (ref) {
+            ref.count -= 1;
+
+            if (ref.count === 0) {
+                ref.pc.disconnect();
+                delete _peerConnections[key];
+            }
+        }
+    }
+};
+
+
+})(window);
+(function(window) {
+
+/**
+ * Abstracts PeerConnection related stuff away from OT.Publisher.
+ *
+ * Responsible for:
+ * * setting up the underlying PeerConnection (delegates to OT.PeerConnections)
+ * * triggering a connected event when the Peer connection is opened
+ * * triggering a disconnected event when the Peer connection is closed
+ * * providing a destroy method
+ * * providing a processMessage method
+ *
+ * Once the PeerConnection is connected and the video element playing it triggers the connected event
+ *
+ * Triggers the following events
+ * * connected
+ * * disconnected
+ */
+OT.PublisherPeerConnection = function(remoteConnection, session, stream, webRTCStream) {
+    var _peerConnection,
+        _hasRelayCandidates = false;
+
+    // Private
+    var _onPeerClosed = function() {
+            this.destroy();
+            this.trigger('disconnected', this);
+        },
+
+        // Note: All Peer errors are fatal right now.
+        _onPeerError = function(errorReason) {
+            this.trigger('error', null, errorReason, this);
+            this.destroy();
+        },
+
+        _relayMessageToPeer = function(type, payload) {
+            if (!_hasRelayCandidates){
+                var extractCandidates = type === OT.Raptor.Actions.CANDIDATE ||
+                                        type === OT.Raptor.Actions.OFFER ||
+                                        type === OT.Raptor.Actions.ANSWER ||
+                                        type === OT.Raptor.Actions.PRANSWER ;
+
+                if (extractCandidates) {
+                    var message = (type === OT.Raptor.Actions.CANDIDATE) ? payload.candidate : payload.sdp;
+                    _hasRelayCandidates = message.indexOf('typ relay') !== -1;
+                }
+            }
+
+            switch(type) {
+            case OT.Raptor.Actions.ANSWER:
+            case OT.Raptor.Actions.PRANSWER:
+                session._.jsepAnswer(remoteConnection.id, stream, payload);
+                break;
+
+            case OT.Raptor.Actions.OFFER:
+                this.trigger('connected');
+                session._.jsepOffer(remoteConnection.id, stream, payload);
+                break;
+
+            case OT.Raptor.Actions.CANDIDATE:
+                session._.jsepCandidate(remoteConnection.id, stream, payload);
+            }
+        }.bind(this);
+
+
+    OT.$.eventing(this);
+
+    // Public
+    this.destroy = function() {
+        // Clean up our PeerConnection
+        if (_peerConnection) {
+            OT.PeerConnections.remove(remoteConnection, stream);
+        }
+
+        _peerConnection.off();
+        _peerConnection = null;
+    };
+
+    this.processMessage = function(type, message) {
+        _peerConnection.processMessage(type, message);
+    };
+
+    this.getStats = function(prevStats, callback) {
+        _peerConnection.getStats(prevStats, callback);
+    }
+
+    // Init
+    this.init = function() {
+        var iceServers = session.sessionInfo.iceServers.map(function(is) {
+            var iceServer = OT.$.clone(is);
+
+            if (iceServer.url.trim().substr(0, 5) === 'turn:') {
+                // Make the username sessionId:connectionId:streamId for tracking purposes.
+                iceServer.username = session.id + '.' + session.connection.id + '.' + stream.id;
+            }
+
+            return iceServer;
+        });
+
+        _peerConnection = OT.PeerConnections.add(remoteConnection, stream, {
+            iceServers: iceServers
+        });
+
+        _peerConnection.on({
+            close: _onPeerClosed,
+            error: _onPeerError
+        }, this);
+
+        _peerConnection.registerMessageDelegate(_relayMessageToPeer);
+        _peerConnection.addLocalStream(webRTCStream);
+
+        Object.defineProperty(this, 'remoteConnection', {value: remoteConnection});
+
+        Object.defineProperty(this, 'hasRelayCandidates', {
+            get: function() { return _hasRelayCandidates; }
+        });
+    }
+};
+
+})(window);
+(function(window) {
+
+/**
+ * Abstracts PeerConnection related stuff away from OT.Subscriber.
+ *
+ * Responsible for:
+ * * setting up the underlying PeerConnection (delegates to OT.PeerConnections)
+ * * triggering a connected event when the Peer connection is opened
+ * * triggering a disconnected event when the Peer connection is closed
+ * * creating a video element when a stream is added
+ * * responding to stream removed intelligently
+ * * providing a destroy method
+ * * providing a processMessage method
+ *
+ * Once the PeerConnection is connected and the video element playing it triggers the connected event
+ *
+ * Triggers the following events
+ * * connected
+ * * disconnected
+ * * remoteStreamAdded
+ * * remoteStreamRemoved
+ * * error
+ *
+ */
+
+OT.SubscriberPeerConnection = function(remoteConnection, session, stream, properties) {
+    var _peerConnection,
+        _hasRelayCandidates = false;
+
+    // Private
+    var _onPeerClosed = function() {
+            this.destroy();
+            this.trigger('disconnected', this);
+        },
+
+        _onRemoteStreamAdded = function(remoteRTCStream) {
+            this.trigger('remoteStreamAdded', remoteRTCStream, this);
+        },
+
+        _onRemoteStreamRemoved = function(remoteRTCStream) {
+            this.trigger('remoteStreamRemoved', remoteRTCStream, this);
+        },
+
+        // Note: All Peer errors are fatal right now.
+        _onPeerError = function(errorReason) {
+            this.trigger('error', null, errorReason, this);
+        },
+
+        _relayMessageToPeer = function(type, payload) {
+            if (!_hasRelayCandidates){
+                var extractCandidates = type === OT.Raptor.Actions.CANDIDATE ||
+                                        type === OT.Raptor.Actions.OFFER ||
+                                        type === OT.Raptor.Actions.ANSWER ||
+                                        type === OT.Raptor.Actions.PRANSWER ;
+
+                if (extractCandidates) {
+                    var message = (type === OT.Raptor.Actions.CANDIDATE) ? payload.candidate : payload.sdp;
+                    _hasRelayCandidates = message.indexOf('typ relay') !== -1;
+                }
+            }
+
+            switch(type) {
+            case OT.Raptor.Actions.ANSWER:
+            case OT.Raptor.Actions.PRANSWER:
+                this.trigger('connected');
+                session._.jsepAnswer(remoteConnection.id, stream, payload);
+                break;
+
+            case OT.Raptor.Actions.OFFER:
+                session._.jsepOffer(remoteConnection.id, stream, payload);
+                break;
+
+            case OT.Raptor.Actions.CANDIDATE:
+                session._.jsepCandidate(remoteConnection.id, stream, payload);
+            }
+        }.bind(this),
+
+        // Helper method used by subscribeToAudio/subscribeToVideo
+        _setEnabledOnStreamTracksCurry = function(isVideo) {
+            var method = 'get' + (isVideo ? 'Video' : 'Audio') + 'Tracks';
+
+            return function(enabled) {
+                var remoteStreams = _peerConnection.remoteStreams,
+                    tracks,
+                    stream;
+
+                if (remoteStreams.length === 0 || !remoteStreams[0][method]) {
+                    // either there is no remote stream or we are in a browser that doesn't
+                    // expose the media tracks (Firefox)
+                    return;
+                }
+
+                for (var i=0, num=remoteStreams.length; i<num; ++i) {
+                    stream = remoteStreams[i];
+                    tracks = stream[method]();
+
+                    for (var k=0, numTracks=tracks.length; k < numTracks; ++k){
+                        tracks[k].enabled=enabled;
+                    }
+                }
+            };
+        };
+
+
+    OT.$.eventing(this);
+
+    // Public
+    this.destroy = function() {
+      if (_peerConnection) {
+        var numDelegates = _peerConnection.unregisterMessageDelegate(_relayMessageToPeer);
+
+        // Only clean up the PeerConnection if there isn't another Subscriber using it
+        if (numDelegates === 0) {
+          // Unsubscribe us from the stream, if it hasn't already been destroyed
+          if (session && session.connected && stream && !stream.destroyed) {
+              // Notify the server components
+              session._.jsepUnsubscribe(stream);
+          }
+
+          // Ref: OPENTOK-2458 disable all audio tracks before removing it.
+          this.subscribeToAudio(false);
+        }
+        OT.PeerConnections.remove(remoteConnection, stream.streamId);
+      }
+      _peerConnection = null;
+      this.off();
+    };
+
+    this.processMessage = function(type, message) {
+        _peerConnection.processMessage(type, message);
+    };
+
+    this.getStats = function(prevStats, callback) {
+        _peerConnection.getStats(prevStats, callback);
+    };
+
+    this.subscribeToAudio = _setEnabledOnStreamTracksCurry(false);
+    this.subscribeToVideo = _setEnabledOnStreamTracksCurry(true);
+
+    Object.defineProperty(this, 'hasRelayCandidates', {
+        get: function() { return _hasRelayCandidates; }
+    });
+
+
+    // Init
+    this.init = function() {
+        var iceServers = session.sessionInfo.iceServers.map(function(is) {
+            var iceServer = OT.$.clone(is);
+
+            if (iceServer.url.trim().substr(0, 5) === 'turn:') {
+                // Make the username sessionId:connectionId:streamId for tracking purposes.
+                iceServer.username = session.id + '.' + session.connection.id + '.' + stream.id;
+            }
+
+            return iceServer;
+        });
+
+        _peerConnection = OT.PeerConnections.add(remoteConnection, stream.streamId, {
+            iceServers: iceServers
+        });
+
+        _peerConnection.on({
+            close: _onPeerClosed,
+            streamAdded: _onRemoteStreamAdded,
+            streamRemoved: _onRemoteStreamRemoved,
+            error: _onPeerError
+        }, this);
+
+        var numDelegates = _peerConnection.registerMessageDelegate(_relayMessageToPeer);
+
+        // If there are already remoteStreams, add them immediately
+        if (_peerConnection.remoteStreams.length > 0) {
+            _peerConnection.remoteStreams.forEach(_onRemoteStreamAdded, this);
+        }
+        else if (numDelegates === 1) {
+            // We only bother with the PeerConnection negotiation if we are the only delegate.
+            session._.jsepSubscribe(stream, properties.subscribeToVideo, properties.subscribeToAudio);
+        }
+    };
+};
+
+})(window);
+(function(window) {
+
+// Manages N Chrome elements
+OT.Chrome = function(properties) {
+    var _visible = false,
+        _widgets = {},
+
+        // Private helper function
+        _set = function(name, widget) {
+            widget.parent = this;
+            widget.appendTo(properties.parent);
+
+            _widgets[name] = widget;
+
+            Object.defineProperty(this, name, {
+                get: function() { return _widgets[name]; }
+            });
+        };
+
+    if (!properties.parent) {
+        // @todo raise an exception
+        return;
+    }
+
+    OT.$.eventing(this);
+
+    this.destroy = function() {
+        this.off();
+        this.hide();
+
+        for (var name in _widgets) {
+            _widgets[name].destroy();
+        }
+    };
+
+    this.show = function() {
+        _visible = true;
+
+        for (var name in _widgets) {
+            _widgets[name].show();
+        }
+    };
+
+    this.hide = function() {
+        _visible = false;
+
+        for (var name in _widgets) {
+            _widgets[name].hide();
+        }
+    };
+
+
+    // Adds the widget to the chrome and to the DOM. Also creates a accessor
+    // property for it on the chrome.
+    //
+    // @example
+    //  chrome.set('foo', new FooWidget());
+    //  chrome.foo.setDisplayMode('on');
+    //
+    // @example
+    //  chrome.set({
+    //      foo: new FooWidget(),
+    //      bar: new BarWidget()
+    //  });
+    //  chrome.foo.setDisplayMode('on');
+    //
+    this.set = function(widgetName, widget) {
+        if (typeof(widgetName) === "string" && widget) {
+            _set.call(this, widgetName, widget);
+        }
+        else {
+          for (var name in widgetName) {
+            if (widgetName.hasOwnProperty(name)) {
+              _set.call(this, name, widgetName[name]);
+            }
+          }
+        }
+
+        return this;
+    };
+};
+
+})(window);
+(function(window) {
+
+if (!OT.Chrome.Behaviour) OT.Chrome.Behaviour = {};
+
+// A mixin to encapsulate the basic widget behaviour. This needs a better name,
+// it's not actually a widget. It's actually "Behaviour that can be applied to
+// an object to make it support the basic Chrome widget workflow"...but that would
+// probably been too long a name.
+OT.Chrome.Behaviour.Widget = function(widget, options) {
+    var _options = options || {},
+        _mode,
+        _previousMode;
+
+    //
+    // @param [String] mode
+    //      'on', 'off', or 'auto'
+    //
+    widget.setDisplayMode = function(mode) {
+        var newMode = mode || 'auto';
+        if (_mode === newMode) return;
+
+        OT.$.removeClass(this.domElement, 'OT_mode-' + _mode);
+        OT.$.addClass(this.domElement, 'OT_mode-' + newMode);
+
+        _previousMode = _mode;
+        _mode = newMode;
+    };
+
+    widget.show = function() {
+        this.setDisplayMode(_previousMode);
+        if (_options.onShow) _options.onShow();
+
+        return this;
+    };
+
+    widget.hide = function() {
+        this.setDisplayMode('off');
+        if (_options.onHide) _options.onHide();
+
+        return this;
+    };
+
+    widget.destroy = function() {
+        if (_options.onDestroy) _options.onDestroy(this.domElement);
+        if (this.domElement) OT.$.removeElement(this.domElement);
+
+        return widget;
+    };
+
+    widget.appendTo = function(parent) {
+        // create the element under parent
+        this.domElement = OT.$.createElement(_options.nodeName || 'div',
+                                            _options.htmlAttributes,
+                                            _options.htmlContent);
+
+        if (_options.onCreate) _options.onCreate(this.domElement);
+
+        // if the mode isn't auto, then we can directly set it
+        if (_options.mode != "auto") {
+            widget.setDisplayMode(_options.mode);
+        } else {
+            // we set it to on at first, and then apply the desired mode
+            // this will let the proper widgets nicely fade away
+            widget.setDisplayMode('on');
+            setTimeout(function() {
+                widget.setDisplayMode(_options.mode);
+            }, 2000);
+        }
+
+        // add the widget to the parent
+        parent.appendChild(this.domElement);
+
+        return widget;
+    };
+};
+
+})(window);
+(function(window) {
+
+// NamePanel Chrome Widget
+//
+// mode (String)
+// Whether to display the name. Possible values are: "auto" (the name is displayed
+// when the stream is first displayed and when the user mouses over the display),
+// "off" (the name is not displayed), and "on" (the name is displayed).
+//
+// displays a name
+// can be shown/hidden
+// can be destroyed
+OT.Chrome.NamePanel = function(options) {
+    var _name = options.name;
+
+    if (!_name || _name.trim().length === '') {
+        _name = null;
+
+        // THere's no name, just flip the mode off
+        options.mode = 'off';
+    }
+
+    // This behaviour must be implemented to make the widget behaviour work.
+    // @fixme This is a nasty code smell
+    var _domElement;
+    Object.defineProperty(this, 'domElement', {
+        get: function() { return _domElement; },
+        set: function(domElement) { _domElement = domElement; }
+    })
+
+    // Mixin common widget behaviour
+    OT.Chrome.Behaviour.Widget(this, {
+        mode: options.mode,
+        nodeName: 'h1',
+        htmlContent: _name,
+        htmlAttributes: {className: 'OT_name'}
+    });
+
+    Object.defineProperty(this, 'name', {
+        set: function(name) {
+            if (!_name) this.setDisplayMode('auto');
+
+            _name = name;
+            _domElement.innerHTML = _name;
+        }.bind(this)
+    });
+};
+
+})(window);
+(function(window) {
+
+OT.Chrome.MuteButton = function(options) {
+    var _onClickCb,
+        _muted = options.muted || false;
+
+    // This behaviour must be implemented to make the widget behaviour work.
+    // @fixme This is a nasty code smell
+    var _domElement;
+    Object.defineProperty(this, 'domElement', {
+        get: function() { return _domElement; },
+        set: function(domElement) { _domElement = domElement; }
+    })
+
+    // Private Event Callbacks
+    var attachEvents = function(elem) {
+            _onClickCb = onClick.bind(this);
+            elem.addEventListener('click', _onClickCb, false);
+        },
+
+        detachEvents = function(elem) {
+            _onClickCb = null;
+            elem.removeEventListener('click', _onClickCb, false);
+        },
+
+        onClick = function(event) {
+            _muted = !_muted;
+
+            if (_muted) {
+                OT.$.addClass(_domElement, 'OT_active');
+                this.parent.trigger('muted', this);
+            }
+            else {
+                OT.$.removeClass(_domElement, 'OT_active');
+                this.parent.trigger('unmuted', this);
+            }
+
+            return false;
+        };
+
+    // Mixin common widget behaviour
+    var classNames = _muted ? 'OT_mute OT_active' : 'OT_mute';
+    OT.Chrome.Behaviour.Widget(this, {
+        mode: options.mode,
+        nodeName: 'button',
+        htmlContent: 'Mute',
+        htmlAttributes: {className: classNames},
+        onCreate: attachEvents.bind(this),
+        onDestroy: detachEvents.bind(this)
+    });
+};
+
+
+})(window);
+(function(window) {
+
+OT.Chrome.MicVolume = function(options) {
+    var _onClickCb,
+        _muted = options.muted || false;
+
+    // This behaviour must be implemented to make the widget behaviour work.
+    // @fixme This is a nasty code smell
+    var _domElement;
+    Object.defineProperty(this, 'domElement', {
+        get: function() { return _domElement; },
+        set: function(domElement) { _domElement = domElement; }
+    })
+
+    // Private Event Callbacks
+    var attachEvents = function(elem) {
+            _onClickCb = onClick.bind(this);
+            elem.addEventListener('click', _onClickCb, false);
+        },
+
+        detachEvents = function(elem) {
+            _onClickCb = null;
+            elem.removeEventListener('click', _onClickCb, false);
+        },
+
+        onClick = function(event) {
+            _muted = !_muted;
+
+            if (_muted) {
+                OT.$.addClass(_domElement, 'active');
+                this.parent.trigger('muted', this);
+            }
+            else {
+                OT.$.removeClass(_domElement, 'active');
+                this.parent.trigger('unmuted', this);
+            }
+
+            return false;
+        };
+
+    // Mixin common widget behaviour
+    OT.Chrome.Behaviour.Widget(this, {
+        mode: options.mode,
+        nodeName: 'button',
+        htmlContent: 'Mute',
+        htmlAttributes: {className: 'OT_mic-volume'},
+        onCreate: attachEvents.bind(this),
+        onDestroy: detachEvents.bind(this)
+    });
+};
+
+
+})(window);
+(function(window) {
+
+OT.Chrome.SettingsPanelButton = function(options) {
+    var _onClickCb;
+
+    // Private Event Callbacks
+    var attachEvents = function(elem) {
+            _onClickCb = onClick.bind(this);
+            elem.addEventListener('click', _onClickCb, false);
+        },
+
+        detachEvents = function(elem) {
+            _onClickCb = null;
+            elem.removeEventListener('click', _onClickCb, false);
+        },
+
+        onClick = function(event) {
+            this.parent.trigger('SettingsPanel:open', this);
+            return false;
+        };
+
+
+    // This behaviour must be implemented to make the widget behaviour work.
+    // @fixme This is a nasty code smell
+    var _domElement;
+    Object.defineProperty(this, 'domElement', {
+        get: function() { return _domElement; },
+        set: function(domElement) { _domElement = domElement; }
+    })
+
+    // Mixin common widget behaviour
+    OT.Chrome.Behaviour.Widget(this, {
+        mode: options.mode,
+        nodeName: 'button',
+        htmlContent: 'Settings',
+        htmlAttributes: {className: 'OT_settings-panel'},
+        onCreate: attachEvents.bind(this),
+        onDestroy: detachEvents.bind(this)
+    });
+};
+
+})(window);
+(function(window) {
+
+OT.Chrome.SettingsPanel = function(options) {
+    if (!options.stream) {
+        // @todo raise error
+        return;
+    }
+
+    var webRTCStream = options.stream;
+
+    // This behaviour must be implemented to make the widget behaviour work.
+    // @fixme This is a nasty code smell
+    var _domElement;
+    Object.defineProperty(this, 'domElement', {
+        get: function() { return _domElement; },
+        set: function(domElement) { _domElement = domElement; }
+    })
+
+    var renderDialog = function() {
+            var camLabel = webRTCStream.getVideoTracks().length ? webRTCStream.getVideoTracks()[0].label : "None",
+                micLabel = webRTCStream.getAudioTracks().length ? webRTCStream.getAudioTracks()[0].label : "None";
+
+            _domElement.innerHTML = "<dl>\
+                                        <dt>Cam</dt>\
+                                        <dd>" + camLabel + "</dd>\
+                                        <dt>Mic</dt>\
+                                        <dd>" + micLabel + "</dd>\
+                                    </dl>";
+
+
+            var closeButton  = OT.$.createButton('Close', {
+                className: 'OT_close'
+            }, {
+                click: onClose.bind(this)
+            });
+
+            _domElement.appendChild(closeButton);
+        },
+
+        onShow = function() {
+            renderDialog.call(this);
+        },
+
+        onClose = function() {
+            this.parent.trigger('SettingsPanel:close', this);
+            return false;
+        };
+
+
+    // Mixin common widget behaviour
+    OT.Chrome.Behaviour.Widget(this, {
+        mode: options.mode,
+        nodeName: 'section',
+        htmlContent: 'Settings',
+        htmlAttributes: {className: 'OT_settings-panel'},
+        onCreate: renderDialog.bind(this),
+        onShow: onShow.bind(this)
+    });
+};
+
+})(window);
+(function(window) {
+
+OT.Chrome.OpenTokButton = function(options) {
+    // This behaviour must be implemented to make the widget behaviour work.
+    // @fixme This is a nasty code smell
+    var _domElement;
+    this.__defineGetter__("domElement", function() { return _domElement; });
+    this.__defineSetter__("domElement", function(domElement) { _domElement = domElement; });
+
+    // Mixin common widget behaviour
+    OT.Chrome.Behaviour.Widget(this, {
+        mode: options ? options.mode : null,
+        nodeName: 'span',
+        htmlContent: 'OpenTok',
+        htmlAttributes: {
+            className: 'OT_opentok'
+        }
+    });
+};
+
+})(window);
+(function(window) {
+/* Stylable Notes
+
+* RTC doesn't need to wait until anything is loaded (flash needs to wait until the Flash component loads)
+* Some bits are controlled by multiple flags, i.e. buttonDisplayMode and nameDisplayMode.
+* When there are multiple flags how is the final setting chosen?
+* When some style bits are set updates will need to be pushed through to the Chrome
+*/
+
+// Mixes the StylableComponent behaviour into the +self+ object. It will
+// also set the default styles to +initialStyles+.
+//
+// @note This Mixin is dependent on OT.Eventing.
+//
+//
+// @example
+//
+//  function SomeObject {
+//      OT.StylableComponent(this, {
+//          name: 'SomeObject',
+//          foo: 'bar'
+//      });
+//  }
+//
+//  var obj = new SomeObject();
+//  obj.getStyle('foo');        // => 'bar'
+//  obj.setStyle('foo', 'baz')
+//  obj.getStyle('foo');        // => 'baz'
+//  obj.getStyle();             // => {name: 'SomeObject', foo: 'baz'}
+//
+OT.StylableComponent = function(self, initalStyles) {
+    if (!self.trigger) {
+        throw new Error("OT.StylableComponent is dependent on the mixin OT.$.eventing. Ensure that this is included in the object before StylableComponent.");
+    }
+
+    // Broadcast style changes as the styleValueChanged event
+    var onStyleChange = function(key, value, oldValue) {
+        if (oldValue) {
+            self.trigger('styleValueChanged', key, value, oldValue);
+        }
+        else {
+            self.trigger('styleValueChanged', key, value);
+        }
+    };
+
+    var _style = new Style(initalStyles, onStyleChange);
+
+    /**
+    * Returns an object that has the properties that define the current user interface controls of the Publisher.
+    * You can modify the properties of this object and pass the object to the <code>setStyle()</code> method of the
+    * Publisher object. (See the documentation for <a href="#setStyle">setStyle()</a> to see the styles that define
+    * this object.)
+    * @return {Object} The object that defines the styles of the Publisher.
+    * @see <a href="#setStyle">setStyle()</a>
+    * @method #getStyle
+    * @memberOf Publisher
+    */
+
+	/**
+	* Returns an object that has the properties that define the current user interface controls of the Subscriber.
+	* You can modify the properties of this object and pass the object to the <code>setStyle()</code> method of the
+	* Subscriber object. (See the documentation for <a href="#setStyle">setStyle()</a> to see the styles that define
+	* this object.)
+	* @return {Object} The object that defines the styles of the Subscriber.
+	* @see <a href="#setStyle">setStyle()</a>
+	* @method #getStyle
+	* @memberOf Subscriber
+	*/
+    // If +key+ is falsly then all styles will be returned.
+    self.getStyle = function(key) {
+        return _style.get(key);
+    };
+
+    /**
+    * Sets properties that define the appearance of some user interface controls of the Publisher.
+    *
+    * <p>You can either pass one parameter or two parameters to this method.</p>
+    *
+    * <p>If you pass one parameter, <code>style</code>, it is an object that has one property: <code>nameDisplayMode</code>.
+    * Possible values for the <code>style.nameDisplayMode</code> property are: "auto" (the name is displayed when the stream
+    * is first displayed and when the user mouses over the display), "off" (the name is not displayed), and "on"
+    * (the name is displayed).
+    *
+    * <p>For example, the following code passes one parameter to the method:</p>
+    *
+    * <pre>myPublisher.setStyle({nameDisplayMode: "off"});</pre>
+    *
+    * <p>If you pass two parameters, <code>style</code> and <code>value</code>, they are key-value pair that
+    * define one property of the display style. For example, the following code passes two parameter values
+    * to the method:</p>
+    *
+    * <pre>myPublisher.setStyle("nameDisplayMode", "off");</pre>
+    *
+    * <p>You can set the initial settings when you call the <code>Session.publish()</code>
+    * or <code>TB.initPublisher()</code> method. Pass a <code>style</code> property as part of the
+    * <code>properties</code> parameter of the method.</p>
+    *
+    * <p>The TB object dispatches an <code>exception</code> event if you pass in an invalid style to the method.
+    * The <code>code</code> property of the ExceptionEvent object is set to 1011.</p>
+    *
+    * @param {Object} style Either an object containing properties that define the style, or a String defining this
+    * single style property to set.
+    * @param {String} value The value to set for the <code>style</code> passed in. Pass a value for this parameter
+    * only if the value of the <code>style</code> parameter is a String.</p>
+    *
+    * @see <a href="#getStyle">getStyle()</a>
+    * @return {Publisher} The Publisher object
+    * @see <a href="#setStyle">setStyle()</a>
+    *
+    * @see <a href="Session.html#subscribe">Session.publish()</a>
+    * @see <a href="TB.html#initPublisher">TB.initPublisher()</a>
+    * @method #setStyle
+    * @memberOf Publisher
+    */
+
+    /**
+    * Sets properties that define the appearance of some user interface controls of the Subscriber.
+    *
+    * <p>You can either pass one parameter or two parameters to this method.</p>
+    *
+    * <p>If you pass one parameter, <code>style</code>, it is an object that has one property: <code>nameDisplayMode</code>.
+    * Possible values for the <code>style.nameDisplayMode</code> property are: "auto" (the name is displayed when the stream
+    * is first displayed and when the user mouses over the display), "off" (the name is not displayed), and "on"
+    * (the name is displayed).
+    *
+    * <p>For example, the following code passes one parameter to the method:</p>
+    *
+    * <pre>mySubscriber.setStyle({nameDisplayMode: "off"});</pre>
+    *
+    * <p>If you pass two parameters, <code>style</code> and <code>value</code>, they are key-value pair that
+    * define one property of the display style. For example, the following code passes two parameter values
+    * to the method:</p>
+    *
+    * <pre>mySubscriber.setStyle("nameDisplayMode", "off");</pre>
+    *
+    * <p>You can set the initial settings when you call the <code>Session.subscribe()</code> method.
+    * Pass a <code>style</code> property as part of the <code>properties</code> parameter of the method.</p>
+    *
+    * <p>The TB object dispatches an <code>exception</code> event if you pass in an invalid style to the method.
+    * The <code>code</code> property of the ExceptionEvent object is set to 1011.</p>
+    *
+    * @param {Object} style Either an object containing properties that define the style, or a String defining this
+    * single style property to set.
+    * @param {String} value The value to set for the <code>style</code> passed in. Pass a value for this parameter
+    * only if the value of the <code>style</code> parameter is a String.</p>
+    *
+    * @returns {Subscriber} The Subscriber object.
+    *
+    * @see <a href="#getStyle">getStyle()</a>
+    * @see <a href="#setStyle">setStyle()</a>
+    *
+    * @see <a href="Session.html#subscribe">Session.subscribe()</a>
+    * @method #setStyle
+    * @memberOf Subscriber
+    */
+    self.setStyle = function(keyOrStyleHash, value, silent) {
+        if (typeof(keyOrStyleHash) !== 'string') {
+            _style.setAll(keyOrStyleHash, silent);
+        }
+        else {
+            _style.set(keyOrStyleHash, value);
+        }
+
+        return this;
+    };
+};
+
+var Style = function(initalStyles, onStyleChange) {
+    var _COMPONENT_STYLES = [
+            "showMicButton",
+            "showSpeakerButton",
+            "showSettingsButton",
+            "showCameraToggleButton",
+            "nameDisplayMode",
+            "buttonDisplayMode",
+            "showSaveButton",
+            "showRecordButton",
+            "showRecordStopButton",
+            "showReRecordButton",
+            "showPauseButton",
+            "showPlayButton",
+            "showPlayStopButton",
+            "showStopButton",
+            "backgroundImageURI",
+            "showControlPanel",
+            "showRecordCounter",
+            "showPlayCounter",
+            "showControlBar",
+            "showPreviewTime"
+        ],
+
+        _validStyleValues = {
+            buttonDisplayMode: ["auto", "off", "on"],
+            nameDisplayMode: ["auto", "off", "on"],
+            showSettingsButton: [true, false],
+            showMicButton: [true, false],
+            showCameraToggleButton: [true, false],
+            showSaveButton: [true, false],
+            backgroundImageURI: null,
+            showControlBar: [true, false],
+            showPlayCounter: [true, false],
+            showRecordCounter: [true, false],
+            showPreviewTime: [true, false]
+        },
+
+        _style = {},
+
+
+        // Validates the style +key+ and also whether +value+ is valid for +key+
+        isValidStyle = function(key, value) {
+            return key === 'backgroundImageURI' ||
+                    (   _validStyleValues.hasOwnProperty(key) &&
+                        _validStyleValues[key].indexOf(value) !== -1 );
+        },
+
+        castValue = function(value) {
+            switch(value) {
+                case 'true':
+                    return true;
+                case 'false':
+                    return false;
+                default:
+                    return value;
+            }
+        };
+
+
+    // Returns a shallow copy of the styles.
+    this.getAll = function() {
+        var style = OT.$.clone(_style);
+
+        for (var i in style) {
+            if (_COMPONENT_STYLES.indexOf(i) < 0) {
+                // Strip unnecessary properties out, should this happen on Set?
+                delete style[i];
+            }
+        }
+
+        return style;
+    };
+
+    this.get = function(key) {
+        if (key) {
+            return _style[key];
+        }
+
+        // We haven't been asked for any specific key, just return the lot
+        return this.getAll();
+    };
+
+    // *note:* this will not trigger onStyleChange if +silent+ is truthy
+    this.setAll = function(newStyles, silent) {
+        var oldValue, newValue;
+
+        for (var key in newStyles) {
+            newValue = castValue(newStyles[key]);
+
+            if (isValidStyle(key, newValue)) {
+                oldValue = _style[key];
+
+                if (newValue !== oldValue) {
+                    _style[key] = newValue;
+                    if (!silent) onStyleChange(key, newValue, oldValue);
+                }
+            }
+            else {
+                OT.warn("Style.setAll::Invalid style property passed " + key + " : " + newValue);
+            }
+        }
+
+        return this;
+    };
+
+    this.set = function(key, value) {
+        OT.debug("Publisher.setStyle: " + key.toString());
+
+        var newValue = castValue(value),
+            oldValue;
+
+        if (!isValidStyle(key, newValue)) {
+            OT.warn("Style.set::Invalid style property passed " + key + " : " + newValue);
+            return this;
+        }
+
+        oldValue = _style[key];
+        if (newValue !== oldValue) {
+            _style[key] = newValue;
+
+            onStyleChange(key, value, oldValue);
+        }
+
+        return this;
+    };
+
+
+    if (initalStyles) this.setAll(initalStyles, true);
+};
+
+})(window);
+(function(window) {
+
+/**
+ * A Publishers Microphone.
+ *
+ * TODO
+ * * bind to changes in mute/unmute/volume/etc and respond to them
+ */
+OT.Microphone = function(webRTCStream, muted) {
+    var _muted,
+        _gain = 50;
+
+
+    Object.defineProperty(this, 'muted', {
+        get: function() { return _muted; },
+        set: function(muted) {
+            if (_muted === muted) return;
+
+            _muted = muted;
+
+            var audioTracks = webRTCStream.getAudioTracks();
+
+            for (var i=0, num=audioTracks.length; i<num; ++i) {
+                audioTracks[i].enabled = !_muted;
+            }
+        }
+    });
+
+    Object.defineProperty(this, 'gain', {
+        get: function() { return _gain; },
+
+        set: function(gain) {
+            OT.warn("OT.Microphone.gain IS NOT YET IMPLEMENTED");
+
+            _gain = gain;
+        }
+    });
+
+    // Set the initial value
+    if (muted !== undefined) {
+        this.muted = muted === true;
+    }
+    else if (webRTCStream.getAudioTracks().length) {
+        this.muted = !webRTCStream.getAudioTracks()[0].enabled;
+    }
+    else {
+        this.muted = false;
+    }
+};
+
+})(window);
+(function(window) {
+
+// A Factory method for generating simple state machine classes.
+//
+// @usage
+//    var StateMachine = OT.generateSimpleStateMachine('start', ['start', 'middle', 'end', {
+//      start: ['middle'],
+//      middle: ['end'],
+//      end: ['start']
+//    }]);
+//
+//    var states = new StateMachine();
+//    state.current;            // <-- start
+//    state.set('middle');
+//
+OT.generateSimpleStateMachine = function(initialState, states, transitions) {
+  var validStates = states.slice(),
+      validTransitions = OT.$.clone(transitions);
+
+  var isValidState = function (state) {
+    return validStates.indexOf(state) !== -1;
+  }
+
+  var isValidTransition = function(fromState, toState) {
+    return validTransitions[fromState] && validTransitions[fromState].indexOf(toState) !== -1;
+  };
+
+  return function(stateChangeFailed) {
+    var currentState = initialState,
+        previousState = null;
+
+    function signalChangeFailed(message, newState) {
+        stateChangeFailed({
+          message: message,
+          newState: newState,
+          currentState: currentState,
+          previousState: previousState
+        });
+    }
+
+    // Validates +newState+. If it's invalid it triggers stateChangeFailed and returns false.
+    function handleInvalidStateChanges(newState) {
+      if (!isValidState(newState)) {
+        signalChangeFailed("'" + newState + "' is not a valid state", newState)
+
+        return false;
+      }
+
+      if (!isValidTransition(currentState, newState)) {
+        signalChangeFailed("'" + currentState + "' cannot transition to '" + newState + "'", newState)
+
+        return false;
+      }
+
+      return true;
+    }
+
+
+    this.set = function(newState) {
+      if (!handleInvalidStateChanges(newState)) return;
+
+      previousState = currentState;
+      currentState = newState;
+    };
+
+    Object.defineProperties(this, {
+      current: {
+        get: function() { return currentState; }
+      },
+
+      subscribing: {
+        get: function() { return currentState === 'Subscribing'; }
+      }
+    });
+  };
+};
+
+})(window);
+(function(window) {
+
+// Models a Subscriber's subscribing State
+//
+// Valid States:
+//     NotSubscribing            (the initial state
+//     Init                      (basic setup of DOM
+//     ConnectingToPeer          (Failure Cases -> No Route, Bad Offer, Bad Answer
+//     BindingRemoteStream       (Failure Cases -> Anything to do with the media being invalid, the media never plays
+//     Subscribing               (this is 'onLoad'
+//     Failed                    (terminal state, with a reason that maps to one of the failure cases above
+//
+//
+// Valid Transitions:
+//     NotSubscribing ->
+//         Init
+//
+//     Init ->
+//             ConnectingToPeer
+//           | BindingRemoteStream         (if we are subscribing to ourselves and we alreay have a stream
+//           | NotSubscribing              (destroy()
+//
+//     ConnectingToPeer ->
+//             BindingRemoteStream
+//           | NotSubscribing
+//           | Failed
+//           | NotSubscribing              (destroy()
+//
+//     BindingRemoteStream ->
+//             Subscribing
+//           | Failed
+//           | NotSubscribing              (destroy()
+//
+//     Subscribing ->
+//             NotSubscribing              (unsubscribe
+//           | Failed                      (probably a peer connection failure after we began subscribing
+//
+//     Failed ->                           (terminal error state)
+//
+//
+// @example
+//     var state = new SubscribingState(function(change) {
+//       console.log(change.message);
+//     });
+//
+//     state.set('Init');
+//     state.current;                 -> 'Init'
+//
+//     state.set('Subscribing');      -> triggers stateChangeFailed and logs out the error message
+//
+//
+
+var validStates = [ 'NotSubscribing', 'Init', 'ConnectingToPeer', 'BindingRemoteStream', 'Subscribing', 'Failed' ],
+
+    validTransitions = {
+      NotSubscribing: ['NotSubscribing', 'Init'],
+      Init: ['NotSubscribing', 'ConnectingToPeer', 'BindingRemoteStream'],
+      ConnectingToPeer: ['NotSubscribing', 'BindingRemoteStream', 'Failed'],
+      BindingRemoteStream: ['NotSubscribing', 'Subscribing', 'Failed'],
+      Subscribing: ['NotSubscribing', 'Failed'],
+      Failed: []
+    },
+
+    initialState = 'NotSubscribing';
+
+OT.SubscribingState = OT.generateSimpleStateMachine(initialState, validStates, validTransitions);
+
+Object.defineProperty(OT.SubscribingState.prototype, 'attemptingToSubscribe', {
+  get: function() { return [ 'Init', 'ConnectingToPeer', 'BindingRemoteStream' ].indexOf(this.current) !== -1; }
+});
+
+})(window);
+(function(window) {
+
+// Models a Publisher's publishing State
+//
+// Valid States:
+//    NotPublishing
+//    GetUserMedia
+//    BindingMedia
+//    MediaBound
+//    PublishingToSession
+//    Publishing
+//    Failed
+//
+//
+// Valid Transitions:
+//    NotPublishing ->
+//        GetUserMedia
+//
+//    GetUserMedia ->
+//        BindingMedia
+//      | Failed                      (Failure Reasons -> stream error, constraints, permission denied
+//      | NotPublishing               (destroy()
+//
+//
+//    BindingMedia ->
+//        MediaBound
+//      | Failed                      (Failure Reasons -> Anything to do with the media being invalid, the media never plays
+//      | NotPublishing               (destroy()
+//
+//    MediaBound ->
+//        PublishingToSession         (MediaBound could transition to PublishingToSession if a stand-alone publish is bound to a session
+//      | Failed                      (Failure Reasons -> media issues with a stand-alone publisher
+//      | NotPublishing               (destroy()
+//
+//    PublishingToSession
+//        Publishing
+//      | Failed                      (Failure Reasons -> timeout while waiting for ack of stream registered. We do not do this right now
+//      | NotPublishing               (destroy()
+//
+//
+//    Publishing ->
+//        NotPublishing               (Unpublish
+//      | Failed                      (Failure Reasons -> loss of network, media error, anything that causes *all* Peer Connections to fail (less than all failing is just an error, all is failure)
+//      | NotPublishing               (destroy()
+//
+//    Failed ->                       (Terminal state
+//
+//
+
+
+var validStates = [ 'NotPublishing', 'GetUserMedia', 'BindingMedia', 'MediaBound', 'PublishingToSession', 'Publishing', 'Failed' ],
+
+    validTransitions = {
+      NotPublishing: ['NotPublishing', 'GetUserMedia'],
+      GetUserMedia: ['BindingMedia', 'Failed', 'NotPublishing'],
+      BindingMedia: ['MediaBound', 'Failed', 'NotPublishing'],
+      MediaBound: ['NotPublishing', 'PublishingToSession', 'Failed'],
+      PublishingToSession: ['NotPublishing', 'Publishing', 'Failed'],
+      Publishing: ['NotPublishing', 'MediaBound', 'Failed'],
+      Failed: []
+    },
+
+    initialState = 'NotPublishing';
+
+OT.PublishingState = OT.generateSimpleStateMachine(initialState, validStates, validTransitions);
+
+Object.defineProperties(OT.PublishingState.prototype, {
+  attemptingToPublish: {
+    get: function() { return [ 'GetUserMedia', 'BindingMedia', 'MediaBound', 'PublishingToSession' ].indexOf(this.current) !== -1; }
+  },
+
+  publishing: {
+    get: function() { return this.current === 'Publishing'; }
+  }
+});
+
+
+})(window);
+(function(window) {
+
+// The default constraints
+var defaultConstraints = {
+    audio: true,
+    video: true
+};
+
+/**
+ * The Publisher object  provides the mechanism through which control of the
+ * published stream is accomplished. Calling the <code>TB.initPublisher</code> method of a
+ *  Session object creates a Publisher object. </p>
+ *
+ *  <p>The following code instantiates a session, and publishes an audio-video stream
+ *  upon connection to the session: </p>
+ *
+ *  <pre>
+ *  var API_KEY = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+ *  var sessionID = ""; // Replace with your own session ID.
+ *                      // See https://dashboard.tokbox.com/projects
+ *  var token = ""; // Replace with a generated token that has been assigned the moderator role.
+ *                  // See https://dashboard.tokbox.com/projects
+ *
+ *  var session = TB.initSession(sessionID);
+ *  session.addEventListener("sessionConnected", sessionConnectHandler);
+ *  session.connect(API_KEY, token);
+ *
+ *  function sessionConnectHandler(event) {
+ *      var div = document.createElement('div');
+ *      div.setAttribute('id', 'publisher');
+ *
+ *      var publisherContainer = document.getElementById('publisherContainer');
+ *          // This example assumes that a publisherContainer div exists
+ *      publisherContainer.appendChild(div);
+ *
+ *      var publisherProperties = {width: 400, height:300, name:"Bob's stream"};
+ *      publisher = TB.initPublisher(API_KEY, 'publisher', publisherProperties);
+ *      session.publish(publisher);
+ *  }
+ *  </pre>
+ *
+ *      <p>This example creates a Publisher object and adds its video to a DOM element named <code>publisher</code>
+ *      by calling the <code>TB.initPublisher()</code> method. It then publishes a stream to the session by calling
+ *      the <code>publish()</code> method of the Session object.</p>
+ *
+ * @property id The DOM ID of the Publisher.
+ * @property stream The {@link Stream} object corresponding the the stream of the Publihser.
+ * @property session The {@link Session} to which the Publisher belongs.
+ *
+ * @see <a href="TB.html#initPublisher">TB.initPublisher</a>
+ * @see <a href="Session.html#publish">Session.publish()</a>
+ *
+ * @class Publisher
+ * @augments EventDispatcher
+ */
+OT.Publisher = function() {
+    // Check that the client meets the minimum requirements, if they don't the upgrade
+    // flow will be triggered.
+    if (!OT.checkSystemRequirements()) {
+        OT.upgradeSystemRequirements();
+        return;
+    }
+
+    var _guid = OT.Publisher.nextId(),
+        _domId,
+        _container,
+        _targetElement,
+        _stream,
+        _webRTCStream,
+        _session,
+        _peerConnections = {},
+        _loaded = false,
+        _publishProperties,
+        _publishStartTime,
+        _streamCreatedTimeout,
+        _microphone,
+        _chrome,
+        _analytics = new OT.Analytics(),
+        _validResolutions = [
+            {width: 320, height: 240},
+            {width: 640, height: 480},
+            {width: 1280, height: 720}
+        ],
+        _qosIntervals = {},
+        _gettingStats = 0,
+        _prevStats = {
+            "timeStamp" : OT.$.now()
+        },
+        _state;
+
+    OT.$.eventing(this);
+
+    OT.StylableComponent(this, {
+        showMicButton: true,
+        showSettingsButton: true,
+        showCameraToggleButton: true,
+        nameDisplayMode: "auto",
+        buttonDisplayMode: "auto",
+        backgroundImageURI: null
+    });
+
+        /// Private Methods
+    var logAnalyticsEvent = function(action, variation, payloadType, payload) {
+            _analytics.logEvent({
+                action: action,
+                variation: variation,
+                payload_type: payloadType,
+                payload: payload,
+                session_id: _session ? _session.sessionId : null,
+                connection_id: _session && _session.connected ? _session.connection.connectionId : null,
+                partner_id: _session ? _session.apiKey : OT.APIKEY,
+                streamId: _stream ? _stream.id : null,
+                widget_id: _guid,
+                widget_type: 'Publisher'
+            });
+        },
+
+        isValidResolution = function(width, height) {
+            for (var i=0; i<_validResolutions.length; ++i) {
+                if (_validResolutions[i].width == width && _validResolutions[i].height == height) {
+                    return true;
+                }
+            }
+            return false;
+        },
+
+        recordQOS = function(connection_id) {
+            var QoS_blob = {
+                widget_type: 'Publisher',
+                stream_type : 'WebRTC',
+                sessionId: _session ? _session.sessionId : null,
+                connectionId: _session && _session.connected ? _session.connection.connectionId : null,
+                partnerId: _session ? _session.apiKey : OT.APIKEY,
+                streamId: _stream ? _stream.id : null,
+                widgetId: _guid,
+                version: OT.properties.version,
+                media_server_name: _session ? _session.sessionInfo.messagingServer : null,
+                p2pFlag: _session ? _session.sessionInfo.p2pEnabled : false,
+                duration: new Date().getTime() -_publishStartTime.getTime(),
+                remote_connection_id: connection_id
+            };
+
+            // get stats for each connection id
+            _peerConnections[connection_id].getStats(_prevStats, function(stats) {
+                if (stats) {
+                    for (var stat_index in stats) {
+                        QoS_blob[stat_index] = stats[stat_index];
+                    }
+                }
+                _analytics.logQOS(QoS_blob);
+            });
+        },
+
+        /// Private Events
+
+        stateChangeFailed = function(changeFailed) {
+            OT.error("Publisher State Change Failed: ", changeFailed.message);
+            OT.debug(changeFailed);
+        },
+
+        onLoaded = function() {
+            OT.debug("OT.Publisher.onLoaded");
+
+            _state.set('MediaBound');
+            _container.loading = false;
+            _loaded = true;
+
+            _createChrome.call(this);
+
+            this.trigger('initSuccess', this);
+            this.trigger('loaded', this);
+        },
+
+        onLoadFailure = function(reason) {
+            logAnalyticsEvent('publish', 'Failure', 'reason', "Publisher PeerConnection Error: " + reason);
+
+            _state.set('Failed');
+            this.trigger('publishError', "Publisher PeerConnection Error: " + reason);
+
+            OT.handleJsException("Publisher PeerConnection Error: " + reason, OT.ExceptionCodes.P2P_CONNECTION_FAILED, {
+                session: _session,
+                target: this
+            });
+        },
+
+        onStreamAvailable = function(webOTStream) {
+            OT.debug("OT.Publisher.onStreamAvailable");
+
+            _state.set('BindingMedia');
+
+            cleanupLocalStream();
+            _webRTCStream = webOTStream;
+
+            _microphone = new OT.Microphone(_webRTCStream, !_publishProperties.publishAudio);
+            this.publishVideo(_publishProperties.publishVideo);
+
+            this.dispatchEvent(
+                new OT.Event(OT.Event.names.ACCESS_ALLOWED, false)
+            );
+
+            _targetElement = new OT.VideoElement({
+                attributes: {muted:true}
+            });
+
+            _targetElement.on({
+                    streamBound: onLoaded,
+                    loadError: onLoadFailure,
+                    error: onVideoError
+                }, this)
+                .bindToStream(_webRTCStream);
+
+            _container.video = _targetElement;
+        },
+
+        onStreamAvailableError = function(error) {
+            OT.error('OT.Publisher.onStreamAvailableError ' + error.name + ': ' + error.message);
+
+            _state.set('Failed');
+            this.trigger('publishError', error.message);
+
+            if (_container) _container.destroy();
+
+            logAnalyticsEvent('publish', 'Failure', 'reason', "Publisher failed to access camera/mic: " + error.message);
+
+            OT.handleJsException("Publisher failed to access camera/mic: " + error.message, 2000, {
+                session: _session,
+                target: this
+            });
+        },
+
+        // The user has clicked the 'deny' button the the allow access dialog (or it's set to always deny)
+        onAccessDenied = function(error) {
+            OT.error('OT.Publisher.onStreamAvailableError Permission Denied');
+
+            _state.set('Failed');
+            this.trigger('publishError', error.message);
+
+            logAnalyticsEvent('publish', 'Failure', 'reason', 'Publisher Access Denied: Permission Denied');
+
+            var event = new OT.Event(OT.Event.names.ACCESS_DENIED),
+                defaultAction = function() {
+                    if (!event.isDefaultPrevented() && _container) _container.destroy();
+                };
+
+            this.dispatchEvent(event, defaultAction);
+        },
+
+        onAccessDialogOpened = function() {
+            logAnalyticsEvent('accessDialog', 'Opened', '', '');
+
+            this.dispatchEvent(
+                new OT.Event(OT.Event.names.ACCESS_DIALOG_OPENED, false)
+            );
+        },
+
+        onAccessDialogClosed = function() {
+            logAnalyticsEvent('accessDialog', 'Closed', '', '');
+
+            this.dispatchEvent(
+                new OT.Event(OT.Event.names.ACCESS_DIALOG_CLOSED, false)
+            );
+        },
+
+        onVideoError = function(errorCode, errorReason) {
+            OT.error('OT.Publisher.onVideoError');
+
+            var message = errorReason + (errorCode ? ' (' + errorCode + ')' : '');
+            logAnalyticsEvent('stream', null, 'reason', "Publisher while playing stream: " + message);
+
+            _state.set('Failed');
+
+            if (_state.attemptingToPublish) {
+                this.trigger('publishError', message);
+            }
+            else {
+                this.trigger('error', message);
+            }
+
+            OT.handleJsException("Publisher error playing stream: " + message, 2000, {
+                session: _session,
+                target: this
+            });
+        },
+
+        onPeerDisconnected = function(peerConnection) {
+            OT.debug("OT.Subscriber has been disconnected from the Publisher's PeerConnection");
+
+            this.cleanupSubscriber(peerConnection.remoteConnection.id);
+        },
+
+        onPeerConnectionFailure = function(code, reason, peerConnection) {
+            logAnalyticsEvent('publish', 'Failure', 'reason|hasRelayCandidates', [
+                reason + ": Publisher PeerConnection with connection " + (peerConnection && peerConnection.remoteConnection && peerConnection.remoteConnection.id)  + " failed",
+                peerConnection.hasRelayCandidates
+                ].join('|'));
+
+            OT.handleJsException("Publisher PeerConnection Error: " + reason, 2000, {
+                session: _session,
+                target: this
+            });
+
+            // We don't call cleanupSubscriber as it also logs a
+            // disconnected analytics event, which we don't want in this
+            // instance. The duplication is crufty though and should
+            // be tidied up.
+            if (peerConnection.remoteConnection) {
+                clearInterval(_qosIntervals[peerConnection.remoteConnection.id]);
+                delete _qosIntervals[peerConnection.remoteConnection.id]
+
+                delete _peerConnections[peerConnection.remoteConnection.id];
+            }
+            peerConnection.off();
+        },
+
+        getStats = function(callback) {
+            if (_gettingStats > 0) {
+                OT.debug("Still getting stats");
+                return;
+            }
+
+            var getStatsBlob = {};
+
+            // loops through all the peer connections get get the stats for them
+            for (var conn_id in _peerConnections) {
+
+                // this locks the getStats function so it isn't accidentally called
+                // again while already in the middle of getting stats
+                _gettingStats++;
+
+                getStatsBlob[conn_id] = null;
+
+                // just so we don't lose the connection id
+                (function(connection_id) {
+                    _peerConnections[connection_id].getStats(function(parsed_stats) {
+
+                        // one down
+                        _gettingStats--;
+
+                        if (parsed_stats) {
+                            getStatsBlob[connection_id] = parsed_stats;
+                        }
+
+                        // if this reaches zero, that means all of the peer connections
+                        // have returned their stats reports
+                        if (_gettingStats == 0) {
+                            callback(getStatsBlob);
+                        }
+                    });
+                })(conn_id);
+            }
+        },
+
+        /// Private Helpers
+
+        // Clean up our LocalMediaStream
+        cleanupLocalStream = function() {
+            if (_webRTCStream) {
+                // Stop revokes our access cam and mic access for this instance
+                // of localMediaStream.
+                _webRTCStream.stop();
+                _webRTCStream = null;
+            }
+        },
+
+        createPeerConnectionForRemote = function(remoteConnection) {
+            var peerConnection = _peerConnections[remoteConnection.id];
+
+            if (!peerConnection) {
+                var startConnectingTime = OT.$.now();
+
+                logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
+
+                // Cleanup our subscriber when they disconnect
+                remoteConnection.on('destroyed', this.cleanupSubscriber.bind(this, remoteConnection.id));
+
+                peerConnection = _peerConnections[remoteConnection.id] = new OT.PublisherPeerConnection(
+                    remoteConnection,
+                    _session,
+                    _stream,
+                    _webRTCStream
+                );
+
+                peerConnection.on({
+                    connected: function() {
+                        logAnalyticsEvent('createPeerConnection', 'Success', 'pcc|hasRelayCandidates', [
+                            parseInt(OT.$.now() - startConnectingTime, 10),
+                            peerConnection.hasRelayCandidates
+                        ].join('|'));
+
+                        // start recording the QoS for this peer connection
+                        _qosIntervals[remoteConnection.id] = setInterval(function() {
+                            recordQOS(remoteConnection.id)
+                        }, 30000);
+                    },
+                    disconnected: onPeerDisconnected,
+                    error: onPeerConnectionFailure
+                }, this);
+
+                peerConnection.init();
+            }
+
+            return peerConnection;
+        },
+
+        /// Chrome
+
+        // If mode is false, then that is the mode. If mode is true then we'll
+        // definitely display  the button, but we'll defer the model to the
+        // Publishers buttonDisplayMode style property.
+        chromeButtonMode = function(mode) {
+            if (mode === false) return 'off';
+
+            var defaultMode = this.getStyle('buttonDisplayMode');
+
+            // The default model is false, but it's overridden by +mode+ being true
+            if (defaultMode === false) return 'on';
+
+            // defaultMode is either true or auto.
+            return defaultMode;
+        },
+
+        updateChromeForStyleChange = function(key, value, oldValue) {
+            if (!_chrome) return;
+
+            switch(key) {
+                case 'nameDisplayMode':
+                    _chrome.name.setDisplayMode(value);
+                    break;
+
+                case 'buttonDisplayMode':
+                case 'showMicButton':
+                case 'showSettingsButton':
+                    // _chrome.settingsPanelButton.setDisplayMode(
+                    //     chromeButtonMode.call(this, this.getStyle('showSettingsButton'))
+                    // );
+
+                    // _chrome.muteButton.setDisplayMode(
+                    //     chromeButtonMode.call(this, this.getStyle('showMicButton'))
+                    // );
+            }
+        },
+
+        _createChrome = function() {
+            _chrome = new OT.Chrome({
+                parent: _container.domElement
+            }).set({
+                name: new OT.Chrome.NamePanel({
+                    name: _publishProperties.name,
+                    mode: this.getStyle('nameDisplayMode')
+                }),
+
+                // settingsPanelButton: new OT.Chrome.SettingsPanelButton({
+                //     mode: chromeButtonMode.call(this, this.getStyle('showSettingsButton'))
+                // }),
+
+                // Disabled until we can change the mic Volume through WebRTC
+                muteButton: new OT.Chrome.MuteButton({
+                    muted: _publishProperties.publishAudio === false,
+                    mode: chromeButtonMode.call(this, this.getStyle('showMicButton'))
+                }),
+
+                opentokButton: new OT.Chrome.OpenTokButton()
+            }).on({
+                // 'SettingsPanel:open': function() {
+                //     if (!_chrome.settingsPanel) {
+                //         // Add the settings panel, hide it initially
+                //         _chrome.set(
+                //             'settingsPanel',
+                //             new OT.Chrome.SettingsPanel({
+                //                 stream: _webRTCStream,
+                //                 mode: 'on'
+                //             })
+                //         );
+                //     }
+                //     else {
+                //         _chrome.settingsPanel.setDisplayMode('on');
+                //     }
+
+                //     OT.$.addClass(_container, 'OT_reversed');
+                // },
+
+                // 'SettingsPanel:close': function() {
+                //     OT.$.removeClass(_container, 'OT_reversed');
+
+                //     // Hide the settings panel after our animation is complete
+                //     setTimeout(function() {
+                //         _chrome.settingsPanel.setDisplayMode('off');
+                //     }, 3000);
+                // },
+
+
+                muted: this.publishAudio.bind(this, false),
+                unmuted: this.publishAudio.bind(this, true)
+            });
+        },
+
+        reset = function() {
+            if (_chrome) {
+              _chrome.destroy();
+              _chrome = null;
+            }
+
+            this.disconnect();
+
+            _microphone = null;
+
+            if (_targetElement) {
+                _targetElement.destroy();
+                _targetElement = null;
+            }
+
+            cleanupLocalStream();
+
+            if (_container) {
+                _container.destroy();
+                _container = null;
+            }
+
+            if (this.session) this._.unpublishFromSession(this.session);
+
+            // clear all the intervals
+            for (var conn_id in _qosIntervals) {
+                clearInterval(_qosIntervals[conn_id]);
+                delete _qosIntervals[conn_id];
+            }
+
+            _domId = null;
+            _stream = null;
+            _loaded = false;
+
+            _session = null;
+            _properties = null;
+
+            _state.set('NotPublishing');
+        }.bind(this);
+
+
+    this.publish = function(targetElement, properties) {
+        OT.debug("OT.Publisher: publish");
+
+        if ( _state.attemptingToPublish || _state.publishing ) reset();
+        _state.set('GetUserMedia');
+
+        _publishProperties = OT.$.defaults(properties || {}, {
+            publishAudio : true,
+            publishVideo : true,
+            mirror: true
+        });
+
+        _publishProperties.constraints = OT.$.defaults(_publishProperties.constraints || {}, defaultConstraints);
+
+        if (_publishProperties.style) {
+            this.setStyle(_publishProperties.style, null, true);
+        }
+
+        if (_publishProperties.name) {
+            _publishProperties.name = _publishProperties.name.toString();
+        }
+
+        _publishProperties.classNames = 'OT_root OT_publisher';
+
+        // Defer actually creating the publisher DOM nodes until we know
+        // the DOM is actually loaded.
+        OT.onLoad(function() {
+            _container = new OT.WidgetView(targetElement, _publishProperties);
+            _domId = _container.domId;
+
+            OT.$.getUserMedia(
+                _publishProperties.constraints,
+                onStreamAvailable.bind(this),
+                onStreamAvailableError.bind(this),
+                onAccessDialogOpened.bind(this),
+                onAccessDialogClosed.bind(this),
+                onAccessDenied.bind(this)
+            );
+        }, this);
+
+        return this;
+    };
+
+ /**
+  * Starts publishing audio (if it is currently not being published)
+  * when the <code>value</code> is <code>true</code>; stops publishing audio
+  * (if it is currently being published) when the <code>value</code> is <code>false</code>.
+  *
+  * @param {Boolean} value Whether to start publishing audio (<code>true</code>)
+  * or not (<code>false</code>).
+  *
+  * @see <a href="TB.html#initPublisher">TB.initPublisher()</a>
+  * @see <a href="Stream.html#hasAudio">Stream.hasAudio</a>
+  * @see StreamPropertyChangedEvent
+  * @method #publishAudio
+  * @memberOf Publisher
+  */
+    this.publishAudio = function(value) {
+        _publishProperties.publishAudio = value;
+
+        if (_microphone) {
+            _microphone.muted = !value;
+        }
+
+        if (_session && _stream) {
+            _session._.modifyStream(_stream.streamId, "hasAudio", value);
+        }
+        return this;
+    };
+
+
+ /**
+  * Starts publishing video (if it is currently not being published)
+  * when the <code>value</code> is <code>true</code>; stops publishing video
+  * (if it is currently being published) when the <code>value</code> is <code>false</code>.
+  *
+  * @param {Boolean} value Whether to start publishing video (<code>true</code>)
+  * or not (<code>false</code>).
+  *
+  * @see <a href="TB.html#initPublisher">TB.initPublisher()</a>
+  * @see <a href="Stream.html#hasVideo">Stream.hasVideo</a>
+  * @see StreamPropertyChangedEvent
+  * @method #publishVideo
+  * @memberOf Publisher
+  */
+    this.publishVideo = function(value) {
+        var oldValue = _publishProperties.publishVideo;
+        _publishProperties.publishVideo = value;
+
+        if (_session && _stream && _publishProperties.publishVideo !== oldValue) {
+            _session._.modifyStream(_stream.streamId, "hasVideo", value);
+        }
+
+        // We currently do this event if the value of publishVideo has not changed
+        // This is because the state of the video tracks enabled flag may not match
+        // the value of publishVideo at this point. This will be tidied up shortly.
+        if (_webRTCStream) {
+            var videoTracks = _webRTCStream.getVideoTracks();
+            for (var i=0, num=videoTracks.length; i<num; ++i) {
+                videoTracks[i].enabled = value;
+            }
+        }
+
+        if(_container) {
+            _container.showPoster = !value;
+        }
+
+        return this;
+    };
+
+    this.recordQOS = function() {
+
+        // have to record QoS for every peer connection
+        for (var conn_id in _peerConnections) {
+            recordQOS(conn_id);
+        }
+    };
+
+    /**
+    * Deletes the Publisher object and removes it from the HTML DOM.
+    * @method #destroy
+    * @memberOf Publisher
+    * @return {Publisher} The Publisher.
+    */
+    this.destroy = function(/* unused */ reason, quiet) {
+        reset();
+
+        if (quiet !== true) {
+            this.dispatchEvent(
+              new OT.DestroyedEvent(
+                OT.Event.names.PUBLISHER_DESTROYED,
+                this,
+                reason
+              ),
+              this.off.bind(this)
+            );
+        }
+
+        return this;
+    };
+
+    /**
+    * @methodOf Publisher
+    * @private
+    */
+    this.disconnect = function() {
+        // Close the connection to each of our subscribers
+        for (var fromConnectionId in _peerConnections) {
+            this.cleanupSubscriber(fromConnectionId);
+        }
+    };
+
+    this.cleanupSubscriber = function(fromConnectionId) {
+        var pc = _peerConnections[fromConnectionId];
+
+        clearInterval(_qosIntervals[fromConnectionId]);
+        delete _qosIntervals[fromConnectionId];
+
+        if (pc) {
+            pc.destroy();
+            delete _peerConnections[fromConnectionId];
+
+            logAnalyticsEvent('disconnect', 'PeerConnection', 'subscriberConnection', fromConnectionId);
+        }
+    };
+
+
+    this.processMessage = function(type, fromConnection, message) {
+        OT.debug("OT.Publisher.processMessage: Received " + type + " from " + fromConnection.id);
+        OT.debug(message);
+
+        switch (type) {
+            case OT.Raptor.Actions.UNSUBSCRIBE:
+                this.cleanupSubscriber(fromConnection.id);
+                break;
+
+            default:
+                var peerConnection = createPeerConnectionForRemote.call(this, fromConnection);
+                peerConnection.processMessage(type, message);
+        }
+    };
+
+    /**
+    * Returns the base-64-encoded string of PNG data representing the Publisher video.
+    *
+    *   <p>You can use the string as the value for a data URL scheme passed to the src parameter of
+    *   an image file, as in the following:</p>
+    *
+    * <pre>
+    *  var imgData = publisher.getImgData();
+    *
+    *  var img = document.createElement("img");
+    *  img.setAttribute("src", "data:image/png;base64," + imgData);
+    *  var imgWin = window.open("about:blank", "Screenshot");
+    *  imgWin.document.write("&lt;body&gt;&lt;/body&gt;");
+    *  imgWin.document.body.appendChild(img);
+    * </pre>
+    *
+    * @method #getImgData
+    * @memberOf Publisher
+    * @return {String} The base-64 encoded string. Returns an empty string if there is no video.
+    */
+
+    this.getImgData = function() {
+        if (!_loaded) {
+            OT.error("OT.Publisher.getImgData: Cannot getImgData before the Publisher is publishing.");
+
+            return null;
+        }
+
+        return _targetElement.imgData;
+    };
+
+
+    // API Compatibility layer for Flash Publisher, this could do with some tidyup.
+    this._ = {
+        publishToSession: function(session) {
+            // Add session property to Publisher
+            this.session = session;
+
+            var createStream = function() {
+                // Bail if this.session is gone, it means we were unpublished
+                // before createStream could finish.
+                if (!this.session) return;
+
+                _state.set('PublishingToSession');
+
+                if (_streamCreatedTimeout) {
+                  clearTimeout(_streamCreatedTimeout);
+                }
+                _streamCreatedTimeout = setTimeout(function () {
+                  logAnalyticsEvent('publish', 'Failure', 'reason', 'StreamCreated: Timed out waiting for streamRegistered');
+                  this.trigger('publishError', "StreamCreated: Timed out waiting for streamRegistered");
+                }.bind(this), 30000);
+
+                session._.createStream( this.guid,
+                                        _publishProperties && _publishProperties.name ? _publishProperties.name : "",
+                                        OT.VideoOrientation.ROTATED_NORMAL,
+                                        _targetElement.videoWidth,                      // actual width and height
+                                        _targetElement.videoHeight,                     // of the video stream.
+                                        _publishProperties.publishAudio,
+                                        _publishProperties.publishVideo );
+            };
+
+            if (_loaded) createStream.call(this);
+            else this.on("initSuccess", createStream, this);
+
+            logAnalyticsEvent('publish', 'Attempt', 'streamType', 'WebRTC');
+
+            return this;
+        }.bind(this),
+
+        unpublishFromSession: function(session) {
+            if (!this.session || session.id !== this.session.id) {
+                OT.warn("The publisher " + this.guid + " is trying to unpublish from a session " + session.id + " it is not attached to");
+                return this;
+            }
+
+            if (session.connected && this.stream) {
+                session._.destroyStream(this.stream.id);
+            }
+
+            // Disconnect immediately, rather than wait for the WebSocket to
+            // reply to our destroyStream message.
+            this.disconnect();
+            this.session = null;
+
+            // We're back to being a stand-alone publisher again.
+            _state.set('MediaBound');
+
+            logAnalyticsEvent('unpublish', 'Success', 'sessionId', session.id);
+
+            return this;
+        }.bind(this),
+
+        // Called once our stream has been ack'd as created by the session
+        streamRegisteredHandler: function(stream) {
+            clearTimeout(_streamCreatedTimeout);
+            _streamCreatedTimeout = null;
+
+            logAnalyticsEvent('publish', 'Success', 'streamType', 'WebRTC');
+
+            this.stream = stream;
+            this.stream.on('destroyed', this.disconnect, this);
+
+            var oldGuid = _guid;
+            _guid = OT.Publisher.nextId();
+
+            // Our publisher has changed guids, let people that rely
+            // on the GUID be non-volatile know.
+            if (oldGuid) {
+                this.trigger('idUpdated', oldGuid, _guid);
+            }
+
+            _state.set('Publishing');
+            _publishStartTime = new Date();
+
+            this.trigger('publishSuccess');
+        }.bind(this)
+    };
+
+    this.detectDevices = function() {
+        OT.warn("Fixme: Haven't implemented detectDevices");
+    };
+
+    this.detectMicActivity = function() {
+        OT.warn("Fixme: Haven't implemented detectMicActivity");
+    };
+
+    this.getEchoCancellationMode = function() {
+        OT.warn("Fixme: Haven't implemented getEchoCancellationMode");
+        return "fullDuplex";
+    };
+
+    this.setMicrophoneGain = function(value) {
+        OT.warn("Fixme: Haven't implemented setMicrophoneGain");
+    };
+
+    this.getMicrophoneGain = function() {
+        OT.warn("Fixme: Haven't implemented getMicrophoneGain");
+        return 0.5;
+    };
+
+    this.setCamera = function(value) {
+        OT.warn("Fixme: Haven't implemented setCamera");
+    };
+
+    this.setMicrophone = function(value) {
+        OT.warn("Fixme: Haven't implemented setMicrophone");
+    };
+
+
+    Object.defineProperties(this, {
+        id: {
+            get: function() { return _domId; },
+            enumerable: true
+        },
+
+        guid: {
+            get: function() { return _guid; },
+            enumerable: true
+        },
+
+        stream: {
+            get: function() { return _stream; },
+            set: function(stream) { _stream = stream; },
+            enumerable: true
+        },
+
+        streamId: {
+            get: function() {
+                if (!_stream) return null;
+
+                return _stream.id;
+            },
+            enumerable: true
+        },
+
+        targetElement: {
+            get: function() { return _targetElement.domElement; }
+        },
+
+        domId: {
+            get: function() { return _domId; }
+        },
+
+        session: {
+            get: function() { return _session; },
+            set: function(session) { _session = session; },
+            enumerable: true
+        },
+
+        isWebRTC: {
+            get: function() { return true; }
+        },
+
+        loading: {
+            get: function(){ return _container && _container.loading }
+        }
+    });
+
+    Object.defineProperty(this._, 'webRtcStream', {
+        get: function() { return _webRTCStream; }
+    });
+
+    this.on('styleValueChanged', updateChromeForStyleChange, this);
+    _state = new OT.PublishingState(stateChangeFailed);
+
+
+	/**
+	* Dispatched when the user has clicked the Allow button, granting the
+	* app access to the camera and microphone.
+	* @name accessAllowed
+	* @event
+	* @memberof Publisher
+	*/
+
+	/**
+	* Dispatched when the user has clicked the Deny button, preventing the
+	* app from having access to the camera and microphone.
+	* @name accessDenied
+	* @event
+	* @memberof Publisher
+	*/
+
+	/**
+	* Dispatched when the Allow/Deny dialog box is opened. (This is the dialog box in which the user can grant
+	* the app access to the camera and microphone.)
+	* @name accessDialogOpened
+	* @event
+	* @memberof Publisher
+	*/
+
+	/**
+	* Dispatched when the Allow/Deny box is closed. (This is the dialog box in which the user can grant
+	* the app access to the camera and microphone.)
+	* @name accessDialogClosed
+	* @event
+	* @memberof Publisher
+	*/
+
+};
+
+// Helper function to generate unique publisher ids
+OT.Publisher.nextId = OT.$.uuid;
+
+})(window);
+(function(window) {
+
+
+/**
+ * The Subscriber object is a representation of the local video element that is playing back a remote stream.
+ * The Subscriber object includes methods that let you disable and enable local audio playback for the subscribed stream.
+ * The <code>subscribe()</code> method of the {@link Session} object returns a Subscriber object.
+ *
+ * @property {String} id The DOM ID of the Subscriber.
+ * @property {Stream} stream The stream to which you are subscribing.
+ * @class Subscriber
+ * @augments EventDispatcher
+ */
+OT.Subscriber = function(targetElement, options) {
+    var _widgetId = OT.$.uuid(),
+        _domId = targetElement || _widgetId,
+        _container,
+        _streamContainer,
+        _chrome,
+        _stream,
+        _fromConnectionId,
+        _peerConnection,
+        _session = options.session,
+        _subscribeStartTime,
+        _startConnectingTime,
+        _qosInterval,
+        _properties = OT.$.clone(options),
+        _analytics = new OT.Analytics(),
+        _audioVolume = 50,
+        _gettingStats = 0,
+        _state,
+        _subscribeAudioFalseWorkaround, // OPENTOK-6844
+        _prevStats = {
+            "timeStamp" : OT.$.now()
+        };
+
+
+    if (!_session) {
+        OT.handleJsException("Subscriber must be passed a session option", 2000, {
+            session: _session,
+            target: this
+        });
+
+        return;
+    }
+
+    OT.$.eventing(this);
+
+    OT.StylableComponent(this, {
+        nameDisplayMode: "auto",
+        buttonDisplayMode: "auto",
+        backgroundImageURI: null
+    });
+
+    var logAnalyticsEvent = function(action, variation, payloadType, payload) {
+            _analytics.logEvent({
+                action: action,
+                variation: variation,
+                payload_type: payloadType,
+                payload: payload,
+                stream_id: _stream ? _stream.id : null,
+                session_id: _session ? _session.sessionId : null,
+                connection_id: _session && _session.connected ? _session.connection.connectionId : null,
+                partner_id: _session && _session.connected ? _session.sessionInfo.partnerId : null,
+                widget_id: _widgetId,
+                widget_type: 'Subscriber'
+            });
+        },
+
+        recordQOS = function() {
+            if(_state.subscribing && _session && _session.connected) {
+                var QoS_blob = {
+                    widget_type: 'Subscriber',
+                    stream_type : 'WebRTC',
+                    session_id: _session ? _session.sessionId : null,
+                    connectionId: _session ? _session.connection.connectionId : null,
+                    media_server_name: _session ? _session.sessionInfo.messagingServer : null,
+                    p2pFlag: _session ? _session.sessionInfo.p2pEnabled : false,
+                    partner_id: _session ? _session.apiKey : null,
+                    stream_id: _stream.id,
+                    widget_id: _widgetId,
+                    version: OT.properties.version,
+                    duration: parseInt(OT.$.now() - _subscribeStartTime, 10),
+                    remote_connection_id: _stream.connection.connectionId
+                };
+
+
+                // get stats for each connection id
+                _peerConnection.getStats(_prevStats, function(stats) {
+                    if (stats) {
+                        for (stat_index in stats) {
+                            QoS_blob[stat_index] = stats[stat_index];
+                        }
+                    }
+                    _analytics.logQOS(QoS_blob);
+                });
+            }
+        },
+
+        stateChangeFailed = function(changeFailed) {
+            OT.error("Subscriber State Change Failed: ", changeFailed.message);
+            OT.debug(changeFailed);
+        },
+
+        onLoaded = function() {
+            if (_state.subscribing || !_streamContainer) return;
+
+            OT.debug("OT.Subscriber.onLoaded");
+
+            _state.set('Subscribing');
+            _subscribeStartTime = OT.$.now();
+
+            logAnalyticsEvent('createPeerConnection', 'Success', 'pcc|hasRelayCandidates', [
+                parseInt(_subscribeStartTime - _startConnectingTime, 10),
+                _peerConnection && _peerConnection.hasRelayCandidates
+            ].join('|'));
+
+            _qosInterval = setInterval(recordQOS, 30000);
+
+            if(_subscribeAudioFalseWorkaround) {
+                _subscribeAudioFalseWorkaround = null;
+                this.subscribeToVideo(false);
+            }
+
+            _container.loading = false;
+
+            _createChrome.call(this);
+
+            this.trigger('subscribeSuccess', this);
+            this.trigger('loaded', this);
+
+
+            logAnalyticsEvent('subscribe', 'Success', 'streamId', _stream.id);
+        },
+
+        onDisconnected = function() {
+            OT.debug("OT.Subscriber has been disconnected from the Publisher's PeerConnection");
+
+            if (_state.attemptingToSubscribe) {
+                // subscribing error
+                _state.set('Failed');
+                this.trigger('subscribeError', "ClientDisconnected");
+            }
+            else if (_state.subscribing) {
+                _state.set('Failed');
+
+                // we were disconnected after we were already subscribing
+                // probably do nothing?
+            }
+
+            this.disconnect();
+        },
+
+
+        onPeerConnectionFailure = function(code, reason) {
+            if (_state.attemptingToSubscribe) {
+                // We weren't subscribing yet so this was a failure in setting
+                // up the PeerConnection or receiving the initial stream.
+                logAnalyticsEvent('createPeerConnection', 'Failure', 'reason|hasRelayCandidates', [
+                    "Subscriber PeerConnection Error: " + reason,
+                    _peerConnection && _peerConnection.hasRelayCandidates
+                ].join('|'));
+
+                _state.set('Failed');
+                this.trigger('subscribeError', reason);
+            }
+            else if (_state.subscribing) {
+                // we were disconnected after we were already subscribing
+                _state.set('Failed');
+                this.trigger('error', reason);
+            }
+
+            this.disconnect();
+
+            logAnalyticsEvent('subscribe', 'Failure', 'reason', reason + ":Subscriber PeerConnection Error");
+
+            OT.handleJsException("Subscriber PeerConnection Error: " + reason, OT.ExceptionCodes.P2P_CONNECTION_FAILED, {
+                session: _session,
+                target: this
+            });
+            _showError.call(this, reason);
+        },
+
+        onRemoteStreamAdded = function(webOTStream) {
+            OT.debug("OT.Subscriber.onRemoteStreamAdded");
+
+            _state.set('BindingRemoteStream');
+
+            // Disable the audio/video, if needed
+            this.subscribeToAudio(_properties.subscribeToAudio);
+
+            var preserver = _subscribeAudioFalseWorkaround;
+            this.subscribeToVideo(_properties.subscribeToVideo);
+            _subscribeAudioFalseWorkaround = preserver;
+
+            var streamElement = new OT.VideoElement();
+
+            // Initialize the audio volume
+            streamElement.setAudioVolume(_audioVolume);
+            streamElement.on({
+                    streamBound: onLoaded,
+                    loadError: onPeerConnectionFailure,
+                    error: onPeerConnectionFailure
+                }, this);
+
+            streamElement.bindToStream(webOTStream);
+             _container.video = streamElement;
+
+            _streamContainer = streamElement;
+
+            _streamContainer.orientation = {
+                width: _stream.videoDimensions.width,
+                height: _stream.videoDimensions.height,
+                videoOrientation: _stream.videoDimensions.orientation
+            };
+
+            logAnalyticsEvent('createPeerConnection', 'StreamAdded', '', '');
+            this.trigger('streamAdded', this);
+        },
+
+        onRemoteStreamRemoved = function(webOTStream) {
+            OT.debug("OT.Subscriber.onStreamRemoved");
+
+            if (_streamContainer.stream == webOTStream) {
+                _streamContainer.destroy();
+                _streamContainer = null;
+            }
+
+
+            this.trigger('streamRemoved', this);
+        },
+
+        streamUpdated = function(event) {
+            switch(event.changedProperty) {
+                case 'orientation':
+                    _streamContainer.orientation = {
+                        width: _stream.videoDimensions.width,
+                        height: _stream.videoDimensions.height,
+                        videoOrientation: _stream.videoDimensions.orientation
+                    };
+                    break;
+
+                case 'hasVideo':
+                    if(_container) {
+                        _container.showPoster = !(_stream.hasVideo && _properties.subscribeToVideo);
+                    }
+
+                    break;
+
+                case 'hasAudio':
+                    // noop
+            }
+        },
+
+        /// Chrome
+
+        updateChromeForStyleChange = function(key, value, oldValue) {
+            if (!_chrome) return;
+
+            switch(key) {
+                case 'nameDisplayMode':
+                    _chrome.name.setDisplayMode(value);
+                    break;
+
+                case 'buttonDisplayMode':
+                    // _chrome.muteButton.setDisplayMode(value);
+            }
+        },
+
+        _createChrome = function() {
+            _chrome = new OT.Chrome({
+                parent: _container.domElement
+            }).set({
+                name: new OT.Chrome.NamePanel({
+                    name: _properties.name,
+                    mode: this.getStyle('nameDisplayMode')
+                }),
+
+                // // Disabled until we can change the mic Volume through WebRTC
+                // muteButton: new OT.Chrome.MicVolume({
+                //     muted: false,
+                //     mode: this.getStyle('buttonDisplayMode')
+                // }),
+
+                opentokButton: new OT.Chrome.OpenTokButton()
+            }).on({
+                muted: function() {
+                    // @todo turn off audio on the web rtc stream
+                },
+
+                unmuted: function() {
+                    // @todo turn on audio on the web rtc stream
+                }
+            });
+        },
+
+        _showError = function(errorMsg) {
+            // Display the error message inside the container, assuming it's
+            // been created by now.
+            if (_container) _container.addError(errorMsg);
+        };
+
+
+    this.recordQOS = function() {
+        recordQOS();
+    };
+
+    this.subscribe = function(stream) {
+        OT.debug("OT.Subscriber: subscribe to " + stream.id);
+
+        if (_state.subscribing) {
+            // @todo error
+            OT.error("OT.Subscriber.Subscribe: Cannot subscribe, already subscribing.");
+            return false;
+        }
+
+        _state.set('Init');
+
+        if (!stream) {
+            // @todo error
+            OT.error("OT.Subscriber: No stream parameter.");
+            return false;
+        }
+
+        if (_stream) {
+            // @todo error
+            OT.error("OT.Subscriber: Already subscribed");
+            return false;
+        }
+
+        _stream = stream;
+        _stream.on({
+            updated: streamUpdated,
+            destroyed: this.disconnect
+        }, this);
+
+        _fromConnectionId = stream.connection.connectionId;
+        _properties.name = _stream.name;
+        _properties.classNames = 'OT_root OT_subscriber';
+
+        if (_properties.style) {
+            this.setStyle(_properties.style, null, true);
+        }
+        if (_properties.audioVolume) {
+            this.setAudioVolume(_properties.audioVolume);
+        }
+
+        _properties.subscribeToAudio = OT.$.castToBoolean(_properties.subscribeToAudio, true);
+        _properties.subscribeToVideo = OT.$.castToBoolean(_properties.subscribeToVideo, true);
+
+        _container = new OT.WidgetView(targetElement, _properties);
+        _domId = _container.domId;
+
+        if(!_properties.subscribeToVideo && OT.$.browser() == 'Chrome') {
+            _subscribeAudioFalseWorkaround = true;
+            _properties.subscribeToVideo = true;
+        }
+
+        _startConnectingTime = OT.$.now();
+
+        if (_stream.connection.id !== _session.connection.id) {
+            logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
+
+            _state.set('ConnectingToPeer');
+
+            _peerConnection = new OT.SubscriberPeerConnection(_stream.connection, _session, _stream, _properties);
+
+            _peerConnection.on({
+                disconnected: onDisconnected,
+                error: onPeerConnectionFailure,
+                remoteStreamAdded: onRemoteStreamAdded,
+                remoteStreamRemoved: onRemoteStreamRemoved
+            }, this);
+
+            // initialize the peer connection AFTER we've added the event listeners
+            _peerConnection.init();
+        }
+        else {
+            logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
+
+            // Subscribe to yourself edge-case
+            onRemoteStreamAdded.call(this, _session.getPublisherForStream(_stream)._.webRtcStream);
+        }
+
+        logAnalyticsEvent('subscribe', 'Attempt', 'streamId', _stream.id);
+
+        return this;
+    };
+
+    this.destroy = function(/* unused */ reason, quiet) {
+        clearInterval(_qosInterval);
+        _qosInterval = null;
+
+        this.disconnect();
+
+        if (_chrome) {
+            _chrome.destroy();
+            _chrome = null;
+        }
+
+        if (_container) {
+            _container.destroy();
+            _container = null;
+        }
+
+        if (_stream && !_stream.destroyed) logAnalyticsEvent('unsubscribe', null, 'streamId', _stream.id);
+
+        _domId = null;
+        _stream = null;
+
+        _session = null;
+        _properties = null;
+
+        if (quiet !== true) {
+            this.dispatchEvent(
+              new OT.DestroyedEvent(
+                OT.Event.names.SUBSCRIBER_DESTROYED,
+                this,
+                reason
+              ),
+              this.off.bind(this)
+            );
+        }
+
+        return this;
+    };
+
+
+    this.disconnect = function() {
+        _state.set('NotSubscribing');
+
+        if (_streamContainer) {
+            _streamContainer.destroy();
+            _streamContainer = null;
+        }
+
+        if (_peerConnection) {
+            _peerConnection.destroy();
+            _peerConnection = null;
+
+            logAnalyticsEvent('disconnect', 'PeerConnection', 'streamId', _stream.id);
+        }
+    };
+
+    this.processMessage = function(type, fromConnection, message) {
+        OT.debug("OT.Subscriber.processMessage: Received " + type + " message from " + fromConnection.id);
+        OT.debug(message);
+
+        if (_fromConnectionId != fromConnection.id) {
+            _fromConnectionId = fromConnection.id;
+        }
+
+        if (_peerConnection) {
+          _peerConnection.processMessage(type, message);
+        }
+    };
+
+    this.updateQuality = function(quality) {
+        // Currently, this only disables the video and disregards
+        // the quality.
+        OT.warn("Due to high packet loss and low bandwidth, video has been disabled");
+        this.subscribeToVideo(false);
+        this.dispatchEvent(new OT.Event("videoDisabled"));
+    };
+
+    /**
+    * Return the base-64-encoded string of PNG data representing the Subscriber video.
+    *
+    *  <p>You can use the string as the value for a data URL scheme passed to the src parameter of
+    *  an image file, as in the following:</p>
+    *
+    *  <pre>
+    *  var imgData = subscriber.getImgData();
+    *
+    *  var img = document.createElement("img");
+    *  img.setAttribute("src", "data:image/png;base64," + imgData);
+    *  var imgWin = window.open("about:blank", "Screenshot");
+    *  imgWin.document.write("&lt;body&gt;&lt;/body&gt;");
+    *  imgWin.document.body.appendChild(img);
+    *  </pre>
+    * @method #getImgData
+    * @memberOf Subscriber
+    * @return {String} The base-64 encoded string. Returns an empty string if there is no video.
+    */
+    this.getImgData = function() {
+        if (!this.subscribing) {
+            OT.error("OT.Subscriber.getImgData: Cannot getImgData before the Subscriber is subscribing.");
+            return null;
+        }
+
+        return _streamContainer.imgData;
+    };
+
+    /**
+    * Sets the audio volume, between 0 and 100, of the Subscriber.
+    *
+    * <p>You can set the initial volume when you call the <code>Session.subscribe()</code>
+    * method. Pass a <code>audioVolume</code> property of the <code>properties</code> parameter
+    * of the method.</p>
+    *
+    * @param {Number} value The audio volume, between 0 and 100.
+    *
+    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the following:
+    *
+    * <pre>mySubscriber.setAudioVolume(50).setStyle(newStyle);</pre>
+    *
+    * @see <a href="#getAudioVolume">getAudioVolume()</a>
+    * @see <a href="Session.html#subscribe">Session.subscribe()</a>
+    * @method #setAudioVolume
+    * @memberOf Subscriber
+    */
+    this.setAudioVolume = function(value) {
+        value = parseInt(value, 10);
+        if (isNaN(value)) {
+            OT.error("OT.Subscriber.setAudioVolume: value should be an integer between 0 and 100");
+            return this;
+        }
+        _audioVolume = Math.max(0, Math.min(100, value));
+        if (_audioVolume != value) {
+            OT.warn("OT.Subscriber.setAudioVolume: value should be an integer between 0 and 100");
+        }
+        if (_streamContainer) {
+            _streamContainer.setAudioVolume(_audioVolume);
+        }
+
+        return this;
+    };
+
+    /**
+    * Returns the audio volume, between 0 and 100, of the Subscriber.
+    *
+    * <p>Generally you use this method in conjunction with the <code>setAudioVolume()</code> method.</p>
+    *
+    * @return {Number} The audio volume, between 0 and 100, of the Subscriber.
+    * @see <a href="#setAudioVolume">setAudioVolume()</a>
+    * @method #getAudioVolume
+    * @memberOf Subscriber
+    */
+    this.getAudioVolume = function() {
+        if (_streamContainer) return _streamContainer.getAudioVolume();
+        else return _audioVolume;
+    };
+
+    /**
+    * Toggles audio on and off. Starts subscribing to audio (if it is available and currently not being
+    * subscribed to) when the <code>value</code> is <code>true</code>; stops subscribing to audio
+    * (if it is currently being subscribed to) when the <code>value</code> is <code>false</code>.
+    * <p>
+    * <i>Note:</i> This method only affects the local playback of audio. It has no impact on the audio
+    * for other connections subscribing to the same stream. If the Publsher is not publishing audio,
+    * enabling the Subscriber audio will have no practical effect.
+    * </p>
+    *
+    * @param {Boolean} value Whether to start subscribing to audio (<code>true</code>) or not (<code>false</code>).
+    *
+    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the following:
+    *
+    * <pre>mySubscriber.subscribeToAudio(true).subscribeToVideo(false);</pre>
+    *
+    * @see <a href="#subscribeToVideo">subscribeToVideo()</a>
+    * @see <a href="Session.html#subscribe">Session.subscribe()</a>
+    * @see <a href="StreamPropertyChangedEvent.html">StreamPropertyChangedEvent</a>
+    *
+    * @method #subscribeToAudio
+    * @memberOf Subscriber
+    */
+    this.subscribeToAudio = function(p_value) {
+        var value = OT.$.castToBoolean(p_value, true);
+
+        if (_peerConnection) {
+            _peerConnection.subscribeToAudio(value);
+
+            if (_session && _stream && value !== _properties.subscribeToAudio) {
+                _session._.modifySubscriber(this, "hasAudio", value);
+            }
+        }
+
+        _properties.subscribeToAudio = value;
+
+        return this;
+    };
+
+
+    /**
+    * Toggles video on and off. Starts subscribing to video (if it is available and currently not being
+    * subscribed to) when the <code>value</code> is <code>true</code>; stops subscribing to video
+    * (if it is currently being subscribed to) when the <code>value</code> is <code>false</code>.
+    * <p>
+    * <i>Note:</i> This method only affects the local playback of video. It has no impact on the video
+    * for other connections subscribing to the same stream. If the Publsher is not publishing video,
+    * enabling the Subscriber video will have no practical video.
+    * </p>
+    *
+    * @param {Boolean} value Whether to start subscribing to video (<code>true</code>) or not (<code>false</code>).
+    *
+    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the following:
+    *
+    * <pre>mySubscriber.subscribeToVideo(true).subscribeToAudio(false);</pre>
+    *
+    * @see <a href="#subscribeToAudio">subscribeToAudio()</a>
+    * @see <a href="Session.html#subscribe">Session.subscribe()</a>
+    * @see <a href="StreamPropertyChangedEvent.html">StreamPropertyChangedEvent</a>
+    *
+    * @method #subscribeToVideo
+    * @memberOf Subscriber
+    */
+    this.subscribeToVideo = function(p_value) {
+        if(_subscribeAudioFalseWorkaround && p_value == true) {
+            // Turn off the workaround if they enable the video
+            _subscribeAudioFalseWorkaround = false;
+            return;
+        }
+
+        var value = OT.$.castToBoolean(p_value, true);
+
+        if(_container) {
+            _container.showPoster = !(value && _stream.hasVideo);
+            if(value && _container.video) {
+                _container.loading = value;
+                _container.video.whenTimeIncrements(function(){
+                    _container.loading = false;
+                }, this);
+            }
+        }
+
+        if (_peerConnection) {
+            _peerConnection.subscribeToVideo(value);
+
+            if (_session && _stream && value !== _properties.subscribeToVideo) {
+                _session._.modifySubscriber(this, "hasVideo", value);
+            }
+        }
+
+        _properties.subscribeToVideo = value;
+
+        return this;
+    };
+
+    Object.defineProperties(this, {
+        id: {
+            get: function() { return _domId; },
+            enumerable: true
+        },
+
+        widgetId: {
+            get: function() { return _widgetId; }
+        },
+
+        stream: {
+            get: function() { return _stream; },
+            enumerable: true
+        },
+
+        streamId: {
+            get: function() {
+                if (!_stream) return null;
+
+                return _stream.id;
+            },
+            enumerable: true
+        },
+
+        targetElement: {
+            get: function() { return _streamContainer ? _streamContainer.domElement : null; }
+        },
+
+        subscribing: {
+            get: function() { return _state.subscribing; },
+            enumerable: true
+        },
+
+        isWebRTC: {
+            get: function() { return true; }
+        },
+
+        loading: {
+            get: function(){ return _container && _container.loading }
+        },
+
+        session: {
+            get: function() { return _session; }
+        }
+    });
+
+    this.on('styleValueChanged', updateChromeForStyleChange, this);
+
+    _state = new OT.SubscribingState(stateChangeFailed);
+
+	/**
+	* Dispatched when the OpenTok media server stops sending video to the subscriber.
+	* This feature of the OpenTok media server has a subscriber drop the video stream
+	* when connectivity degrades. The subscriber continues to receive the audio stream,
+	* if there is one. This feature is only available in sessions that use the OpenTok
+	* media server, not in peer-to-peer sessions.
+	* @name videoDisabled
+	* @event
+	* @memberof Subscriber
+	*/
+
+};
+
+})(window);
+(function(window) {
+    OT.SessionInfo = function(xmlDocument) {
+        var sessionXML = null;
+
+        this.sessionId = null;
+        this.partnerId = null;
+        this.sessionStatus = null;
+        this.p2pEnabled = false;
+
+        this.messagingServer = null;
+        this.iceServers = null;
+
+        OT.log("SessionInfo Response:")
+        OT.log(xmlDocument);
+
+        if (xmlDocument && xmlDocument.documentElement && xmlDocument.documentElement.firstElementChild !== null) {
+            sessionXML = xmlDocument.documentElement.firstElementChild;
+        }
+
+        var element = sessionXML.firstElementChild;
+        do {
+            switch (element.localName) {
+            case "session_id":
+                this.sessionId = element.textContent;
+                break;
+
+            case "partner_id":
+                this.partnerId = element.textContent;
+                break;
+
+            case "session_status":
+                this.sessionStatus = element.textContent;
+                break;
+
+            case "messaging_server_url":
+                this.messagingServer = element.textContent;
+                break;
+
+            case "ice_servers":
+                // <ice_servers>
+                //     <ice_server url="foo.com" />
+                //     <ice_server url="bar.com" credential="xxx" />
+                // </ice_servers>
+
+                this.iceServers = normaliseIceServers( parseIceServersXml(element.childNodes) );
+                break;
+
+            case "properties":
+                var property = element.firstElementChild;
+                if (property) {
+                    do {
+                        if (property.localName === "p2p" && property.firstElementChild !== null) {
+                            this.p2pEnabled = (property.firstElementChild.textContent === "enabled");
+                            break;
+                        }
+                    } while (property = property.nextElementSibling);
+                }
+
+                break;
+
+            default:
+                // OT.debug("OT.SessionInfo element was not handled (" + element.localName + ")");
+                break;
+            }
+
+        } while (element = element.nextElementSibling);
+
+        if (!this.iceServers || this.iceServers.length === 0) {
+            // We haven't got any ICE Servers from Anvil, default to something
+            OT.warn("SessionInfo contained not ICE Servers, using the default");
+            this.iceServers = [ {"url": "stun:stun.l.google.com:19302"} ];
+        }
+
+        //we've parsed the XML into the object
+
+        sessionXML = null;
+    };
+
+
+// Retrieves Session Info for +session+. The SessionInfo object will be passed
+// to the +onSuccess+ callback. The +onFailure+ callback will be passed an error
+// object and the DOMEvent that relates to the error.
+OT.SessionInfo.get = function(session, onSuccess, onFailure) {
+    var sessionInfoURL = OT.properties.apiURL + '/session/' + session.id + "?extended=true",
+
+        startTime = OT.$.now(),
+
+        validateRawSessionInfo = function(sessionInfo) {
+            session.logEvent('Instrumentation', null, 'gsi', OT.$.now() - startTime);
+
+            var error = parseErrorFromXMLDocument(sessionInfo);
+
+            if (error === false) {
+                onGetResponseCallback(session, onSuccess, sessionInfo);
+            }
+            else {
+                onGetErrorCallback(session, onFailure, error);
+            }
+        };
+
+    session.logEvent('getSessionInfo', 'Attempt', 'api_url', OT.properties.apiURL);
+
+    OT.$.getXML(sessionInfoURL, {
+        headers: {"X-TB-TOKEN-AUTH": session.token, "X-TB-VERSION": 1},
+
+        success: validateRawSessionInfo,
+
+        error: function(event) {
+            onGetErrorCallback(session, onFailure, parseErrorFromXMLDocument(event.target.responseXML));
+        }
+    });
+};
+
+var messageServerToClientErrorCodes = {};
+messageServerToClientErrorCodes['404'] = OT.ExceptionCodes.INVALID_SESSION_ID;
+messageServerToClientErrorCodes['403'] = OT.ExceptionCodes.AUTHENTICATION_ERROR;
+
+// Return the error in +xmlDocument+, if there is one. Otherwise it will return
+// false.
+parseErrorFromXMLDocument = function(xmlDocument) {
+    if (xmlDocument && xmlDocument.documentElement && xmlDocument.documentElement.firstElementChild !== null) {
+        var errorNodes = xmlDocument.evaluate('//error', xmlDocument.documentElement, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null ),
+            numErrorNodes = errorNodes.snapshotLength;
+
+        if (numErrorNodes === 0) return false;
+
+        for (var i=0; i<numErrorNodes; ++i) {
+            var errorNode = errorNodes.snapshotItem(i);
+
+            return {
+                code: errorNode.getAttribute('code'),
+                message: errorNode.firstElementChild.getAttribute('message')
+            };
+        }
+    }
+
+    // There was an error, but we couldn't find the error info.
+    return {
+        code: null,
+        message: "Unknown error: getSessionInfo XML response was badly formed " +
+          (xmlDocument && xmlDocument.documentElement && xmlDocument.documentElement.innerHTML)
+    };
+};
+
+onGetResponseCallback = function(session, onSuccess, rawSessionInfo) {
+  session.logEvent('getSessionInfo', 'Success', 'api_url', OT.properties.apiURL);
+
+  onSuccess( new OT.SessionInfo(rawSessionInfo) );
+};
+
+onGetErrorCallback = function(session, onFailure, error) {
+    TB.handleJsException("TB.SessionInfoError :: Unable to get session info " + error.message, messageServerToClientErrorCodes[error.code], {
+        session: session
+    });
+
+    session.logEvent('Connect', 'Failure', 'errorMessage', "GetSessionInfo:" + error.code + ": Unable to get session info " + error.message);
+    onFailure(error, session);
+};
+
+parseIceServersXml = function (nodes) {
+    var iceServers = [],
+        iceServer,
+        attributes;
+
+    for (var i=0, numNodes=nodes.length; i<numNodes; ++i) {
+        if (nodes[i].localName === 'ice_server') {
+            // @todo parse either a URL node, or a URL and credentials
+            attributes = nodes[i].attributes;
+            iceServer = {
+                url: attributes.getNamedItem('url').nodeValue
+            };
+
+            if (attributes.getNamedItem('credential') && attributes.getNamedItem('credential').nodeValue.length) {
+                iceServer.credential = attributes.getNamedItem('credential').nodeValue;
+            }
+
+            iceServers.push(iceServer);
+        }
+    }
+
+    return iceServers;
+};
+
+// This is ugly. Here we are handling the following:
+// 1. Firefox doesn't support TURN until version 25. We fallback to STUN
+// in previous versions.
+//
+// 2. In FF >= 23 the new syntax for declaring Ice Servers with credentials
+// is used. i.e. url, credential, and username as opposed to just url and credential.
+//
+// 3. FF >= 27 supports the TURN transport parameter, in older versions we need
+// to strip it out.
+//
+normaliseIceServers = function (iceServers) {
+    var userAgent = navigator.userAgent.match(/(Firefox)\/([0-9]+\.[0-9]+)/),
+        firefoxVersion = userAgent ? parseFloat(userAgent[2], 10) : void 0,
+        bits;
+
+    return iceServers.map(function(iceServer) {
+        // We don't need to normalise STUN, just pass it on through
+        if (iceServer.url.trim().substr(0, 5) !== 'turn:') {
+            return iceServer;
+        }
+
+        if (userAgent !== null) {
+            // TURN is broken in these versions of FF: Fallback to STUN.
+            if (firefoxVersion < 25) {
+                return {url: iceServer.url.replace("turn:", "stun:")};
+            }
+
+            // FF < 27 doesn't support the TURN transport parameter, so we strip it out
+            if (firefoxVersion < 27 && iceServer.url.indexOf('?') !== -1) {
+                iceServer.url = iceServer.url.trim().split('?')[0];
+            }
+        }
+
+        bits = iceServer.url.trim().split(/[:@]/);
+
+        return {
+            username: bits[1],
+            credential: iceServer.credential,
+            url: bits[0] + ':' + bits[2] + (bits.length === 4 ? ':' + bits[3] : '')
+        };
+    });
+};
+
+})(window);
+(function(window) {
+	/**
+	 * A class defining properties of the <code>capabilities</code> property of a
+     * Session object. See <a href="Session.html#capabilites">Session.capabilities</a>.
+	 * <p>
+	 * All Capabilities properties are undefined until you have connected to a session
+	 * and the Session object has dispatched the <code>sessionConnected</code> event.
+	 * <p>
+	 * For more information on token roles, see the <a href="server_side_libraries.html#generate_token">generate_token()</a>
+     * method of the OpenTok server-side libraries.
+	 *
+	 * @class Capabilities
+	 *
+	 * @property {Number} forceDisconnect Specifies whether you can call
+     the <code>Session.forceDisconnect()</code> method (1) or not (0). To call the <code>Session.forceDisconnect()</code> method,
+     the user must have a token that is assigned the role of moderator.
+	 * @property {Number} forceUnpublish Specifies whether you can call
+     the <code>Session.forceUnpublish()</code> method (1) or not (0). To call the <code>Session.forceUnpublish()</code> method,
+     the user must have a token that is assigned the role of moderator.
+	 * @property {Number} publish Specifies whether you can publish to the session (1) or not (0).
+     The ability to publish is based on a few factors. To publish, the user must have a token that
+     is assigned a role that supports publishing. There must be a connected camera and microphone.
+	 * @property {Number} subscribe Specifies whether you can subscribe to streams
+     in the session (1) or not (0). Currently, this capability is available for all users on all platforms.
+	 * @property {Number} supportsWebRTC Whether the client supports WebRTC (1) or not (0).
+	 */
+	OT.Capabilities = function(permissions) {
+	    this.publish = permissions.indexOf('publish') !== -1 ? 1 : 0;
+	    this.subscribe = permissions.indexOf('subscribe') !== -1 ? 1 : 0;
+	    this.forceUnpublish = permissions.indexOf('forceunpublish') !== -1 ? 1 : 0;
+	    this.forceDisconnect = permissions.indexOf('forcedisconnect') !== -1 ? 1 : 0;
+	    this.supportsWebRTC = OT.$.supportsWebRTC() ? 1 : 0;
+    };
+
+})(window);
+(function(window) {
+
+// Wraps up some common error handling for implementing callbacks
+// for work requests made to the OT backend via the Messenger.
+var RemoteWork = function RemoteWork (parent, success, error, options) {
+  var REQUEST_TIMEOUT = 30000,
+      timeoutInterval,
+      exceptionCodesIndicatingFailure = {};
+
+  var destroy = function() {
+        clearTimeout(timeoutInterval);
+        parent.off('exception', onException);
+      },
+
+      onException = function(event) {
+        if (!exceptionCodesIndicatingFailure.hasOwnProperty(event.code)) return;
+
+        // We don't even know if this relates to this particular forceDisconnct...
+        this.failed(exceptionCodesIndicatingFailure[event.code]);
+      },
+
+      onTimeout = function() {
+        var reason = options && options.timeoutMessage ? options.timeoutMessage : "Timed out while waiting for the server to respond.";
+        this.failed(reason);
+      };
+
+
+  this.failsOnExceptionCodes = function(codes) {
+    exceptionCodesIndicatingFailure = codes;
+  };
+
+  this.succeeded = function() {
+    destroy();
+    if (completionHandler) OT.$.callAsync(completionHandler, null);
+  };
+
+  this.failed = function(reason) {
+    destroy();
+    if (completionHandler) OT.$.callAsync(completionHandler, new OT.Error(null, reason));
+  };
+
+  parent.on('exception', onException, this);
+  timeoutInterval = setTimeout(onTimeout.bind(this), REQUEST_TIMEOUT);
+};
+
+
+/**
+ * The Session object returned by the <code>TB.initSession()</code> method provides access to much of the OpenTok functionality.
+ *
+ * @class Session
+ * @augments EventDispatcher
+ *
+ * @property {Capabilities} capabilities A {@link Capabilities} object that includes information about the capabilities of the client.
+ * All properties of the <code>capabilities</code> object are undefined until you have connected to a session
+ * and the Session object has dispatched the <code>sessionConnected</code> event.
+ * @property {Connection} connection The {@link Connection} object for this session. The connection property is only available once the
+ * Session object dispatches the sessionConnected event. The Session object asynchronously dispatches a sessionConnected event in response
+ * to a successful call to the connect() method. See: <a href="Session#connect">connect</a> and {@link Connection}.
+ * @property {String} sessionId The session ID for this session. You pass this value into the <code>TB.initSession()</code> method when you create
+ * the Session object. (Note: a Session object is not connected to the OpenTok server until you
+ * call the connect() method of the object and the object dispatches a connected event. See {@link TB.initSession} and {@link connect}).
+ * 	For more information on sessions and session IDs, see
+ * <a href="/opentok/tutorials/create-session/">Session creation</a>.
+ */
+OT.Session = function(sessionId) {
+  // Check that the client meets the minimum requirements, if they don't the upgrade
+  // flow will be triggered.
+  if (!OT.checkSystemRequirements()) {
+      OT.upgradeSystemRequirements();
+      return;
+  }
+
+  var _initialConnection = true,
+      _apiKey,
+      _token,
+      _sessionId = sessionId,
+      _socket,
+      _widgetId = OT.$.uuid(),
+      _analytics = new OT.Analytics(),
+      _connectionId,
+      _callbacks = {
+        forceDisconnect: {},
+        forceUnpublish: {}
+      };
+
+
+  OT.$.eventing(this);
+  var setState = OT.$.statable(this, ['disconnected', 'connecting', 'connected', 'disconnecting'], 'disconnected');
+
+  this.connections = new OT.Collection();
+  this.streams = new OT.Collection();
+
+
+	//--------------------------------------
+	//  MESSAGE HANDLERS
+	//--------------------------------------
+
+	var
+  // The duplication of this and sessionConnectionFailed will go away when
+  // session and messenger are refactored
+  sessionConnectFailed = function(reason, code) {
+    setState('disconnected');
+
+    OT.error(reason);
+
+    this.trigger('sessionConnectFailed', reason);
+
+    TB.handleJsException(reason, code || OT.ExceptionCodes.CONNECT_FAILED, {
+      session: this
+    });
+  },
+
+	sessionDisconnectedHandler = function(event) {
+    var reason = event.reason;
+    if(reason == "networkTimedout") {
+      reason = "networkDisconnected";
+      this.logEvent('Connect', 'TimeOutDisconnect', "reason", event.reason);
+    } else {
+      this.logEvent('Connect', 'Disconnected', "reason", event.reason);
+    }
+
+		var publicEvent = new OT.SessionDisconnectEvent('sessionDisconnected', reason);
+
+    reset.call(this);
+    disconnectComponents.call(this);
+
+		var defaultAction = function() {
+      if (!publicEvent.isDefaultPrevented()) destroyComponents.call(this, publicEvent.reason);
+		}.bind(this);
+
+		this.dispatchEvent(publicEvent, defaultAction);
+	},
+
+  connectionCreatedHandler = function(connection) {
+    // We don't broadcast events for the symphony connection
+    if (connection.id.match(/^symphony\./)) return;
+
+    this.dispatchEvent(new OT.ConnectionEvent(
+        OT.Event.names.CONNECTION_CREATED,
+        [connection]
+    ));
+  },
+
+	connectionDestroyedHandler = function(connection, reason) {
+    // We don't broadcast events for the symphony connection
+    if (connection.id.match(/^symphony\./)) return;
+
+    // Don't delete the connection if it's ours. This only happens when
+    // we're about to receive a session disconnected and session disconnected
+    // will also clean up our connection.
+    if (connection.id === _socket.id) return;
+
+    // Handle success callbacks
+    if (_callbacks.forceDisconnect[connection.id]) {
+      var callback = _callbacks.forceDisconnect[connection.id];
+      delete _callbacks.forceDisconnect[connection.id];
+
+
+      if (reason !== 'forceDisconnected') {
+        OT.warn("Expected a forceDisconnect for connection " + connection.id + ", but a " + reason + " was received instead.");
+      }
+
+      callback.succeeded();
+    }
+
+    this.dispatchEvent(
+      new OT.ConnectionEvent(
+        OT.Event.names.CONNECTION_DESTROYED,
+        [connection],
+        reason
+      )
+    );
+	},
+
+  streamCreatedHandler = function(stream) {
+    this.dispatchEvent(new OT.StreamEvent(
+      OT.Event.names.STREAM_CREATED,
+      [stream]
+    ));
+  },
+
+  streamPropertyModifiedHandler = function(event) {
+    var stream = event.target,
+        propertyName = event.changedProperty,
+        newValue = event.newValue;
+
+    if (propertyName === 'orientation') {
+      propertyName = 'videoDimensions';
+      newValue = {width: newValue.width, height: newValue.height};
+    }
+
+    this.dispatchEvent(new OT.StreamPropertyChangedEvent(
+      OT.Event.names.STREAM_PROPERTY_CHANGED,
+      stream,
+      propertyName,
+      event.oldValue,
+      newValue
+    ));
+  },
+
+	streamDestroyedHandler = function(stream, reason) {
+    // Handle success callbacks
+    if (_callbacks.forceUnpublish[stream.id]) {
+      var callback = _callbacks.forceUnpublish[stream.id];
+      delete _callbacks.forceUnpublish[stream.id];
+
+      if (reason !== 'forceUnpublished') {
+        OT.warn("Expected a forceUnpublish for stream " + stream.id + ", but a " + reason + " destroyed was received instead.");
+      }
+
+      callback.succeeded();
+    }
+
+    var event = new OT.StreamEvent('streamDestroyed', [stream], reason);
+
+    var defaultAction = function() {
+      if (!event.isDefaultPrevented()) {
+        // If the stream is one of ours then we need to cleanup
+        // a publisher.
+        var publisher = OT.publishers.where({streamId: stream.id})[0];
+        if (publisher) {
+          publisher._.unpublishFromSession(this);
+          publisher.destroy();
+        }
+
+        // If we are subscribed to any of the streams we should unsubscribe
+        OT.subscribers.where({streamId: stream.id}).forEach(function(subscriber) {
+          if (subscriber.session.id === this.id) {
+            this.unsubscribe(subscriber);
+          }
+        }, this);
+      }
+		}.bind(this);
+
+		this.dispatchEvent(event, defaultAction);
+	},
+
+
+	// Put ourselves into a pristine state
+	reset = function() {
+    _apiKey = null;
+    _token = null;
+    setState('disconnected');
+
+    this.connections.destroy();
+    this.streams.destroy();
+	},
+
+  disconnectComponents = function() {
+    OT.publishers.where({session: this}).forEach(function(publisher) {
+      publisher.disconnect();
+    });
+
+    OT.subscribers.where({session: this}).forEach(function(subscriber) {
+      subscriber.disconnect();
+    });
+  },
+
+  destroyComponents = function(reason) {
+    OT.publishers.where({session: this}).forEach(function(publisher) {
+      publisher.destroy(reason);
+    });
+
+    OT.subscribers.where({session: this}).forEach(function(subscriber) {
+      subscriber.destroy(reason);
+    });
+  },
+
+	connectMessenger = function() {
+    TB.debug("OT.Session: connecting to Raptor");
+
+    _socket = new OT.Raptor.Socket(_widgetId, this.sessionInfo.messagingServer);
+    _socket.connect(_token, this.sessionInfo, function(error, sessionState) {
+      if (error) {
+        sessionConnectFailed.call(this, error.reason, error.code);
+        return;
+      }
+
+      OT.debug("OT.Session: Received session state from Raptor", sessionState);
+
+      _connectionId = this.connection.id;
+      setState('connected');
+
+      // Listen for our own connection's destroyed event so we know when we've been disconnected.
+      this.connection.on('destroyed', sessionDisconnectedHandler, this);
+
+      // Listen for connection updates
+      this.connections.on({
+        add: connectionCreatedHandler,
+        remove: connectionDestroyedHandler
+      }, this);
+
+      // Listen for stream updates
+      this.streams.on({
+        add: streamCreatedHandler,
+        remove: streamDestroyedHandler,
+        update: streamPropertyModifiedHandler
+      }, this);
+
+      this.dispatchEvent(new OT.SessionConnectEvent(
+        OT.Event.names.SESSION_CONNECTED,
+        sessionState.connections,
+        sessionState.streams,
+        sessionState.archives
+      ));
+    }.bind(this));
+	},
+
+  getSessionInfo = function() {
+    if (this.is('connecting')) {
+      OT.SessionInfo.get(
+        this,
+        onSessionInfoResponse.bind(this),
+        function(error) {
+          sessionConnectFailed.call(this, error.message + (error.code ? ' (' + error.code + ')' : ''));
+        }.bind(this)
+      );
+    }
+  },
+
+  onSessionInfoResponse = function(sessionInfo) {
+    if (this.is('connecting')) {
+      this.sessionInfo = sessionInfo;
+      if (this.sessionInfo.partnerId && this.sessionInfo.partnerId != _apiKey) {
+          _apiKey = this.sessionInfo.partnerId;
+
+          var reason = 'Authentication Error: The apiKey passed into the session.connect ' +
+            'method does not match the apiKey in the token or session you are trying to ' +
+            'connect to.';
+
+          this.logEvent('Connect', 'Failure', 'reason', 'GetSessionInfo:' +
+            OT.ExceptionCodes.AUTHENTICATION_ERROR + ':' + reason);
+
+          sessionConnectFailed.call(this, reason, OT.ExceptionCodes.AUTHENTICATION_ERROR);
+      } else {
+          connectMessenger.call(this);
+      }
+    }
+  },
+
+  // Check whether we have permissions to perform the action.
+  permittedTo = function(action) {
+      return _socket && _socket.permittedTo(action);
+  };
+
+  this.logEvent = function(action, variation, payload_type, payload) {
+    var event = {
+      action: action,
+      variation: variation,
+      payload_type: payload_type,
+      payload: payload,
+      session_id: _sessionId,
+      partner_id: _apiKey,
+      widget_id: _widgetId,
+      widget_type: 'Controller'
+    };
+    if (this.connection && this.connection.id) event.connection_id = this.connection.id;
+    else if (_connectionId) event.connection_id = _connectionId;
+    _analytics.logEvent(event);
+  };
+
+ /**
+ * Connects to an OpenTok session. Pass your API key as the <code>apiKey</code> parameter. You get an API key when you
+ * <a href="https://dashboard.tokbox.com/users/sign_in">sign up</a> for an OpenTok account. Pass a token string as
+ * the <code>token</code> parameter. You generate a token using the
+ * <a href="/opentok/api/tools/documentation/api/server_side_libraries.html">OpenTok server-side libraries</a>
+ * or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page. For more information, see
+ * <a href="/opentok/tutorials/create-token/">Connection token creation</a>.
+ *  <p>
+ *  	Upon a successful connection, the Session object dispatches a <code>sessionConnected</code> event. Call the
+ * <code>addEventListener()</code> method to set up an event listener to process this event before calling other methods of the Session object.
+ *  </p>
+ *  <p>
+ *  	The Session object dispatches a <code>connectionCreated</code> event when other clients create connections to the session.
+ *  </p>
+ *  <p>
+ *  	The TB object dispatches an <code>exception</code> event if the session ID,
+ *    API key, or token string are invalid. See <a href="ExceptionEvent.html">ExceptionEvent</a>
+ *    and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+ *  </p>
+ *  <p>
+ *  	The application throws an error if the system requirements are not met
+ *    (see <a href="TB.html#checkSystemRequirements">TB.checkSystemRequirements()</a>).
+ *  </p>
+ *
+ *  <h5>
+ *  Example
+ *  </h5>
+ *  <p>
+ *  The following code initializes a session and sets up an event listener for when the session connects:
+ *  </p>
+ *  <pre>
+ *  var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+ *  var sessionID = ""; // Replace with your own session ID.
+ *                      // See https://dashboard.tokbox.com/projects
+ *  var token = ""; // Replace with a generated token that has been assigned the moderator role.
+ *                  // See https://dashboard.tokbox.com/projects
+ *
+ *  var session = TB.initSession(sessionID);
+ *  session.addEventListener("sessionConnected", sessionConnectHandler);
+ *  session.connect(apiKey, token);
+ *
+ *  function sessionConnectHandler(sessionConnectEvent) {
+ *      //
+ *  }
+ *  </pre>
+ *  <p>
+ *  <p>
+ *  	In this example, the <code>sessionConnectHandler()</code> function is passed an event object of type {@link SessionConnectEvent}.
+ *  </p>
+ *
+ *  <h5>
+ *  Events dispatched:
+ *  </h5>
+ *
+ *  <p>
+ *  	<code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151; Dispatched by the TB class
+ *  	locally in the event of an error.
+ *  </p>
+ *  <p>
+ *  	<code>connectionCreated</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
+ *      Dispatched by the Session object on all clients connected to the session.
+ *  </p>
+ *  <p>
+ *  	<code>sessionConnected</code> (<a href="SessionConnectEvent.html">SessionConnectEvent</a>) &#151;
+ *      Dispatched locally by the Session object when the connection is established.
+ *  </p>
+ *
+  * @param {String} apiKey The API key that TokBox provided you when you registered for the OpenTok API.
+  *
+  * @param {String} token The session token. You generate a session token using our
+  * <a href="/opentok/libraries/server/">server-side libraries</a> or the
+  * <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page. For more information, see
+  * <a href="/opentok/tutorials/create-token/">Connection token creation</a>.
+  *
+  * @method #connect
+  * @memberOf Session
+  */
+  this.connect = function(apiKey, token, completionHandler) {
+    if (this.is('connecting', 'connected')) {
+      OT.warn("OT.Session: Cannot connect, the session is already " + this.state);
+      return;
+    }
+
+    reset.call(this);
+    setState('connecting');
+    _token = token;
+
+    // Get a new widget ID when reconnecting.
+    if (_initialConnection) {
+      _initialConnection = false;
+    } else {
+      _widgetId = OT.$.uuid();
+    }
+
+    _apiKey = apiKey.toString();
+
+    // Ugly hack, make sure OT.APIKEY is set
+    if (OT.APIKEY.length === 0) {
+        OT.APIKEY = _apiKey;
+    }
+
+    if (completionHandler && OT.$.isFunction(completionHandler)) {
+      this.once(OT.Event.names.SESSION_CONNECTED, completionHandler.bind(null, null));
+      this.once('sessionConnectFailed', completionHandler);
+    }
+
+    var analyticsPayload = [
+      navigator.userAgent, OT.properties.version,
+      window.externalHost ? 'yes' : 'no'
+    ];
+    this.logEvent( 'Connect', 'Attempt',
+      'userAgent|sdkVersion|chromeFrame',
+      analyticsPayload.map(function(e) { return e.replace('|', '\\|'); }).join('|')
+    );
+
+    getSessionInfo.call(this);
+  };
+
+ /**
+  * Disconnects from the OpenTok session.
+  *
+  * <p>
+  * Calling the <code>disconnect()</code> method ends your connection with the session. In the course of terminating your connection,
+  * it also ceases publishing any stream(s) you were publishing.
+  * </p>
+  * <p>
+  * Session objects on remote clients dispatch <code>streamDestroyed</code> events for any stream you were publishing.
+  * The Session object dispatches a <code>sessionDisconnected</code> event locally. The Session objects on remote clients dispatch
+  * <code>connectionDestroyed</code> events, letting other connections know you have left the session. The {@link SessionDisconnectEvent}
+  * and {@link StreamEvent} objects that define the <code>sessionDisconnect</code> and <code>connectionDestroyed</code> events each have
+  * a <code>reason</code> property. The <code>reason</code> property lets the developer determine whether the connection is being
+  * terminated voluntarily and whether any streams are being destroyed as a byproduct of the underlying connection's voluntary destruction.
+  * </p>
+  * <p>
+  * If the session is not currently connected, calling this method causes a warning to be logged.
+  * See <a "href=TB.html#setLogLevel">TB.setLogLevel()</a>.
+  * </p>
+  *
+  * <p>
+  * <i>Note:</i> If you intend to reuse a Publisher object created using <code>TB.initPublisher()</code>
+  * to publish to different sessions sequentially, call either <code>Session.disconnect()</code> or
+  * <code>Session.unpublish()</code>. Do not call both. Then call the <code>preventDefault()</code> method
+  * of the <code>streamDestroyed</code> or <code>sessionDisconnected</code> event object to prevent the
+  * Publisher object from being removed from the page. Be sure to call <code>preventDefault()</code> only
+  * if the <code>connection.connectionId</code> property of the Stream object in the event matches the
+  * <code>connection.connectionId</code> property of your Session object (to ensure that you are preventing
+  * the default behavior for your published streams, not for other streams that you subscribe to).
+  * </p>
+  *
+  * <h5>
+  * Events dispatched:
+  * </h5>
+  * <p>
+  * <code>sessionDisconnected</code> (<a href="SessionDisconnectEvent.html">SessionDisconnectEvent</a>)
+  * &#151; Dispatched locally when the connection is disconnected.
+  * </p>
+  * <p>
+  * <code>connectionDestroyed</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
+  * Dispatched on other connections, along with the <code>streamDestroyed</code> event (as warranted).
+  * </p>
+  *
+  * <p>
+  * <code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
+  * Dispatched if streams are lost as a result of the session disconnecting.
+  * </p>
+  *
+  * @method #disconnect
+  * @memberOf Session
+  */
+  this.disconnect = function() {
+    if (_socket && _socket.isNot('disconnected')) {
+      setState('disconnecting');
+      _socket.disconnect();
+    }
+    else {
+      reset.call(this);
+    }
+  };
+
+  this.destroy = function(reason, quiet) {
+    this.streams.destroy();
+    this.connections.destroy();
+    this.disconnect();
+  };
+
+ /**
+  * The <code>publish()</code> method starts publishing an audio-video stream to the session.
+  * The audio-video stream is captured from a local microphone and webcam. Upon successful publishing,
+  * the Session objects on all connected clients dispatch the <code>streamCreated</code> event.
+  * </p>
+  *
+  * <!--JS-ONLY-->
+  * <p>You pass a Publisher object as the one parameter of the method. You can initialize a Publisher object by calling the
+  * <a href="TB.html#initPublisher">TB.initPublisher()</a> method. Before calling <code>Session.publish()</code>.
+  * </p>
+  *
+  * <p>This method takes an alternate form: <code>publish([targetElement:String, properties:Object]):Publisher</code> &#151;
+  * In this form, you do <i>not</i> pass a Publisher object into the function. Instead, you pass in a <code>targetElement</code>
+  * (the ID of the DOM element that the Publisher will replace) and a <code>properties</code> object that defines
+  * options for the Publisher (see <a href="TB.html#initPublisher">TB.initPublisher()</a>.) The method
+  * returns a new Publisher object, which starts sending an audio-video stream to the session.
+  * The remainder of this documentation describes the form that takes a single Publisher object as a parameter.
+  *
+  * <p>
+  * 	A local display of the published stream is created on the web page by replacing
+  *         the specified element in the DOM with a streaming video display. The video stream
+  *         is automatically mirrored horizontally so that users see themselves and movement
+  *         in their stream in a natural way. If the width and height of the display do not match
+  *         the 4:3 aspect ratio of the video signal, the video stream is cropped to fit the display.
+  * </p>
+  *
+  * <p>
+  * 	If calling this method creates a new Publisher object and the OpenTok library does not have access to
+  * 	the camera or microphone, the web page alerts the user to grant access to the camera and microphone.
+  * </p>
+  *
+  * <p>
+  * The TB object dispatches an <code>exception</code> event if the user's role does not
+  * include permissions required to publish. For example, if the user's role is set to subscriber,
+  * then they cannot publish. You define a user's role when you create the user token using the <code>generate_token()</code> method
+  * of our <a href="/opentok/libraries/server/">server-side libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
+  * You pass the token string as a parameter of the <code>connect()</code> method of the Session object.
+  * See <a href="ExceptionEvent.html">ExceptionEvent</a> and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+  * </p>
+  *     <p>
+  *     The application throws an error if the session is not connected.
+  *     </p>
+  *
+  * <h5>Events dispatched:</h5>
+  * <p>
+  * <code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151; Dispatched by the TB object. This
+  * can occur when user's role does not allow publishing (the <code>code</code> property of event object is set to 1500);
+  * it can also occur if the connection fails to connect (the <code>code</code> property of event object is set to 1013).
+  * WebRTC is a peer-to-peer protocol, and it is possible that connections will fail to connect. The most common cause
+  * for failure is a firewall that the protocol cannot traverse.</li>
+  * </p>
+  * <p>
+  * <code>streamCreated</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
+  * The stream has been published. The Session object dispatches this on all clients
+  * subscribed to the stream, as well as on the publisher's client.
+  * </p>
+  *
+  * <h5>Example</h5>
+  *
+  * <p>
+  * 	The following example publishes a video once the session connects:
+  * </p>
+  * <pre>
+  * var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+  * var sessionId = ""; // Replace with your own session ID.
+  *                     // See https://dashboard.tokbox.com/projects
+  * var token = ""; // Replace with a generated token that has been assigned the moderator role.
+  *                 // See https://dashboard.tokbox.com/projects
+  * var session = TB.initSession(sessionID);
+  * session.addEventListener("sessionConnected", sessionConnectHandler);
+  * session.connect(apiKey, token);
+  *
+  * function sessionConnectHandler(event) {
+  *     var divProps = {width: 400, height:300, name:"Bob's stream"};
+  *     publisher = TB.initPublisher(apiKey, 'publisher', divProps);
+  *                       // This assumes that there is a DOM element with the ID 'publisher'.
+  *     session.publish(publisher);
+  * }
+  * </pre>
+  *
+  * @param publisher A Publisher object, which you initialize by calling the <a href="TB.html#initPublisher">TB.initPublisher()</a>
+  * method.
+  *
+  * @returns The Publisher object for this stream.
+  *
+  * @method #publish
+  * @memberOf Session
+  */
+  this.publish = function(publisher, properties, completionHandler) {
+    var errorMsg;
+
+    if (this.isNot('connected')) {
+      _analytics.logError(1010, 'tb.exception', "We need to be connected before you can publish", null, {
+        action: 'publish',
+        variation: 'Failure',
+        payload_type: "reason",
+        payload: "We need to be connected before you can publish",
+        session_id: _sessionId,
+        partner_id: _apiKey,
+        widgetId: _widgetId,
+        widget_type: 'Controller'
+      });
+
+      if (completionHandler && OT.$.isFunction(completionHandler)) {
+        errorMsg = "We need to be connected before you can publish";
+        OT.$.callAsync(completionHandler, new OT.Error(OT.ExceptionCodes.NOT_CONNECTED, errorMsg));
+      }
+
+      return null;
+    }
+
+    if (!permittedTo("publish")) {
+      this.logEvent('publish', 'Failure', 'reason', 'This token does not allow publishing. The role must be at least `publisher` to enable this functionality');
+
+      TB.handleJsException("This token does not allow publishing. The role must be at least `publisher` to enable this functionality", OT.ExceptionCodes.UNABLE_TO_PUBLISH, {
+        session: this
+      });
+      return null;
+    }
+
+    // If the user has passed in an ID of a element then we create a new publisher.
+    if (!publisher || typeof(publisher)==='string' || publisher.nodeType == Node.ELEMENT_NODE){
+      // Initiate a new Publisher with the new session credentials
+     publisher = OT.initPublisher(this.apiKey, publisher, properties);
+    }
+    else if (publisher instanceof OT.Publisher){
+
+      // If the publisher already has a session attached to it we can
+      if( "session" in publisher && publisher.session && "sessionId" in publisher.session ){
+        // send a warning message that we can't publish again.
+        if( publisher.session.sessionId === this.sessionId){
+          OT.warn("Cannot publish " + publisher.guid + " again to " + this.sessionId + ". Please call session.unpublish(publisher) first.");
+        }
+        else {
+          OT.warn("Cannot publish " + publisher.guid + " publisher already attached to " + publisher.session.sessionId+ ". Please call session.unpublish(publisher) first.");
+        }
+      }
+    }
+    else {
+      errorMsg = "Session.publish :: First parameter passed in is neither a string nor an instance of the Publisher";
+      OT.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    if (completionHandler && OT.$.isFunction(completionHandler)) publisher.once('publishComplete', completionHandler);
+
+    // Add publisher reference to the session
+    publisher._.publishToSession(this);
+
+    // return the embed publisher
+    return publisher;
+  };
+
+ /**
+  * Ceases publishing the specified publisher's audio-video stream
+  * to the session. By default, the local representation of the audio-video stream is removed from the
+  * web page.< Upon successful termination, the Session object on every connected
+  * web page dispatches
+  * a <code>streamDestroyed</code> event.
+  * </p>
+  *
+  * <p>
+  * To prevent the Publisher from being removed from the DOM, add an event listener for the
+  * <code>streamDestroyed</code> event and call the <code>preventDefault()</code> method of the event object.
+  * </p>
+  *
+  * <p>
+  * <i>Note:</i> If you intend to reuse a Publisher object created using <code>TB.initPublisher()</code>
+  * to publish to different sessions sequentially, call either <code>Session.disconnect()</code> or
+  * <code>Session.unpublish()</code>. Do not call both. Then call the <code>preventDefault()</code> method
+  * of the <code>streamDestroyed</code> or <code>sessionDisconnected</code> event object to prevent the
+  * Publisher object from being removed from the page. Be sure to call <code>preventDefault()</code> only
+  * if the <code>connection.connectionId</code> property of the Stream object in the event matches the
+  * <code>connection.connectionId</code> property of your Session object (to ensure that you are preventing
+  * the default behavior for your published streams, not for other streams that you subscribe to).
+  * </p>
+  *
+  * <h5>Events dispatched:</h5>
+  *
+  * <p>
+  * <code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
+  * The stream associated with the Publisher has been destroyed. Dispatched on
+  * the Publisher's browser and on the browser for all connections subscribing
+  * to the publisher's stream.
+  *                </p>
+  *
+  * <h5>Example</h5>
+  *
+  * The following example publishes a stream to a session and adds a Disconnect link to the web page. Clicking this link causes the stream to stop being published.
+  *
+  * <pre>
+  * &lt;script&gt;
+  *     var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+  *     var sessionID = ""; // Replace with your own session ID.
+  *                      // See https://dashboard.tokbox.com/projects
+  *     var token = "Replace with the TokBox token string provided to you."
+  *     var session = TB.initSession(sessionID);
+  *     session.addEventListener("sessionConnected", sessionConnectHandler);
+  *     session.connect(apiKey, token);
+  *     var publisher;
+  *
+  *     function sessionConnectHandler(event) {
+  *         publisher = TB.initPublisher(apiKey, 'publisher');
+  *                         // This assumes that there is a DOM element with the ID 'publisher'.
+  *         session.publish(publisher);
+  *     }
+  *     function unpublsh() {
+  *         session.unpublish(publisher);
+  *     }
+  * &lt;/script&gt;
+  *
+  * &lt;body&gt;
+  *
+  *     &lt;div id="publisherContainer/&gt;
+  *     &lt;br/&gt;
+  *
+  *     &lt;a href="javascript:unpublish()"&gt;Stop Publishing&lt;/a&gt;
+  *
+  * &lt;/body&gt;
+  *
+  * </pre>
+  *
+  * @see <a href="#publish">publish()</a>
+  *
+  * @see <a href="StreamEvent.html">streamDestroyed event</a>
+  *
+  * @param {Publisher} publisher</span> The Publisher object to stop streaming.
+  *
+  * @method #unpublish
+  * @memberOf Session
+  */
+  this.unpublish = function(publisher) {
+    if (!publisher) {
+      OT.error('OT.Session.unpublish: publisher parameter missing.');
+      return;
+    }
+
+    // Unpublish the localMedia publisher
+    publisher._.unpublishFromSession(this);
+  };
+
+
+ /**
+  * Subscribes to a stream that is available to the session. You can get an array of
+  * available streams from the <code>streams</code> property of the <code>sessionConnected</code>
+  * and <code>streamCreated</code> events (see <a href="SessionConnectEvent.html">SessionConnectEvent</a> and
+  * <a href="StreamEvent.html">StreamEvent</a>).
+  * </p>
+  * <p>
+  * The subscribed stream is displayed on the local web page by replacing the specified element in the DOM with a streaming video display.
+  * If the width and height of the display do not match the 4:3 aspect ratio of the video signal, the video stream is cropped to fit
+  * the display. If the stream lacks a video component, a blank screen with an audio indicator is displayed in place of the video stream.
+  * </p>
+  *
+  * <p>
+  * The application throws an error if the session is not connected<!--JS-ONLY--> or if the
+  * <code>targetElement</code> does not exist in the HTML DOM<!--/JS-ONLY-->.
+  * </p>
+  *
+  * <h5>Example</h5>
+  *
+  * The following code subscribes to available streams at the time that a session is connected
+  *
+  * <pre>
+  * var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+  * var sessionID = ""; // Replace with your own session ID.
+  *                     // See https://dashboard.tokbox.com/projects
+  *
+  * var session = TB.initSession(sessionID);
+  * session.addEventListener("sessionConnected", sessionConnectHandler);
+  * session.connect(apiKey, token);
+  *
+  * function sessionConnectHandler(event) {
+  *     for (var i = 0; i &lt; event.streams.length; i++) {
+  *         var stream = event.streams[i];
+  *         displayStream(stream);
+  *     }
+  * }
+  *
+  * function displayStream(stream) {
+  *     var div = document.createElement('div');
+  *     div.setAttribute('id', 'stream' + stream.streamId);
+  *     var streamsContainer = document.getElementById('streamsContainer');
+  *     streamsContainer.appendChild(div);
+  *     subscriber = session.subscribe(stream, 'stream' + stream.streamId);
+  * }
+  * </pre>
+  * <p>
+  * You can also add an event listener for the <code>streamCreated</code> event. The Session object dispatches this event when a new stream is created.
+  * </p>
+  * <pre>
+  * session.addEventListener("streamCreated", streamCreatedHandler);
+  *
+  * function streamCreatedHandler(event) {
+  *     for (var i = 0; i &lt; event.streams.length; i++) {
+  *         var stream = event.streams[i];
+  *         displayStream(stream);
+  *     }
+  * }
+  * </pre>
+  *
+  * @param {Stream} stream The Stream object representing the stream to which we are trying to subscribe.
+  *
+  * @param {String} targetElement The ID of the existing DOM element
+  * that the Subscriber replaces. If you do not specify a <code>targetElement</code>, the application
+  * appends a new DOM element to the HTML <code>body</code>.
+  *
+  * @param {Object} properties This is an object that contains the following properties:
+  *    <ul>
+  *       <li><code>audioVolume</code> (Number) &#151; The desired audio volume, between 0 and 100, when the Subscriber
+  *       is first opened (default: 50). After you subscribe to the stream, you can adjust the volume by calling
+  *       the <a href="Subscriber.html#setAudioVolume"><code>setAudioVolume()</code> method</a> of the Subscriber
+  *       object. This volume setting affects local playback only; it does not affect the stream's volume on other
+  *       clients.</li>
+  *
+  *       <li><code>height</code> (Number) &#151; The desired height, in pixels, of the
+  *        displayed Subscriber video stream (default: 198). <i>Note:</i> Use the
+  *       <code>height</code> and <code>width</code> properties to set the dimensions
+  *       of the Subscriber video; do not set the height and width of the DOM element
+  *       (using CSS).</li>
+  *
+  *       <li><code>style.nameDisplayMode</code> (String) &#151; This property determines whether to display the
+  *       stream name. Possible values are: <code>"auto"</code> (the name is displayed when the stream is first
+  *       displayed and when the user mouses over the display), <code>"off"</code> (the name is not displayed),
+  *       and <code>"on"</code> (the name is displayed).</li>
+  *
+  *       <li><code>subscribeToAudio</code> (Boolean) &#151; Whether to initially subscribe to audio
+  *       (if available) for the stream (default: <code>true</code>).</li>
+  *
+  *       <li><code>subscribeToVideo</code> (Boolean) &#151; Whether to initially subscribe to video
+  *       (if available) for the stream (default: <code>true</code>).</li>
+  *
+  *       <li><code>width</code> (Number) &#151; The desired width, in pixels, of the
+  *       displayed Subscriber video stream (default: 264). <i>Note:</i> Use the
+  *       <code>height</code> and <code>width</code> properties to set the dimensions
+  *        of the Subscriber video; do not set the height and width of the DOM element
+  *       (using CSS).</li>
+  *
+  *    </ul>
+  *
+  * @signature subscribe(stream, targetElement, properties)
+  * @returns {Subscriber} The Subscriber object for this stream. Stream control functions are exposed through the Subscriber object.
+  * @method #subscribe
+  * @memberOf Session
+  */
+  this.subscribe = function(stream, targetElement, properties, completionHandler) {
+    var errorMsg;
+
+    if (!this.connection || !this.connection.connectionId) {
+      errorMsg = "Session.subscribe :: Connection required to subscribe";
+      OT.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    if (!stream) {
+      errorMsg = "Session.subscribe :: stream cannot be null";
+      OT.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    if (!stream.hasOwnProperty("streamId")) {
+      errorMsg = "Session.subscribe :: invalid stream object";
+      OT.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    var subscriber = new OT.Subscriber(targetElement, OT.$.extend(properties || {}, {
+        session: this
+    }));
+
+    if (completionHandler && OT.$.isFunction(completionHandler)) subscriber.once('subscribeComplete', completionHandler);
+
+    OT.subscribers.add(subscriber);
+    subscriber.subscribe(stream);
+
+    return subscriber;
+  };
+
+ /**
+  * Stops subscribing to a stream in the session. the display of the audio-video stream is removed from the local web page.
+  *
+  * <h5>Example</h5>
+  * <p>
+  * The following code subscribes to available streams at the time that a session is connected. For each stream, the code also
+  * adds an Unsubscribe link.
+  * </p>
+  * <pre>
+  * var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+  * var sessionID = ""; // Replace with your own session ID.
+  *                     // See https://dashboard.tokbox.com/projects
+  * var streams = [];
+  *
+  * var session = TB.initSession(sessionID);
+  * session.addEventListener("sessionConnected", sessionConnectHandler);
+  * session.connect(apiKey, token);
+  *
+  * function sessionConnectHandler(event) {
+  *     for (var i = 0; i &lt; event.streams.length; i++) {
+  *         var stream = event.streams[i];
+  *         displayStream(stream);
+  *     }
+  * }
+  *
+  * function displayStream(stream) {
+  *     var div = document.createElement('div');
+  *     div.setAttribute('id', 'stream' + stream.streamId);
+  *
+  *
+  *
+  *     var subscriber = session.subscribe(stream, 'stream' + stream.streamId);
+  *     subscribers.push(subscriber);
+  *
+  *
+  *     var aLink = document.createElement('a');
+  *     aLink.setAttribute('href', 'javascript: unsubscribe("' + subscriber.id + '")');
+  *     aLink.innerHTML = "Unsubscribe";
+  *
+  *     var streamsContainer = document.getElementById('streamsContainer');
+  *     streamsContainer.appendChild(div);
+  *     streamsContainer.appendChild(aLink);
+  *
+  *     streams = event.streams;
+  * }
+  *
+  * function unsubscribe(subscriberId) {
+  *     console.log("unsubscribe called");
+  *     for (var i = 0; i &lt; subscribers.length; i++) {
+  *         var subscriber = subscribers[i];
+  *         if (subscriber.id == subscriberId) {
+  *             session.unsubscribe(subscriber);
+  *         }
+  *     }
+  * }
+  * </pre>
+  *
+  * @param {Subscriber} subscriber The Subscriber object to unsubcribe.
+  *
+  * @see <a href="#subscribe">subscribe()</a>
+  *
+  * @method #unsubscribe
+  * @memberOf Session
+  */
+  this.unsubscribe = function(subscriber) {
+    if (!subscriber) {
+      var errorMsg = "OT.Session.unsubscribe: subscriber cannot be null";
+      OT.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    if (!subscriber.stream) {
+        OT.warn("OT.Session.unsubscribe:: tried to unsubscribe a subscriber that had no stream");
+        return false;
+    }
+
+    OT.debug("OT.Session.unsubscribe: subscriber " + subscriber.id);
+
+    subscriber.destroy();
+
+    return true;
+  };
+
+ /**
+  * Returns an array of local Subscriber objects for a given stream.
+  *
+  * @param {Stream} stream The stream for which you want to find subscribers.
+  *
+  * @returns {Array} An array of {@link Subscriber} objects for the specified stream.
+  *
+  * @see <a href="#unsubscribe">unsubscribe()</a>
+  * @see <a href="Subscriber.html">Subscriber</a>
+  * @see <a href="StreamEvent.html">StreamEvent</a>
+  * @method #getSubscribersForStream
+  * @memberOf Session
+  */
+  this.getSubscribersForStream = function(stream) {
+    return OT.subscribers.where({streamId: stream.id});
+  };
+
+ /**
+  * Returns the local Publisher object for a given stream.
+  *
+  * @param {Stream} stream The stream for which you want to find the Publisher.
+  *
+  * @returns {Publisher} A Publisher object for the specified stream. Returns <code>null</code> if there is no local Publisher object
+  * for the specified stream.
+  *
+  * @see <a href="#forceUnpublish">forceUnpublish()</a>
+  * @see <a href="Subscriber.html">Subscriber</a>
+  * @see <a href="StreamEvent.html">StreamEvent</a>
+  *
+  * @method #getPublisherForStream
+  * @memberOf Session
+  */
+  this.getPublisherForStream = function(stream) {
+    var streamId;
+
+    if (typeof(stream) == "string") {
+      streamId = stream;
+    } else if (typeof(stream) == "object" && stream && stream.hasOwnProperty("id")) {
+      streamId = stream.id;
+    } else {
+      errorMsg = "Session.getPublisherForStream :: Invalid stream type";
+      OT.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    return OT.publishers.where({streamId: streamId})[0];
+  };
+
+
+  // Private Session API: for internal OT use only
+  this._ = {
+    jsepSubscribe: function(stream, subscribeToVideo, subscribeToAudio) {
+      return _socket.jsepSubscribe(stream.connection.id, stream.id, subscribeToVideo, subscribeToAudio);
+    }.bind(this),
+
+    jsepUnsubscribe: function(stream) {
+      return _socket.jsepUnsubscribe(stream.connection.id, stream.id);
+    }.bind(this),
+
+    jsepCandidate: function(toConnectionId, stream, candidate) {
+      return _socket.jsepCandidate(toConnectionId, stream.id, candidate);
+    }.bind(this),
+
+    jsepOffer: function(toConnectionId, stream, offerSDP) {
+      return _socket.jsepOffer(toConnectionId, stream.id, offerSDP);
+    }.bind(this),
+
+    jsepAnswer: function(toConnectionId, stream, answerSDP) {
+      return _socket.jsepAnswer(toConnectionId, stream.id, answerSDP);
+    }.bind(this),
+
+    // session.on("signal", function(SignalEvent))
+    // session.on("signal:{type}", function(SignalEvent))
+    dispatchSignal: function(fromConnection, type, data) {
+      var event = new OT.SignalEvent(type, data, fromConnection);
+      event.target = this;
+
+      // signal a "signal" event
+      // NOTE: trigger doesn't support defaultAction, and therefore preventDefault.
+      this.trigger(OT.Event.names.SIGNAL, event);
+
+      // signal an "signal:{type}" event" if there was a custom type
+      if (type) this.dispatchEvent(event);
+    }.bind(this),
+
+    modifySubscriber: function(subscriber, key, value) {
+      return _socket.modifySubscriber(subscriber, key, value);
+    }.bind(this),
+
+    createStream: function(publisherId, name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo) {
+      _socket.createStream(publisherId, name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo);
+    }.bind(this),
+
+    modifyStream: function(streamId, key, value) {
+      if (!streamId || !key || value === void 0) {
+        OT.error('OT.Session.modifyStream: must provide streamId, key and value to modify a stream property.');
+        return;
+      }
+
+      _socket.updateStream(streamId, key, value);
+    }.bind(this),
+
+    destroyStream: function(streamId) {
+      _socket.destroyStream(streamId);
+    }.bind(this)
+  };
+
+
+ /**
+  * Sends a signal to each client or specified clients in the session. Specify a <code>connections</code> property
+  * of the <code>signal</code> parameter to limit the recipients of the signal; otherwise the signal is sent to
+  * each client connected to the session.
+  * <p>
+  * The following example sends a signal of type "foo" with a specified data payload to all clients connected to
+  * the session:
+  * <pre>
+  * session.signal({
+  *     type: "foo",
+  *     data: {messageString:"hello", scores:[7, 14, 23]},
+  *   },
+  *   function(error) {
+  *     if (error) {
+  *       console.log("signal error: " + error.reason);
+  *     } else {
+  *       console.log("signal sent");
+  *     }
+  *   }
+  * );
+  * </pre>
+  * <p>
+  * Calling this method without limiting the set of recipient clients will result in multiple signals sent (one to
+  * each client in the session). For information on charges for signaling, see the <a href="http://tokbox.com/pricing">OpenTok
+  * pricing</a> page.
+  * <p>
+  * The following example sends a signal of type "foo" with a specified data payload to two specific clients
+  * connected to the session:
+  * <pre>
+  * session.signal({
+  *     type: "foo",
+  *     to: [connection1, connection2]; // connection1 and 2 are Connection objects
+  *     data: {messageString:"hello"}
+  *   },
+  *   function(error) {
+  *     if (error) {
+  *       console.log("signal error: " + error.reason);
+  *     } else {
+  *       console.log("signal sent");
+  *     }
+  *   }
+  * );
+  * </pre>
+  * <p>
+  * Each of the properties of the object you pass into the <code>signal()</code> method is optional.
+  * <p>
+  * Add an event handler for the <code>signal</code> event to listen for all signals sent in the session.
+  * Add an event handler for the <code>signal:type</code> event to listen for signals of a specified type
+  * only (replace <code>type</code>, in <code>signal:type</code>, with the type of signal to listen for). The
+  * Session object dispatches these events. (See <a href="#events">events</a>.)
+  * <p>
+  * Each property is optional. If you set none of the properties, you will send a signal with no data or type to
+  * each client connected to the session.</p>
+  *
+  * @param {Object} signal An object that contains the following properties defining the signal:
+  * <ul>
+  *   <li><code>to</code> &mdash; (Array) An array of <a href="Connection.html">Connection</a> objects, corresponding
+  *      to clients that the message is to be sent to. If you do not specify this property, the signal is sent to all
+  *      clients connected to the session.</li>
+  *   <li><code>data</code> &mdash; (Object) The data to send. Valid types for data are a JSON-parsable object,
+  *     a JSON-parsable array, a string, a number, a Boolean value, or <code>null</code>. Numbers cannot be NaN or Infinity.
+  *     The limit to the size of data is 8kB.</li>
+  *   <li><code>type</code> &mdash; (String) The type of the signal. You can use the type to filter signals when setting an
+  *     event handler for the <code>signal:type</code> event (where you replace <code>type</code> with the type string).
+  *     The maximum length of the <code>type</code> string is 128 characters, and it must contain only letters (A-Z and a-z),
+  *     numbers (0-9), '-', '_', and '~'.</li>
+  *   </li>
+  * </ul>
+  *
+  * <p>Each property is optional. If you set none of the properties, you will send a signal with no data or type to
+  * each client connected to the session.</p>
+  *
+  * @param {Function} completionHandler A function that is called when sending the signal succeeds or fails. This
+  * function takes one parameter, <code>error</code>, which is set to <code>null</code> if sending the signal succeeds;
+  * otherwise the <code>error</code> object has the following properties:
+  *
+  * <ul>
+  *   <li><code>code</code> &mdash; (Number) An error code, which can be one of the following:
+  *     <table style="width:100%">
+  *         <tr>
+  *           <td>400</td> <td>One of the signal properties &mdash; data, type, or to &mdash; is invalid.
+  *                         Or the data cannot be parsed as JSON.</td>
+  *         </tr>
+  *         <tr>
+  *           <td>404</td> <td>The to connection does not exist.</td>
+  *         </tr>
+  *         <tr>
+  *           <td>413</td> <td>The type string exceeds the maximum length (128 characters),
+  *                        or the data property exceeds the maximum size (8kB).</td>
+  *         </tr>
+  *         <tr>
+  *           <td>500</td> <td>The WebSocket connection is down.</td>
+  *         </tr>
+  *      </table>
+  *   </li>
+  *   <li><code>reason</code> &mdash; (String) A description of the error.</li>
+  *   <li><code>signal</code> &mdash; (Object) An object with properties corresponding to the values passed
+  *     into the <code>signal()</code> method &mdash; <code>data</code>, <code>to</code>, and <code>type</code>.
+  *   </li>
+  * </ul>
+  *
+  * <p>Note that the <code>completionHandler</code> success result (<code>error == null</code>) indicates that the
+  * options passed into the <code>Session.signal()</code> method are valid and the signal was sent. It does
+  * <i>not</i> indicate that the signal was successfully received by any of the intended recipients.
+  *
+  * @method #signal
+  * @memberOf Session
+  * @see <a href="#event:signal">signal</a> and <a href="#event:signal:type">signal:type</a> events
+  */
+  this.signal = function(options, completion) {
+    _socket.signal(options, completion);
+  };
+
+ /**
+  * 	Forces a remote connection to leave the session.
+  *
+  * <p>
+  * 	The <code>forceDisconnect()</code> method is normally used as a moderation tool
+  *        to remove users from an ongoing session.
+  * </p>
+  * <p>
+  * 	When a connection is terminated using the <code>forceDisconnect()</code>,
+  *        <code>sessionDisconnected</code>, <code>connectionDestroyed</code> and
+  *        <code>streamDestroyed</code> events are dispatched in the same way as they
+  *        would be if the connection had terminated itself using the <code>disconnect()</code> method. However,
+  *        the <code>reason</code> property of a {@link ConnectionEvent} or {@link StreamEvent} object specifies
+  *        <code>"forceDisconnected"</code> as the reason for the destruction of the connection and stream(s).
+  * </p>
+  * <p>
+  * 	While you can use the <code>forceDisconnect()</code> method to terminate your own connection,
+  *        calling the <code>disconnect()</code> method is simpler.
+  * </p>
+  * <p>
+  * 	The TB object dispatches an <code>exception</code> event if the user's role
+  * 	does not include permissions required to force other users to disconnect.
+  *        You define a user's role when you create the user token using the <code>generate_token()</code>
+  *        method using our <a href="/opentok/libraries/server/">server-side libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
+  * 	See <a href="ExceptionEvent.html">ExceptionEvent</a> and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+  * </p>
+  * <p>
+  * 	The application throws an error if the session is not connected.
+  * </p>
+  *
+  * <h5>Events dispatched:</h5>
+  *
+  * <p>
+  * 	<code>connectionDestroyed</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
+  *     On clients other than which had the connection terminated.
+  * </p>
+  * <p>
+  * 	<code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151;
+  *     The user's role does not allow forcing other user's to disconnect (<code>event.code = 1530</code>),
+  * 	or the specified stream is not publishing to the session (<code>event.code = 1535</code>).
+  * </p>
+  * <p>
+  * 	<code>sessionDisconnected</code> (<a href="SessionDisconnectEvent.html">SessionDisconnectEvent</a>) &#151;
+  *     On the client which has the connection terminated.
+  * </p>
+  * <p>
+  * 	<code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
+  *     If streams are stopped as a result of the connection ending.
+  * </p>
+  *
+  * @param {Connection} connection The connection to be disconnected from the session.
+  * This value can either be a <a href="Connection.html">Connection</a> object or a connection ID (which can be
+  * obtained from the <code>connectionId</code> property of the Connection object).
+  *
+  * @method #forceDisconnect
+  * @memberOf Session
+  */
+
+  this.forceDisconnect = function(connectionOrConnectionId, completionHandler) {
+    var notPermittedErrorMsg = "This token does not allow forceDisconnect. The role must be at least `moderator` to enable this functionality";
+
+    if (permittedTo("forceDisconnect")) {
+      var connectionId = typeof(connectionOrConnectionId) === 'string' ? connectionOrConnectionId : connectionOrConnectionId.id;
+
+      if (completionHandler) {
+        var work = new RemoteWork(this, completionHandler, {
+          timeoutMessage: "Timed out while waiting for connection " + connectionId + " to be force Disconnected."
+        });
+
+        work.failsOnExceptionCodes({
+          1520: notPermittedErrorMsg
+        });
+
+        _callbacks.forceDisconnect[connectionId] = work;
+      }
+
+      _socket.forceDisconnect(connectionId);
+    } else {
+      // if this throws an error the handleJsException won't occur
+      if (completionHandler) OT.$.callAsync(completionHandler, new OT.Error(null, notPermittedErrorMsg));
+
+      TB.handleJsException(notPermittedErrorMsg, OT.ExceptionCodes.UNABLE_TO_FORCE_DISCONNECT, {
+        session: this
+      });
+    }
+  };
+
+ /**
+  * Forces the publisher of the specified stream to stop publishing the stream.
+  *
+  * <p>
+  * Calling this method causes the Session object to dispatch a <code>streamDestroyed</code>
+  * event on all clients that are subscribed to the stream (including the client that is
+  * publishing the stream). The <code>reason</code> property of the StreamEvent object is
+  * set to <code>"forceUnpublished"</code>.
+  * </p>
+  * <p>
+  * The TB object dispatches an <code>exception</code> event if the user's role
+  * does not include permissions required to force other users to unpublish.
+  * You define a user's role when you create the user token using the <code>generate_token()</code>
+  * method using our <a href="/opentok/libraries/server/">server-side libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page page.
+  * You pass the token string as a parameter of the <code>connect()</code> method of the Session object.
+  * See <a href="ExceptionEvent.html">ExceptionEvent</a> and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+  * </p>
+  *
+  * <h5>Events dispatched:</h5>
+  *
+  * <p>
+  * 	<code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151;
+  *     The user's role does not allow forcing other users to unpublish.
+  * </p>
+  * <p>
+  * 	<code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
+  *     The stream has been unpublished. The Session object dispatches this on all clients
+  *     subscribed to the stream, as well as on the publisher's client.
+  * </p>
+  *
+  * @param {Stream} stream The stream to be unpublished.
+  *
+  * @method #forceUnpublish
+  * @memberOf Session
+  */
+  this.forceUnpublish = function(streamOrStreamId, completionHandler) {
+    var notPermittedErrorMsg = "This token does not allow forceUnpublish. The role must be at least `moderator` to enable this functionality";
+
+    if (permittedTo("forceUnpublish")) {
+      var stream = typeof(streamOrStreamId) === 'string' ? this.streams.get(streamOrStreamId) : streamOrStreamId;
+
+      if (completionHandler) {
+        var work = new RemoteWork(this, completionHandler, {
+          timeoutMessage: "Timed out while waiting for stream " + stream.id + " to be force unpublished."
+        });
+
+        work.failsOnExceptionCodes({
+          1530: notPermittedErrorMsg
+        });
+
+        _callbacks.forceUnpublish[stream.id] = work;
+      }
+
+      _socket.forceUnpublish(stream.id);
+    } else {
+      // if this throws an error the handleJsException won't occur
+      if (completionHandler) OT.$.callAsync(completionHandler, new OT.Error(null, notPermittedErrorMsg));
+
+      TB.handleJsException(notPermittedErrorMsg, OT.ExceptionCodes.UNABLE_TO_FORCE_UNPUBLISH, {
+        session: this
+      });
+    }
+  };
+
+  this.getStateManager = function() {
+      OT.warn("Fixme: Have not implemented session.getStateManager");
+  };
+
+  OT.$.defineGetters(this, {
+    apiKey: function() { return _apiKey; },
+    token: function() { return _token; },
+    connected: function() { return this.is('connected'); },
+    connection: function() { return _socket && _socket.id ? this.connections.get(_socket.id) : null; },
+    capabilities: function() { return _socket ? _socket.capabilities : new OT.Capabilities([]); },
+    sessionId: function() { return _sessionId; },
+    id: function() { return _sessionId; }
+  }, true);
+
+
+	/**
+	 * A new connection to this session has been created.
+	 * @name connectionCreated
+	 * @event
+	 * @memberof Session
+	 * @see ConnectionEvent
+	 * @see <a href="TB.html#initSession">TB.initSession()</a>
+	 */
+
+	/**
+	 * A connection to this session has ended.
+	 * @name connectionDestroyed
+	 * @event
+	 * @memberof Session
+	 * @see ConnectionEvent
+	 */
+
+	/**
+	 * The page has connected to an OpenTok session. This event is dispatched asynchronously in response to
+	 * a successful call to the <code>connect()</code> method of a Session object. Before calling the <code>connect()</code>
+	 * method, initialize the session by calling the <code>TB.initSession()</code> method. For a code example and more details,
+	 * see <a href="#connect">Session.connect()</a>.
+	 * @name sessionConnected
+	 * @event
+	 * @memberof Session
+	 * @see SessionConnectEvent
+	 * @see <a href="#connect">Session.connect()</a>
+	 * @see <a href="TB.html#initSession">TB.initSession()</a>
+	 */
+
+	/**
+	 * The session has disconnected. This event may be dispatched asynchronously in response to a successful call to the
+	 * <code>disconnect()</code> method of the Session object. The event may also be disptached if a session connection is lost
+	 * inadvertantly, as in the case of a lost network connection.
+	 * @name sessionDisconnected
+	 * @event
+	 * @memberof Session
+	 * @see <a href="#disconnect">Session.disconnect()</a>
+	 * @see <a href="#disconnect">Session.forceDisconnect()</a>
+	 * @see SessionDisconnectEvent
+	 */
+
+	/**
+	 * A new stream has been created on this session. For a code example and more details, see {@link StreamEvent}.
+	 * @name streamCreated
+	 * @event
+	 * @memberof Session
+	 * @see StreamEvent
+	 * @see <a href="Session.html#publish">Session.publish()</a>
+	 */
+
+	/**
+	 * A stream has closed on this connection. For a code example and more details, see {@link StreamEvent}.
+	 * @name streamDestroyed
+	 * @event
+	 * @memberof Session
+	 * @see StreamEvent
+	 */
+
+	/**
+	 * A stream has started or stopped publishing audio or video (see <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a> and
+	 * <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a>); or the <code>videoDimensions</code> property of the Stream
+	 * object has changed (see <a href="Stream.html#"videoDimensions>Stream.videoDimensions</a>).
+	 * @name streamPropertyChanged
+	 * @event
+	 * @memberof Session
+	 * @see StreamPropertyChangedEvent
+	 * @see <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a>
+	 * @see <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a>
+	 * @see <a href="Stream.html#"hasAudio>Stream.hasAudio</a>
+	 * @see <a href="Stream.html#"hasVideo>Stream.hasVideo</a>
+	 * @see <a href="Stream.html#"videoDimensions>Stream.videoDimensions</a>
+	 */
+
+	/**
+	 * A signal was received from the session. The <a href="SignalEvent.html">SignalEvent</a> class defines this event object.
+	 * It includes the following properties:
+	 * <ul>
+	 *   <li><code>data</code> &mdash; (Object) The data payload sent with the signal (if there is one).</li>
+	 *   <li><code>from</code> &mdash; (<a href="Connection.html">Connection</a>) The Connection corresponding to the
+	 *   client that sent with the signal.</li>
+	 *   <li><code>type</code> &mdash; (String) The type assigned to the signal (if there is one).</li>
+	 * </ul>
+	 * <p>
+	 * You can register to receive all signals sent in the session, by adding an event handler for the <code>signal</code>
+	 * event. For example, the following code adds an event handler to process all signals sent in the session:
+	 * <pre>
+	 * session.addEventListener("signal", function(event) {
+	 *   console.log("Signal sent from connection " + event.from.id);
+	 * });
+	 * </pre>
+	 * <p>You can register for signals of a specfied type by adding an event handler for the <code>signal:type</code>
+	 * event (replacing <code>type</code> with the actual type string to filter on).
+	 *
+	 * @name signal
+	 * @event
+	 * @memberof Session
+	 * @see <a href="Session.html#signal">Session.signal()</a>
+	 * @see SignalEvent
+	 * @see <a href="#event:signal:type">signal:type</a> event
+	 */
+
+	/**
+	 * A signal of the specified type was received from the session. The <a href="SignalEvent.html">SignalEvent</a> class
+	 * defines this event object.
+	 * It includes the following properties:
+	 * <ul>
+	 *   <li><code>data</code> &mdash; (Object) The data payload sent with the signal.</li>
+	 *   <li><code>from</code> &mdash; (<a href="Connection.html">Connection</a>) The Connection corresponding to the
+	 *   client that sent with the signal.</li>
+	 *   <li><code>type</code> &mdash; (String) The type assigned to the signal (if there is one).</li>
+	 * </ul>
+	 * <p>
+	 * You can register for signals of a specfied type by adding an event handler for the <code>signal:type</code>
+	 * event (replacing <code>type</code> with the actual type string to filter on). For example, the following code adds
+	 * an event handler for signals of type "foo":
+	 * <pre>
+	 * session.addEventListener("signal:foo", function(event) {
+	 *   console.log("foo signal sent from connection " + event.from.id);
+	 * });
+	 * </pre>
+	 * <p>
+	 * You can register to receive <i>all</i> signals sent in the session, by adding an event handler for the
+	 * <code>signal</code> event.
+	 *
+	 * @name signal:type
+	 * @event
+	 * @memberof Session
+	 * @see <a href="Session.html#signal">Session.signal()</a>
+	 * @see SignalEvent
+	 * @see <a href="#event:signal">signal</a> event
+	 */
+
+
+};
+
+})(window);
+(function(window) {
+  var style = document.createElement('link');
+  style.type = 'text/css';
+  style.media = 'screen';
+  style.rel = 'stylesheet';
+  style.href = OT.properties.cssURL;
+  var head = document.head || document.getElementsByTagName('head')[0];
+  head.appendChild(style);
+})(window);
+(function(window){
+
+// Register as a named AMD module, since TokBox could be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Uppercase TB is used because AMD module names are
+// derived from file names, and OpenTok is normally delivered in an uppercase
+// file name.
+if ( typeof define === "function" && define.amd ) {
+  define( "TB", [], function () { return TB; } );
+}
+
+})(window);
diff --git a/test/webapp_test.js b/test/webapp_test.js
index d27f9b57c439..7ccadbf9b3be 100644
--- a/test/webapp_test.js
+++ b/test/webapp_test.js
@@ -9,16 +9,10 @@ var expect = chai.expect;
 describe("loop.webapp", function() {
   "use strict";
 
-  var sandbox, fakeXHR, requests = [];
+  var sandbox;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
-    fakeXHR = sandbox.useFakeXMLHttpRequest();
-    requests = [];
-    // https://github.com/cjohansen/Sinon.JS/issues/393
-    fakeXHR.xhr.onCreate = function(xhr) {
-      requests.push(xhr);
-    };
   });
 
   afterEach(function() {
@@ -29,7 +23,7 @@ describe("loop.webapp", function() {
     var conversation, fakeSessionData;
 
     beforeEach(function() {
-      conversation = new loop.webapp.ConversationModel();
+      conversation = new loop.shared.models.ConversationModel();
       fakeSessionData = {
         sessionId:    "sessionId",
         sessionToken: "sessionToken",
@@ -101,7 +95,8 @@ describe("loop.webapp", function() {
 
       describe("#conversation", function() {
         it("should load the ConversationView if session is set", function() {
-          sandbox.stub(loop.webapp.ConversationView.prototype, "initialize");
+          sandbox.stub(loop.shared.views.ConversationView.prototype,
+            "initialize");
           conversation.set("sessionId", "fakeSessionId");
 
           router.conversation();
@@ -148,89 +143,13 @@ describe("loop.webapp", function() {
     });
   });
 
-  describe("ConversationModel", function() {
-    var conversation, fakeSessionData;
-
-    beforeEach(function() {
-      conversation = new loop.webapp.ConversationModel();
-      fakeSessionData = {
-        sessionId:    "sessionId",
-        sessionToken: "sessionToken",
-        apiKey:       "apiKey"
-      };
-    });
-
-    describe("#initiate", function() {
-      it("should prevent launching a conversation when token is missing",
-        function() {
-          expect(function() {
-            conversation.initiate();
-          }).to.Throw(Error, /missing required attribute loopToken/);
-        });
-
-      it("should update conversation session information from server data",
-        function() {
-          conversation.set("loopToken", "fakeToken");
-          conversation.initiate();
-
-          expect(requests).to.have.length.of(1);
-
-          requests[0].respond(200, {"Content-Type": "application/json"},
-                                   JSON.stringify(fakeSessionData));
-
-          expect(conversation.get("sessionId")).eql("sessionId");
-          expect(conversation.get("sessionToken")).eql("sessionToken");
-          expect(conversation.get("apiKey")).eql("apiKey");
-        });
-
-      it("should trigger session:ready without fetching session data over "+
-         "HTTP when already set", function(done) {
-          sandbox.stub(jQuery, "ajax");
-          conversation.set("loopToken", "fakeToken");
-          conversation.set(fakeSessionData);
-
-          conversation.on("session:ready", function() {
-            sinon.assert.notCalled($.ajax);
-            done();
-          }).initiate();
-        });
-
-      it("should trigger a `session:error` on failure", function(done) {
-        conversation.set("loopToken", "fakeToken");
-        conversation.initiate();
-
-        conversation.on("session:error", function(err) {
-          expect(err.message).to.match(/failed: HTTP 400 Bad Request; fake/);
-          done();
-        });
-
-        requests[0].respond(400, {"Content-Type": "application/json"},
-                                  JSON.stringify({error: "fake"}));
-      });
-    });
-
-    describe("#setReady", function() {
-      it("should update conversation session information", function() {
-        conversation.setReady(fakeSessionData);
-
-        expect(conversation.get("sessionId")).eql("sessionId");
-        expect(conversation.get("sessionToken")).eql("sessionToken");
-        expect(conversation.get("apiKey")).eql("apiKey");
-      });
-
-      it("should trigger a `session:ready` event", function(done) {
-        conversation.on("session:ready", function() {
-          done();
-        }).setReady(fakeSessionData);
-      });
-    });
-  });
-
   describe("Router", function() {
     var router, conversation;
 
     beforeEach(function() {
-      conversation = new loop.webapp.ConversationModel({loopToken: "fake"});
+      conversation = new loop.shared.models.ConversationModel({
+        loopToken: "fake"
+      });
       router = new loop.webapp.Router({conversation: conversation});
     });
 
@@ -257,7 +176,7 @@ describe("loop.webapp", function() {
       var conversation, initiate, view, fakeSubmitEvent;
 
       beforeEach(function() {
-        conversation = new loop.webapp.ConversationModel();
+        conversation = new loop.shared.models.ConversationModel();
         view = new loop.webapp.ConversationFormView({model: conversation});
         fakeSubmitEvent = {preventDefault: sinon.spy()};
       });

From 4ac3aa169a0fca0a0672a6adab95ae0068b11184 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 041/117] Bug 985596 - Refactored shared assets & tests.
 r=dmose

--HG--
rename : static/shared/README.md => browser/components/loop/content/shared/README.md
rename : static/shared/css/common.css => browser/components/loop/content/shared/css/common.css
rename : static/shared/css/conversation.css => browser/components/loop/content/shared/css/conversation.css
rename : static/shared/css/panel.css => browser/components/loop/content/shared/css/panel.css
rename : static/shared/css/readme.html => browser/components/loop/content/shared/css/readme.html
rename : static/shared/img/icon_32.png => browser/components/loop/content/shared/img/icon_32.png
rename : static/shared/img/icon_64.png => browser/components/loop/content/shared/img/icon_64.png
rename : static/shared/js/models.js => browser/components/loop/content/shared/js/models.js
rename : static/shared/js/views.js => browser/components/loop/content/shared/js/views.js
rename : static/shared/libs/backbone-1.1.2.js => browser/components/loop/content/shared/libs/backbone-1.1.2.js
rename : static/shared/libs/jquery-2.1.0.js => browser/components/loop/content/shared/libs/jquery-2.1.0.js
rename : static/shared/libs/lodash-2.4.1.js => browser/components/loop/content/shared/libs/lodash-2.4.1.js
rename : static/shared/libs/sdk.js => browser/components/loop/content/shared/libs/sdk.js
rename : static/shared/libs/webl10n-20130617.js => browser/components/loop/content/shared/libs/webl10n-20130617.js
rename : static/css/webapp.css => browser/components/loop/standalone/content/css/webapp.css
rename : static/index.html => browser/components/loop/standalone/content/index.html
rename : static/js/webapp.js => browser/components/loop/standalone/content/js/webapp.js
rename : static/l10n/data.ini => browser/components/loop/standalone/content/l10n/data.ini
rename : test/webapp_test.js => browser/components/loop/test/standalone/webapp_test.js
extra : transplant_source : %DA%D9%3A%E9%C6%E0d%13%84%C1%BEps%C8b%F09o%D7m
---
 .../components/loop/content}/shared/README.md |   0
 .../loop/content}/shared/css/common.css       |   0
 .../loop/content}/shared/css/conversation.css |   0
 .../loop/content}/shared/css/panel.css        |   0
 .../loop/content}/shared/css/readme.html      |   0
 .../loop/content}/shared/img/icon_32.png      | Bin
 .../loop/content}/shared/img/icon_64.png      | Bin
 .../loop/content}/shared/js/models.js         |  29 +++-
 .../loop/content/shared/js/router.js          |  37 +++++
 .../loop/content}/shared/js/views.js          |  75 ++++++++--
 .../content}/shared/libs/backbone-1.1.2.js    |   0
 .../loop/content}/shared/libs/jquery-2.1.0.js |   0
 .../loop/content}/shared/libs/lodash-2.4.1.js |   0
 .../loop/content}/shared/libs/sdk.js          |   0
 .../content}/shared/libs/webl10n-20130617.js  |   0
 .../components/loop/standalone/.jshintignore  |   2 +-
 browser/components/loop/standalone/Makefile   |   2 +-
 browser/components/loop/standalone/README.md  |   6 +-
 .../loop/standalone/content}/css/webapp.css   |   0
 .../loop/standalone/content}/index.html       |   1 +
 .../loop/standalone/content}/js/webapp.js     |  45 +++---
 .../loop/standalone/content}/l10n/data.ini    |   0
 browser/components/loop/standalone/server.js  |   2 +-
 .../components/loop/test/shared/index.html    |  21 ++-
 .../loop/test/shared/models_test.js           |   9 +-
 .../loop/test/shared/router_test.js           |  40 ++++++
 .../components/loop/test/shared/views_test.js | 132 +++++++++++++++++-
 .../loop/test/standalone/index.html           |  45 ++++++
 .../loop/test/standalone}/webapp_test.js      |  53 ++-----
 29 files changed, 395 insertions(+), 104 deletions(-)
 rename {static => browser/components/loop/content}/shared/README.md (100%)
 rename {static => browser/components/loop/content}/shared/css/common.css (100%)
 rename {static => browser/components/loop/content}/shared/css/conversation.css (100%)
 rename {static => browser/components/loop/content}/shared/css/panel.css (100%)
 rename {static => browser/components/loop/content}/shared/css/readme.html (100%)
 rename {static => browser/components/loop/content}/shared/img/icon_32.png (100%)
 rename {static => browser/components/loop/content}/shared/img/icon_64.png (100%)
 rename {static => browser/components/loop/content}/shared/js/models.js (81%)
 create mode 100644 browser/components/loop/content/shared/js/router.js
 rename {static => browser/components/loop/content}/shared/js/views.js (52%)
 rename {static => browser/components/loop/content}/shared/libs/backbone-1.1.2.js (100%)
 rename {static => browser/components/loop/content}/shared/libs/jquery-2.1.0.js (100%)
 rename {static => browser/components/loop/content}/shared/libs/lodash-2.4.1.js (100%)
 rename {static => browser/components/loop/content}/shared/libs/sdk.js (100%)
 rename {static => browser/components/loop/content}/shared/libs/webl10n-20130617.js (100%)
 rename {static => browser/components/loop/standalone/content}/css/webapp.css (100%)
 rename {static => browser/components/loop/standalone/content}/index.html (97%)
 rename {static => browser/components/loop/standalone/content}/js/webapp.js (79%)
 rename {static => browser/components/loop/standalone/content}/l10n/data.ini (100%)
 create mode 100644 browser/components/loop/test/shared/router_test.js
 create mode 100644 browser/components/loop/test/standalone/index.html
 rename {test => browser/components/loop/test/standalone}/webapp_test.js (75%)

diff --git a/static/shared/README.md b/browser/components/loop/content/shared/README.md
similarity index 100%
rename from static/shared/README.md
rename to browser/components/loop/content/shared/README.md
diff --git a/static/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
similarity index 100%
rename from static/shared/css/common.css
rename to browser/components/loop/content/shared/css/common.css
diff --git a/static/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
similarity index 100%
rename from static/shared/css/conversation.css
rename to browser/components/loop/content/shared/css/conversation.css
diff --git a/static/shared/css/panel.css b/browser/components/loop/content/shared/css/panel.css
similarity index 100%
rename from static/shared/css/panel.css
rename to browser/components/loop/content/shared/css/panel.css
diff --git a/static/shared/css/readme.html b/browser/components/loop/content/shared/css/readme.html
similarity index 100%
rename from static/shared/css/readme.html
rename to browser/components/loop/content/shared/css/readme.html
diff --git a/static/shared/img/icon_32.png b/browser/components/loop/content/shared/img/icon_32.png
similarity index 100%
rename from static/shared/img/icon_32.png
rename to browser/components/loop/content/shared/img/icon_32.png
diff --git a/static/shared/img/icon_64.png b/browser/components/loop/content/shared/img/icon_64.png
similarity index 100%
rename from static/shared/img/icon_64.png
rename to browser/components/loop/content/shared/img/icon_64.png
diff --git a/static/shared/js/models.js b/browser/components/loop/content/shared/js/models.js
similarity index 81%
rename from static/shared/js/models.js
rename to browser/components/loop/content/shared/js/models.js
index 437c90c26911..e9d307af7278 100644
--- a/static/shared/js/models.js
+++ b/browser/components/loop/content/shared/js/models.js
@@ -14,6 +14,7 @@ loop.shared.models = (function() {
    */
   var ConversationModel = Backbone.Model.extend({
     defaults: {
+      callerId:     undefined, // Loop caller id
       loopToken:    undefined, // Loop conversation token
       sessionId:    undefined, // TB session id
       sessionToken: undefined, // TB session token
@@ -31,12 +32,11 @@ loop.shared.models = (function() {
      *   retrieved from the server;
      * - `session:error` when the request failed.
      *
-     * @param  {Object} baseServerUrl The server URL
-     * @throws {Error} If no baseServerUrl is given
-     * @throws {Error} If no conversation token is set
+     * @param  {String} baseServerUrl The server URL
+     * @throws {Error}  If no baseServerUrl is given
+     * @throws {Error}  If no conversation token is set
      */
     initiate: function(baseServerUrl) {
-
       if (!baseServerUrl) {
         throw new Error("baseServerUrl arg must be passed to initiate()");
       }
@@ -95,7 +95,26 @@ loop.shared.models = (function() {
     }
   });
 
+  /**
+   * Notification model.
+   */
+  var NotificationModel = Backbone.Model.extend({
+    defaults: {
+      level: "info",
+      message: ""
+    }
+  });
+
+  /**
+   * Notification collection
+   */
+  var NotificationCollection = Backbone.Collection.extend({
+    model: NotificationModel
+  });
+
   return {
-    ConversationModel: ConversationModel
+    ConversationModel: ConversationModel,
+    NotificationCollection: NotificationCollection,
+    NotificationModel: NotificationModel
   };
 })();
diff --git a/browser/components/loop/content/shared/js/router.js b/browser/components/loop/content/shared/js/router.js
new file mode 100644
index 000000000000..87712033f75b
--- /dev/null
+++ b/browser/components/loop/content/shared/js/router.js
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.router = (function() {
+  "use strict";
+
+  /**
+   * Base Router. Allows defining a main active view and ease toggling it when
+   * the active route changes.
+   *
+   * @link http://mikeygee.com/blog/backbone.html
+   */
+  var BaseRouter = Backbone.Router.extend({
+    activeView: undefined,
+
+    /**
+     * Loads and render current active view.
+     *
+     * @param {loop.shared.views.BaseView} view View.
+     */
+    loadView : function(view) {
+      if (this.activeView) {
+        this.activeView.hide();
+      }
+      this.activeView = view.render().show();
+    }
+  });
+
+  return {
+    BaseRouter: BaseRouter
+  };
+})();
diff --git a/static/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
similarity index 52%
rename from static/shared/js/views.js
rename to browser/components/loop/content/shared/js/views.js
index 01e35aa6538e..2a223e553da1 100644
--- a/static/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -4,8 +4,6 @@
 
 /* global loop:true */
 
-// XXX This file needs unit tests.
-
 var loop = loop || {};
 loop.shared = loop.shared || {};
 loop.shared.views = (function(TB) {
@@ -42,15 +40,23 @@ loop.shared.views = (function(TB) {
   var ConversationView = BaseView.extend({
     el: "#conversation",
 
-    initialize: function() {
-      this.videoStyles = { width: "100%", height: "100%" };
+    videoStyles: { width: "100%", height: "100%" },
 
-      // XXX this feels like to be moved to the ConversationModel, but as it's
+    /**
+     * Establishes webrtc communication using TB sdk.
+     */
+    initialize: function(options) {
+      options = options || {};
+      if (!options.sdk) {
+        throw new Error("missing required sdk");
+      }
+      this.sdk = options.sdk;
+      // XXX: this feels like to be moved to the ConversationModel, but as it's
       // tighly coupled with the DOM (element ids to receive streams), we'd need
       // an abstraction we probably don't want yet.
-      this.session   = TB.initSession(this.model.get("sessionId"));
-      this.publisher = TB.initPublisher(this.model.get("apiKey"), "outgoing",
-                                        this.videoStyles);
+      this.session   = this.sdk.initSession(this.model.get("sessionId"));
+      this.publisher = this.sdk.initPublisher(this.model.get("apiKey"),
+                                              "outgoing", this.videoStyles);
 
       this.session.connect(this.model.get("apiKey"),
                            this.model.get("sessionToken"));
@@ -85,8 +91,59 @@ loop.shared.views = (function(TB) {
     }
   });
 
+  /**
+   * Notification view.
+   */
+  var NotificationView = Backbone.View.extend({
+    template: _.template([
+      '<div class="alert alert-<%- level %>">',
+      '  <button class="close"></button>',
+      '  <p class="message"><%- message %></p>',
+      '</div>'
+    ].join("")),
+
+    events: {
+      "click .close": "dismiss"
+    },
+
+    dismiss: function(event) {
+      event.preventDefault();
+      this.$el.addClass("fade-out");
+      setTimeout(function() {
+        this.collection.remove(this.model);
+        this.remove();
+      }.bind(this), 500); // XXX make timeout value configurable
+    },
+
+    render: function() {
+      this.$el.html(this.template(this.model.toJSON()));
+      return this;
+    }
+  });
+
+  /**
+   * Notification list view.
+   */
+  var NotificationListView = Backbone.View.extend({
+    initialize: function() {
+      this.listenTo(this.collection, "reset add remove", this.render);
+    },
+
+    render: function() {
+      this.$el.html(this.collection.map(function(notification) {
+        return new NotificationView({
+          model: notification,
+          collection: this.collection
+        }).render().$el;
+      }.bind(this)));
+      return this;
+    }
+  });
+
   return {
     BaseView: BaseView,
-    ConversationView: ConversationView
+    ConversationView: ConversationView,
+    NotificationListView: NotificationListView,
+    NotificationView: NotificationView
   };
 })(window.TB);
diff --git a/static/shared/libs/backbone-1.1.2.js b/browser/components/loop/content/shared/libs/backbone-1.1.2.js
similarity index 100%
rename from static/shared/libs/backbone-1.1.2.js
rename to browser/components/loop/content/shared/libs/backbone-1.1.2.js
diff --git a/static/shared/libs/jquery-2.1.0.js b/browser/components/loop/content/shared/libs/jquery-2.1.0.js
similarity index 100%
rename from static/shared/libs/jquery-2.1.0.js
rename to browser/components/loop/content/shared/libs/jquery-2.1.0.js
diff --git a/static/shared/libs/lodash-2.4.1.js b/browser/components/loop/content/shared/libs/lodash-2.4.1.js
similarity index 100%
rename from static/shared/libs/lodash-2.4.1.js
rename to browser/components/loop/content/shared/libs/lodash-2.4.1.js
diff --git a/static/shared/libs/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
similarity index 100%
rename from static/shared/libs/sdk.js
rename to browser/components/loop/content/shared/libs/sdk.js
diff --git a/static/shared/libs/webl10n-20130617.js b/browser/components/loop/content/shared/libs/webl10n-20130617.js
similarity index 100%
rename from static/shared/libs/webl10n-20130617.js
rename to browser/components/loop/content/shared/libs/webl10n-20130617.js
diff --git a/browser/components/loop/standalone/.jshintignore b/browser/components/loop/standalone/.jshintignore
index a8f602076302..a7b5683a54a4 100644
--- a/browser/components/loop/standalone/.jshintignore
+++ b/browser/components/loop/standalone/.jshintignore
@@ -1,4 +1,4 @@
 node_modules
-static/shared/libs
+content/shared/libs
 test/shared/vendor
 
diff --git a/browser/components/loop/standalone/Makefile b/browser/components/loop/standalone/Makefile
index 306eb4c48644..306c0f6c4c33 100644
--- a/browser/components/loop/standalone/Makefile
+++ b/browser/components/loop/standalone/Makefile
@@ -11,7 +11,7 @@ test:
 	@echo "Not implemented yet."
 
 lint:
-	@$(NODE_LOCAL_BIN)/jshint *.js static test
+	@$(NODE_LOCAL_BIN)/jshint *.js content test
 
 runserver:
 	@node server.js
diff --git a/browser/components/loop/standalone/README.md b/browser/components/loop/standalone/README.md
index e4eccab2c6c0..4349c817d1cb 100644
--- a/browser/components/loop/standalone/README.md
+++ b/browser/components/loop/standalone/README.md
@@ -20,11 +20,11 @@ For development, run a local static file server:
 
 Then point your browser at:
 
-- `http://localhost:3000/static/` for public web contents,
+- `http://localhost:3000/content/` for all public webapp contents,
 - `http://localhost:3000/test/` for tests.
 
-**Note:** the provided static file server is **not** intended for production
-use.
+**Note:** the provided static file server for web contents is **not** intended
+for production use.
 
 Code linting
 ------------
diff --git a/static/css/webapp.css b/browser/components/loop/standalone/content/css/webapp.css
similarity index 100%
rename from static/css/webapp.css
rename to browser/components/loop/standalone/content/css/webapp.css
diff --git a/static/index.html b/browser/components/loop/standalone/content/index.html
similarity index 97%
rename from static/index.html
rename to browser/components/loop/standalone/content/index.html
index 2a413c2e4fcb..b6ad0f59e11e 100644
--- a/static/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -56,6 +56,7 @@
     <!-- app scripts -->
     <script type="text/javascript" src="shared/js/models.js"></script>
     <script type="text/javascript" src="shared/js/views.js"></script>
+    <script type="text/javascript" src="shared/js/router.js"></script>
     <script type="text/javascript" src="js/webapp.js"></script>
 
     <script>
diff --git a/static/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
similarity index 79%
rename from static/js/webapp.js
rename to browser/components/loop/standalone/content/js/webapp.js
index 33ce96607e3f..8915269cc943 100644
--- a/static/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -15,11 +15,15 @@ loop.webapp = (function($, TB) {
    *
    * @type {String}
    */
-  var baseApiUrl = "http://localhost:5000";
+  var sharedModels = loop.shared.models,
+      sharedViews = loop.shared.views,
+      // XXX this one should be configurable
+      //     see https://bugzilla.mozilla.org/show_bug.cgi?id=987086
+      baseServerUrl = "http://localhost:5000";
 
   /**
    * App router.
-   * @type {loop.webapp.Router}
+   * @type {loop.webapp.WebappRouter}
    */
   var router;
 
@@ -32,7 +36,7 @@ loop.webapp = (function($, TB) {
   /**
    * Homepage view.
    */
-  var HomeView = loop.shared.views.BaseView.extend({
+  var HomeView = sharedViews.BaseView.extend({
     el: "#home"
   });
 
@@ -40,7 +44,7 @@ loop.webapp = (function($, TB) {
    * Conversation launcher view. A ConversationModel is associated and attached
    * as a `model` property.
    */
-  var ConversationFormView = loop.shared.views.BaseView.extend({
+  var ConversationFormView = sharedViews.BaseView.extend({
     el: "#conversation-form",
 
     events: {
@@ -57,18 +61,18 @@ loop.webapp = (function($, TB) {
 
     initiate: function(event) {
       event.preventDefault();
-      this.model.initiate(baseApiUrl);
+      this.model.initiate(baseServerUrl);
     }
   });
 
   /**
-   * App Router. Allows defining a main active view and ease toggling it when
-   * the active route changes.
+   * Webapp Router. Allows defining a main active view and easily toggling it
+   * when the active route changes.
+   *
    * @link http://mikeygee.com/blog/backbone.html
    */
-  var Router = Backbone.Router.extend({
+  var WebappRouter = loop.shared.router.BaseRouter.extend({
     _conversation: undefined,
-    activeView: undefined,
 
     routes: {
       "": "home",
@@ -104,18 +108,6 @@ loop.webapp = (function($, TB) {
       this.navigate("call/" + this._conversation.get("token"), {trigger: true});
     },
 
-    /**
-     * Loads and render current active view.
-     *
-     * @param {loop.shared.BaseView} view View.
-     */
-    loadView : function(view) {
-      if (this.activeView) {
-        this.activeView.hide();
-      }
-      this.activeView = view.render().show();
-    },
-
     /**
      * Default entry point.
      */
@@ -149,7 +141,10 @@ loop.webapp = (function($, TB) {
         }
       }
       this.loadView(
-        new loop.shared.views.ConversationView({model: this._conversation}));
+        new sharedViews.ConversationView({
+          sdk: TB,
+          model: this._conversation
+        }));
     }
   });
 
@@ -157,8 +152,8 @@ loop.webapp = (function($, TB) {
    * App initialization.
    */
   function init() {
-    conversation = new loop.shared.models.ConversationModel();
-    router = new Router({conversation: conversation});
+    conversation = new sharedModels.ConversationModel();
+    router = new WebappRouter({conversation: conversation});
     Backbone.history.start();
   }
 
@@ -166,6 +161,6 @@ loop.webapp = (function($, TB) {
     ConversationFormView: ConversationFormView,
     HomeView: HomeView,
     init: init,
-    Router: Router
+    WebappRouter: WebappRouter
   };
 })(jQuery, window.TB);
diff --git a/static/l10n/data.ini b/browser/components/loop/standalone/content/l10n/data.ini
similarity index 100%
rename from static/l10n/data.ini
rename to browser/components/loop/standalone/content/l10n/data.ini
diff --git a/browser/components/loop/standalone/server.js b/browser/components/loop/standalone/server.js
index 6a917d9eeb54..60010cfb622e 100644
--- a/browser/components/loop/standalone/server.js
+++ b/browser/components/loop/standalone/server.js
@@ -9,6 +9,6 @@ app.use(express.static(__dirname + '/'));
 
 app.listen(3000);
 console.log("Serving repository root over HTTP at http://localhost:3000/");
-console.log("Static contents are available at http://localhost:3000/static/");
+console.log("Static contents are available at http://localhost:3000/content/");
 console.log("Tests are viewable at http://localhost:3000/test/");
 console.log("Use this for development only.");
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index 04e412c9ca59..fd51146629a3 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -3,16 +3,13 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <html>
-
 <head>
   <meta charset="utf-8">
   <title>Loop mocha tests</title>
   <link rel="stylesheet" media="all" href="vendor/mocha-1.17.1.css">
-  <link rel="prefetch" type="application/l10n" href="../../static/l10n/data.ini">
+  <link rel="prefetch" type="application/l10n" href="../../content/l10n/data.ini">
 </head>
-
 <body>
-
   <div id="mocha">
     <p><a href=".">Index</a></p>
   </div>
@@ -20,10 +17,10 @@
   <div id="fixtures"></div>
 
   <!-- libs -->
-  <script src="../../static/shared/libs/webl10n-20130617.js"></script>
-  <script src="../../static/shared/libs/jquery-2.1.0.js"></script>
-  <script src="../../static/shared/libs/lodash-2.4.1.js"></script>
-  <script src="../../static/shared/libs/backbone-1.1.2.js"></script>
+  <script src="../../content/shared/libs/webl10n-20130617.js"></script>
+  <script src="../../content/shared/libs/jquery-2.1.0.js"></script>
+  <script src="../../content/shared/libs/lodash-2.4.1.js"></script>
+  <script src="../../content/shared/libs/backbone-1.1.2.js"></script>
 
   <!-- test dependencies -->
   <script src="vendor/mocha-1.17.1.js"></script>
@@ -35,17 +32,17 @@
   </script>
 
   <!-- App scripts -->
-  <script src="../../static/shared/js/models.js"></script>
-  <script src="../../static/shared/js/views.js"></script>
-
+  <script src="../../content/shared/js/models.js"></script>
+  <script src="../../content/shared/js/views.js"></script>
+  <script src="../../content/shared/js/router.js"></script>
   <!-- Test scripts -->
   <script src="models_test.js"></script>
   <script src="views_test.js"></script>
+  <script src="router_test.js"></script>
   <script>
     mocha.run(function () {
       $("#mocha").append("<p>Complete.</p>");
     });
   </script>
-
 </body>
 </html>
diff --git a/browser/components/loop/test/shared/models_test.js b/browser/components/loop/test/shared/models_test.js
index 153ccde804f8..eb67c3e149d5 100644
--- a/browser/components/loop/test/shared/models_test.js
+++ b/browser/components/loop/test/shared/models_test.js
@@ -9,7 +9,8 @@ var expect = chai.expect;
 describe("loop.shared.models", function() {
   "use strict";
 
-  var sandbox, fakeXHR, requests = [];
+  var sharedModels = loop.shared.models,
+      sandbox, fakeXHR, requests = [];
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -29,7 +30,7 @@ describe("loop.shared.models", function() {
     var conversation, fakeSessionData, fakeBaseServerUrl;
 
     beforeEach(function() {
-      conversation = new loop.shared.models.ConversationModel();
+      conversation = new sharedModels.ConversationModel();
       fakeSessionData = {
         sessionId:    "sessionId",
         sessionToken: "sessionToken",
@@ -39,7 +40,6 @@ describe("loop.shared.models", function() {
     });
 
     describe("#initiate", function() {
-
       it("should throw an Error if no baseServerUrl argument is passed",
         function () {
           expect(function() {
@@ -69,8 +69,8 @@ describe("loop.shared.models", function() {
       it("should update conversation session information from server data",
         function() {
           conversation.set("loopToken", "fakeToken");
-
           conversation.initiate(fakeBaseServerUrl);
+
           requests[0].respond(200, {"Content-Type": "application/json"},
                                    JSON.stringify(fakeSessionData));
 
@@ -122,4 +122,3 @@ describe("loop.shared.models", function() {
     });
   });
 });
-
diff --git a/browser/components/loop/test/shared/router_test.js b/browser/components/loop/test/shared/router_test.js
new file mode 100644
index 000000000000..8f1dbbc83813
--- /dev/null
+++ b/browser/components/loop/test/shared/router_test.js
@@ -0,0 +1,40 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop, sinon */
+
+var expect = chai.expect;
+
+describe("loop.shared.router", function() {
+  "use strict";
+
+  var sandbox;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("BaseRouter", function() {
+    var router;
+
+    beforeEach(function() {
+      router = new loop.shared.router.BaseRouter();
+    });
+
+    describe("#loadView", function() {
+      it("should set the active view", function() {
+        var TestView = loop.shared.views.BaseView.extend({});
+        var view = new TestView();
+
+        router.loadView(view);
+
+        expect(router.activeView).eql(view);
+      });
+    });
+  });
+});
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index 74b94bb40cc2..a180f74376f8 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -2,23 +2,149 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* global sinon */
+/* global loop, sinon */
+
+var expect = chai.expect;
 
 describe("loop.shared.views", function() {
   "use strict";
 
-  var sandbox;
+  var sharedModels = loop.shared.models,
+      sharedViews = loop.shared.views,
+      sandbox;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
+    sandbox.useFakeTimers(); // exposes sandbox.clock as a fake timer
   });
 
   afterEach(function() {
+    $("#fixtures").empty();
     sandbox.restore();
   });
 
   describe("ConversationView", function() {
-    it("should be tested");
+    var fakeSDK, fakeSession;
+
+    beforeEach(function() {
+      fakeSession = _.extend({
+        connect: sandbox.spy()
+      }, Backbone.Events);
+      fakeSDK = {
+        initPublisher: sandbox.spy(),
+        initSession: sandbox.stub().returns(fakeSession)
+      };
+    });
+
+    describe("initialize", function() {
+      it("should require an sdk object", function() {
+        expect(function() {
+          new sharedViews.ConversationView();
+        }).to.Throw(Error, /sdk/);
+      });
+
+      it("should initiate a session", function() {
+        new sharedViews.ConversationView({
+          sdk: fakeSDK,
+          model: new sharedModels.ConversationModel()
+        });
+
+        sinon.assert.calledOnce(fakeSession.connect);
+      });
+
+      it("should trigger a session:ended model event when connectionDestroyed" +
+         " event is received/", function(done) {
+          // XXX remove when we implement proper notifications
+          sandbox.stub(window, "alert");
+          var model = new sharedModels.ConversationModel();
+          new sharedViews.ConversationView({
+            sdk: fakeSDK,
+            model: model
+          });
+
+          model.once("session:ended", function() {
+            done();
+          });
+
+          fakeSession.trigger("connectionDestroyed", {reason: "ko"});
+        });
+    });
+  });
+
+  describe("NotificationView", function() {
+    var collection, model, view;
+
+    beforeEach(function() {
+      $("#fixtures").append('<div id="test-notif"></div>');
+      model = new sharedModels.NotificationModel({
+        level: "error",
+        message: "plop"
+      });
+      collection = new sharedModels.NotificationCollection([model]);
+      view = new sharedViews.NotificationView({
+        el: $("#test-notif"),
+        collection: collection,
+        model: model
+      });
+    });
+
+    describe("#dismiss", function() {
+      it("should automatically dismiss notification after 500ms", function() {
+        view.render().dismiss({preventDefault: sandbox.spy()});
+
+        expect(view.$(".message").text()).eql("plop");
+
+        sandbox.clock.tick(500);
+
+        expect(collection).to.have.length.of(0);
+        expect($("#test-notif").html()).eql(undefined);
+      });
+    });
+
+    describe("#render", function() {
+      it("should render template with model attribute values", function() {
+        view.render();
+
+        expect(view.$(".message").text()).eql("plop");
+      });
+    });
+  });
+
+  describe("NotificationListView", function() {
+    describe("Collection events", function() {
+      var coll, testNotif, view;
+
+      beforeEach(function() {
+        sandbox.stub(sharedViews.NotificationListView.prototype, "render");
+        testNotif = new sharedModels.NotificationModel({
+          level: "error",
+          message: "plop"
+        });
+        coll = new sharedModels.NotificationCollection();
+        view = new sharedViews.NotificationListView({collection: coll});
+      });
+
+      it("should render on notification added to the collection", function() {
+        coll.add(testNotif);
+
+        sinon.assert.calledOnce(view.render);
+      });
+
+      it("should render on notification removed from the collection",
+        function() {
+          coll.add(testNotif);
+          coll.remove(testNotif);
+
+          sinon.assert.calledTwice(view.render);
+        });
+
+      it("should render on collection reset",
+        function() {
+          coll.reset();
+
+          sinon.assert.calledOnce(view.render);
+        });
+    });
   });
 });
 
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
new file mode 100644
index 000000000000..ad85824d1933
--- /dev/null
+++ b/browser/components/loop/test/standalone/index.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Loop mocha tests</title>
+  <link rel="stylesheet" media="all" href="../shared/vendor/mocha-1.17.1.css">
+  <link rel="prefetch" type="application/l10n" href="../../content/l10n/data.ini">
+</head>
+<body>
+  <div id="mocha">
+    <p><a href=".">Index</a></p>
+    <p><a href="../shared/">Shared Tests</a></p>
+ </div>
+  <div id="messages"></div>
+  <div id="fixtures"></div>
+  <!-- libs -->
+  <script src="../../content/shared/libs/webl10n-20130617.js"></script>
+  <script src="../../content/shared/libs/jquery-2.1.0.js"></script>
+  <script src="../../content/shared/libs/lodash-2.4.1.js"></script>
+  <script src="../../content/shared/libs/backbone-1.1.2.js"></script>
+  <!-- test dependencies -->
+  <script src="../shared/vendor/mocha-1.17.1.js"></script>
+  <script src="../shared/vendor/chai-1.9.0.js"></script>
+  <script src="../shared/vendor/sinon-1.9.0.js"></script>
+  <script>
+    chai.Assertion.includeStack = true;
+    mocha.setup('bdd');
+  </script>
+  <!-- App scripts -->
+  <script src="../../content/shared/js/models.js"></script>
+  <script src="../../content/shared/js/views.js"></script>
+  <script src="../../content/shared/js/router.js"></script>
+  <script src="../../content/js/webapp.js"></script>
+  <!-- Test scripts -->
+  <script src="webapp_test.js"></script>
+  <script>
+    mocha.run(function () {
+      $("#mocha").append("<p>Complete.</p>");
+    });
+</script>
+</body>
+</html>
diff --git a/test/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
similarity index 75%
rename from test/webapp_test.js
rename to browser/components/loop/test/standalone/webapp_test.js
index 7ccadbf9b3be..ad4639409587 100644
--- a/test/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -9,7 +9,8 @@ var expect = chai.expect;
 describe("loop.webapp", function() {
   "use strict";
 
-  var sandbox;
+  var sharedModels = loop.shared.models,
+      sandbox;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -19,11 +20,11 @@ describe("loop.webapp", function() {
     sandbox.restore();
   });
 
-  describe("Router", function() {
+  describe("WebappRouter", function() {
     var conversation, fakeSessionData;
 
     beforeEach(function() {
-      conversation = new loop.shared.models.ConversationModel();
+      conversation = new sharedModels.ConversationModel();
       fakeSessionData = {
         sessionId:    "sessionId",
         sessionToken: "sessionToken",
@@ -34,14 +35,14 @@ describe("loop.webapp", function() {
     describe("#constructor", function() {
       it("should require a ConversationModel instance", function() {
         expect(function() {
-          new loop.webapp.Router();
+          new loop.webapp.WebappRouter();
         }).to.Throw(Error, /missing required conversation/);
       });
 
       it("should load the HomeView", function() {
-        sandbox.stub(loop.webapp.Router.prototype, "loadView");
+        sandbox.stub(loop.webapp.WebappRouter.prototype, "loadView");
 
-        var router = new loop.webapp.Router({conversation: conversation});
+        var router = new loop.webapp.WebappRouter({conversation: conversation});
 
         sinon.assert.calledOnce(router.loadView);
         sinon.assert.calledWithMatch(router.loadView,
@@ -53,7 +54,7 @@ describe("loop.webapp", function() {
       var router;
 
       beforeEach(function() {
-        router = new loop.webapp.Router({conversation: conversation});
+        router = new loop.webapp.WebappRouter({conversation: conversation});
       });
 
       describe("#loadView", function() {
@@ -66,7 +67,7 @@ describe("loop.webapp", function() {
       var router;
 
       beforeEach(function() {
-        router = new loop.webapp.Router({conversation: conversation});
+        router = new loop.webapp.WebappRouter({conversation: conversation});
         sandbox.stub(router, "loadView");
       });
 
@@ -132,8 +133,10 @@ describe("loop.webapp", function() {
     describe("Events", function() {
       it("should navigate to call/ongoing once the call session is ready",
         function() {
-          sandbox.stub(loop.webapp.Router.prototype, "navigate");
-          var router = new loop.webapp.Router({conversation: conversation});
+          sandbox.stub(loop.webapp.WebappRouter.prototype, "navigate");
+          var router = new loop.webapp.WebappRouter({
+            conversation: conversation
+          });
 
           conversation.setReady(fakeSessionData);
 
@@ -143,40 +146,12 @@ describe("loop.webapp", function() {
     });
   });
 
-  describe("Router", function() {
-    var router, conversation;
-
-    beforeEach(function() {
-      conversation = new loop.shared.models.ConversationModel({
-        loopToken: "fake"
-      });
-      router = new loop.webapp.Router({conversation: conversation});
-    });
-
-    describe("#constructor", function() {
-      it("should define a default active view", function() {
-        expect(router.activeView).to.be.an.instanceOf(loop.webapp.HomeView);
-      });
-    });
-
-    describe("#loadView", function() {
-      it("should set the active view", function() {
-        router.loadView(new loop.webapp.ConversationFormView({
-          model: conversation
-        }));
-
-        expect(router.activeView).to.be.an.instanceOf(
-          loop.webapp.ConversationFormView);
-      });
-    });
-  });
-
   describe("ConversationFormView", function() {
     describe("#initiate", function() {
       var conversation, initiate, view, fakeSubmitEvent;
 
       beforeEach(function() {
-        conversation = new loop.shared.models.ConversationModel();
+        conversation = new sharedModels.ConversationModel();
         view = new loop.webapp.ConversationFormView({model: conversation});
         fakeSubmitEvent = {preventDefault: sinon.spy()};
       });

From a87e3940b2766c0702757fddfeb903a6378cfa9a Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 042/117] Bug 985596 Improve conversation model to handle
 incoming and outgoing calls. r=dmose

--HG--
extra : transplant_source : %DA%3FS%93%89%FF%90S3%E7%18%26%5D%2An.K%EA%BA%80
---
 .../loop/content/shared/js/client.js          | 163 +++++++++++++++
 .../loop/content/shared/js/models.js          |  66 +++---
 .../loop/standalone/content/index.html        |   1 +
 .../loop/standalone/content/js/webapp.js      |   5 +-
 .../loop/test/shared/client_test.js           | 192 ++++++++++++++++++
 .../components/loop/test/shared/index.html    |   3 +
 .../loop/test/shared/models_test.js           |  85 +++++---
 .../loop/test/standalone/webapp_test.js       |  16 +-
 8 files changed, 463 insertions(+), 68 deletions(-)
 create mode 100644 browser/components/loop/content/shared/js/client.js
 create mode 100644 browser/components/loop/test/shared/client_test.js

diff --git a/browser/components/loop/content/shared/js/client.js b/browser/components/loop/content/shared/js/client.js
new file mode 100644
index 000000000000..60ad773c6f50
--- /dev/null
+++ b/browser/components/loop/content/shared/js/client.js
@@ -0,0 +1,163 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.Client = (function($) {
+  "use strict";
+
+  /**
+   * Loop server client.
+   *
+   * @param {Object} settings Settings object.
+   */
+  function Client(settings) {
+    settings = settings || {};
+    if (!settings.hasOwnProperty("baseServerUrl") ||
+        !settings.baseServerUrl) {
+      throw new Error("missing required baseServerUrl");
+    }
+    this.settings = settings;
+  }
+
+  Client.prototype = {
+    /**
+     * Validates a data object to confirm it has the specified properties.
+     *
+     * @param  {Object} The data object to verify
+     * @param  {Array} The list of properties to verify within the object
+     * @return This returns either the specific property if only one
+     *         property is specified, or it returns all properties
+     */
+    _validate: function(data, properties) {
+      if (typeof data !== "object") {
+        throw new Error("Invalid data received from server");
+      }
+
+      properties.forEach(function (property) {
+        if (!data.hasOwnProperty(property)) {
+          throw new Error("Invalid data received from server - missing " +
+            property);
+        }
+      });
+
+      if (properties.length <= 1) {
+        return data[properties[0]];
+      }
+
+      return data;
+    },
+
+    /**
+     * Generic handler for XHR failures.
+     *
+     * @param {Function} cb Callback(err)
+     * @param jqXHR See jQuery docs
+     * @param testStatus See jQuery docs
+     * @param errorThrown See jQuery docs
+     */
+    _failureHandler: function(cb, jqXHR, testStatus, errorThrown) {
+      var error = "Unknown error.";
+      if (jqXHR && jqXHR.responseJSON && jqXHR.responseJSON.error) {
+        error = jqXHR.responseJSON.error;
+      }
+      var message = "HTTP error " + jqXHR.status + ": " +
+        errorThrown + "; " + error;
+      console.error(message);
+      cb(new Error(message));
+    },
+
+    /**
+     * Requests a call URL from the Loop server.
+     *
+     * @param  {String} simplepushUrl a registered Simple Push URL
+     * @param  {string} nickname the nickname of the future caller
+     * @param  {Function} cb Callback(err, callUrl)
+     */
+    requestCallUrl: function(nickname, cb) {
+      var endpoint = this.settings.baseServerUrl + "/call-url/",
+          reqData  = {callerId: nickname};
+
+      var req = $.post(endpoint, reqData, function(callUrlData) {
+        try {
+          cb(null, this._validate(callUrlData, ["call_url"]));
+        } catch (err) {
+          console.log("Error requesting call info", err);
+          cb(err);
+        }
+      }.bind(this), "json");
+
+      req.fail(this._failureHandler.bind(this, cb));
+    },
+
+    /**
+     * Requests call information from the server for all calls since the
+     * given version.
+     *
+     * @param  {String} version the version identifier from the push
+     *                          notification
+     * @param  {Function} cb Callback(err, calls)
+     */
+    requestCallsInfo: function(version, cb) {
+      if (!version) {
+        throw new Error("missing required parameter version");
+      }
+
+      var endpoint = this.settings.baseServerUrl + "/calls";
+
+      // XXX It is likely that we'll want to move some of this to whatever
+      // opens the chat window, but we'll need to decide that once we make a
+      // decision on chrome versus content, and know if we're going with
+      // LoopService or a frameworker.
+      var req = $.get(endpoint + "?version=" + version, function(callsData) {
+        try {
+          cb(null, this._validate(callsData, ["calls"]));
+        } catch (err) {
+          console.log("Error requesting calls info", err);
+          cb(err);
+        }
+      }.bind(this), "json");
+
+      req.fail(this._failureHandler.bind(this, cb));
+    },
+
+    /**
+     * Posts a call request to the server for a call represented by the
+     * loopToken. Will return the session data for the call.
+     *
+     * @param  {String} loopToken The loopToken representing the call
+     * @param  {Function} cb Callback(err, sessionData)
+     */
+    requestCallInfo: function(loopToken, cb) {
+      if (!loopToken) {
+        throw new Error("missing required parameter loopToken");
+      }
+
+      var req = $.ajax({
+        url:         this.settings.baseServerUrl + "/calls/" + loopToken,
+        method:      "POST",
+        contentType: "application/json",
+        data:        JSON.stringify({}),
+        dataType:    "json"
+      });
+
+      req.done(function(sessionData) {
+        try {
+          cb(null, this._validate(sessionData, [
+            "sessionId", "sessionToken", "apiKey"
+          ]));
+        } catch (err) {
+          console.log("Error requesting call info", err);
+          cb(err);
+        }
+      }.bind(this));
+
+      req.fail(this._failureHandler.bind(this, cb));
+    }
+  };
+
+  return Client;
+})(jQuery);
diff --git a/browser/components/loop/content/shared/js/models.js b/browser/components/loop/content/shared/js/models.js
index e9d307af7278..2d7b07f8978c 100644
--- a/browser/components/loop/content/shared/js/models.js
+++ b/browser/components/loop/content/shared/js/models.js
@@ -16,6 +16,10 @@ loop.shared.models = (function() {
     defaults: {
       callerId:     undefined, // Loop caller id
       loopToken:    undefined, // Loop conversation token
+      loopVersion:  undefined, // Loop version for /calls/ information. This
+                               // is the version received from the push
+                               // notification and is used by the server to
+                               // determine the pending calls
       sessionId:    undefined, // TB session id
       sessionToken: undefined, // TB session token
       apiKey:       undefined  // TB api key
@@ -26,48 +30,56 @@ loop.shared.models = (function() {
      * server and updates appropriately the current model attributes with the
      * data.
      *
+     * Available options:
+     *
+     * - {String} baseServerUrl The server URL
+     * - {Boolean} outgoing Set to true if this model represents the
+     *                            outgoing call.
+     *
      * Triggered events:
      *
      * - `session:ready` when the session information have been successfully
      *   retrieved from the server;
      * - `session:error` when the request failed.
      *
-     * @param  {String} baseServerUrl The server URL
-     * @throws {Error}  If no baseServerUrl is given
-     * @throws {Error}  If no conversation token is set
+     * @param {Object} options Options object
      */
-    initiate: function(baseServerUrl) {
-      if (!baseServerUrl) {
-        throw new Error("baseServerUrl arg must be passed to initiate()");
-      }
-
-      if (!this.get("loopToken")) {
-        throw new Error("missing required attribute loopToken");
-      }
-
+    initiate: function(options) {
       // Check if the session is already set
       if (this.isSessionReady()) {
         return this.trigger("session:ready", this);
       }
 
-      var request = $.ajax({
-        url:         baseServerUrl + "/calls/" + this.get("loopToken"),
-        method:      "POST",
-        contentType: "application/json",
-        data:        JSON.stringify({}),
-        dataType:    "json"
+      var client = new loop.shared.Client({
+        baseServerUrl: options.baseServerUrl
       });
 
-      request.done(this.setReady.bind(this));
-
-      request.fail(function(xhr, _, statusText) {
-        var serverError = xhr.status + " " + statusText;
-        if (typeof xhr.responseJSON === "object" && xhr.responseJSON.error) {
-          serverError += "; " + xhr.responseJSON.error;
+      function handleResult(err, sessionData) {
+        /*jshint validthis:true */
+        if (err) {
+          this.trigger("session:error", new Error(
+            "Retrieval of session information failed: HTTP " + err));
+          return;
         }
-        this.trigger("session:error", new Error(
-          "Retrieval of session information failed: HTTP " + serverError));
-      }.bind(this));
+
+        // XXX For incoming calls we might have more than one call queued.
+        // For now, we'll just assume the first call is the right information.
+        // We'll probably really want to be getting this data from the
+        // background worker on the desktop client.
+        // Bug 990714 should fix this.
+        if (!options.outgoing)
+          sessionData = sessionData[0];
+
+        this.setReady(sessionData);
+      }
+
+      if (options.outgoing) {
+        client.requestCallInfo(this.get("loopToken"), handleResult.bind(this));
+      }
+      else {
+        client.requestCallsInfo(this.get("loopVersion"),
+          handleResult.bind(this));
+      }
     },
 
     /**
diff --git a/browser/components/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
index b6ad0f59e11e..ec1d7d519f15 100644
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -54,6 +54,7 @@
     <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
 
     <!-- app scripts -->
+    <script type="text/javascript" src="shared/js/client.js"></script>
     <script type="text/javascript" src="shared/js/models.js"></script>
     <script type="text/javascript" src="shared/js/views.js"></script>
     <script type="text/javascript" src="shared/js/router.js"></script>
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 8915269cc943..11bff3e309e7 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -61,7 +61,10 @@ loop.webapp = (function($, TB) {
 
     initiate: function(event) {
       event.preventDefault();
-      this.model.initiate(baseServerUrl);
+      this.model.initiate({
+        baseServerUrl: baseServerUrl,
+        outgoing: true
+      });
     }
   });
 
diff --git a/browser/components/loop/test/shared/client_test.js b/browser/components/loop/test/shared/client_test.js
new file mode 100644
index 000000000000..9af77dcf7549
--- /dev/null
+++ b/browser/components/loop/test/shared/client_test.js
@@ -0,0 +1,192 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop, sinon */
+
+var expect = chai.expect;
+
+describe("loop.shared.Client", function() {
+  "use strict";
+
+  var sandbox, fakeXHR, requests = [], callback;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    fakeXHR = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+    // https://github.com/cjohansen/Sinon.JS/issues/393
+    fakeXHR.xhr.onCreate = function (xhr) {
+      requests.push(xhr);
+    };
+    callback = sinon.spy();
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("loop.shared.Client", function() {
+    describe("#constructor", function() {
+      it("should require a baseServerUrl setting", function() {
+        expect(function() {
+          new loop.shared.Client();
+        }).to.Throw(Error, /required/);
+      });
+    });
+
+    describe("#requestCallUrl", function() {
+      var client;
+
+      beforeEach(function() {
+        client = new loop.shared.Client({baseServerUrl: "http://fake.api"});
+      });
+
+      it("should post to /call-url/", function() {
+        client.requestCallUrl("foo", callback);
+
+        expect(requests).to.have.length.of(1);
+        expect(requests[0].method).to.be.equal("POST");
+        expect(requests[0].url).to.be.equal("http://fake.api/call-url/");
+        expect(requests[0].requestBody).to.be.equal('callerId=foo');
+
+      });
+
+      it("should request a call url", function() {
+        client.requestCallUrl("foo", callback);
+
+        expect(requests).to.have.length.of(1);
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                            '{"call_url": "fakeCallUrl"}');
+        sinon.assert.calledWithExactly(callback, null, "fakeCallUrl");
+      });
+
+      it("should send an error when the request fails", function() {
+        client.requestCallUrl("foo", callback);
+
+        expect(requests).to.have.length.of(1);
+
+        requests[0].respond(400, {"Content-Type": "application/json"},
+                            '{"error": "my error"}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /400.*my error/.test(err.message);
+        }));
+      });
+
+      it("should send an error if the data is not valid", function() {
+        client.requestCallUrl("foo", callback);
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                            '{"bad": {}}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /Invalid data received/.test(err.message);
+        }));
+      });
+    });
+
+    describe("#requestCallsInfo", function() {
+      var client;
+
+      beforeEach(function() {
+        client = new loop.shared.Client({baseServerUrl: "http://fake.api"});
+      });
+
+      it("should prevent launching a conversation when version is missing",
+        function() {
+          expect(function() {
+            client.requestCallsInfo();
+          }).to.Throw(Error, /missing required parameter version/);
+        });
+
+      it("should request data for all calls", function() {
+        client.requestCallsInfo(42, callback);
+
+        expect(requests).to.have.length.of(1);
+        expect(requests[0].url).to.be.equal("http://fake.api/calls?version=42");
+        expect(requests[0].method).to.be.equal("GET");
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                                 '{"calls": [{"apiKey": "fake"}]}');
+        sinon.assert.calledWithExactly(callback, null, [{apiKey: "fake"}]);
+      });
+
+      it("should send an error when the request fails", function() {
+        client.requestCallsInfo(42, callback);
+
+        requests[0].respond(400, {"Content-Type": "application/json"},
+                                 '{"error": "my error"}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /400.*my error/.test(err.message);
+        }));
+      });
+
+      it("should send an error if the data is not valid", function() {
+        client.requestCallsInfo(42, callback);
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                                 '{"bad": {}}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /Invalid data received/.test(err.message);
+        }));
+      });
+    });
+
+    describe("requestCallInfo", function() {
+      var client;
+
+      beforeEach(function() {
+        client = new loop.shared.Client({baseServerUrl: "http://fake.api"});
+      });
+
+      it("should prevent launching a conversation when token is missing",
+        function() {
+          expect(function() {
+            client.requestCallInfo();
+          }).to.Throw(Error, /missing.*[Tt]oken/);
+        });
+
+      it("should post data for the given call", function() {
+        client.requestCallInfo("fake", callback);
+
+        expect(requests).to.have.length.of(1);
+        expect(requests[0].url).to.be.equal("http://fake.api/calls/fake");
+        expect(requests[0].method).to.be.equal("POST");
+      });
+
+      it("should receive call data for the given call", function() {
+        client.requestCallInfo("fake", callback);
+
+        var sessionData = {
+          sessionId: "one",
+          sessionToken: "two",
+          apiKey: "three"
+        };
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                            JSON.stringify(sessionData));
+        sinon.assert.calledWithExactly(callback, null, sessionData);
+      });
+
+      it("should send an error when the request fails", function() {
+        client.requestCallInfo("fake", callback);
+
+        requests[0].respond(400, {"Content-Type": "application/json"},
+                            '{"error": "my error"}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /400.*my error/.test(err.message);
+        }));
+      });
+
+      it("should send an error if the data is not valid", function() {
+        client.requestCallsInfo("fake", callback);
+
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                            '{"bad": "one"}');
+        sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
+          return /Invalid data received/.test(err.message);
+        }));
+      });
+    });
+  });
+});
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index fd51146629a3..14d1c708bae1 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -32,10 +32,13 @@
   </script>
 
   <!-- App scripts -->
+  <script src="../../content/shared/js/client.js"></script>
   <script src="../../content/shared/js/models.js"></script>
   <script src="../../content/shared/js/views.js"></script>
   <script src="../../content/shared/js/router.js"></script>
+
   <!-- Test scripts -->
+  <script src="client_test.js"></script>
   <script src="models_test.js"></script>
   <script src="views_test.js"></script>
   <script src="router_test.js"></script>
diff --git a/browser/components/loop/test/shared/models_test.js b/browser/components/loop/test/shared/models_test.js
index eb67c3e149d5..9181ee51b70f 100644
--- a/browser/components/loop/test/shared/models_test.js
+++ b/browser/components/loop/test/shared/models_test.js
@@ -27,52 +27,75 @@ describe("loop.shared.models", function() {
   });
 
   describe("ConversationModel", function() {
-    var conversation, fakeSessionData, fakeBaseServerUrl;
+    var conversation, reqCallInfoStub, reqCallsInfoStub,
+      fakeSessionData, fakeBaseServerUrl;
 
     beforeEach(function() {
       conversation = new sharedModels.ConversationModel();
+      conversation.set("loopToken", "fakeToken");
       fakeSessionData = {
         sessionId:    "sessionId",
         sessionToken: "sessionToken",
         apiKey:       "apiKey"
       };
       fakeBaseServerUrl = "http://fakeBaseServerUrl";
+      reqCallInfoStub = sandbox.stub(loop.shared.Client.prototype,
+        "requestCallInfo");
+      reqCallsInfoStub = sandbox.stub(loop.shared.Client.prototype,
+        "requestCallsInfo");
     });
 
     describe("#initiate", function() {
-      it("should throw an Error if no baseServerUrl argument is passed",
-        function () {
-          expect(function() {
-            conversation.initiate();
-          }).to.Throw(Error, /baseServerUrl/);
+      it("call requestCallInfo on the client for outgoing calls",
+        function() {
+          conversation.initiate({
+            baseServerUrl: fakeBaseServerUrl,
+            outgoing: true
+          });
+
+          sinon.assert.calledOnce(reqCallInfoStub);
+          sinon.assert.calledWith(reqCallInfoStub, "fakeToken");
         });
 
-      it("should prevent launching a conversation when token is missing",
+      it("should not call requestCallsInfo on the client for outgoing calls",
         function() {
-          expect(function() {
-            conversation.initiate(fakeBaseServerUrl);
-          }).to.Throw(Error, /missing required attribute loopToken/);
+          conversation.initiate({
+            baseServerUrl: fakeBaseServerUrl,
+            outgoing: true
+          });
+
+          sinon.assert.notCalled(reqCallsInfoStub);
         });
 
-      it("should make one ajax POST to a correctly constructed URL",
+      it("call requestCallsInfo on the client for incoming calls",
         function() {
-          conversation.set("loopToken", "fakeToken");
+          conversation.initiate({
+            baseServerUrl: fakeBaseServerUrl,
+            outgoing: false
+          });
 
-          conversation.initiate(fakeBaseServerUrl);
+          sinon.assert.calledOnce(reqCallsInfoStub);
+          sinon.assert.calledWith(reqCallsInfoStub);
+        });
 
-          expect(requests).to.have.length.of(1);
-          expect(requests[0].method.toLowerCase()).to.equal("post");
-          expect(requests[0].url).to.match(
-            new RegExp("^" + fakeBaseServerUrl + "/calls/fakeToken"));
+      it("should not call requestCallInfo on the client for incoming calls",
+        function() {
+          conversation.initiate({
+            baseServerUrl: fakeBaseServerUrl,
+            outgoing: false
+          });
+
+          sinon.assert.notCalled(reqCallInfoStub);
         });
 
       it("should update conversation session information from server data",
         function() {
-          conversation.set("loopToken", "fakeToken");
-          conversation.initiate(fakeBaseServerUrl);
+          reqCallInfoStub.callsArgWith(1, null, fakeSessionData);
 
-          requests[0].respond(200, {"Content-Type": "application/json"},
-                                   JSON.stringify(fakeSessionData));
+          conversation.initiate({
+            baseServerUrl: fakeBaseServerUrl,
+            outgoing: true
+          });
 
           expect(conversation.get("sessionId")).eql("sessionId");
           expect(conversation.get("sessionToken")).eql("sessionToken");
@@ -81,27 +104,29 @@ describe("loop.shared.models", function() {
 
       it("should trigger session:ready without fetching session data over "+
          "HTTP when already set", function(done) {
-          sandbox.stub(jQuery, "ajax");
-          conversation.set("loopToken", "fakeToken");
           conversation.set(fakeSessionData);
 
           conversation.on("session:ready", function() {
-            sinon.assert.notCalled($.ajax);
+            sinon.assert.notCalled(reqCallInfoStub);
             done();
-          }).initiate(fakeBaseServerUrl);
+          }).initiate({
+            baseServerUrl: fakeBaseServerUrl,
+            outgoing: true
+          });
+
         });
 
       it("should trigger a `session:error` on failure", function(done) {
-        conversation.set("loopToken", "fakeToken");
-        conversation.initiate(fakeBaseServerUrl);
+        reqCallInfoStub.callsArgWith(1,
+          new Error("failed: HTTP 400 Bad Request; fake"));
 
         conversation.on("session:error", function(err) {
           expect(err.message).to.match(/failed: HTTP 400 Bad Request; fake/);
           done();
+        }).initiate({
+          baseServerUrl: fakeBaseServerUrl,
+          outgoing: true
         });
-
-        requests[0].respond(400, {"Content-Type": "application/json"},
-                                  JSON.stringify({error: "fake"}));
       });
     });
 
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index ad4639409587..85e9779e7588 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -38,16 +38,6 @@ describe("loop.webapp", function() {
           new loop.webapp.WebappRouter();
         }).to.Throw(Error, /missing required conversation/);
       });
-
-      it("should load the HomeView", function() {
-        sandbox.stub(loop.webapp.WebappRouter.prototype, "loadView");
-
-        var router = new loop.webapp.WebappRouter({conversation: conversation});
-
-        sinon.assert.calledOnce(router.loadView);
-        sinon.assert.calledWithMatch(router.loadView,
-                                     {$el: {selector: "#home"}});
-      });
     });
 
     describe("constructed", function() {
@@ -164,6 +154,12 @@ describe("loop.webapp", function() {
 
         sinon.assert.calledOnce(fakeSubmitEvent.preventDefault);
         sinon.assert.calledOnce(initiate);
+        // XXX host should be configurable
+        //     see https://bugzilla.mozilla.org/show_bug.cgi?id=987086
+        sinon.assert.calledWith(initiate, {
+          baseServerUrl: "http://localhost:5000",
+          outgoing: true
+        });
       });
     });
   });

From 0c731b20a6f8d7d646343c8fcac2b466ac8a5c14 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 043/117] Bug 991654 - Updated client to use new server error
 format. r=Standard8

--HG--
extra : transplant_source : %E9Jpme%FB%C0%29Un%01J%10%EFd%00%19%BD%F4%E3
---
 .../loop/content/shared/js/client.js          | 26 ++++++++++++++-----
 .../loop/test/shared/client_test.js           | 26 ++++++++++++++-----
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/browser/components/loop/content/shared/js/client.js b/browser/components/loop/content/shared/js/client.js
index 60ad773c6f50..cf198053c107 100644
--- a/browser/components/loop/content/shared/js/client.js
+++ b/browser/components/loop/content/shared/js/client.js
@@ -56,16 +56,28 @@ loop.shared.Client = (function($) {
      *
      * @param {Function} cb Callback(err)
      * @param jqXHR See jQuery docs
-     * @param testStatus See jQuery docs
+     * @param textStatus See jQuery docs
      * @param errorThrown See jQuery docs
      */
-    _failureHandler: function(cb, jqXHR, testStatus, errorThrown) {
-      var error = "Unknown error.";
-      if (jqXHR && jqXHR.responseJSON && jqXHR.responseJSON.error) {
-        error = jqXHR.responseJSON.error;
+    _failureHandler: function(cb, jqXHR, textStatus, errorThrown) {
+      var error = "Unknown error.",
+          jsonRes = jqXHR && jqXHR.responseJSON || {};
+      // Received error response format:
+      // { "status": "errors",
+      //   "errors": [{
+      //      "location": "url",
+      //      "name": "token",
+      //      "description": "invalid token"
+      // }]}
+      if (jsonRes.status === "errors" && Array.isArray(jsonRes.errors)) {
+        error = "Details: " + jsonRes.errors.map(function(err) {
+          return Object.keys(err).map(function(field) {
+            return field + ": " + err[field];
+          }).join(", ");
+        }).join("; ");
       }
-      var message = "HTTP error " + jqXHR.status + ": " +
-        errorThrown + "; " + error;
+      var message = "HTTP " + jqXHR.status + " " + errorThrown +
+          "; " + error;
       console.error(message);
       cb(new Error(message));
     },
diff --git a/browser/components/loop/test/shared/client_test.js b/browser/components/loop/test/shared/client_test.js
index 9af77dcf7549..0ced77dcb74e 100644
--- a/browser/components/loop/test/shared/client_test.js
+++ b/browser/components/loop/test/shared/client_test.js
@@ -9,7 +9,19 @@ var expect = chai.expect;
 describe("loop.shared.Client", function() {
   "use strict";
 
-  var sandbox, fakeXHR, requests = [], callback;
+  var sandbox,
+      fakeXHR,
+      requests = [],
+      callback;
+
+  var fakeErrorRes = JSON.stringify({
+      status: "errors",
+      errors: [{
+        location: "url",
+        name: "token",
+        description: "invalid token"
+      }]
+    });
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -68,9 +80,9 @@ describe("loop.shared.Client", function() {
         expect(requests).to.have.length.of(1);
 
         requests[0].respond(400, {"Content-Type": "application/json"},
-                            '{"error": "my error"}');
+                            fakeErrorRes);
         sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
-          return /400.*my error/.test(err.message);
+          return /400.*invalid token/.test(err.message);
         }));
       });
 
@@ -115,9 +127,9 @@ describe("loop.shared.Client", function() {
         client.requestCallsInfo(42, callback);
 
         requests[0].respond(400, {"Content-Type": "application/json"},
-                                 '{"error": "my error"}');
+                                 fakeErrorRes);
         sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
-          return /400.*my error/.test(err.message);
+          return /400.*invalid token/.test(err.message);
         }));
       });
 
@@ -172,9 +184,9 @@ describe("loop.shared.Client", function() {
         client.requestCallInfo("fake", callback);
 
         requests[0].respond(400, {"Content-Type": "application/json"},
-                            '{"error": "my error"}');
+                            fakeErrorRes);
         sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
-          return /400.*my error/.test(err.message);
+          return /400.*invalid token/.test(err.message);
         }));
       });
 

From a5e9958ef2c59547528042ff609723c153d87188 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 044/117] Bug 991122 - Fixed video layout on Google Chrome.
 r=dmose

--HG--
extra : transplant_source : %80%D6%CA5J%AC%8C%14%F4%EA%D9zz%C3%95%2AH%D0v%27
---
 browser/components/loop/content/shared/js/views.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 2a223e553da1..2cf6db93c69c 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -40,7 +40,9 @@ loop.shared.views = (function(TB) {
   var ConversationView = BaseView.extend({
     el: "#conversation",
 
-    videoStyles: { width: "100%", height: "100%" },
+    // height set to "auto" to fix video layout on Google Chrome
+    // @see https://bugzilla.mozilla.org/show_bug.cgi?id=991122
+    videoStyles: { width: "100%", height: "auto" },
 
     /**
      * Establishes webrtc communication using TB sdk.

From 7b19cc12a8cbcd9165a58711eef2f4224e235f7c Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 045/117] Bug 988229 - Shared notifier component. r=dmose

--HG--
extra : transplant_source : %26%85%C1%04J%17%17%17%AF%95%AF%9D%CA%9F%EF%E21%25W%21
---
 .../loop/content/shared/js/views.js           | 33 ++++++-
 .../loop/standalone/content/index.html        |  2 +
 .../loop/standalone/content/js/webapp.js      | 83 ++++++++++++++----
 .../loop/standalone/content/l10n/data.ini     |  4 +
 .../components/loop/test/shared/views_test.js | 86 +++++++++++++++----
 .../loop/test/standalone/webapp_test.js       | 69 +++++++++++++--
 6 files changed, 235 insertions(+), 42 deletions(-)

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 2cf6db93c69c..6ea2d06846d2 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -9,6 +9,8 @@ loop.shared = loop.shared || {};
 loop.shared.views = (function(TB) {
   "use strict";
 
+  var sharedModels = loop.shared.models;
+
   /**
    * Base Backbone view.
    */
@@ -127,10 +129,39 @@ loop.shared.views = (function(TB) {
    * Notification list view.
    */
   var NotificationListView = Backbone.View.extend({
-    initialize: function() {
+    /**
+     * Constructor.
+     *
+     * Available options:
+     * - {loop.shared.models.NotificationCollection} collection Notifications
+     *                                                          collection
+     *
+     * @param  {Object} options Options object
+     */
+    initialize: function(options) {
+      options = options || {};
+      if (!options.collection) {
+        this.collection = new sharedModels.NotificationCollection();
+      }
       this.listenTo(this.collection, "reset add remove", this.render);
     },
 
+    /**
+     * Clears the notification stack.
+     */
+    clear: function() {
+      this.collection.reset();
+    },
+
+    /**
+     * Adds a new notification to the stack, triggering rendering of it.
+     *
+     * @param  {Object|NotificationModel} notification Notification data.
+     */
+    notify: function(notification) {
+      this.collection.add(notification);
+    },
+
     render: function() {
       this.$el.html(this.collection.map(function(notification) {
         return new NotificationView({
diff --git a/browser/components/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
index ec1d7d519f15..5a08fd8dddec 100644
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -17,6 +17,8 @@
       <h1>Loop</h1>
     </header>
 
+    <div id="messages"></div>
+
     <div id="home">
       <p data-l10n-id="welcome">Welcome to the Loop web client.</p>
     </div>
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 11bff3e309e7..bc672b6383f7 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -5,7 +5,7 @@
 /* global loop:true */
 
 var loop = loop || {};
-loop.webapp = (function($, TB) {
+loop.webapp = (function($, TB, webl10n) {
   "use strict";
 
   /**
@@ -19,7 +19,9 @@ loop.webapp = (function($, TB) {
       sharedViews = loop.shared.views,
       // XXX this one should be configurable
       //     see https://bugzilla.mozilla.org/show_bug.cgi?id=987086
-      baseServerUrl = "http://localhost:5000";
+      baseServerUrl = "http://localhost:5000",
+      // aliasing translation function as __ for concision
+      __ = webl10n.get;
 
   /**
    * App router.
@@ -51,11 +53,36 @@ loop.webapp = (function($, TB) {
       "submit": "initiate"
     },
 
-    initialize: function() {
-      this.listenTo(this.model, "session:error", function(error) {
-        // XXX: display a proper error notification to end user, probably
-        //      reusing the BB notification system from the Loop desktop client.
-        alert(error);
+    /**
+     * Constructor.
+     *
+     * Required options:
+     * - {loop.shared.model.ConversationModel}    model    Conversation model.
+     * - {loop.shared.views.NotificationListView} notifier Notifier component.
+     *
+     * @param  {Object} options Options object.
+     */
+    initialize: function(options) {
+      options = options || {};
+
+      if (!options.model) {
+        throw new Error("missing required model");
+      }
+      this.model = options.model;
+
+      if (!options.notifier) {
+        throw new Error("missing required notifier");
+      }
+      this.notifier = options.notifier;
+
+      this.listenTo(this.model, "session:error", this._onSessionError);
+    },
+
+    _onSessionError: function(error) {
+      console.error(error);
+      this.notifier.notify({
+        message: __("unable_retrieve_call_info"),
+        level: "error"
       });
     },
 
@@ -75,8 +102,18 @@ loop.webapp = (function($, TB) {
    * @link http://mikeygee.com/blog/backbone.html
    */
   var WebappRouter = loop.shared.router.BaseRouter.extend({
+    /**
+     * Current conversation.
+     * @type {loop.shared.models.ConversationModel}
+     */
     _conversation: undefined,
 
+    /**
+     * Notifications dispatcher.
+     * @type {loop.shared.views.NotificationListView}
+     */
+    _notifier: undefined,
+
     routes: {
       "": "home",
       "call/ongoing": "conversation",
@@ -90,6 +127,11 @@ loop.webapp = (function($, TB) {
       }
       this._conversation = options.conversation;
 
+      if (!options.notifier) {
+        throw new Error("missing required notifier");
+      }
+      this._notifier = options.notifier;
+
       this.listenTo(this._conversation, "session:ready", this._onSessionReady);
       this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
 
@@ -126,7 +168,10 @@ loop.webapp = (function($, TB) {
      */
     initiate: function(loopToken) {
       this._conversation.set("loopToken", loopToken);
-      this.loadView(new ConversationFormView({model: this._conversation}));
+      this.loadView(new ConversationFormView({
+        model: this._conversation,
+        notifier: this._notifier
+      }));
     },
 
     /**
@@ -139,15 +184,17 @@ loop.webapp = (function($, TB) {
         if (loopToken) {
           return this.navigate("call/" + loopToken, {trigger: true});
         } else {
-          // XXX: notify user that a call token is missing
+          this._notifier.notify({
+            message: __("Missing conversation information"),
+            level: "error"
+          });
           return this.navigate("home", {trigger: true});
         }
       }
-      this.loadView(
-        new sharedViews.ConversationView({
-          sdk: TB,
-          model: this._conversation
-        }));
+      this.loadView(new sharedViews.ConversationView({
+        sdk: TB,
+        model: this._conversation
+      }));
     }
   });
 
@@ -156,14 +203,18 @@ loop.webapp = (function($, TB) {
    */
   function init() {
     conversation = new sharedModels.ConversationModel();
-    router = new WebappRouter({conversation: conversation});
+    router = new WebappRouter({
+      conversation: conversation,
+      notifier: new sharedViews.NotificationListView({el: "#messages"})
+    });
     Backbone.history.start();
   }
 
   return {
+    baseServerUrl: baseServerUrl,
     ConversationFormView: ConversationFormView,
     HomeView: HomeView,
     init: init,
     WebappRouter: WebappRouter
   };
-})(jQuery, window.TB);
+})(jQuery, window.TB, document.webL10n);
diff --git a/browser/components/loop/standalone/content/l10n/data.ini b/browser/components/loop/standalone/content/l10n/data.ini
index 489091c6cd90..81449b841e7f 100644
--- a/browser/components/loop/standalone/content/l10n/data.ini
+++ b/browser/components/loop/standalone/content/l10n/data.ini
@@ -1,10 +1,14 @@
 [en]
+missing_conversation_info=Missing conversation information.
+unable_retrieve_call_info=Unable to retrieve conversation information.
 start=Start
 stop=Stop
 start_call=Start the call
 welcome=Welcome to the Loop web client.
 
 [fr]
+missing_conversation_info=Informations de communication manquantes.
+unable_retrieve_call_info=Impossible de récupérer les informations liées à cet appel.
 start=Démarrer
 stop=Arrêter
 start_call=Démarrer l'appel
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index a180f74376f8..83bda6c92278 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -111,26 +111,79 @@ describe("loop.shared.views", function() {
   });
 
   describe("NotificationListView", function() {
-    describe("Collection events", function() {
-      var coll, testNotif, view;
+    var coll, notifData, testNotif;
+
+    beforeEach(function() {
+      notifData = {level: "error", message: "plop"};
+      testNotif = new sharedModels.NotificationModel(notifData);
+      coll = new sharedModels.NotificationCollection();
+    });
+
+    describe("#initialize", function() {
+      it("should accept a collection option", function() {
+        var view = new sharedViews.NotificationListView({collection: coll});
+
+        expect(view.collection).to.be.an.instanceOf(
+          sharedModels.NotificationCollection);
+      });
+
+      it("should set a default collection when none is passed", function() {
+        var view = new sharedViews.NotificationListView();
+
+        expect(view.collection).to.be.an.instanceOf(
+          sharedModels.NotificationCollection);
+      });
+    });
+
+    describe("#clear", function() {
+      it("should clear all notifications from the collection", function() {
+        var view = new sharedViews.NotificationListView();
+        view.notify(testNotif);
+
+        view.clear();
+
+        expect(coll).to.have.length.of(0);
+      });
+    });
+
+    describe("#notify", function() {
+      var view;
 
       beforeEach(function() {
-        sandbox.stub(sharedViews.NotificationListView.prototype, "render");
-        testNotif = new sharedModels.NotificationModel({
-          level: "error",
-          message: "plop"
-        });
-        coll = new sharedModels.NotificationCollection();
         view = new sharedViews.NotificationListView({collection: coll});
       });
 
-      it("should render on notification added to the collection", function() {
-        coll.add(testNotif);
+      describe("adds a new notification to the stack", function() {
+        it("using a plain object", function() {
+          view.notify(notifData);
 
-        sinon.assert.calledOnce(view.render);
+          expect(coll).to.have.length.of(1);
+        });
+
+        it("using a NotificationModel instance", function() {
+          view.notify(testNotif);
+
+          expect(coll).to.have.length.of(1);
+        });
+      });
+    });
+
+    describe("Collection events", function() {
+      var view;
+
+      beforeEach(function() {
+        sandbox.stub(sharedViews.NotificationListView.prototype, "render");
+        view = new sharedViews.NotificationListView({collection: coll});
       });
 
-      it("should render on notification removed from the collection",
+      it("should render when a notification is added to the collection",
+        function() {
+          coll.add(testNotif);
+
+          sinon.assert.calledOnce(view.render);
+        });
+
+      it("should render when a notification is removed from the collection",
         function() {
           coll.add(testNotif);
           coll.remove(testNotif);
@@ -138,12 +191,11 @@ describe("loop.shared.views", function() {
           sinon.assert.calledTwice(view.render);
         });
 
-      it("should render on collection reset",
-        function() {
-          coll.reset();
+      it("should render when the collection is reset", function() {
+        coll.reset();
 
-          sinon.assert.calledOnce(view.render);
-        });
+        sinon.assert.calledOnce(view.render);
+      });
     });
   });
 });
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 85e9779e7588..476321bda165 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -21,9 +21,10 @@ describe("loop.webapp", function() {
   });
 
   describe("WebappRouter", function() {
-    var conversation, fakeSessionData;
+    var conversation, notifier, fakeSessionData;
 
     beforeEach(function() {
+      notifier = {notify: sandbox.spy()};
       conversation = new sharedModels.ConversationModel();
       fakeSessionData = {
         sessionId:    "sessionId",
@@ -38,6 +39,12 @@ describe("loop.webapp", function() {
           new loop.webapp.WebappRouter();
         }).to.Throw(Error, /missing required conversation/);
       });
+
+      it("should require a notifier", function() {
+        expect(function() {
+          new loop.webapp.WebappRouter({conversation: {}});
+        }).to.Throw(Error, /missing required notifier/);
+      });
     });
 
     describe("constructed", function() {
@@ -57,7 +64,10 @@ describe("loop.webapp", function() {
       var router;
 
       beforeEach(function() {
-        router = new loop.webapp.WebappRouter({conversation: conversation});
+        router = new loop.webapp.WebappRouter({
+          conversation: conversation,
+          notifier: notifier
+        });
         sandbox.stub(router, "loadView");
       });
 
@@ -125,7 +135,8 @@ describe("loop.webapp", function() {
         function() {
           sandbox.stub(loop.webapp.WebappRouter.prototype, "navigate");
           var router = new loop.webapp.WebappRouter({
-            conversation: conversation
+            conversation: conversation,
+            notifier: notifier
           });
 
           conversation.setReady(fakeSessionData);
@@ -137,12 +148,30 @@ describe("loop.webapp", function() {
   });
 
   describe("ConversationFormView", function() {
+    describe("#initialize", function() {
+      it("should require a conversation option", function() {
+        expect(function() {
+          new loop.webapp.WebappRouter();
+        }).to.Throw(Error, /missing required conversation/);
+      });
+
+      it("should require a notifier option", function() {
+        expect(function() {
+          new loop.webapp.WebappRouter({conversation: {}});
+        }).to.Throw(Error, /missing required notifier/);
+      });
+    });
+
     describe("#initiate", function() {
-      var conversation, initiate, view, fakeSubmitEvent;
+      var notifier, conversation, initiate, view, fakeSubmitEvent;
 
       beforeEach(function() {
+        notifier = {notify: sandbox.spy()};
         conversation = new sharedModels.ConversationModel();
-        view = new loop.webapp.ConversationFormView({model: conversation});
+        view = new loop.webapp.ConversationFormView({
+          model: conversation,
+          notifier: notifier
+        });
         fakeSubmitEvent = {preventDefault: sinon.spy()};
       });
 
@@ -154,13 +183,37 @@ describe("loop.webapp", function() {
 
         sinon.assert.calledOnce(fakeSubmitEvent.preventDefault);
         sinon.assert.calledOnce(initiate);
-        // XXX host should be configurable
-        //     see https://bugzilla.mozilla.org/show_bug.cgi?id=987086
         sinon.assert.calledWith(initiate, {
-          baseServerUrl: "http://localhost:5000",
+          baseServerUrl: loop.webapp.baseServerUrl,
           outgoing: true
         });
       });
     });
+
+    describe("Events", function() {
+      var notifier, conversation, view;
+
+      beforeEach(function() {
+        notifier = {notify: sandbox.spy()};
+        conversation = new sharedModels.ConversationModel({
+          loopToken: "fake"
+        });
+        view = new loop.webapp.ConversationFormView({
+          model: conversation,
+          notifier: notifier
+        });
+      });
+
+      it("should trigger a notication when a session:error model event is " +
+         " received", function() {
+        conversation.trigger("session:error", "tech error");
+
+        sinon.assert.calledOnce(notifier.notify);
+        // XXX We should test for the actual message content, but webl10n gets
+        //     in the way as translated messages are all empty because matching
+        //     DOM elements are missing.
+        sinon.assert.calledWithMatch(notifier.notify, {level: "error"});
+      });
+    });
   });
 });

From b96f8de0688d265314c2f5778857ae6a9ce8ce5d Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 046/117] Bug 991126 - Prevented multiple form submission.
 r=Standard8

--HG--
extra : transplant_source : rK%128L%3A%89%1A%F5%06%3F%CB%EEr%00a%AC%E0%B0E
---
 browser/components/loop/content/shared/css/common.css |  2 +-
 browser/components/loop/standalone/content/index.html |  4 +++-
 .../components/loop/standalone/content/js/webapp.js   | 10 ++++++++++
 .../components/loop/test/standalone/webapp_test.js    | 11 ++++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index 46d8cdad9178..511d1d9f7418 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -85,7 +85,7 @@ img {
   background: #d9534f;
 }
 
-.disabled {
+.disabled, button[disabled] {
     cursor: not-allowed;
     pointer-events: none;
     opacity: 0.65;
diff --git a/browser/components/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
index 5a08fd8dddec..bf31eebd5ec8 100644
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -23,7 +23,9 @@
       <p data-l10n-id="welcome">Welcome to the Loop web client.</p>
     </div>
 
-    <form id="conversation-form" class="hide">
+    <!-- The autocomplete attribute is set to "off" to prevent keeping the state
+         of the disabled button across reloads  -->
+    <form id="conversation-form" autocomplete="off" class="hide">
       <p>
         <button class="btn btn-success" data-l10n-id="start_call">Start call</button>
       </p>
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index bc672b6383f7..d1bc6795371c 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -86,12 +86,22 @@ loop.webapp = (function($, TB, webl10n) {
       });
     },
 
+    /**
+     * Disables this form to prevent multiple submissions.
+     *
+     * @see  https://bugzilla.mozilla.org/show_bug.cgi?id=991126
+     */
+    disableForm: function() {
+      this.$("button").attr("disabled", "disabled");
+    },
+
     initiate: function(event) {
       event.preventDefault();
       this.model.initiate({
         baseServerUrl: baseServerUrl,
         outgoing: true
       });
+      this.disableForm();
     }
   });
 
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 476321bda165..6e7f0d110c63 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -173,10 +173,10 @@ describe("loop.webapp", function() {
           notifier: notifier
         });
         fakeSubmitEvent = {preventDefault: sinon.spy()};
+        initiate = sinon.stub(conversation, "initiate");
       });
 
       it("should start the conversation establishment process", function() {
-        initiate = sinon.stub(conversation, "initiate");
         conversation.set("loopToken", "fake");
 
         view.initiate(fakeSubmitEvent);
@@ -188,6 +188,15 @@ describe("loop.webapp", function() {
           outgoing: true
         });
       });
+
+      it("should disable current form once session is initiated", function() {
+        sandbox.stub(view, "disableForm");
+        conversation.set("loopToken", "fake");
+
+        view.initiate(fakeSubmitEvent);
+
+        sinon.assert.calledOnce(view.disableForm);
+      });
     });
 
     describe("Events", function() {

From fc5cbbe6783c877f85584351a48408bf11e83698 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 047/117] Bug 993324 Upgrade Loop to use TokBox SDK v2.2
 r=nperriault

--HG--
extra : transplant_source : %B6%95%BF%E3%7E%E4p%98%D3%16%3F%8E%3B%20c%B4%06%C5%AB%C3
---
 .../loop/content/shared/js/models.js          |     6 +-
 .../loop/content/shared/js/views.js           |     6 +-
 .../loop/content/shared/libs/sdk.js           | 19029 +++++++++-------
 .../loop/standalone/content/index.html        |     2 +-
 .../loop/standalone/content/js/webapp.js      |     6 +-
 5 files changed, 10737 insertions(+), 8312 deletions(-)

diff --git a/browser/components/loop/content/shared/js/models.js b/browser/components/loop/content/shared/js/models.js
index 2d7b07f8978c..6ba5cb8254ad 100644
--- a/browser/components/loop/content/shared/js/models.js
+++ b/browser/components/loop/content/shared/js/models.js
@@ -20,9 +20,9 @@ loop.shared.models = (function() {
                                // is the version received from the push
                                // notification and is used by the server to
                                // determine the pending calls
-      sessionId:    undefined, // TB session id
-      sessionToken: undefined, // TB session token
-      apiKey:       undefined  // TB api key
+      sessionId:    undefined, // OT session id
+      sessionToken: undefined, // OT session token
+      apiKey:       undefined  // OT api key
     },
 
     /**
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 6ea2d06846d2..cb198ebde250 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -6,7 +6,7 @@
 
 var loop = loop || {};
 loop.shared = loop.shared || {};
-loop.shared.views = (function(TB) {
+loop.shared.views = (function(OT) {
   "use strict";
 
   var sharedModels = loop.shared.models;
@@ -47,7 +47,7 @@ loop.shared.views = (function(TB) {
     videoStyles: { width: "100%", height: "auto" },
 
     /**
-     * Establishes webrtc communication using TB sdk.
+     * Establishes webrtc communication using OT sdk.
      */
     initialize: function(options) {
       options = options || {};
@@ -179,4 +179,4 @@ loop.shared.views = (function(TB) {
     NotificationListView: NotificationListView,
     NotificationView: NotificationView
   };
-})(window.TB);
+})(window.OT);
diff --git a/browser/components/loop/content/shared/libs/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
index 3acbd56c76ec..57b0702fefd5 100644
--- a/browser/components/loop/content/shared/libs/sdk.js
+++ b/browser/components/loop/content/shared/libs/sdk.js
@@ -1,43 +1,59 @@
 /**
- * @license  OpenTok JavaScript Library v2.0.18.1
+ * @license  OpenTok JavaScript Library v2.2.4.1
  * http://www.tokbox.com/
  *
  * Copyright (c) 2013 TokBox, Inc.
  *
- * Date: March 18 06:20:17 2014
+ * Date: March 27 05:49:25 2014
  */
 
 (function(window) {
-if (!window.OT) window.OT = {};
+  if (!window.OT) window.OT = {};
 
-OT.properties = {
-  version: "v2.0.18.1",         // The current version (eg. v2.0.4) (This is replaced by gradle)
-  build: "7333ca3",    // The current build hash (This is replaced by gradle)
+  OT.properties = {
+    version: 'v2.2.4.1',         // The current version (eg. v2.0.4) (This is replaced by gradle)
+    build: 'e42c038',    // The current build hash (This is replaced by gradle)
 
-  debug: "false",      // Whether or not to turn on debug logging by default
-  websiteURL: "http://www.tokbox.com",      // The URL of the tokbox website
+    // Whether or not to turn on debug logging by default
+    debug: 'false',
+    // The URL of the tokbox website
+    websiteURL: 'http://www.tokbox.com',
 
-  cdnURL: "http://static.opentok.com",        // The URL of the CDN
-  loggingURL: "http://hlg.tokbox.com/prod",   // The URL to use for logging
-  apiURL: "http://anvil.opentok.com",          // The anvil API URL
+    // The URL of the CDN
+    cdnURL: 'http://static.opentok.com',
+    // The URL to use for logging
+    loggingURL: 'http://hlg.tokbox.com/prod',
+    // The anvil API URL
+    apiURL: 'http://anvil.opentok.com',
 
-  messagingProtocol: "wss",         // What protocol to use when connecting to the rumor web socket
-  messagingPort: 443,               // What port to use when connection to the rumor web socket
+    // What protocol to use when connecting to the rumor web socket
+    messagingProtocol: 'wss',
+    // What port to use when connection to the rumor web socket
+    messagingPort: 443,
 
-  supportSSL: "true",           // If this environment supports SSL
-  cdnURLSSL: "https://static.opentok.com",         // The CDN to use if we're using SSL
-  loggingURLSSL: "https://hlg.tokbox.com/prod",    // The loggging URL to use if we're using SSL
-  apiURLSSL: "https://anvil.opentok.com"             // The anvil API URL to use if we're using SSL
-};
+    // If this environment supports SSL
+    supportSSL: 'true',
+    // The CDN to use if we're using SSL
+    cdnURLSSL: 'https://static.opentok.com',
+    // The loggging URL to use if we're using SSL
+    loggingURLSSL: 'https://hlg.tokbox.com/prod',
+    // The anvil API URL to use if we're using SSL
+    apiURLSSL: 'https://anvil.opentok.com',
+
+    minimumVersion: {
+      firefox: parseFloat('26'),
+      chrome: parseFloat('32')
+    }
+  };
 
 })(window);
 /**
- * @license  Common JS Helpers on OpenTok 0.1.0 628a0b9 master
+ * @license  Common JS Helpers on OpenTok 0.2.0 da024f2 master
  * http://www.tokbox.com/
  *
  * Copyright (c) 2014 TokBox, Inc.
  *
- * Date: January 08 04:13:37 2014
+ * Date: March 17 02:18:55 2014
  *
  */
 
@@ -61,47 +77,170 @@ OT.properties = {
 !(function(window, undefined) {
 
 
-var OTHelpers = function(domId) {
+  var OTHelpers = function(domId) {
     return document.getElementById(domId);
-};
+  };
 
-var previousOTHelpers = window.OTHelpers;
+  var previousOTHelpers = window.OTHelpers;
 
-window.OTHelpers = OTHelpers;
+  window.OTHelpers = OTHelpers;
+
+  OTHelpers.keys = Object.keys || function(object) {
+    var keys = [], hasOwnProperty = Object.prototype.hasOwnProperty;
+    for(var key in object) {
+      if(hasOwnProperty.call(object, key)) {
+        keys.push(key);
+      }
+    }
+    return keys;
+  };
+
+  var _each = Array.prototype.forEach || function(iter, ctx) {
+    for(var idx = 0, count = this.length || 0; idx < count; ++idx) {
+      if(idx in this) {
+        iter.call(ctx, this[idx], idx);
+      }
+    }
+  };
+
+  OTHelpers.forEach = function(array, iter) {
+    return _each.call(array, iter);
+  };
+
+  var _map = Array.prototype.map || function(iter, ctx) {
+    var collect = [];
+    _each.call(this, function(item, idx) {
+      collect.push(iter.call(ctx, item, idx));
+    });
+    return collect;
+  };
+
+  OTHelpers.map = function(array, iter) {
+    return _map.call(array, iter);
+  };
+
+  var _filter = Array.prototype.filter || function(iter, ctx) {
+    var collect = [];
+    _each.call(this, function(item, idx) {
+      if(iter.call(ctx, item, idx)) {
+        collect.push(item);
+      }
+    });
+    return collect;
+  };
+
+  OTHelpers.filter = function(array, iter, ctx) {
+    return _filter.call(array, iter, ctx);
+  };
+
+  var _some = Array.prototype.some || function(iter, ctx) {
+    var any = false;
+    for(var idx = 0, count = this.length || 0; idx < count; ++idx) {
+      if(idx in this) {
+        if(iter.call(ctx, this[idx], idx)) {
+          any = true;
+          break;
+        }
+      }
+    }
+    return any;
+  };
+
+  OTHelpers.some = function(array, iter, ctx) {
+    return _some.call(array, iter, ctx);
+  };
+
+  var _indexOf = Array.prototype.indexOf || function(searchElement, fromIndex) {
+    var i,
+        pivot = (fromIndex) ? fromIndex : 0,
+        length;
+
+    if (!this) {
+      throw new TypeError();
+    }
+
+    length = this.length;
+
+    if (length === 0 || pivot >= length) {
+      return -1;
+    }
+
+    if (pivot < 0) {
+      pivot = length - Math.abs(pivot);
+    }
+
+    for (i = pivot; i < length; i++) {
+      if (this[i] === searchElement) {
+        return i;
+      }
+    }
+    return -1;
+  };
+
+  OTHelpers.arrayIndexOf = function(array, searchElement, fromIndex) {
+    return _indexOf.call(array, searchElement, fromIndex);
+  };
+
+  var _bind = Function.prototype.bind || function() {
+    var args = Array.prototype.slice.call(arguments),
+        ctx = args.shift(),
+        fn = this;
+    return function() {
+      return fn.apply(ctx, args.concat(Array.prototype.slice.call(arguments)));
+    };
+  };
+
+  OTHelpers.bind = function() {
+    var args = Array.prototype.slice.call(arguments),
+        fn = args.shift();
+    return _bind.apply(fn, args);
+  };
+
+  var _trim = String.prototype.trim || function() {
+    return this.replace(/^\s+|\s+$/g, '');
+  };
+
+  OTHelpers.trim = function(str) {
+    return _trim.call(str);
+  };
 
-OTHelpers.noConflict = function() {
   OTHelpers.noConflict = function() {
+    OTHelpers.noConflict = function() {
+      return OTHelpers;
+    };
+    window.OTHelpers = previousOTHelpers;
     return OTHelpers;
   };
-  window.OTHelpers = previousOTHelpers;
-  return OTHelpers;
-};
 
+  OTHelpers.isNone = function(obj) {
+    return obj === undefined || obj === null;
+  };
 
-OTHelpers.isEmpty = function(obj) {
-  if (obj === null || obj === undefined) return true;
-  if (Array.isArray(obj) || typeof(obj) === 'string') return obj.length === 0;
+  OTHelpers.isObject = function(obj) {
+    return obj === Object(obj);
+  };
 
-  // Objects without enumerable owned properties are empty.
-  for (var key in obj) {
-    if (obj.hasOwnProperty(key)) return false;
-  }
+  OTHelpers.isFunction = function(obj) {
+    return !!obj && (obj.toString().indexOf('()') !== -1 ||
+      Object.prototype.toString.call(obj) === '[object Function]');
+  };
 
-  return true;
-};
+  OTHelpers.isArray = OTHelpers.isFunction(Array.isArray) && Array.isArray ||
+    function (vArg) {
+      return Object.prototype.toString.call(vArg) === '[object Array]';
+    };
 
-OTHelpers.isNone = function(obj) {
-  return obj === undefined || obj === null;
-};
+  OTHelpers.isEmpty = function(obj) {
+    if (obj === null || obj === undefined) return true;
+    if (OTHelpers.isArray(obj) || typeof(obj) === 'string') return obj.length === 0;
 
-OTHelpers.isObject = function(obj) {
-  return obj === Object(obj);
-};
+    // Objects without enumerable owned properties are empty.
+    for (var key in obj) {
+      if (obj.hasOwnProperty(key)) return false;
+    }
 
-
-OTHelpers.isFunction = function(obj) {
-    return typeof obj === 'function';
-};
+    return true;
+  };
 
 // Extend a target object with the properties from one or
 // more source objects
@@ -109,18 +248,18 @@ OTHelpers.isFunction = function(obj) {
 // @example:
 //    dest = OTHelpers.extend(dest, source1, source2, source3);
 //
-OTHelpers.extend = function(/* dest, source1[, source2, ..., , sourceN]*/) {
+  OTHelpers.extend = function(/* dest, source1[, source2, ..., , sourceN]*/) {
     var sources = Array.prototype.slice.call(arguments),
         dest = sources.shift();
 
-    sources.forEach(function(source) {
-        for (var key in source) {
-            dest[key] = source[key];
-        }
+    OTHelpers.forEach(sources, function(source) {
+      for (var key in source) {
+        dest[key] = source[key];
+      }
     });
 
     return dest;
-};
+  };
 
 // Ensures that the target object contains certain defaults.
 //
@@ -129,41 +268,40 @@ OTHelpers.extend = function(/* dest, source1[, source2, ..., , sourceN]*/) {
 //     loading: true     // loading by default
 //   });
 //
-OTHelpers.defaults = function(/* dest, defaults1[, defaults2, ..., , defaultsN]*/) {
+  OTHelpers.defaults = function(/* dest, defaults1[, defaults2, ..., , defaultsN]*/) {
     var sources = Array.prototype.slice.call(arguments),
         dest = sources.shift();
 
-    sources.forEach(function(source) {
-        for (var key in source) {
-            if (dest[key] === void 0) dest[key] = source[key];
-        }
+    OTHelpers.forEach(sources, function(source) {
+      for (var key in source) {
+        if (dest[key] === void 0) dest[key] = source[key];
+      }
     });
 
     return dest;
-};
+  };
 
-//
-OTHelpers.clone = function(obj) {
+  OTHelpers.clone = function(obj) {
     if (!OTHelpers.isObject(obj)) return obj;
-    return Array.isArray(obj) ? obj.slice() : OTHelpers.extend({}, obj);
-};
+    return OTHelpers.isArray(obj) ? obj.slice() : OTHelpers.extend({}, obj);
+  };
 
 
 
 // Handy do nothing function
-OTHelpers.noop = function() {};
+  OTHelpers.noop = function() {};
 
 // Returns true if the client supports WebSockets, false otherwise.
-OTHelpers.supportsWebSockets = function() {
+  OTHelpers.supportsWebSockets = function() {
     return 'WebSocket' in window;
-};
+  };
 
 // Returns the number of millisceonds since the the UNIX epoch, this is functionally
 // equivalent to executing new Date().getTime().
 //
 // Where available, we use 'performance.now' which is more accurate and reliable,
 // otherwise we default to new Date().getTime().
-OTHelpers.now = (function() {
+  OTHelpers.now = (function() {
     var performance = window.performance || {},
         navigationStart,
         now =  performance.now       ||
@@ -173,51 +311,88 @@ OTHelpers.now = (function() {
                performance.webkitNow;
 
     if (now) {
-        now = now.bind(performance);
-        navigationStart = performance.timing.navigationStart;
+      now = OTHelpers.bind(now, performance);
+      navigationStart = performance.timing.navigationStart;
 
-        return  function() { return navigationStart + now(); };
+      return  function() { return navigationStart + now(); };
+    } else {
+      return function() { return new Date().getTime(); };
     }
-    else {
-        return function() { return new Date().getTime(); };
-    }
-})();
+  })();
 
-OTHelpers.browser = function() {
+  var _browser = function() {
     var userAgent = window.navigator.userAgent.toLowerCase(),
+        appName = window.navigator.appName,
         navigatorVendor,
-        browser = 'Unknown';
+        browser = 'unknown',
+        version = -1;
 
-    if (userAgent.indexOf('firefox') > -1)   {
-        browser = 'Firefox';
-    }
-    if (userAgent.indexOf('opera') > -1)   {
-        browser = 'Opera';
-    }
-    else if (userAgent.indexOf("msie") > -1) {
-        browser = "IE";
-    }
-    else if (userAgent.indexOf("chrome") > -1) {
-        browser = "Chrome";
+    if (userAgent.indexOf('opera') > -1 || userAgent.indexOf('opr') > -1) {
+      browser = 'Opera';
+
+      if (/opr\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (userAgent.indexOf('firefox') > -1)   {
+      browser = 'Firefox';
+
+      if (/firefox\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (appName === 'Microsoft Internet Explorer') {
+      // IE 10 and below
+      browser = 'IE';
+
+      if (/msie ([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (appName === 'Netscape' && userAgent.indexOf('trident') > -1) {
+      // IE 11+
+
+      browser = 'IE';
+
+      if (/trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if (userAgent.indexOf('chrome') > -1) {
+      browser = 'Chrome';
+
+      if (/chrome\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
+
+    } else if ((navigatorVendor = window.navigator.vendor) &&
+      navigatorVendor.toLowerCase().indexOf('apple') > -1) {
+      browser = 'Safari';
+
+      if (/version\/([0-9]{1,}[\.0-9]{0,})/.exec(userAgent) !== null) {
+        version = parseFloat( RegExp.$1 );
+      }
     }
 
-    if ((navigatorVendor = window.navigator.vendor) && navigatorVendor.toLowerCase().indexOf("apple") > -1) {
-        browser = "Safari";
-    }
+    return {browser: browser, version: version};
+  }();
 
-    userAgent = null;
-    OTHelpers.browser = function() { return browser; };
-    return browser;
-};
+  OTHelpers.browser = function() {
+    return _browser.browser;
+  };
+
+  OTHelpers.browserVersion = function() {
+    return _browser;
+  };
 
 
-OTHelpers.canDefineProperty = true;
+  OTHelpers.canDefineProperty = true;
 
-try {
+  try {
     Object.defineProperty({}, 'x', {});
-} catch (err) {
+  } catch (err) {
     OTHelpers.canDefineProperty = false;
-}
+  }
 
 // A helper for defining a number of getters at once.
 //
@@ -226,68 +401,97 @@ try {
 //     apiKey: function() { return _apiKey; },
 //     token: function() { return _token; },
 //     connected: function() { return this.is('connected'); },
-//     connection: function() { return _socket && _socket.id ? this.connections.get(_socket.id) : null; },
 //     capabilities: function() { return _socket.capabilities; },
 //     sessionId: function() { return _sessionId; },
 //     id: function() { return _sessionId; }
 //   });
 //
-OTHelpers.defineGetters = function(self, getters, enumerable) {
-  var propsDefinition = {};
+  OTHelpers.defineGetters = function(self, getters, enumerable) {
+    var propsDefinition = {};
 
-  if (enumerable === void 0) enumerable = false;
+    if (enumerable === void 0) enumerable = false;
 
-  for (var key in getters) {
-    propsDefinition[key] = {
-      get: getters[key],
-      enumerable: enumerable
-    };
-  }
+    for (var key in getters) {
+      propsDefinition[key] = {
+        get: getters[key],
+        enumerable: enumerable
+      };
+    }
 
-  Object.defineProperties(self, propsDefinition);
-};
+    Object.defineProperties(self, propsDefinition);
+  };
+
+  var generatePropertyFunction = function(object, getter, setter) {
+    if(getter && !setter) {
+      return function() {
+        return getter.call(object);
+      };
+    } else if(getter && setter) {
+      return function(value) {
+        if(value !== void 0) {
+          setter.call(object, value);
+        }
+        return getter.call(object);
+      };
+    } else {
+      return function(value) {
+        if(value !== void 0) {
+          setter.call(object, value);
+        }
+      };
+    }
+  };
+
+  OTHelpers.defineProperties = function(object, getterSetters) {
+    for (var key in getterSetters) {
+      object[key] = generatePropertyFunction(object, getterSetters[key].get,
+        getterSetters[key].set);
+    }
+  };
 
 
 // Polyfill Object.create for IE8
 //
 // See https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/create
 //
-if (!Object.create) {
+  if (!Object.create) {
     Object.create = function (o) {
-        if (arguments.length > 1) {
-            throw new Error('Object.create implementation only accepts the first parameter.');
-        }
-        function F() {}
-        F.prototype = o;
-        return new F();
+      if (arguments.length > 1) {
+        throw new Error('Object.create implementation only accepts the first parameter.');
+      }
+      function F() {}
+      F.prototype = o;
+      return new F();
     };
-}
-
-OTHelpers.setCookie = function(key, value) {
-  try {
-    localStorage.setItem(key, value);
-  } catch (err) {
-    // Store in browser cookie
-    var date = new Date();
-    date.setTime(date.getTime()+(365*24*60*60*1000));
-    var expires = "; expires="+date.toGMTString();
-    document.cookie = key+"="+value+expires+"; path=/";
   }
-};
 
-OTHelpers.getCookie = function(key) {
+  OTHelpers.setCookie = function(key, value) {
+    try {
+      localStorage.setItem(key, value);
+    } catch (err) {
+      // Store in browser cookie
+      var date = new Date();
+      date.setTime(date.getTime()+(365*24*60*60*1000));
+      var expires = '; expires=' + date.toGMTString();
+      document.cookie = key + '=' + value + expires + '; path=/';
+    }
+  };
+
+  OTHelpers.getCookie = function(key) {
     var value;
 
     try {
-      value = localStorage.getItem("opentok_client_id");
+      value = localStorage.getItem('opentok_client_id');
       return value;
     } catch (err) {
       // Check browser cookies
-      var nameEQ = key + "=";
+      var nameEQ = key + '=';
       var ca = document.cookie.split(';');
       for(var i=0;i < ca.length;i++) {
         var c = ca[i];
-        while (c.charAt(0)==' ') c = c.substring(1,c.length);
+        while (c.charAt(0) === ' ') {
+          c = c.substring(1,c.length);
+        }
         if (c.indexOf(nameEQ) === 0) {
           value = c.substring(nameEQ.length,c.length);
         }
@@ -299,7 +503,7 @@ OTHelpers.getCookie = function(key) {
     }
 
     return null;
-};
+  };
 
 
 /// Stolen from Underscore, this needs replacing
@@ -316,24 +520,25 @@ OTHelpers.getCookie = function(key) {
   // List of HTML entities for escaping.
   var entityMap = {
     escape: {
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-      '"': '&quot;',
-      "'": '&#x27;',
-      '/': '&#x2F;'
+      '&':  '&amp;',
+      '<':  '&lt;',
+      '>':  '&gt;',
+      '"':  '&quot;',
+      '\'': '&#x27;',
+      '/':  '&#x2F;'
     }
   };
+
   entityMap.unescape = OTHelpers.invert(entityMap.escape);
 
   // Regexes containing the keys and values listed immediately above.
   var entityRegexes = {
-    escape:   new RegExp('[' + Object.keys(entityMap.escape).join('') + ']', 'g'),
-    unescape: new RegExp('(' + Object.keys(entityMap.unescape).join('|') + ')', 'g')
+    escape:   new RegExp('[' + OTHelpers.keys(entityMap.escape).join('') + ']', 'g'),
+    unescape: new RegExp('(' + OTHelpers.keys(entityMap.unescape).join('|') + ')', 'g')
   };
 
   // Functions for escaping and unescaping strings to/from HTML interpolation.
-  ['escape', 'unescape'].forEach(function(method) {
+  OTHelpers.forEach(['escape', 'unescape'], function(method) {
     OTHelpers[method] = function(string) {
       if (string === null || string === undefined) return '';
       return ('' + string).replace(entityRegexes[method], function(match) {
@@ -344,158 +549,162 @@ OTHelpers.getCookie = function(key) {
 
 // By default, Underscore uses ERB-style template delimiters, change the
 // following template settings to use alternative delimiters.
-OTHelpers.templateSettings = {
-  evaluate    : /<%([\s\S]+?)%>/g,
-  interpolate : /<%=([\s\S]+?)%>/g,
-  escape      : /<%-([\s\S]+?)%>/g
-};
+  OTHelpers.templateSettings = {
+    evaluate    : /<%([\s\S]+?)%>/g,
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };
 
 // When customizing `templateSettings`, if you don't want to define an
 // interpolation, evaluation or escaping regex, we need one that is
 // guaranteed not to match.
-var noMatch = /(.)^/;
+  var noMatch = /(.)^/;
 
 // Certain characters need to be escaped so that they can be put into a
 // string literal.
-var escapes = {
-  "'":      "'",
-  '\\':     '\\',
-  '\r':     'r',
-  '\n':     'n',
-  '\t':     't',
-  '\u2028': 'u2028',
-  '\u2029': 'u2029'
-};
+  var escapes = {
+    '\'':     '\'',
+    '\\':     '\\',
+    '\r':     'r',
+    '\n':     'n',
+    '\t':     't',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
+  };
 
-var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
 
 // JavaScript micro-templating, similar to John Resig's implementation.
 // Underscore templating handles arbitrary delimiters, preserves whitespace,
 // and correctly escapes quotes within interpolated code.
-OTHelpers.template = function(text, data, settings) {
-  var render;
-  settings = OTHelpers.defaults({}, settings, OTHelpers.templateSettings);
+  OTHelpers.template = function(text, data, settings) {
+    var render;
+    settings = OTHelpers.defaults({}, settings, OTHelpers.templateSettings);
 
-  // Combine delimiters into one regular expression via alternation.
-  var matcher = new RegExp([
-    (settings.escape || noMatch).source,
-    (settings.interpolate || noMatch).source,
-    (settings.evaluate || noMatch).source
-  ].join('|') + '|$', 'g');
+    // Combine delimiters into one regular expression via alternation.
+    var matcher = new RegExp([
+      (settings.escape || noMatch).source,
+      (settings.interpolate || noMatch).source,
+      (settings.evaluate || noMatch).source
+    ].join('|') + '|$', 'g');
 
-  // Compile the template source, escaping string literals appropriately.
-  var index = 0;
-  var source = "__p+='";
-  text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
-    source += text.slice(index, offset)
-      .replace(escaper, function(match) { return '\\' + escapes[match]; });
+    // Compile the template source, escaping string literals appropriately.
+    var index = 0;
+    var source = '__p+=\'';
+    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+      source += text.slice(index, offset)
+        .replace(escaper, function(match) { return '\\' + escapes[match]; });
 
-    if (escape) {
-      source += "'+\n((__t=(" + escape + "))==null?'':OTHelpers.escape(__t))+\n'";
+      if (escape) {
+        source += '\'+\n((__t=(' + escape + '))==null?\'\':OTHelpers.escape(__t))+\n\'';
+      }
+      if (interpolate) {
+        source += '\'+\n((__t=(' + interpolate + '))==null?\'\':__t)+\n\'';
+      }
+      if (evaluate) {
+        source += '\';\n' + evaluate + '\n__p+=\'';
+      }
+      index = offset + match.length;
+      return match;
+    });
+    source += '\';\n';
+
+    // If a variable is not specified, place data values in local scope.
+    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+    source = 'var __t,__p=\'\',__j=Array.prototype.join,' +
+      'print=function(){__p+=__j.call(arguments,\'\');};\n' +
+      source + 'return __p;\n';
+
+    try {
+      // evil is necessary for the new Function line
+      /*jshint evil:true */
+      render = new Function(settings.variable || 'obj', source);
+    } catch (e) {
+      e.source = source;
+      throw e;
     }
-    if (interpolate) {
-      source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
-    }
-    if (evaluate) {
-      source += "';\n" + evaluate + "\n__p+='";
-    }
-    index = offset + match.length;
-    return match;
-  });
-  source += "';\n";
 
-  // If a variable is not specified, place data values in local scope.
-  if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+    if (data) return render(data);
+    var template = function(data) {
+      return render.call(this, data);
+    };
 
-  source = "var __t,__p='',__j=Array.prototype.join," +
-    "print=function(){__p+=__j.call(arguments,'');};\n" +
-    source + "return __p;\n";
+    // Provide the compiled function source as a convenience for precompilation.
+    template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
 
-
-  try {
-    // evil is necessary for the new Function line
-    /*jshint evil:true */
-    render = new Function(settings.variable || 'obj', source);
-  } catch (e) {
-    e.source = source;
-    throw e;
-  }
-
-  if (data) return render(data);
-  var template = function(data) {
-    return render.call(this, data);
+    return template;
   };
 
-  // Provide the compiled function source as a convenience for precompilation.
-  template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
-
-  return template;
-};
-
 })(window);
+
 /*jshint browser:true, smarttabs:true*/
 
 // tb_require('../../helpers.js')
 
 (function(window, OTHelpers, undefined) {
 
-OTHelpers.statable = function(self, possibleStates, initialState, stateChanged, stateChangedFailed) {
-  var previousState,
-      currentState = initialState;
+  OTHelpers.statable = function(self, possibleStates, initialState, stateChanged,
+    stateChangedFailed) {
+    var previousState,
+        currentState = initialState;
 
-  var setState = function(state) {
-    if (currentState !== state) {
-        if (possibleStates.indexOf(state) === -1) {
-          if (stateChangedFailed && OTHelpers.isFunction(stateChangedFailed)) stateChangedFailed('invalidState', state);
+    var setState = function(state) {
+      if (currentState !== state) {
+        if (OTHelpers.arrayIndexOf(possibleStates, state) === -1) {
+          if (stateChangedFailed && OTHelpers.isFunction(stateChangedFailed)) {
+            stateChangedFailed('invalidState', state);
+          }
           return;
         }
 
         previousState = currentState;
         currentState = state;
         if (stateChanged && OTHelpers.isFunction(stateChanged)) stateChanged(state, previousState);
-    }
+      }
+    };
+
+
+    // Returns a number of states and returns true if the current state
+    // is any of them.
+    //
+    // @example
+    // if (this.is('connecting', 'connected')) {
+    //   // do some stuff
+    // }
+    //
+    self.is = function (/* state0:String, state1:String, ..., stateN:String */) {
+      return OTHelpers.arrayIndexOf(arguments, currentState) !== -1;
+    };
+
+
+    // Returns a number of states and returns true if the current state
+    // is none of them.
+    //
+    // @example
+    // if (this.isNot('connecting', 'connected')) {
+    //   // do some stuff
+    // }
+    //
+    self.isNot = function (/* state0:String, state1:String, ..., stateN:String */) {
+      return OTHelpers.arrayIndexOf(arguments, currentState) === -1;
+    };
+
+    Object.defineProperties(self, {
+      state: {
+        get: function() { return currentState; }
+      },
+
+      previousState: {
+        get: function() { return previousState; }
+      }
+    });
+
+    return setState;
   };
 
-
-  // Returns a number of states and returns true if the current state
-  // is any of them.
-  //
-  // @example
-  // if (this.is('connecting', 'connected')) {
-  //   // do some stuff
-  // }
-  //
-  self.is = function (/* state0:String, state1:String, ..., stateN:String */) {
-    return Array.prototype.indexOf.call(arguments, currentState) !== -1;
-  };
-
-
-  // Returns a number of states and returns true if the current state
-  // is none of them.
-  //
-  // @example
-  // if (this.isNot('connecting', 'connected')) {
-  //   // do some stuff
-  // }
-  //
-  self.isNot = function (/* state0:String, state1:String, ..., stateN:String */) {
-    return Array.prototype.indexOf.call(arguments, currentState) === -1;
-  };
-
-  Object.defineProperties(self, {
-    state: {
-      get: function() { return currentState; }
-    },
-
-    previousState: {
-      get: function() { return previousState; }
-    }
-  });
-
-  return setState;
-};
-
 })(window, window.OTHelpers);
+
 /*!
  *  This is a modified version of Robert Kieffer awesome uuid.js library.
  *  The only modifications we've made are to remove the Node.js specific
@@ -637,85 +846,6 @@ OTHelpers.statable = function(self, possibleStates, initialState, stateChanged,
   OTHelpers.uuid = uuid;
 
 }(window, window.OTHelpers));
-// AJAX helpers
-
-/*jshint browser:true, smarttabs:true*/
-/*global ActiveXObject:true*/
-
-// tb_require('../helpers.js')
-
-(function(window, OTHelpers, undefined) {
-
-// Shim up XML support for IE8
-function shimXMLForIE8(xml) {
-    // https://developer.mozilla.org/en/DOM/Element.firstElementChild
-    Object.defineProperty(xml.prototype, "firstElementChild", {
-        "get" : function() {
-            var node = this;
-            node = node.firstChild;
-            while(node && node.nodeType != 1) node = node.nextSibling;
-            return node;
-        }
-    });
-
-    // https://developer.mozilla.org/En/DOM/Element.lastElementChild
-    Object.defineProperty(xml.prototype, "lastElementChild", {
-        "get" : function() {
-            var node = this;
-            node = node.lastChild;
-            while(node && node.nodeType != 1) node = node.previousSibling;
-            return node;
-        }
-    });
-
-    // https://developer.mozilla.org/En/DOM/Element.nextElementSibling
-    Object.defineProperty(xml.prototype, "nextElementSibling", {
-        "get" : function() {
-            var node = this;
-            while(!OTHelpers.isNone(node = node.nextSibling)) {
-                if(node.nodeType == 1) break;
-            }
-
-            return node;
-        }
-    });
-
-    // https://developer.mozilla.org/En/DOM/Element.previousElementSibling
-    Object.defineProperty(xml.prototype, "previousElementSibling", {
-        "get" : function() {
-            var node = this;
-            while(!OTHelpers.isNone(node = node.previousSibling)) {
-                if(node.nodeType == 1) break;
-            }
-            return node;
-        }
-    });
-}
-
-OTHelpers.parseXML = function(xmlString) {
-    var root, xml;
-
-    if (window.DOMParser) { // Standard IE9 + everyone else
-        xml = (new DOMParser()).parseFromString(xmlString, "text/xml");
-    } else { // <= IE8
-        xml = new ActiveXObject("Microsoft.XMLDOM");
-        xml.async = "false";
-        xml.loadXML(xmlString);
-
-        shimXMLForIE8(xml);
-    }
-
-    root = xml.documentElement;
-
-    if (!root || !root.nodeName || root.nodeName === "parsererror") {
-        // Badly formed XML
-        return null;
-    }
-
-    return xml;
-};
-
-})(window, window.OTHelpers);
 /*jshint browser:true, smarttabs:true*/
 
 // tb_require('../helpers.js')
@@ -735,6 +865,17 @@ OTHelpers.useLogHelpers = function(on){
     var _logLevel = on.NONE,
         _logs = [];
 
+    // Some objects can't be logged in the console, mostly these are certain
+    // types of native objects that are exposed to JS. This is only really a
+    // problem with IE, hence only the IE version does anything.
+    var makeLogArgumentsSafe = function(args) { return args; };
+
+    if (OTHelpers.browser() === 'IE') {
+        makeLogArgumentsSafe = function(args) {
+            return [toDebugString(Array.prototype.slice.apply(args))];
+        };
+    }
+
     // Generates a logging method for a particular method and log level.
     //
     // Attempts to handle the following cases:
@@ -746,9 +887,12 @@ OTHelpers.useLogHelpers = function(on){
     function generateLoggingMethod(method, level, fallback) {
         return function() {
             if (on.shouldLog(level)) {
-                var cons = window.console;
+                var cons = window.console,
+                    args = makeLogArgumentsSafe(arguments);
 
                 // In IE, window.console may not exist if the developer tools aren't open
+                // This also means that cons and cons[method] can appear at any moment
+                // hence why we retest this every time.
                 if (cons && cons[method]) {
                     // the desired console method isn't a real object, which means
                     // that we can't use apply on it. We force it to be a real object
@@ -758,26 +902,26 @@ OTHelpers.useLogHelpers = function(on){
                             cons[method] = Function.prototype.bind.call(cons[method], cons);
                         }
 
-                        cons[method].apply(cons, arguments);
+                        cons[method].apply(cons, args);
                     }
                     else {
                         // This isn't the same result as the above, but it's better
                         // than nothing.
-                        cons[method](
-                            Array.prototype.slice.apply(arguments).join(' ')
-                        );
+                        cons[method](args);
                     }
                 }
                 else if (fallback) {
-                    fallback.apply(on, arguments);
+                    fallback.apply(on, args);
+
+                    // Skip appendToLogs, we delegate entirely to the fallback
+                    return;
                 }
 
-                appendToLogs(method, arguments);
+                appendToLogs(method, makeLogArgumentsSafe(arguments));
             }
         };
     }
 
-
     on.log = generateLoggingMethod('log', on.LOG);
 
     // Generate debug, info, warn, and error logging methods, these all fallback to on.log
@@ -789,7 +933,7 @@ OTHelpers.useLogHelpers = function(on){
 
     on.setLogLevel = function(level) {
         _logLevel = typeof(level) === 'number' ? level : 0;
-        on.debug("TB.setLogLevel(" + _logLevel + ")");
+        on.debug("OT.setLogLevel(" + _logLevel + ")");
         return _logLevel;
     };
 
@@ -809,32 +953,74 @@ OTHelpers.useLogHelpers = function(on){
         return now.toLocaleTimeString() + now.getMilliseconds();
     }
 
+    function toJson(object) {
+        try {
+            return JSON.stringify(object);
+        } catch(e) {
+            return object.toString();
+        }
+    }
+
+    function toDebugString(object) {
+        var components = [];
+
+        if (typeof(object) === 'undefined') {
+            // noop
+        }
+        else if (object === null) {
+            components.push('NULL');
+        }
+        else if (OTHelpers.isArray(object)) {
+            for (var i=0; i<object.length; ++i) {
+                components.push(toJson(object[i]));
+            }
+        }
+        else if (OTHelpers.isObject(object)) {
+            for (var key in object) {
+                var stringValue;
+
+                if (!OTHelpers.isFunction(object[key])) {
+                    stringValue = toJson(object[key]);
+                }
+                else if (object.hasOwnProperty(key)) {
+                    stringValue = 'function ' + key + '()';
+                }
+
+                components.push(key + ': ' + stringValue);
+            }
+        }
+        else if (OTHelpers.isFunction(object)) {
+            try {
+                components.push(object.toString());
+            } catch(e) {
+                components.push('function()');
+            }
+        }
+        else  {
+            components.push(object.toString());
+        }
+
+        return components.join(", ");
+    }
 
     // Append +args+ to logs, along with the current log level and the a date stamp.
     function appendToLogs(level, args) {
         if (!args) return;
 
-        var message;
-
-        try {
-            message = JSON.stringify(args);
-        } catch(e) {
-            message = args.toString();
-        }
-
+        var message = toDebugString(args);
         if (message.length <= 2) return;
 
         _logs.push(
             [level, formatDateStamp(), message]
         );
     }
-
 };
 
 OTHelpers.useLogHelpers(OTHelpers);
 OTHelpers.setLogLevel(OTHelpers.ERROR);
 
 })(window, window.OTHelpers);
+
 /*jshint browser:true, smarttabs:true*/
 
 // tb_require('../helpers.js')
@@ -858,434 +1044,648 @@ OTHelpers.roundFloat = function(value, places) {
 
 (function(window, OTHelpers, undefined) {
 
-var timeouts = [],
-    messageName = "OTHelpers." + OTHelpers.uuid.v4() + ".zero-timeout";
+  var timeouts = [],
+      messageName = 'OTHelpers.' + OTHelpers.uuid.v4() + '.zero-timeout';
 
-var handleMessage = function(event) {
-// XXX In chrome windows, event.source is not defined, so the full check
-// doesn't work. I'm not even convinced they need the window check anyway.
-//    if (event.source == window && event.data == messageName) {
-    if (event.data == messageName) {
+  var handleMessage = function(event) {
+    if (event.data === messageName) {
+      if(OTHelpers.isFunction(event.stopPropagation)) {
         event.stopPropagation();
-        if (timeouts.length > 0) {
-            var args = timeouts.shift(),
-                fn = args.shift();
+      }
+      event.cancelBubble = true;
+      if (timeouts.length > 0) {
+        var args = timeouts.shift(),
+            fn = args.shift();
 
-            fn.apply(null, args);
-        }
+        fn.apply(null, args);
+      }
     }
-};
+  };
 
-window.addEventListener("message", handleMessage, true);
+  if(window.addEventListener) {
+    window.addEventListener('message', handleMessage, true);
+  } else if(window.attachEvent) {
+    window.attachEvent('onmessage', handleMessage);
+  }
 
-// Calls the function +fn+ asynchronously with the current execution.
-// This is most commonly used to execute something straight after
-// the current function.
-//
-// Any arguments in addition to +fn+ will be passed to +fn+ when it's
-// called.
-//
-// You would use this inplace of setTimeout(fn, 0) type constructs. callAsync
-// is preferable as it executes in a much more predictable time window,
-// unlike setTimeout which could execute anywhere from 2ms to several thousand
-// depending on the browser/context.
-//
-OTHelpers.callAsync = function (/* fn, [arg1, arg2, ..., argN] */) {
+  // Calls the function +fn+ asynchronously with the current execution.
+  // This is most commonly used to execute something straight after
+  // the current function.
+  //
+  // Any arguments in addition to +fn+ will be passed to +fn+ when it's
+  // called.
+  //
+  // You would use this inplace of setTimeout(fn, 0) type constructs. callAsync
+  // is preferable as it executes in a much more predictable time window,
+  // unlike setTimeout which could execute anywhere from 2ms to several thousand
+  // depending on the browser/context.
+  //
+  OTHelpers.callAsync = function (/* fn, [arg1, arg2, ..., argN] */) {
     timeouts.push(Array.prototype.slice.call(arguments));
-    window.postMessage(messageName, "*");
-};
+    window.postMessage(messageName, '*');
+  };
 
 
-// Wraps +handler+ in a function that will execute it asynchronously
-// so that it doesn't interfere with it's exceution context if it raises
-// an exception.
-OTHelpers.createAsyncHandler = function(handler) {
+  // Wraps +handler+ in a function that will execute it asynchronously
+  // so that it doesn't interfere with it's exceution context if it raises
+  // an exception.
+  OTHelpers.createAsyncHandler = function(handler) {
     return function() {
-        var args = Array.prototype.slice.call(arguments);
+      var args = Array.prototype.slice.call(arguments);
 
-        OTHelpers.callAsync(function() {
-          handler.apply(null, args);
-        });
+      OTHelpers.callAsync(function() {
+        handler.apply(null, args);
+      });
     };
-};
+  };
 
 })(window, window.OTHelpers);
+
 /*jshint browser:true, smarttabs:true*/
 /*global jasmine:true*/
 
 // tb_require('../../helpers.js')
 // tb_require('../callbacks.js')
 
-
 (function(window, OTHelpers, undefined) {
 
 /**
-* This base class defines the <code>addEventListener()</code> and <code>removeEventListner()</code> methods of objects
-* that can dispatch events.
+* This base class defines the <code>on</code>, <code>once</code>, and <code>off</code>
+* methods of objects that can dispatch events.
 *
 * @class EventDispatcher
 */
-OTHelpers.eventing = function(self, syncronous) {
-  var _events = {};
+  OTHelpers.eventing = function(self, syncronous) {
+    var _events = {};
 
 
-  // Call the defaultAction, passing args
-  function executeDefaultAction(defaultAction, args) {
-    if (!defaultAction) return;
+    // Call the defaultAction, passing args
+    function executeDefaultAction(defaultAction, args) {
+      if (!defaultAction) return;
 
-    defaultAction.apply(null, args.slice());
-  }
+      defaultAction.apply(null, args.slice());
+    }
 
-  // Execute each handler in +listeners+ with +args+.
-  //
-  // Each handler will be executed async. On completion the defaultAction
-  // handler will be executed with the args.
-  //
-  // @param [Array] listeners
-  //    An array of functions to execute. Each will be passed args.
-  //
-  // @param [Array] args
-  //    An array of arguments to execute each function in  +listeners+ with.
-  //
-  // @param [String] name
-  //    The name of this event.
-  //
-  // @param [Function, Null, Undefined] defaultAction
-  //    An optional function to execute after every other handler. This will execute even
-  //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
-  //    handler would.
-  //
-  // @return Undefined
-  //
-  function executeListenersAsyncronously(name, args, defaultAction) {
-    var listeners = _events[name];
-    if (!listeners || listeners.length === 0) return;
+    // Execute each handler in +listeners+ with +args+.
+    //
+    // Each handler will be executed async. On completion the defaultAction
+    // handler will be executed with the args.
+    //
+    // @param [Array] listeners
+    //    An array of functions to execute. Each will be passed args.
+    //
+    // @param [Array] args
+    //    An array of arguments to execute each function in  +listeners+ with.
+    //
+    // @param [String] name
+    //    The name of this event.
+    //
+    // @param [Function, Null, Undefined] defaultAction
+    //    An optional function to execute after every other handler. This will execute even
+    //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
+    //    handler would.
+    //
+    // @return Undefined
+    //
+    function executeListenersAsyncronously(name, args, defaultAction) {
+      var listeners = _events[name];
+      if (!listeners || listeners.length === 0) return;
 
-    var listenerAcks = listeners.length;
+      var listenerAcks = listeners.length;
 
-    listeners.forEach(function(listener) { // , index
-      function filterHandlerAndContext(_listener) {
-        return _listener.context === listener.context && _listener.handler === listener.handler;
-      }
-
-      // We run this asynchronously so that it doesn't interfere with execution if an error happens
-      OTHelpers.callAsync(function() {
-        try {
-          // have to check if the listener has not been removed
-          if (_events[name] && _events[name].some(filterHandlerAndContext)) {
-            (listener.closure || listener.handler).apply(listener.context || null, args);
-          }
+      OTHelpers.forEach(listeners, function(listener) { // , index
+        function filterHandlerAndContext(_listener) {
+          return _listener.context === listener.context && _listener.handler === listener.handler;
         }
-        finally {
-          listenerAcks--;
 
-          if (listenerAcks === 0) {
-            executeDefaultAction(defaultAction, args);
-          }
-        }
-      });
-    });
-  }
-
-
-  // This is identical to executeListenersAsyncronously except that handlers will
-  // be executed syncronously.
-  //
-  // On completion the defaultAction handler will be executed with the args.
-  //
-  // @param [Array] listeners
-  //    An array of functions to execute. Each will be passed args.
-  //
-  // @param [Array] args
-  //    An array of arguments to execute each function in  +listeners+ with.
-  //
-  // @param [String] name
-  //    The name of this event.
-  //
-  // @param [Function, Null, Undefined] defaultAction
-  //    An optional function to execute after every other handler. This will execute even
-  //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
-  //    handler would.
-  //
-  // @return Undefined
-  //
-  function executeListenersSyncronously(name, args) { // defaultAction is not used
-    var listeners = _events[name];
-    if (!listeners || listeners.length === 0) return;
-
-    listeners.forEach(function(listener) { // index
-      (listener.closure || listener.handler).apply(listener.context || null, args);
-    });
-  }
-
-  var executeListeners = syncronous === true ? executeListenersSyncronously : executeListenersAsyncronously;
-
-
-  var removeAllListenersNamed = function (eventName, context) {
-    if (_events[eventName]) {
-      if (context) {
-        // We are removing by context, get only events that don't
-        // match that context
-        _events[eventName] = _events[eventName].filter(function(listener){
-          return listener.context !== context;
-        });
-      }
-      else {
-        delete _events[eventName];
-      }
-    }
-  };
-
-  var addListeners = function (eventNames, handler, context, closure) {
-    var listener = {handler: handler};
-    if (context) listener.context = context;
-    if (closure) listener.closure = closure;
-
-    eventNames.forEach(function(name) {
-      if (!_events[name]) _events[name] = [];
-      _events[name].push(listener);
-    });
-  }.bind(self);
-
-
-  var removeListeners = function (eventNames, handler, context) {
-    function filterHandlerAndContext(listener) {
-      return !(listener.handler === handler && listener.context === context);
-    }
-
-    eventNames.forEach(function(name) {
-      if (_events[name]) {
-        _events[name] = _events[name].filter(filterHandlerAndContext);
-        if (_events[name].length === 0) delete _events[name];
-      }
-    });
-  }.bind(self);
-
-
-  // Execute any listeners bound to the +event+ Event.
-  //
-  // Each handler will be executed async. On completion the defaultAction
-  // handler will be executed with the args.
-  //
-  // @param [Event] event
-  //    An Event object.
-  //
-  // @param [Function, Null, Undefined] defaultAction
-  //    An optional function to execute after every other handler. This will execute even
-  //    if there are listeners bound to this event. +defaultAction+ will be passed
-  //    args as a normal handler would.
-  //
-  // @return this
-  //
-  self.dispatchEvent = function(event, defaultAction) {
-    if (!event.type) {
-      OTHelpers.error("OTHelpers.Eventing.dispatchEvent: Event has no type");
-      OTHelpers.error(event);
-
-      throw new Error("OTHelpers.Eventing.dispatchEvent: Event has no type");
-    }
-
-    if (!event.target) {
-      event.target = this;
-    }
-
-    if (!_events[event.type] || _events[event.type].length === 0) {
-      executeDefaultAction(defaultAction, [event]);
-      return;
-    }
-
-    executeListeners(event.type, [event], defaultAction);
-
-    return this;
-  };
-
-  // Execute each handler for the event called +name+.
-  //
-  // Each handler will be executed async, and any exceptions that they throw will
-  // be caught and logged
-  //
-  // How to pass these?
-  //  * defaultAction
-  //
-  // @example
-  //  foo.on('bar', function(name, message) {
-  //    alert("Hello " + name + ": " + message);
-  //  });
-  //
-  //  foo.trigger('OpenTok', 'asdf');     // -> Hello OpenTok: asdf
-  //
-  //
-  // @param [String] eventName
-  //    The name of this event.
-  //
-  // @param [Array] arguments
-  //    Any additional arguments beyond +eventName+ will be passed to the handlers.
-  //
-  // @return this
-  //
-  self.trigger = function(eventName) {
-    if (!_events[eventName] || _events[eventName].length === 0) {
-      return;
-    }
-
-    var args = Array.prototype.slice.call(arguments);
-
-    // Remove the eventName arg
-    args.shift();
-
-    executeListeners(eventName, args);
-
-    return this;
-  };
-
-  self.on = function(eventNames, handler_or_context, context) {
-    if (typeof(eventNames) === "string" && handler_or_context) {
-      addListeners(eventNames.split(' '), handler_or_context, context);
-    }
-    else {
-      for (var name in eventNames) {
-        if (eventNames.hasOwnProperty(name)) {
-          addListeners([name], eventNames[name], handler_or_context);
-        }
-      }
-    }
-
-    return this;
-  };
-
- self.off = function(eventNames, handler_or_context, context) {
-    if (typeof(eventNames) === "string") {
-      if (handler_or_context && OTHelpers.isFunction(handler_or_context)) {
-        removeListeners(eventNames.split(' '), handler_or_context, context);
-      }
-      else {
-        eventNames.split(' ').forEach(function(name) {
-          removeAllListenersNamed(name, handler_or_context);
-        }, this);
-      }
-    }
-    else if (!eventNames) {
-      // remove all bound events
-      _events = {};
-    }
-    else {
-      for (var name in eventNames) {
-        if (eventNames.hasOwnProperty(name)) {
-          removeListeners([name], eventNames[name], handler_or_context);
-        }
-      }
-    }
-
-    return this;
-  };
-
-
-  self.once = function(eventNames, handler, context) {
-    var names = eventNames.split(' '),
-        fun = function() {
-          var result = handler.apply(context || null, arguments);
-          removeListeners(names, handler, context);
-
-          return result;
-        }.bind(this);
-
-    addListeners(names, handler, context, fun);
-    return this;
-  };
-
-
-  /**
-  * This method registers a method as an event listener for a specific event.
-  * <p>
-  *
-  * <p>
-  *   If a handler is not registered for an event, the event is ignored locally. If the event listener function does not exist,
-  *   the event is ignored locally.
-  * </p>
-  * <p>
-  *   Throws an exception if the <code>listener</code> name is invalid.
-  * </p>
-  *
-  * @param {String} type The string identifying the type of event.
-  *
-  * @param {Function} listener The function to be invoked when the object dispatches the event.
-  *
-  * @memberOf EventDispatcher
-  * @method #addEventListener
-  * @see <a href="#events">Events</a>
-  */
-  // See 'on' for usage.
-  // @depreciated will become a private helper function in the future.
-  self.addEventListener = function(eventName, handler, context) {
-    addListeners([eventName], handler, context);
-  };
-
-
-  /**
-  * Removes an event listener for a specific event.
-  * <p>
-  *
-  * <p>
-  *   Throws an exception if the <code>listener</code> name is invalid.
-  * </p>
-  *
-  * @param {String} type The string identifying the type of event.
-  *
-  * @param {Function} listener The event listener function to remove.
-  *
-  * @memberOf EventDispatcher
-  * @method #removeEventListener
-  * @see <a href="#events">Events</a>
-  */
-  // See 'off' for usage.
-  // @depreciated will become a private helper function in the future.
-  self.removeEventListener = function(eventName, handler, context) {
-    removeListeners([eventName], handler, context);
-  };
-
-
-
-
-
-  return self;
-};
-
-OTHelpers.eventing.Event = function() {
-
-    return function (type, cancelable) {
-        this.type = type;
-        this.cancelable = cancelable !== undefined ? cancelable : true;
-
-        var _defaultPrevented = false,
-            _target = null;
-
-        this.preventDefault = function() {
-            if (this.cancelable) {
-                _defaultPrevented = true;
-            } else {
-                OTHelpers.warn("Event.preventDefault :: Trying to preventDefault on an Event that isn't cancelable");
+        // We run this asynchronously so that it doesn't interfere with execution if an
+        // error happens
+        OTHelpers.callAsync(function() {
+          try {
+            // have to check if the listener has not been removed
+            if (_events[name] && OTHelpers.some(_events[name], filterHandlerAndContext)) {
+              (listener.closure || listener.handler).apply(listener.context || null, args);
             }
-        };
+          }
+          finally {
+            listenerAcks--;
 
-        this.isDefaultPrevented = function() {
-            return _defaultPrevented;
-        };
+            if (listenerAcks === 0) {
+              executeDefaultAction(defaultAction, args);
+            }
+          }
+        });
+      });
+    }
 
-        if (OTHelpers.canDefineProperty) {
-            Object.defineProperty(this, 'target', {
-                set: function(target) {
-                    _target = target;
-                },
 
-                get: function() {
-                    return _target;
-                }
-            });
+    // This is identical to executeListenersAsyncronously except that handlers will
+    // be executed syncronously.
+    //
+    // On completion the defaultAction handler will be executed with the args.
+    //
+    // @param [Array] listeners
+    //    An array of functions to execute. Each will be passed args.
+    //
+    // @param [Array] args
+    //    An array of arguments to execute each function in  +listeners+ with.
+    //
+    // @param [String] name
+    //    The name of this event.
+    //
+    // @param [Function, Null, Undefined] defaultAction
+    //    An optional function to execute after every other handler. This will execute even
+    //    if +listeners+ is empty. +defaultAction+ will be passed args as a normal
+    //    handler would.
+    //
+    // @return Undefined
+    //
+    function executeListenersSyncronously(name, args) { // defaultAction is not used
+      var listeners = _events[name];
+      if (!listeners || listeners.length === 0) return;
+
+      OTHelpers.forEach(listeners, function(listener) { // index
+        (listener.closure || listener.handler).apply(listener.context || null, args);
+      });
+    }
+
+    var executeListeners = syncronous === true ?
+      executeListenersSyncronously : executeListenersAsyncronously;
+
+
+    var removeAllListenersNamed = function (eventName, context) {
+      if (_events[eventName]) {
+        if (context) {
+          // We are removing by context, get only events that don't
+          // match that context
+          _events[eventName] = OTHelpers.filter(_events[eventName], function(listener){
+            return listener.context !== context;
+          });
         }
+        else {
+          delete _events[eventName];
+        }
+      }
     };
 
-};
+    var addListeners = OTHelpers.bind(function (eventNames, handler, context, closure) {
+      var listener = {handler: handler};
+      if (context) listener.context = context;
+      if (closure) listener.closure = closure;
+
+      OTHelpers.forEach(eventNames, function(name) {
+        if (!_events[name]) _events[name] = [];
+        _events[name].push(listener);
+      });
+    }, self);
+
+
+    var removeListeners = function (eventNames, handler, context) {
+      function filterHandlerAndContext(listener) {
+        return !(listener.handler === handler && listener.context === context);
+      }
+
+      OTHelpers.forEach(eventNames, OTHelpers.bind(function(name) {
+        if (_events[name]) {
+          _events[name] = OTHelpers.filter(_events[name], filterHandlerAndContext);
+          if (_events[name].length === 0) delete _events[name];
+        }
+      }, self));
+
+    };
+
+    // Execute any listeners bound to the +event+ Event.
+    //
+    // Each handler will be executed async. On completion the defaultAction
+    // handler will be executed with the args.
+    //
+    // @param [Event] event
+    //    An Event object.
+    //
+    // @param [Function, Null, Undefined] defaultAction
+    //    An optional function to execute after every other handler. This will execute even
+    //    if there are listeners bound to this event. +defaultAction+ will be passed
+    //    args as a normal handler would.
+    //
+    // @return this
+    //
+    self.dispatchEvent = function(event, defaultAction) {
+      if (!event.type) {
+        OTHelpers.error('OTHelpers.Eventing.dispatchEvent: Event has no type');
+        OTHelpers.error(event);
+
+        throw new Error('OTHelpers.Eventing.dispatchEvent: Event has no type');
+      }
+
+      if (!event.target) {
+        event.target = this;
+      }
+
+      if (!_events[event.type] || _events[event.type].length === 0) {
+        executeDefaultAction(defaultAction, [event]);
+        return;
+      }
+
+      executeListeners(event.type, [event], defaultAction);
+
+      return this;
+    };
+
+    // Execute each handler for the event called +name+.
+    //
+    // Each handler will be executed async, and any exceptions that they throw will
+    // be caught and logged
+    //
+    // How to pass these?
+    //  * defaultAction
+    //
+    // @example
+    //  foo.on('bar', function(name, message) {
+    //    alert("Hello " + name + ": " + message);
+    //  });
+    //
+    //  foo.trigger('OpenTok', 'asdf');     // -> Hello OpenTok: asdf
+    //
+    //
+    // @param [String] eventName
+    //    The name of this event.
+    //
+    // @param [Array] arguments
+    //    Any additional arguments beyond +eventName+ will be passed to the handlers.
+    //
+    // @return this
+    //
+    self.trigger = function(eventName) {
+      if (!_events[eventName] || _events[eventName].length === 0) {
+        return;
+      }
+
+      var args = Array.prototype.slice.call(arguments);
+
+      // Remove the eventName arg
+      args.shift();
+
+      executeListeners(eventName, args);
+
+      return this;
+    };
+
+   /**
+    * Adds an event handler function for one or more events.
+    *
+    * <p>
+    * The following code adds an event handler for one event:
+    * </p>
+    *
+    * <pre>
+    * obj.on("eventName", function (event) {
+    *     // This is the event handler.
+    * });
+    * </pre>
+    *
+    * <p>If you pass in multiple event names and a handler method, the handler is
+    * registered for each of those events:</p>
+    *
+    * <pre>
+    * obj.on("eventName1 eventName2",
+    *        function (event) {
+    *            // This is the event handler.
+    *        });
+    * </pre>
+    *
+    * <p>You can also pass in a third <code>context</code> parameter (which is optional) to
+    * define the value of <code>this</code> in the handler method:</p>
+    *
+    * <pre>obj.on("eventName",
+    *        function (event) {
+    *            // This is the event handler.
+    *        },
+    *        obj);
+    * </pre>
+    *
+    * <p>
+    * The method also supports an alternate syntax, in which the first parameter is an object
+    * that is a hash map of event names and handler functions and the second parameter (optional)
+    * is the context for this in each handler:
+    * </p>
+    * <pre>
+    * obj.on(
+    *    {
+    *       eventName1: function (event) {
+    *               // This is the handler for eventName1.
+    *           },
+    *       eventName2:  function (event) {
+    *               // This is the handler for eventName2.
+    *           }
+    *    },
+    *    obj);
+    * </pre>
+    *
+    * <p>
+    * If you do not add a handler for an event, the event is ignored locally.
+    * </p>
+    *
+    * @param {String} type The string identifying the type of event. You can specify multiple event
+    * names in this string, separating them with a space. The event handler will process each of
+    * the events.
+    * @param {Function} handler The handler function to process the event. This function takes
+    * the event object as a parameter.
+    * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
+    * handler function.
+    *
+    * @returns {EventDispatcher} The EventDispatcher object.
+    *
+    * @memberOf EventDispatcher
+    * @method #on
+    * @see <a href="#off">off()</a>
+    * @see <a href="#once">once()</a>
+    * @see <a href="#events">Events</a>
+    */
+    self.on = function(eventNames, handlerOrContext, context) {
+      if (typeof(eventNames) === 'string' && handlerOrContext) {
+        addListeners(eventNames.split(' '), handlerOrContext, context);
+      }
+      else {
+        for (var name in eventNames) {
+          if (eventNames.hasOwnProperty(name)) {
+            addListeners([name], eventNames[name], handlerOrContext);
+          }
+        }
+      }
+
+      return this;
+    };
+
+   /**
+    * Removes an event handler or handlers.
+    *
+    * <p>If you pass in one event name and a handler method, the handler is removed for that
+    * event:</p>
+    *
+    * <pre>obj.off("eventName", eventHandler);</pre>
+    *
+    * <p>If you pass in multiple event names and a handler method, the handler is removed for
+    * those events:</p>
+    *
+    * <pre>obj.off("eventName1 eventName2", eventHandler);</pre>
+    *
+    * <p>If you pass in an event name (or names) and <i>no</i> handler method, all handlers are
+    * removed for those events:</p>
+    *
+    * <pre>obj.off("event1Name event2Name");</pre>
+    *
+    * <p>If you pass in no arguments, <i>all</i> event handlers are removed for all events
+    * dispatched by the object:</p>
+    *
+    * <pre>obj.off();</pre>
+    *
+    * <p>
+    * The method also supports an alternate syntax, in which the first parameter is an object that
+    * is a hash map of event names and handler functions and the second parameter (optional) is
+    * the context for this in each handler:
+    * </p>
+    * <pre>
+    * obj.off(
+    *    {
+    *       eventName1: event1Handler,
+    *       eventName2: event2Handler
+    *    });
+    * </pre>
+    *
+    * @param {String} type (Optional) The string identifying the type of event. You can
+    * use a space to specify multiple events, as in "accessAllowed accessDenied
+    * accessDialogClosed". If you pass in no <code>type</code> value (or other arguments),
+    * all event handlers are removed for the object.
+    * @param {Function} handler (Optional) The event handler function to remove. The handler
+    * must be the same function object as was passed into <code>on()</code>. Be careful with
+    * helpers like <code>bind()</code> that return a new function when called. If you pass in
+    * no <code>handler</code>, all event handlers are removed for the specified event
+    * <code>type</code>.
+    * @param {Object} context (Optional) If you specify a <code>context</code>, the event handler
+    * is removed for all specified events and handlers that use the specified context. (The
+    * context must match the context passed into <code>on()</code>.)
+    *
+    * @returns {Object} The object that dispatched the event.
+    *
+    * @memberOf EventDispatcher
+    * @method #off
+    * @see <a href="#on">on()</a>
+    * @see <a href="#once">once()</a>
+    * @see <a href="#events">Events</a>
+    */
+    self.off = function(eventNames, handlerOrContext, context) {
+      if (typeof eventNames === 'string') {
+        if (handlerOrContext && OTHelpers.isFunction(handlerOrContext)) {
+          removeListeners(eventNames.split(' '), handlerOrContext, context);
+        }
+        else {
+          OTHelpers.forEach(eventNames.split(' '), function(name) {
+            removeAllListenersNamed(name, handlerOrContext);
+          }, this);
+        }
+
+      } else if (!eventNames) {
+        // remove all bound events
+        _events = {};
+
+      } else {
+        for (var name in eventNames) {
+          if (eventNames.hasOwnProperty(name)) {
+            removeListeners([name], eventNames[name], handlerOrContext);
+          }
+        }
+      }
+
+      return this;
+    };
+
+
+   /**
+    * Adds an event handler function for one or more events. Once the handler is called,
+    * the specified handler method is removed as a handler for this event. (When you use
+    * the <code>on()</code> method to add an event handler, the handler is <i>not</i>
+    * removed when it is called.) The <code>once()</code> method is the equivilent of
+    * calling the <code>on()</code>
+    * method and calling <code>off()</code> the first time the handler is invoked.
+    *
+    * <p>
+    * The following code adds a one-time event handler for the <code>accessAllowed</code> event:
+    * </p>
+    *
+    * <pre>
+    * obj.once("eventName", function (event) {
+    *    // This is the event handler.
+    * });
+    * </pre>
+    *
+    * <p>If you pass in multiple event names and a handler method, the handler is registered
+    * for each of those events:</p>
+    *
+    * <pre>obj.once("eventName1 eventName2"
+    *          function (event) {
+    *              // This is the event handler.
+    *          });
+    * </pre>
+    *
+    * <p>You can also pass in a third <code>context</code> parameter (which is optional) to define
+    * the value of
+    * <code>this</code> in the handler method:</p>
+    *
+    * <pre>obj.once("eventName",
+    *          function (event) {
+    *              // This is the event handler.
+    *          },
+    *          obj);
+    * </pre>
+    *
+    * <p>
+    * The method also supports an alternate syntax, in which the first parameter is an object that
+    * is a hash map of event names and handler functions and the second parameter (optional) is the
+    * context for this in each handler:
+    * </p>
+    * <pre>
+    * obj.once(
+    *    {
+    *       eventName1: function (event) {
+    *                  // This is the event handler for eventName1.
+    *           },
+    *       eventName2:  function (event) {
+    *                  // This is the event handler for eventName1.
+    *           }
+    *    },
+    *    obj);
+    * </pre>
+    *
+    * @param {String} type The string identifying the type of event. You can specify multiple
+    * event names in this string, separating them with a space. The event handler will process
+    * the first occurence of the events. After the first event, the handler is removed (for
+    * all specified events).
+    * @param {Function} handler The handler function to process the event. This function takes
+    * the event object as a parameter.
+    * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
+    * handler function.
+    *
+    * @returns {Object} The object that dispatched the event.
+    *
+    * @memberOf EventDispatcher
+    * @method #once
+    * @see <a href="#on">on()</a>
+    * @see <a href="#off">off()</a>
+    * @see <a href="#events">Events</a>
+    */
+    self.once = function(eventNames, handler, context) {
+      var names = eventNames.split(' '),
+          fun = OTHelpers.bind(function() {
+            var result = handler.apply(context || null, arguments);
+            removeListeners(names, handler, context);
+
+            return result;
+          }, this);
+
+      addListeners(names, handler, context, fun);
+      return this;
+    };
+
+
+    /**
+    * Deprecated; use <a href="#on">on()</a> or <a href="#once">once()</a> instead.
+    * <p>
+    * This method registers a method as an event listener for a specific event.
+    * <p>
+    *
+    * <p>
+    *   If a handler is not registered for an event, the event is ignored locally. If the
+    *   event listener function does not exist, the event is ignored locally.
+    * </p>
+    * <p>
+    *   Throws an exception if the <code>listener</code> name is invalid.
+    * </p>
+    *
+    * @param {String} type The string identifying the type of event.
+    *
+    * @param {Function} listener The function to be invoked when the object dispatches the event.
+    *
+    * @param {Object} context (Optional) Defines the value of <code>this</code> in the event
+    * handler function.
+    *
+    * @memberOf EventDispatcher
+    * @method #addEventListener
+    * @see <a href="#on">on()</a>
+    * @see <a href="#once">once()</a>
+    * @see <a href="#events">Events</a>
+    */
+    // See 'on' for usage.
+    // @depreciated will become a private helper function in the future.
+    self.addEventListener = function(eventName, handler, context) {
+      OTHelpers.warn('The addEventListener() method is deprecated. Use on() or once() instead.');
+      addListeners([eventName], handler, context);
+    };
+
+
+    /**
+    * Deprecated; use <a href="#on">on()</a> or <a href="#once">once()</a> instead.
+    * <p>
+    * Removes an event listener for a specific event.
+    * <p>
+    *
+    * <p>
+    *   Throws an exception if the <code>listener</code> name is invalid.
+    * </p>
+    *
+    * @param {String} type The string identifying the type of event.
+    *
+    * @param {Function} listener The event listener function to remove.
+    *
+    * @param {Object} context (Optional) If you specify a <code>context</code>, the event
+    * handler is removed for all specified events and event listeners that use the specified
+    context. (The context must match the context passed into
+    * <code>addEventListener()</code>.)
+    *
+    * @memberOf EventDispatcher
+    * @method #removeEventListener
+    * @see <a href="#off">off()</a>
+    * @see <a href="#events">Events</a>
+    */
+    // See 'off' for usage.
+    // @depreciated will become a private helper function in the future.
+    self.removeEventListener = function(eventName, handler, context) {
+      OTHelpers.warn('The removeEventListener() method is deprecated. Use off() instead.');
+      removeListeners([eventName], handler, context);
+    };
+
+
+
+
+
+    return self;
+  };
+
+  OTHelpers.eventing.Event = function() {
+
+    return function (type, cancelable) {
+      this.type = type;
+      this.cancelable = cancelable !== undefined ? cancelable : true;
+
+      var _defaultPrevented = false;
+
+      this.preventDefault = function() {
+        if (this.cancelable) {
+          _defaultPrevented = true;
+        } else {
+          OTHelpers.warn('Event.preventDefault :: Trying to preventDefault ' +
+            'on an Event that isn\'t cancelable');
+        }
+      };
+
+      this.isDefaultPrevented = function() {
+        return _defaultPrevented;
+      };
+    };
+
+  };
+  
 })(window, window.OTHelpers);
+
 /*jshint browser:true, smarttabs:true*/
 
 // tb_require('../helpers.js')
@@ -1468,21 +1868,21 @@ OTHelpers.observeStyleChanges = function(element, stylesToObserve, onChange) {
         };
 
     // get the inital values
-    stylesToObserve.forEach(function(style) {
+    OTHelpers.forEach(stylesToObserve, function(style) {
         oldStyles[style] = getStyle(style);
     });
 
     var observer = new MutationObserver(function(mutations) {
         var changeSet = {};
 
-        mutations.forEach(function(mutation) {
+        OTHelpers.forEach(mutations, function(mutation) {
             if (mutation.attributeName !== 'style') return;
 
             var isHidden = OTHelpers.isDisplayNone(element);
 
-            stylesToObserve.forEach(function(style) {
+            OTHelpers.forEach(stylesToObserve, function(style) {
                 if(isHidden && (style == 'width' || style == 'height')) return;
-
+                
                 var newValue = getStyle(style);
 
                 if (newValue !== oldStyles[style]) {
@@ -1525,7 +1925,7 @@ OTHelpers.observeStyleChanges = function(element, stylesToObserve, onChange) {
 //  // observe changings to the width and height of object
 //  nodeObserver = OTHelpers.observeNodeOrChildNodeRemoval(object, function(removedNodes) {
 //      OT.debug("Some child nodes were removed");
-//      removedNodes.forEach(function(node) {
+//      OTHelpers.forEach(removedNodes, function(node) {
 //          OT.debug(node);
 //      });
 //  });
@@ -1539,7 +1939,7 @@ OTHelpers.observeNodeOrChildNodeRemoval = function(element, onChange) {
     var observer = new MutationObserver(function(mutations) {
         var removedNodes = [];
 
-        mutations.forEach(function(mutation) {
+        OTHelpers.forEach(mutations, function(mutation) {
             if (mutation.removedNodes.length) {
                 removedNodes = removedNodes.concat(Array.prototype.slice.call(mutation.removedNodes));
             }
@@ -1565,6 +1965,7 @@ OTHelpers.observeNodeOrChildNodeRemoval = function(element, onChange) {
 
 })(window, window.OTHelpers);
 
+
 /*jshint browser:true, smarttabs:true*/
 
 // tb_require('../helpers.js')
@@ -1642,7 +2043,7 @@ OTHelpers.addClass = function(element, value) {
         return;
     }
 
-    var classNames = value.trim().split(/\s+/),
+    var classNames = OTHelpers.trim(value).split(/\s+/),
         i, l;
 
     if (OTHelpers.supportsClassList()) {
@@ -1667,7 +2068,7 @@ OTHelpers.addClass = function(element, value) {
             }
         }
 
-        element.className = setClass.trim();
+        element.className = OTHelpers.trim(setClass);
     }
 
     return this;
@@ -1681,7 +2082,7 @@ OTHelpers.removeClass = function(element, value) {
         return;
     }
 
-    var newClasses = value.trim().split(/\s+/),
+    var newClasses = OTHelpers.trim(value).split(/\s+/),
         i, l;
 
     if (OTHelpers.supportsClassList()) {
@@ -1698,7 +2099,7 @@ OTHelpers.removeClass = function(element, value) {
         className = className.replace(' ' + newClasses[i] + ' ', ' ');
     }
 
-    element.className = className.trim();
+    element.className = OTHelpers.trim(className);
 
     return this;
 };
@@ -1773,6 +2174,7 @@ OTHelpers.centerElement = function(element, width, height) {
 };
 
 })(window, window.OTHelpers);
+
 // CSS helpers helpers
 
 /*jshint browser:true, smarttabs:true*/
@@ -1791,7 +2193,7 @@ var defaultDisplayValueForElement = function(element) {
     }
 
     if (!defaultDisplays[element.ownerDocument]) defaultDisplays[element.ownerDocument] = {};
-
+    
     // We need to know what display value to use for this node. The easiest way
     // is to actually create a node and read it out.
     var testNode = element.ownerDocument.createElement(element.nodeName),
@@ -1812,7 +2214,7 @@ var isHidden = function(element) {
 };
 
 OTHelpers.show = function(element) {
-    var display = element.style.display;
+    var display = element.style.display; 
         //,
         // computedStyle = element.ownerDocument.defaultView.getComputedStyle(element, null),
         // computedDisplay = computedStyle.getPropertyValue('display');
@@ -1823,7 +2225,7 @@ OTHelpers.show = function(element) {
     }
 
     if (isHidden(element)) {
-        // It's still hidden so there's probably a stylesheet that declares this
+        // It's still hidden so there's probably a stylesheet that declares this 
         // element as display:none;
         displayStateCache[element] = 'none';
 
@@ -1905,7 +2307,7 @@ OTHelpers.applyCSS = function(element, styles, callback) {
 
 // Make +element+ visible while executing +callback+.
 OTHelpers.makeVisibleAndYield = function(element, callback) {
-    // find whether it's the element or an ancester that's display none and
+    // find whether it's the element or an ancester that's display none and 
     // then apply to whichever it is
     var targetElement = OTHelpers.findElementWithDisplayNone(element);
     if (!targetElement) return;
@@ -1924,397 +2326,322 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 /*jshint browser:true, smarttabs:true*/
 
 // tb_require('../helpers.js')
-// tb_require('./xml.js')
 
 (function(window, OTHelpers, undefined) {
 
-function formatPostData(data) { //, contentType
+  function formatPostData(data) { //, contentType
     // If it's a string, we assume it's properly encoded
     if (typeof(data) === 'string') return data;
 
     var queryString = [];
 
     for (var key in data) {
-        queryString.push(
-            encodeURIComponent(key) + '=' + encodeURIComponent(data[key])
-        );
+      queryString.push(
+        encodeURIComponent(key) + '=' + encodeURIComponent(data[key])
+      );
     }
 
-    return queryString.join('&').replace(/\+/g, "%20");
-}
+    return queryString.join('&').replace(/\+/g, '%20');
+  }
 
-OTHelpers.getXML = function(url, options) {
-    var callerSuccessCb = options && options.success,
+  OTHelpers.getJSON = function(url, options, callback) {
+    options = options || {};
 
-        isValidXMLDocument = function(xmlDocument) {
-            var root;
+    var done = function(error, event) {
+      if(error) {
+        callback(error);
+      } else {
+        var response;
 
-            if (!xmlDocument) {
-                // Badly formed XML
-                return false;
-            }
-
-            // If we got some XML back, attempt to infer if the XML is badly formed
-            root = xmlDocument.documentElement;
-
-            if (!root || !root.nodeName || root.nodeName === "parsererror") {
-                // Badly formed XML
-                return false;
-            }
-
-            return true;
-        },
-
-        onSuccess = function(event) {
-            var response = event.target.responseXML;
-
-            if (isValidXMLDocument(response)) {
-                if (callerSuccessCb) callerSuccessCb(response, event, event.target);
-            }
-            else if (options && options.error) {
-                options.error(event, event.target);
-            }
-        };
-
-    var extendedHeaders = OTHelpers.extend(options.headers || {}, {
-            'Content-Type': 'application/xml'
-        });
-
-    OTHelpers.get(url, OTHelpers.extend(options || {}, {
-        success: onSuccess,
-        headers: extendedHeaders
-    }));
-};
-
-OTHelpers.getJSON = function(url, options) {
-    var callerSuccessCb = options && options.success,
-        onSuccess = function(event) {
-            var response;
-
-            try {
-                response = JSON.parse(event.target.responseText);
-            } catch(e) {
-                // Badly formed JSON
-                if (options && options.error) options.error(event, event.target);
-                return;
-            }
-
-            if (callerSuccessCb) callerSuccessCb(response, event, event.target);
-        };
-
-    OTHelpers.get(url, OTHelpers.extend(options || {}, {
-        success: onSuccess,
-        headers: {
-            'Content-Type': 'application/json'
+        try {
+          response = JSON.parse(event.target.responseText);
+        } catch(e) {
+          // Badly formed JSON
+          callback(e);
+          return;
         }
-    }));
-};
 
-OTHelpers.get = function(url, options) {
-    var request = new XMLHttpRequest(),
-        _options = options || {};
-
-    bindToSuccessAndErrorCallbacks(request, _options.success, _options.error);
-    if (_options.process) request.addEventListener("progress", _options.progress, false);
-    if (_options.cancelled) request.addEventListener("abort", _options.cancelled, false);
-
-
-    request.open('GET', url, true);
-
-    if (!_options.headers) _options.headers = {};
-
-    for (var name in _options.headers) {
-        request.setRequestHeader(name, _options.headers[name]);
-    }
-
-    request.send();
-};
-
-OTHelpers.post = function(url, options) {
-    var request = new XMLHttpRequest(),
-        _options = options || {};
-
-    bindToSuccessAndErrorCallbacks(request, _options.success, _options.error);
-
-    if (_options.process) request.addEventListener("progress", _options.progress, false);
-    if (_options.cancelled) request.addEventListener("abort", _options.cancelled, false);
-
-    request.open('POST', url, true);
-
-    if (!_options.headers) _options.headers = {};
-
-    for (var name in _options.headers) {
-        request.setRequestHeader(name, _options.headers[name]);
-    }
-
-    request.send(formatPostData(_options.data));
-};
-
-OTHelpers.postFormData = function(url, data, options) {
-    if (!data) {
-        throw new Error("OTHelpers.postFormData must be passed a data options.");
-    }
-
-    var formData = new FormData();
-
-    for (var key in data) {
-        formData.append(key, data[key]);
-    }
-
-    OTHelpers.post(url, OTHelpers.extend(options || {}, {
-        data: formData
-    }));
-};
-
-
-// Make a GET request via JSONP.
-//
-// @example Make a request to 'http://tokbox.com:9999/session/foo' with success and error callbacks
-//
-//  OTHelpers.getJSONP('http://tokbox.com:9999/session/foo', {
-//      success: successCallback,
-//      error: errorCallback
-//  });
-//
-OTHelpers.getJSONP = function(url, options) {
-    var _loadTimeout = 30000,
-        _script,
-        _head = document.head || document.getElementsByTagName('head')[0],
-        _waitUntilTimeout,
-        _urlWithCallback = url,
-        _options = OTHelpers.extend(options || {}, {
-            callbackParameter: 'callback'
-        }),
-
-        _clearTimeout = function() {
-            if (_waitUntilTimeout) {
-                clearTimeout(_waitUntilTimeout);
-                _waitUntilTimeout = null;
-            }
-        },
-
-        _cleanup = function() {
-            _clearTimeout();
-
-            if (_script) {
-                _script.onload = _script.onreadystatechange = null;
-
-                OTHelpers.removeElement( _script );
-
-                _script = undefined;
-            }
-        },
-
-        _onLoad = function() {
-            if (_script.readyState && !/loaded|complete/.test( _script.readyState )) {
-                // Yeah, we're not ready yet...
-                return;
-            }
-
-            _clearTimeout();
-        },
-
-        _onLoadTimeout = function() {
-            _cleanup();
-
-            OTHelpers.error("The JSONP request to " + _urlWithCallback + " timed out after " + _loadTimeout + "ms.");
-            if (_options.error) _options.error("The JSONP request to " + url + " timed out after " + _loadTimeout + "ms.", _urlWithCallback,  _options);
-        },
-
-        _generateCallbackName = function() {
-            return 'jsonp_callback_' + (+new Date());
-        };
-
-
-    _options.callbackName = _generateCallbackName();
-    this.jsonp_callbacks[_options.callbackName] = function(response) {
-        _cleanup();
-
-        if (_options.success) _options.success(response);
+        callback(null, response, event);
+      }
     };
 
-    // This doesn't handle URLs like "http://www.google.com?blah=1#something". The callback name
-    // will be incorrectly appended after the #.
-    _urlWithCallback += ((/\?/).test(_urlWithCallback) ? "&" : "?") + _options.callbackParameter + '=' + _options.callbackName;
+    if(options.xdomainrequest) {
+      OTHelpers.xdomainRequest(url, { method: 'GET' }, done);
+    } else {
+      var extendedHeaders = OTHelpers.extend({
+        'Accept': 'application/json'
+      }, options.headers || {});
 
-    _script = OTHelpers.createElement('script', {
-        async: 'async',
-        src: _urlWithCallback,
-        onload: _onLoad,
-        onreadystatechange: _onLoad
-    });
-    _head.appendChild(_script);
+      OTHelpers.get(url, OTHelpers.extend(options || {}, {
+        headers: extendedHeaders
+      }), done);
+    }
 
-    _waitUntilTimeout = setTimeout(function() { _onLoadTimeout(); }, _loadTimeout);
-};
+  };
 
-// Private helper method used (by OTHelpers.get and OTHelpers.post among others) to setup
-// callbacks to correctly respond to success and error callbacks. This includes
-// interpreting the responses HTTP status, which XmlHttpRequest seems to ignore
-// by default.
-var bindToSuccessAndErrorCallbacks = function(request, success, error) {
-    request.addEventListener("load", function(event) {
+  OTHelpers.xdomainRequest = function(url, options, callback) {
+    /*global XDomainRequest*/
+    var xdr = new XDomainRequest(),
+        _options = options || {},
+        _method = _options.method;
+
+    if(!_method) {
+      callback(new Error('No HTTP method specified in options'));
+      return;
+    }
+
+    _method = _method.toUpperCase();
+
+    if(!(_method === 'GET' || _method === 'POST')) {
+      callback(new Error('HTTP method can only be '));
+      return;
+    }
+
+    function done(err, event) {
+      xdr.onload = xdr.onerror = xdr.ontimeout = function() {};
+      xdr = void 0;
+      callback(err, event);
+    }
+
+
+    xdr.onload = function() {
+      done(null, {
+        target: {
+          responseText: xdr.responseText,
+          headers: {
+            'content-type': xdr.contentType
+          }
+        }
+      });
+    };
+
+    xdr.onerror = function() {
+      done(new Error('XDomainRequest of ' + url + ' failed'));
+    };
+
+    xdr.ontimeout = function() {
+      done(new Error('XDomainRequest of ' + url + ' timed out'));
+    };
+
+    xdr.open(_method, url);
+    xdr.send(options.body && formatPostData(options.body));
+
+  };
+
+  OTHelpers.request = function(url, options, callback) {
+    var request = new XMLHttpRequest(),
+        _options = options || {},
+        _method = _options.method;
+
+    if(!_method) {
+      callback(new Error('No HTTP method specified in options'));
+      return;
+    }
+
+    // Setup callbacks to correctly respond to success and error callbacks. This includes
+    // interpreting the responses HTTP status, which XmlHttpRequest seems to ignore
+    // by default.
+    if(callback) {
+      request.addEventListener('load', function(event) {
         var status = event.target.status;
 
         // We need to detect things that XMLHttpRequest considers a success,
         // but we consider to be failures.
         if ( status >= 200 && status < 300 || status === 304 ) {
-            if (success) success.apply(null, arguments);
+          callback(null, event);
+        } else {
+          callback(event);
         }
-        else if (error) {
-            error(event);
-        }
-    }, false);
+      }, false);
 
-
-    if (error) {
-        request.addEventListener("error", error, false);
+      request.addEventListener('error', callback, false);
     }
-};
+
+    request.open(options.method, url, true);
+
+    if (!_options.headers) _options.headers = {};
+
+    for (var name in _options.headers) {
+      request.setRequestHeader(name, _options.headers[name]);
+    }
+
+    request.send(options.body && formatPostData(options.body));
+  };
+
+  OTHelpers.get = function(url, options, callback) {
+    var _options = OTHelpers.extend(options || {}, {
+      method: 'GET'
+    });
+    OTHelpers.request(url, _options, callback);
+  };
+
+  OTHelpers.post = function(url, options, callback) {
+    var _options = OTHelpers.extend(options || {}, {
+      method: 'POST'
+    });
+
+    if(_options.xdomainrequest) {
+      OTHelpers.xdomainRequest(url, _options, callback);
+    } else {
+      OTHelpers.request(url, _options, callback);
+    }
+  };
 
 })(window, window.OTHelpers);
 !(function(window) {
 
-if (!window.OT) window.OT = {};
+  /* global OTHelpers */
 
-// Bring OTHelpers in as OT.$
-OT.$ = OTHelpers.noConflict();
+  if (!window.OT) window.OT = {};
 
-// Allow events to be bound on OT
-OT.$.eventing(OT);
+  // Bring OTHelpers in as OT.$
+  OT.$ = OTHelpers.noConflict();
 
-// OT.$.Modal was OT.Modal before the great common-js-helpers move
-OT.Modal = OT.$.Modal;
+  // Allow events to be bound on OT
+  OT.$.eventing(OT);
 
-// Add logging methods
-OT.$.useLogHelpers(OT);
-var _debugHeaderLogged = false;
-var _setLogLevel = OT.setLogLevel;
+  // OT.$.Modal was OT.Modal before the great common-js-helpers move
+  OT.Modal = OT.$.Modal;
 
-// On the first time log level is set to DEBUG (or higher) show version info.
-OT.setLogLevel = function(level) {
+  // Add logging methods
+  OT.$.useLogHelpers(OT);
+
+  var _debugHeaderLogged = false,
+      _setLogLevel = OT.setLogLevel;
+
+  // On the first time log level is set to DEBUG (or higher) show version info.
+  OT.setLogLevel = function(level) {
     // Set OT.$ to the same log level
     OT.$.setLogLevel(level);
     var retVal = _setLogLevel.call(OT, level);
     if (OT.shouldLog(OT.DEBUG) && !_debugHeaderLogged) {
-        OT.debug("OpenTok JavaScript library " + OT.properties.version);
-        OT.debug("Release notes: " + OT.properties.websiteURL  +"/opentok/webrtc/docs/js/release-notes.html");
-        OT.debug("Known issues: " + OT.properties.websiteURL + "/opentok/webrtc/docs/js/release-notes.html#knownIssues");
-        _debugHeaderLogged = true;
+      OT.debug('OpenTok JavaScript library ' + OT.properties.version);
+      OT.debug('Release notes: ' + OT.properties.websiteURL +
+        '/opentok/webrtc/docs/js/release-notes.html');
+      OT.debug('Known issues: ' + OT.properties.websiteURL +
+        '/opentok/webrtc/docs/js/release-notes.html#knownIssues');
+      _debugHeaderLogged = true;
     }
-    OT.debug("TB.setLogLevel(" + retVal + ")");
+    OT.debug('OT.setLogLevel(' + retVal + ')');
     return retVal;
-};
+  };
 
-OT.setLogLevel(OT.properties.debug ? OT.DEBUG : OT.ERROR);
+  OT.setLogLevel(OT.properties.debug ? OT.DEBUG : OT.ERROR);
 
-/**
-* Sets the API log level.
-* <p>
-* Calling <code>TB.setLogLevel()</code> sets the log level for runtime log messages that are the OpenTok library generates.
-* The default value for the log level is <code>TB.ERROR</code>.
-* </p>
-* <p>
-* The OpenTok JavaScript library displays log messages in the debugger console (such as Firebug), if one exists.
-* </p>
-* <p>
-* The following example logs the session ID to the console, by calling <code>TB.log()</code>. The code also logs
-* an error message when it attempts to publish a stream before the Session object dispatches a
-* <code>sessionConnected</code> event.
-* </p>
-* <pre>
-* TB.setLogLevel(TB.LOG);
-* session = TB.initSession(sessionId);
-* TB.log(sessionId);
-* publisher = TB.initPublisher(API_KEY, "publishContainer");
-* session.publish(publisher);
-* </pre>
-*
-* @param {Number} logLevel The degree of logging desired by the developer:
-*
-* <p>
-* <ul>
-*   <li>
-*     <code>TB.NONE</code> &#151; API logging is disabled.
-*   </li>
-*   <li>
-*     <code>TB.ERROR</code> &#151; Logging of errors only.
-*   </li>
-*   <li>
-*     <code>TB.WARN</code> &#151; Logging of warnings and errors.
-*   </li>
-*   <li>
-*     <code>TB.INFO</code> &#151; Logging of other useful information, in addition to warnings and errors.
-*   </li>
-*   <li>
-*     <code>TB.LOG</code> &#151; Logging of <code>TB.log()</code> messages, in addition to OpenTok info, warning,
-*     and error messages.
-*   </li>
-*   <li>
-*     <code>TB.DEBUG</code> &#151; Fine-grained logging of all API actions, as well as <code>TB.log()</code> messages.
-*   </li>
-* </ul>
-* </p>
-*
-* @name TB.setLogLevel
-* @memberof TB
-* @function
-* @see <a href="#log">TB.log()</a>
-*/
+  /**
+  * Sets the API log level.
+  * <p>
+  * Calling <code>OT.setLogLevel()</code> sets the log level for runtime log messages that
+  * are the OpenTok library generates. The default value for the log level is <code>OT.ERROR</code>.
+  * </p>
+  * <p>
+  * The OpenTok JavaScript library displays log messages in the debugger console (such as
+  * Firebug), if one exists.
+  * </p>
+  * <p>
+  * The following example logs the session ID to the console, by calling <code>OT.log()</code>.
+  * The code also logs an error message when it attempts to publish a stream before the Session
+  * object dispatches a <code>sessionConnected</code> event.
+  * </p>
+  * <pre>
+  * OT.setLogLevel(OT.LOG);
+  * session = OT.initSession(sessionId);
+  * OT.log(sessionId);
+  * publisher = OT.initPublisher("publishContainer");
+  * session.publish(publisher);
+  * </pre>
+  *
+  * @param {Number} logLevel The degree of logging desired by the developer:
+  *
+  * <p>
+  * <ul>
+  *   <li>
+  *     <code>OT.NONE</code> &#151; API logging is disabled.
+  *   </li>
+  *   <li>
+  *     <code>OT.ERROR</code> &#151; Logging of errors only.
+  *   </li>
+  *   <li>
+  *     <code>OT.WARN</code> &#151; Logging of warnings and errors.
+  *   </li>
+  *   <li>
+  *     <code>OT.INFO</code> &#151; Logging of other useful information, in addition to
+  *     warnings and errors.
+  *   </li>
+  *   <li>
+  *     <code>OT.LOG</code> &#151; Logging of <code>OT.log()</code> messages, in addition
+  *     to OpenTok info, warning,
+  *     and error messages.
+  *   </li>
+  *   <li>
+  *     <code>OT.DEBUG</code> &#151; Fine-grained logging of all API actions, as well as
+  *     <code>OT.log()</code> messages.
+  *   </li>
+  * </ul>
+  * </p>
+  *
+  * @name OT.setLogLevel
+  * @memberof OT
+  * @function
+  * @see <a href="#log">OT.log()</a>
+  */
 
-/**
-* Sends a string to the the debugger console (such as Firebug), if one exists. However, the function
-* only logs to the console if you have set the log level to <code>TB.LOG</code> or <code>TB.DEBUG</code>,
-* by calling <code>TB.setLogLevel(TB.LOG)</code> or <code>TB.setLogLevel(TB.DEBUG)</code>.
-*
-* @param {String} message The string to log.
-*
-* @name TB.log
-* @memberof TB
-* @function
-* @see <a href="#setLogLevel">TB.setLogLevel()</a>
-*/
+  /**
+  * Sends a string to the the debugger console (such as Firebug), if one exists.
+  * However, the function only logs to the console if you have set the log level
+  * to <code>OT.LOG</code> or <code>OT.DEBUG</code>,
+  * by calling <code>OT.setLogLevel(OT.LOG)</code> or <code>OT.setLogLevel(OT.DEBUG)</code>.
+  *
+  * @param {String} message The string to log.
+  *
+  * @name OT.log
+  * @memberof OT
+  * @function
+  * @see <a href="#setLogLevel">OT.setLogLevel()</a>
+  */
 
 })(window);
-(function(window) {
+!(function(window) {
 
-// IMPORTANT This file should be included straight after helpers.js
-if (!window.OT) window.OT = {};
+  // IMPORTANT This file should be included straight after helpers.js
+  if (!window.OT) window.OT = {};
 
-if (!OT.properties) {
-	throw new Error("OT.properties does not exist, please ensure that you include a valid properties file.");
-}
+  if (!OT.properties) {
+    throw new Error('OT.properties does not exist, please ensure that you include a valid ' +
+      'properties file.');
+  }
 
-// Consumes and overwrites OT.properties. Makes it better and stronger!
-OT.properties = function(properties) {
+  // Consumes and overwrites OT.properties. Makes it better and stronger!
+  OT.properties = function(properties) {
     var props = OT.$.clone(properties);
 
     props.debug = properties.debug === 'true' || properties.debug === true;
     props.supportSSL = properties.supportSSL === 'true' || properties.supportSSL === true;
 
-    if (props.supportSSL && (window.location.protocol.indexOf("https") >= 0 || window.location.protocol.indexOf("chrome-extension") >= 0)) {
-        props.assetURL = props.cdnURLSSL + "/webrtc/" + props.version;
-        props.loggingURL = props.loggingURLSSL;
-        props.apiURL = props.apiURLSSL;
+    if (props.supportSSL && (window.location.protocol.indexOf('https') >= 0 ||
+      window.location.protocol.indexOf('chrome-extension') >= 0)) {
+      props.assetURL = props.cdnURLSSL + '/webrtc/' + props.version;
+      props.loggingURL = props.loggingURLSSL;
+      props.apiURL = props.apiURLSSL;
     } else {
-        props.assetURL = props.cdnURL + "/webrtc/" + props.version;
+      props.assetURL = props.cdnURL + '/webrtc/' + props.version;
     }
 
-    props.configURL = props.assetURL + "/js/dynamic_config.min.js";
-    props.cssURL = props.assetURL + "/css/ot.min.css";
+    props.configURL = props.assetURL + '/js/dynamic_config.min.js';
+    props.cssURL = props.assetURL + '/css/ot.min.css';
 
     return props;
-}(OT.properties);
+  }(OT.properties);
 
 })(window);
-(function(window) {
+!(function() {
 
 //--------------------------------------
 // JS Dynamic Config
 //--------------------------------------
 
 
-OT.Config = (function() {
+  OT.Config = (function() {
     var _loaded = false,
         _global = {},
         _partners = {},
@@ -2323,133 +2650,140 @@ OT.Config = (function() {
         _loadTimer,
 
         _clearTimeout = function() {
-            if (_loadTimer) {
-                clearTimeout(_loadTimer);
-                _loadTimer = null;
-            }
+          if (_loadTimer) {
+            clearTimeout(_loadTimer);
+            _loadTimer = null;
+          }
         },
 
         _cleanup = function() {
-            _clearTimeout();
+          _clearTimeout();
 
-            if (_script) {
-                _script.onload = _script.onreadystatechange = null;
+          if (_script) {
+            _script.onload = _script.onreadystatechange = null;
 
-                if ( _head && _script.parentNode ) {
-                    _head.removeChild( _script );
-                }
-
-                _script = undefined;
+            if ( _head && _script.parentNode ) {
+              _head.removeChild( _script );
             }
+
+            _script = undefined;
+          }
         },
 
         _onLoad = function() {
-            // Only IE and Opera actually support readyState on Script elements.
-            if (_script.readyState && !/loaded|complete/.test( _script.readyState )) {
-                // Yeah, we're not ready yet...
-                return;
-            }
+          // Only IE and Opera actually support readyState on Script elements.
+          if (_script.readyState && !/loaded|complete/.test( _script.readyState )) {
+              // Yeah, we're not ready yet...
+            return;
+          }
 
-            _clearTimeout();
+          _clearTimeout();
 
-            if (!_loaded) {
-                // Our config script is loaded but there is not config (as
-                // replaceWith wasn't called). Something went wrong. Possibly
-                // the file we loaded wasn't actually a valid config file.
-                _this._onLoadTimeout();
-            }
+          if (!_loaded) {
+            // Our config script is loaded but there is not config (as
+            // replaceWith wasn't called). Something went wrong. Possibly
+            // the file we loaded wasn't actually a valid config file.
+            _this._onLoadTimeout();
+          }
         },
 
         _getModule = function(moduleName, apiKey) {
-            if (apiKey && _partners[apiKey] && _partners[apiKey][moduleName]) {
-                return _partners[apiKey][moduleName];
-            }
+          if (apiKey && _partners[apiKey] && _partners[apiKey][moduleName]) {
+            return _partners[apiKey][moduleName];
+          }
 
-            return _global[moduleName];
+          return _global[moduleName];
         },
 
-        _this = {
-            // In ms
-            loadTimeout: 4000,
+        _this;
 
-            load: function(configUrl) {
-                if (!configUrl) throw new Error("You must pass a valid configUrl to Config.load");
+    _this = {
+      // In ms
+      loadTimeout: 4000,
 
-                _loaded = false;
+      load: function(configUrl) {
+        if (!configUrl) throw new Error('You must pass a valid configUrl to Config.load');
 
-                setTimeout(function() {
-                    _script = document.createElement( "script" );
-                    _script.async = "async";
-                    _script.src = configUrl;
-                    _script.onload = _script.onreadystatechange = _onLoad.bind(this);
-                    _head.appendChild(_script);
-                },1);
+        _loaded = false;
 
-                _loadTimer = setTimeout(function() {
-                    _this._onLoadTimeout();
-                }, this.loadTimeout);
-            },
+        setTimeout(function() {
+          _script = document.createElement( 'script' );
+          _script.async = 'async';
+          _script.src = configUrl;
+          _script.onload = _script.onreadystatechange = _onLoad.bind(this);
+          _head.appendChild(_script);
+        },1);
 
-            _onLoadTimeout: function() {
-                _cleanup();
+        _loadTimer = setTimeout(function() {
+          _this._onLoadTimeout();
+        }, this.loadTimeout);
+      },
 
-                OT.warn("TB DynamicConfig failed to load in " + _this.loadTimeout + " ms");
-                this.trigger('dynamicConfigLoadFailed');
-            },
+      _onLoadTimeout: function() {
+        _cleanup();
 
-            isLoaded: function() {
-                return _loaded;
-            },
+        OT.warn('TB DynamicConfig failed to load in ' + _this.loadTimeout + ' ms');
+        this.trigger('dynamicConfigLoadFailed');
+      },
 
-            reset: function() {
-                _cleanup();
-                _loaded = false;
-                _global = {};
-                _partners = {};
-            },
+      isLoaded: function() {
+        return _loaded;
+      },
 
-            // This is public so that the dynamic config file can load itself.
-            // Using it for other purposes is discouraged, but not forbidden.
-            replaceWith: function(config) {
-                _cleanup();
+      reset: function() {
+        _cleanup();
+        _loaded = false;
+        _global = {};
+        _partners = {};
+      },
 
-                if (!config) config = {};
+      // This is public so that the dynamic config file can load itself.
+      // Using it for other purposes is discouraged, but not forbidden.
+      replaceWith: function(config) {
+        _cleanup();
 
-                _global = config.global || {};
-                _partners = config.partners || {};
+        if (!config) config = {};
 
-                if (!_loaded) _loaded = true;
-                this.trigger('dynamicConfigChanged');
-            },
+        _global = config.global || {};
+        _partners = config.partners || {};
 
-            // @example Get the value that indicates whether exceptionLogging is enabled
-            //  OT.Config.get('exceptionLogging', 'enabled');
-            //
-            // @example Get a key for a specific partner, fallback to the default if there is
-            // no key for that partner
-            //  OT.Config.get('exceptionLogging', 'enabled', 'apiKey');
-            //
-            get: function(moduleName, key, apiKey) {
-                var module = _getModule(moduleName, apiKey);
-                return module ? module[key] : null;
-            }
-        };
+        if (!_loaded) _loaded = true;
+        this.trigger('dynamicConfigChanged');
+      },
+
+      // @example Get the value that indicates whether exceptionLogging is enabled
+      //  OT.Config.get('exceptionLogging', 'enabled');
+      //
+      // @example Get a key for a specific partner, fallback to the default if there is
+      // no key for that partner
+      //  OT.Config.get('exceptionLogging', 'enabled', 'apiKey');
+      //
+      get: function(moduleName, key, apiKey) {
+        var module = _getModule(moduleName, apiKey);
+        return module ? module[key] : null;
+      }
+    };
 
     OT.$.eventing(_this);
 
     return _this;
-})();
+  })();
 
 })(window);
-(function(window) {
+!(function() {
+/*global OT:true */
 
-var defaultAspectRatio = 4.0/3.0;
+  var defaultAspectRatio = 4.0/3.0,
+      miniWidth = 128,
+      miniHeight = 128,
+      microWidth = 64,
+      microHeight = 64;
 
-// This code positions the video element so that we don't get any letterboxing.
-// It will take into consideration aspect ratios other than 4/3 but only when
-// the video element is first created. If the aspect ratio changes at a later point
-// this calculation will become incorrect.
-function fixAspectRatio(element, width, height, desiredAspectRatio, rotated) {
+  // This code positions the video element so that we don't get any letterboxing.
+  // It will take into consideration aspect ratios other than 4/3 but only when
+  // the video element is first created. If the aspect ratio changes at a later point
+  // this calculation will become incorrect.
+  function fixAspectRatio(element, width, height, desiredAspectRatio, rotated) {
     if (!width) width = parseInt(OT.$.width(element.parentNode), 10);
     else width = parseInt(width, 10);
 
@@ -2461,96 +2795,114 @@ function fixAspectRatio(element, width, height, desiredAspectRatio, rotated) {
     if (!desiredAspectRatio) desiredAspectRatio = defaultAspectRatio;
 
     var actualRatio = (width + 0.0)/height,
-        props = {
-            width: '100%',
-            height: '100%',
-            left: 0,
-            top: 0
-        };
+        props;
+
+    props = {
+      width: '100%',
+      height: '100%',
+      left: 0,
+      top: 0
+    };
 
     if (actualRatio > desiredAspectRatio) {
         // Width is largest so we blow up the height so we don't have letterboxing
-        var newHeight = (actualRatio / desiredAspectRatio) * 100;
+      var newHeight = (actualRatio / desiredAspectRatio) * 100;
 
-        props.height = newHeight + '%';
-        props.top = '-' + ((newHeight - 100) / 2) + '%';
+      props.height = newHeight + '%';
+      props.top = '-' + ((newHeight - 100) / 2) + '%';
     } else if (actualRatio < desiredAspectRatio) {
-        // Height is largest, blow up the width
-        var newWidth = (desiredAspectRatio / actualRatio) * 100;
+      // Height is largest, blow up the width
+      var newWidth = (desiredAspectRatio / actualRatio) * 100;
 
-        props.width = newWidth + '%';
-        props.left = '-' + ((newWidth - 100) / 2) + '%';
+      props.width = newWidth + '%';
+      props.left = '-' + ((newWidth - 100) / 2) + '%';
     }
 
     OT.$.css(element, props);
 
     var video = element.querySelector('video');
     if(video) {
-        if(rotated) {
-            var w = element.offsetWidth,
-                h = element.offsetHeight,
-                props = { width: h + 'px', height: w + 'px', marginTop: '', marginLeft: '' },
-                diff = w - h;
-                props.marginLeft = (diff / 2) + 'px';
-                props.marginTop = -(diff / 2) + 'px';
-                OT.$.css(video, props);
-        } else {
-            OT.$.css(video, { width: '', height: '', marginTop: '', marginLeft: ''});
-        }
+      if(rotated) {
+        var w = element.offsetWidth,
+            h = element.offsetHeight,
+            diff = w - h;
+        props = {
+          width: h + 'px',
+          height: w + 'px',
+          marginTop: -(diff / 2) + 'px',
+          marginLeft: (diff / 2) + 'px'
+        };
+        OT.$.css(video, props);
+      } else {
+        OT.$.css(video, { width: '', height: '', marginTop: '', marginLeft: ''});
+      }
     }
+  }
 
-}
+  function fixMini(container, width, height) {
+    var w = parseInt(width, 10),
+        h = parseInt(height, 10);
 
-var getOrCreateContainer = function getOrCreateContainer(elementOrDomId, insertMode) {
+    if(w < microWidth || h < microHeight) {
+      OT.$.addClass(container, 'OT_micro');
+    } else {
+      OT.$.removeClass(container, 'OT_micro');
+    }
+    if(w < miniWidth || h < miniHeight) {
+      OT.$.addClass(container, 'OT_mini');
+    } else {
+      OT.$.removeClass(container, 'OT_mini');
+    }
+  }
+
+  var getOrCreateContainer = function getOrCreateContainer(elementOrDomId, insertMode) {
     var container,
         domId;
 
     if (elementOrDomId && elementOrDomId.nodeName) {
-        // It looks like we were given a DOM element. Grab the id or generate
-        // one if it doesn't have one.
-        container = elementOrDomId;
-        if (!container.getAttribute('id') || container.getAttribute('id').length === 0) {
-            container.setAttribute('id', 'OT_' + OT.$.uuid());
-        }
+      // It looks like we were given a DOM element. Grab the id or generate
+      // one if it doesn't have one.
+      container = elementOrDomId;
+      if (!container.getAttribute('id') || container.getAttribute('id').length === 0) {
+        container.setAttribute('id', 'OT_' + OT.$.uuid());
+      }
 
-        domId = container.getAttribute('id');
-    }
-    else {
-        // We may have got an id, try and get it's DOM element.
-        container = OT.$(elementOrDomId);
-        domId = elementOrDomId || ('OT_' + OT.$.uuid());
+      domId = container.getAttribute('id');
+    } else {
+      // We may have got an id, try and get it's DOM element.
+      container = OT.$(elementOrDomId);
+      domId = elementOrDomId || ('OT_' + OT.$.uuid());
     }
 
     if (!container) {
-        container = OT.$.createElement('div', {id: domId});
-        container.style.backgroundColor = "#000000";
-        document.body.appendChild(container);
-    }
-    else {
+      container = OT.$.createElement('div', {id: domId});
+      container.style.backgroundColor = '#000000';
+      document.body.appendChild(container);
+    } else {
+      if(!(insertMode == null || insertMode === 'replace')) {
+        var placeholder = document.createElement('div');
+        placeholder.id = ('OT_' + OT.$.uuid());
+        if(insertMode === 'append') {
+          container.appendChild(placeholder);
+          container = placeholder;
+        } else if(insertMode === 'before') {
+          container.parentNode.insertBefore(placeholder, container);
+          container = placeholder;
+        } else if(insertMode === 'after') {
+          container.parentNode.insertBefore(placeholder, container.nextSibling);
+          container = placeholder;
+        }
+      } else {
         OT.$.emptyElement(container);
-    }
-
-    if(!(insertMode == null || insertMode == 'replace')) {
-      var placeholder = document.createElement('div');
-      placeholder.id = ('OT_' + OT.$.uuid());
-      if(insertMode == 'append') {
-        container.appendChild(placeholder);
-        container = placeholder;
-      } else if(insertMode == 'before') {
-        container.parentNode.insertBefore(placeholder, container);
-        container = placeholder;
-      } else if(insertMode == 'after') {
-        container.parentNode.insertBefore(placeholder, container.nextSibling);
-        container = placeholder;
       }
     }
 
     return container;
-};
+  };
 
-// Creates the standard container that the Subscriber and Publisher use to hold
-// their video element and other chrome.
-OT.WidgetView = function(targetElement, properties) {
+  // Creates the standard container that the Subscriber and Publisher use to hold
+  // their video element and other chrome.
+  OT.WidgetView = function(targetElement, properties) {
     var container = getOrCreateContainer(targetElement, properties && properties.insertMode),
         videoContainer = document.createElement('div'),
         oldContainerStyles = {},
@@ -2559,29 +2911,34 @@ OT.WidgetView = function(targetElement, properties) {
         videoObserver,
         posterContainer,
         loadingContainer,
+        width,
+        height,
         loading = true;
 
     if (properties) {
-        width = properties.width;
-        height = properties.height;
+      width = properties.width;
+      height = properties.height;
 
-        if (width) {
-            if (typeof(width) == "number") {
-                width = width + "px";
-            }
+      if (width) {
+        if (typeof(width) === 'number') {
+          width = width + 'px';
         }
+      }
 
-        if (height) {
-            if (typeof(height) == "number") {
-                height = height + "px";
-            }
+      if (height) {
+        if (typeof(height) === 'number') {
+          height = height + 'px';
         }
+      }
 
-        container.style.width = width ? width : "264px";
-        container.style.height = height ? height : "198px";
-        container.style.overflow = "hidden";
+      container.style.width = width ? width : '264px';
+      container.style.height = height ? height : '198px';
+      container.style.overflow = 'hidden';
+      fixMini(container, width || '264px', height || '198px');
 
-        if (properties.mirror === undefined || properties.mirror) OT.$.addClass(container, 'OT_mirrored');
+      if (properties.mirror === undefined || properties.mirror) {
+        OT.$.addClass(container, 'OT_mirrored');
+      }
     }
 
     if (properties.classNames) OT.$.addClass(container, properties.classNames);
@@ -2594,206 +2951,237 @@ OT.WidgetView = function(targetElement, properties) {
     container.appendChild(videoContainer);
     fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight);
 
-    loadingContainer = document.createElement("div");
-    OT.$.addClass(loadingContainer, "OT_video-loading");
+    loadingContainer = document.createElement('div');
+    OT.$.addClass(loadingContainer, 'OT_video-loading');
     videoContainer.appendChild(loadingContainer);
 
-    posterContainer = document.createElement("div");
-    OT.$.addClass(posterContainer, "OT_video-poster");
+    posterContainer = document.createElement('div');
+    OT.$.addClass(posterContainer, 'OT_video-poster');
     videoContainer.appendChild(posterContainer);
 
     oldContainerStyles.width = container.offsetWidth;
     oldContainerStyles.height = container.offsetHeight;
 
     // Observe changes to the width and height and update the aspect ratio
-    dimensionsObserver = OT.$.observeStyleChanges(container, ['width', 'height'], function(changeSet) {
-        var width = changeSet.width ? changeSet.width[1] : container.offsetWidth,
-            height = changeSet.height ? changeSet.height[1] : container.offsetHeight;
-
-        fixAspectRatio(videoContainer, width, height, videoElement ? videoElement.aspectRatio : null);
+    dimensionsObserver = OT.$.observeStyleChanges(container, ['width', 'height'],
+      function(changeSet) {
+      var width = changeSet.width ? changeSet.width[1] : container.offsetWidth,
+          height = changeSet.height ? changeSet.height[1] : container.offsetHeight;
+      fixMini(container, width, height);
+      fixAspectRatio(videoContainer, width, height, videoElement ?
+        videoElement.aspectRatio : null);
     });
 
 
-    // @todo observe if the video container or the video element get removed, if they do we should do some cleanup
+    // @todo observe if the video container or the video element get removed
+    // if they do we should do some cleanup
     videoObserver = OT.$.observeNodeOrChildNodeRemoval(container, function(removedNodes) {
-        if (!videoElement) return;
+      if (!videoElement) return;
 
-        // This assumes a video element being removed is the main video element. This may
-        // not be the case.
-        var videoRemoved = removedNodes.some(function(node) { return node === videoContainer || node.nodeName === 'VIDEO'; });
+      // This assumes a video element being removed is the main video element. This may
+      // not be the case.
+      var videoRemoved = removedNodes.some(function(node) {
+        return node === videoContainer || node.nodeName === 'VIDEO';
+      });
 
-        if (videoRemoved) {
-            videoElement.destroy();
-            videoElement = null;
-        }
+      if (videoRemoved) {
+        videoElement.destroy();
+        videoElement = null;
+      }
 
-        if (videoContainer) {
-            OT.$.removeElement(videoContainer);
-            videoContainer = null;
-        }
+      if (videoContainer) {
+        OT.$.removeElement(videoContainer);
+        videoContainer = null;
+      }
 
-        if (dimensionsObserver) {
-            dimensionsObserver.disconnect();
-            dimensionsObserver = null;
-        }
+      if (dimensionsObserver) {
+        dimensionsObserver.disconnect();
+        dimensionsObserver = null;
+      }
 
-        if (videoObserver) {
-            videoObserver.disconnect();
-            videoObserver = null;
-        }
+      if (videoObserver) {
+        videoObserver.disconnect();
+        videoObserver = null;
+      }
     });
 
     this.destroy = function() {
-        if (dimensionsObserver) {
-            dimensionsObserver.disconnect();
-            dimensionsObserver = null;
-        }
+      if (dimensionsObserver) {
+        dimensionsObserver.disconnect();
+        dimensionsObserver = null;
+      }
 
-        if (videoObserver) {
-            videoObserver.disconnect();
-            videoObserver = null;
-        }
+      if (videoObserver) {
+        videoObserver.disconnect();
+        videoObserver = null;
+      }
 
-        if (videoElement) {
-            videoElement.destroy();
-            videoElement = null;
-        }
+      if (videoElement) {
+        videoElement.destroy();
+        videoElement = null;
+      }
 
-        if (container) {
-            OT.$.removeElement(container);
-            container = null;
-        }
+      if (container) {
+        OT.$.removeElement(container);
+        container = null;
+      }
     };
 
     Object.defineProperties(this, {
 
-        showPoster: {
-            get: function() {
-                return !OT.$.isDisplayNone(posterContainer);
-            },
-            set: function(shown) {
-                if(shown) {
-                    OT.$.show(posterContainer);
-                }
-                else {
-                    OT.$.hide(posterContainer);
-                }
-            }
+      showPoster: {
+        get: function() {
+          return !OT.$.isDisplayNone(posterContainer);
         },
-
-        poster: {
-            get: function() {
-                return OT.$.css(posterContainer, "backgroundImage");
-            },
-            set: function(src) {
-                OT.$.css(posterContainer, "backgroundImage", "url(" + src + ")");
-            }
-        },
-
-        loading: {
-            get: function() { return loading; },
-            set: function(l) {
-                loading = l;
-
-                if (loading) {
-                    OT.$.addClass(container, 'OT_loading');
-                }
-                else {
-                    OT.$.removeClass(container, 'OT_loading');
-                }
-            }
-        },
-
-        video: {
-            get: function() { return videoElement; },
-            set: function(video) {
-                // remove the old video element if it exists
-                // @todo this might not be safe, publishers/subscribers use this as well...
-                if (videoElement) videoElement.destroy();
-
-                video.appendTo(videoContainer);
-                videoElement = video;
-
-                videoElement.on({
-                    orientationChanged: function(){
-                        fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight, videoElement.aspectRatio, videoElement.isRotated);
-                    }
-                });
-
-                fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight, videoElement ? videoElement.aspectRatio : null, videoElement ? videoElement.isRotated : null);
-            }
-        },
-
-        domElement: {
-            get: function() { return container; }
-        },
-
-        domId: {
-          get: function() { return container.getAttribute('id'); }
+        set: function(shown) {
+          if(shown) {
+            OT.$.show(posterContainer);
+          } else {
+            OT.$.hide(posterContainer);
+          }
         }
+      },
+
+      poster: {
+        get: function() {
+          return OT.$.css(posterContainer, 'backgroundImage');
+        },
+        set: function(src) {
+          OT.$.css(posterContainer, 'backgroundImage', 'url(' + src + ')');
+        }
+      },
+
+      loading: {
+        get: function() { return loading; },
+        set: function(l) {
+          loading = l;
+
+          if (loading) {
+            OT.$.addClass(container, 'OT_loading');
+          } else {
+            OT.$.removeClass(container, 'OT_loading');
+          }
+        }
+      },
+
+      video: {
+        get: function() { return videoElement; },
+        set: function(video) {
+          // remove the old video element if it exists
+          // @todo this might not be safe, publishers/subscribers use this as well...
+          if (videoElement) videoElement.destroy();
+
+          video.appendTo(videoContainer);
+          videoElement = video;
+
+          videoElement.on({
+            orientationChanged: function(){
+              fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight,
+                videoElement.aspectRatio, videoElement.isRotated);
+            }
+          });
+
+          if (videoElement) {
+            var fix = function() {
+              fixAspectRatio(videoContainer, container.offsetWidth, container.offsetHeight,
+                videoElement ? videoElement.aspectRatio : null,
+                videoElement ? videoElement.isRotated : null);
+            };
+            if(isNaN(videoElement.aspectRatio)) {
+              videoElement.on('streamBound', fix);
+            } else {
+              fix();
+            }
+          }
+        }
+      },
+
+      domElement: {
+        get: function() { return container; }
+      },
+
+      domId: {
+        get: function() { return container.getAttribute('id'); }
+      }
     });
 
-    this.addError = function(errorMsg) {
-        container.innerHTML = "<p>" + errorMsg + "<p>";
-        OT.$.addClass(container, "OT_subscriber_error");
+    this.addError = function(errorMsg, helpMsg) {
+      container.innerHTML = '<p>' + errorMsg +
+        ' <span class="ot-help-message">' + helpMsg + '</span></p>';
+      OT.$.addClass(container, 'OT_subscriber_error');
+      if(container.querySelector('p').offsetHeight > container.offsetHeight) {
+        container.querySelector('span').style.display = 'none';
+      }
     };
-};
+  };
 
 })(window);
 // Web OT Helpers
-(function(window) {
+!(function(window) {
 
-// Handy cross-browser getUserMedia shim. Inspired by some code from Adam Barth
-var getUserMedia = (function() {
+  /* global mozRTCPeerConnection */
+
+  var nativeGetUserMedia,
+      mozToW3CErrors,
+      chromeToW3CErrors,
+      gumNamesToMessages,
+      mapVendorErrorName,
+      parseErrorEvent,
+      areInvalidConstraints;
+
+  // Handy cross-browser getUserMedia shim. Inspired by some code from Adam Barth
+  nativeGetUserMedia = (function() {
     if (navigator.getUserMedia) {
-        return navigator.getUserMedia.bind(navigator);
+      return navigator.getUserMedia.bind(navigator);
     } else if (navigator.mozGetUserMedia) {
-        return navigator.mozGetUserMedia.bind(navigator);
+      return navigator.mozGetUserMedia.bind(navigator);
     } else if (navigator.webkitGetUserMedia) {
-        return navigator.webkitGetUserMedia.bind(navigator);
+      return navigator.webkitGetUserMedia.bind(navigator);
     }
-})();
+  })();
 
 
-if (navigator.webkitGetUserMedia) {
+  if (navigator.webkitGetUserMedia) {
+    /*global webkitMediaStream, webkitRTCPeerConnection*/
     // Stub for getVideoTracks for Chrome < 26
     if (!webkitMediaStream.prototype.getVideoTracks) {
-        webkitMediaStream.prototype.getVideoTracks = function() {
-            return this.videoTracks;
-        };
+      webkitMediaStream.prototype.getVideoTracks = function() {
+        return this.videoTracks;
+      };
     }
 
     // Stubs for getAudioTracks for Chrome < 26
     if (!webkitMediaStream.prototype.getAudioTracks) {
-        webkitMediaStream.prototype.getAudioTracks = function() {
-            return this.audioTracks;
-        };
+      webkitMediaStream.prototype.getAudioTracks = function() {
+        return this.audioTracks;
+      };
     }
 
     if (!webkitRTCPeerConnection.prototype.getLocalStreams) {
-        webkitRTCPeerConnection.prototype.getLocalStreams = function() {
-          return this.localStreams;
-        };
+      webkitRTCPeerConnection.prototype.getLocalStreams = function() {
+        return this.localStreams;
+      };
     }
 
     if (!webkitRTCPeerConnection.prototype.getRemoteStreams) {
-        webkitRTCPeerConnection.prototype.getRemoteStreams = function() {
-          return this.remoteStreams;
-        };
+      webkitRTCPeerConnection.prototype.getRemoteStreams = function() {
+        return this.remoteStreams;
+      };
     }
-}
-else if (navigator.mozGetUserMedia) {
+
+  } else if (navigator.mozGetUserMedia) {
     // Firefox < 23 doesn't support get Video/Audio tracks, we'll just stub them out for now.
+    /* global MediaStream */
     if (!MediaStream.prototype.getVideoTracks) {
-        MediaStream.prototype.getVideoTracks = function() {
-            return [];
-        };
+      MediaStream.prototype.getVideoTracks = function() {
+        return [];
+      };
     }
 
     if (!MediaStream.prototype.getAudioTracks) {
-        MediaStream.prototype.getAudioTracks = function() {
-            return [];
-        };
+      MediaStream.prototype.getAudioTracks = function() {
+        return [];
+      };
     }
 
     // This won't work as mozRTCPeerConnection is a weird internal Firefox
@@ -2811,359 +3199,410 @@ else if (navigator.mozGetUserMedia) {
     //         return this.remoteStreams;
     //     };
     // }
-}
+  }
 
 
-// Mozilla error strings and the equivalent W3C names. NOT_SUPPORTED_ERROR does not
-// exist in the spec right now, so we'll include Mozilla's error description.
-var mozToW3CErrors = {
-    PERMISSION_DENIED: 'PERMISSION_DENIED',
-    NOT_SUPPORTED_ERROR: "A constraint specified is not supported by the browser.",
-    MANDATORY_UNSATISFIED_ERROR: 'CONSTRAINT_NOT_SATISFIED'
-};
+  // Mozilla error strings and the equivalent W3C names. NOT_SUPPORTED_ERROR does not
+  // exist in the spec right now, so we'll include Mozilla's error description.
+  mozToW3CErrors = {
+    PERMISSION_DENIED: 'PermissionDeniedError',
+    NOT_SUPPORTED_ERROR: 'NotSupportedError',
+    MANDATORY_UNSATISFIED_ERROR: ' ConstraintNotSatisfiedError',
+    NO_DEVICES_FOUND: 'NoDevicesFoundError',
+    HARDWARE_UNAVAILABLE: 'HardwareUnavailableError'
+  };
 
-// Chrome only seems to expose a single error with a code of 1 right now.
-var chromeToW3CErrors = {
-    1: 'PERMISSION_DENIED'
-};
+  // Chrome only seems to expose a single error with a code of 1 right now.
+  chromeToW3CErrors = {
+    1: 'PermissionDeniedError'
+  };
 
-
-var gumNamesToMessages = {
-    PERMISSION_DENIED: "User denied permission for scripts from this origin to access the media device.",
-    CONSTRAINT_NOT_SATISFIED: "One of the mandatory constraints could not be satisfied."
-};
+  gumNamesToMessages = {
+    PermissionDeniedError: 'User denied permission for scripts from this origin to ' +
+      'access the media device.',
+    NotSupportedError: 'A constraint specified is not supported by the browser.',
+    ConstraintNotSatisfiedError: 'One of the mandatory constraints could not be satisfied.',
+    OverconstrainedError: 'Due to changes in the environment, one or more mandatory ' +
+      'constraints can no longer be satisfied.',
+    NoDevicesFoundError: 'No video or audio input devices are available on this machine.',
+    HardwareUnavailableError: 'The selected audio or video input devices are not available, ' +
+      'possibly because they are in use by another application.'
+  };
 
 // Map vendor error strings to names and messages
-var mapVendorErrorName = function mapVendorErrorName (vendorErrorName, vendorErrors) {
+  mapVendorErrorName = function mapVendorErrorName (vendorErrorName, vendorErrors) {
     var errorName = vendorErrors[vendorErrorName],
         errorMessage = gumNamesToMessages[errorName];
 
     if (!errorMessage) {
-        // This doesn't map to a known error from the Media Capture spec, it's
-        // probably a custom vendor error message.
-        errorMessage = eventName;
-        errorName = vendorErrorName;
+      // This doesn't map to a known error from the Media Capture spec, it's
+      // probably a custom vendor error message.
+      errorMessage = null; // This is undefined?
+      errorName = vendorErrorName;
     }
 
     return {
-        name: errorName,
-        message: errorMessage
+      name: errorName,
+      message: errorMessage
     };
-};
+  };
 
-// Parse and normalise a getUserMedia error event from Chrome or Mozilla
-//
-// @ref http://dev.w3.org/2011/webrtc/editor/getusermedia.html#idl-def-NavigatorUserMediaError
-//
-var parseErrorEvent = function parseErrorObject (event) {
+  // Parse and normalise a getUserMedia error event from Chrome or Mozilla
+  // @ref http://dev.w3.org/2011/webrtc/editor/getusermedia.html#idl-def-NavigatorUserMediaError
+  parseErrorEvent = function parseErrorObject (event) {
     var error;
 
     if (OT.$.isObject(event) && event.name) {
-        error = {
-            name: event.name,
-            message: event.message,
-            constraintName: event.constraintName
-        };
-    }
-    else if (OT.$.isObject(event)) {
-        error = mapVendorErrorName(event.code, chromeToW3CErrors);
+      error = {
+        name: event.name,
+        message: event.message || gumNamesToMessages[event.name],
+        constraintName: event.constraintName
+      };
 
-        // message and constraintName are probably missing if the
-        // property is also omitted, but just in case they aren't.
-        if (event.message) error.message = event.message;
-        if (event.constraintName) error.constraintName = event.constraintName;
-    }
-    else if (event && mozToW3CErrors.hasOwnProperty(event)) {
-        error = mapVendorErrorName(event, mozToW3CErrors);
-    }
-    else {
-        error = {
-            message: "Unknown Error while getting user media"
-        };
-    }
+    } else if (OT.$.isObject(event)) {
+      error = mapVendorErrorName(event.code, chromeToW3CErrors);
 
+      // message and constraintName are probably missing if the
+      // property is also omitted, but just in case they aren't.
+      if (event.message) error.message = event.message;
+      if (event.constraintName) error.constraintName = event.constraintName;
+
+    } else if (event && mozToW3CErrors.hasOwnProperty(event)) {
+      error = mapVendorErrorName(event, mozToW3CErrors);
+
+    } else {
+      error = {
+        message: 'Unknown Error while getting user media'
+      };
+    }
 
     return error;
-};
+  };
 
-
-
-// Validates a Hash of getUserMedia constraints. Currently we only
-// check to see if there is at least one non-false constraint.
-var areInvalidConstraints = function(constraints) {
+  // Validates a Hash of getUserMedia constraints. Currently we only
+  // check to see if there is at least one non-false constraint.
+  areInvalidConstraints = function(constraints) {
     if (!constraints || !OT.$.isObject(constraints)) return true;
 
     for (var key in constraints) {
-        if (constraints[key]) return false;
+      if (constraints[key]) return false;
     }
 
     return true;
-};
+  };
 
-
-
-
-
-// Returns true if the client supports Web RTC, false otherwise.
-//
-// Chrome Issues:
-// * The explicit prototype.addStream check is because webkitRTCPeerConnection was
-// partially implemented, but not functional, in Chrome 22.
-//
-// Firefox Issues:
-// * No real support before Firefox 19
-// * Firefox 19 has issues with generating Offers.
-// * Firefox 20 doesn't interoperate with Chrome.
-//
-OT.$.supportsWebRTC = function() {
+  // Returns true if the client supports Web RTC, false otherwise.
+  //
+  // Chrome Issues:
+  // * The explicit prototype.addStream check is because webkitRTCPeerConnection was
+  // partially implemented, but not functional, in Chrome 22.
+  //
+  // Firefox Issues:
+  // * No real support before Firefox 19
+  // * Firefox 19 has issues with generating Offers.
+  // * Firefox 20 doesn't interoperate with Chrome.
+  //
+  OT.$.supportsWebRTC = function() {
     var _supportsWebRTC = false;
 
-    if (navigator.webkitGetUserMedia) {
-        _supportsWebRTC = typeof(webkitRTCPeerConnection) === 'function' && !!webkitRTCPeerConnection.prototype.addStream;
-    }
-    else if (navigator.mozGetUserMedia) {
-        var firefoxVersion = window.navigator.userAgent.toLowerCase().match(/Firefox\/([0-9\.]+)/i);
-        _supportsWebRTC = typeof(mozRTCPeerConnection) === 'function' && (firefoxVersion !== null && parseFloat(firefoxVersion[1], 10) > 20.0);
-        if (_supportsWebRTC) {
-            try {
-                new mozRTCPeerConnection();
-                _supportsWebRTC = true;
-            } catch (err) {
-                _supportsWebRTC = false;
-            }
+    var browser = OT.$.browserVersion(),
+        minimumVersions = OT.properties.minimumVersion || {},
+        minimumVersion = minimumVersions[browser.browser.toLowerCase()];
+
+    if(minimumVersion && minimumVersion > browser.version) {
+      OT.debug('Support for', browser.browser, 'is disabled because we require',
+        minimumVersion, 'but this is', browser.version);
+      _supportsWebRTC = false;
+
+    } else if (navigator.webkitGetUserMedia) {
+      _supportsWebRTC = typeof(webkitRTCPeerConnection) === 'function' &&
+        !!webkitRTCPeerConnection.prototype.addStream;
+
+    } else if (navigator.mozGetUserMedia) {
+      if (typeof(mozRTCPeerConnection) === 'function' && browser.version > 20.0) {
+        try {
+          new mozRTCPeerConnection();
+          _supportsWebRTC = true;
+        } catch (err) {
+          _supportsWebRTC = false;
         }
+      }
     }
 
     OT.$.supportsWebRTC = function() {
-        return _supportsWebRTC;
+      return _supportsWebRTC;
     };
 
     return _supportsWebRTC;
-};
+  };
 
-// Returns a String representing the supported WebRTC crypto scheme. The possible
-// values are SDES_SRTP, DTLS_SRTP, and NONE;
-//
-// Broadly:
-// * Firefox only supports DTLS
-// * Older versions of Chrome (<= 24) only support SDES
-// * Newer versions of Chrome (>= 25) support DTLS and SDES
-//
-OT.$.supportedCryptoScheme = function() {
+  // Returns a String representing the supported WebRTC crypto scheme. The possible
+  // values are SDES_SRTP, DTLS_SRTP, and NONE;
+  //
+  // Broadly:
+  // * Firefox only supports DTLS
+  // * Older versions of Chrome (<= 24) only support SDES
+  // * Newer versions of Chrome (>= 25) support DTLS and SDES
+  //
+  OT.$.supportedCryptoScheme = function() {
     if (!OT.$.supportsWebRTC()) return 'NONE';
 
     var chromeVersion = window.navigator.userAgent.toLowerCase().match(/chrome\/([0-9\.]+)/i);
     return chromeVersion && parseFloat(chromeVersion[1], 10) < 25 ? 'SDES_SRTP' : 'DTLS_SRTP';
-};
+  };
 
-// Returns true if the browser supports bundle
-//
-// Broadly:
-// * Firefox doesn't support bundle
-// * Chrome support bundle
-//
-OT.$.supportsBundle = function() {
+  // Returns true if the browser supports bundle
+  //
+  // Broadly:
+  // * Firefox doesn't support bundle
+  // * Chrome support bundle
+  //
+  OT.$.supportsBundle = function() {
     return OT.$.supportsWebRTC() && OT.$.browser() === 'Chrome';
-};
+  };
 
-// Returns true if the browser supports rtcp mux
-//
-// Broadly:
-// * Older versions of Firefox (<= 25) don't support rtcp mux
-// * Older versions of Firefox (>= 26) support rtcp mux (not tested yet)
-// * Chrome support bundle
-//
-OT.$.supportsRtcpMux = function() {
+  // Returns true if the browser supports rtcp mux
+  //
+  // Broadly:
+  // * Older versions of Firefox (<= 25) don't support rtcp mux
+  // * Older versions of Firefox (>= 26) support rtcp mux (not tested yet)
+  // * Chrome support bundle
+  //
+  OT.$.supportsRtcpMux = function() {
     return OT.$.supportsWebRTC() && OT.$.browser() === 'Chrome';
-};
+  };
+
+  // A wrapper for the builtin navigator.getUserMedia. In addition to the usual
+  // getUserMedia behaviour, this helper method also accepts a accessDialogOpened
+  // and accessDialogClosed callback.
+  //
+  // @memberof OT.$
+  // @private
+  //
+  // @param {Object} constraints
+  //      A dictionary of constraints to pass to getUserMedia. See
+  //      http://dev.w3.org/2011/webrtc/editor/getusermedia.html#idl-def-MediaStreamConstraints
+  //      in the Media Capture and Streams spec for more info.
+  //
+  // @param {function} success
+  //      Called when getUserMedia completes successfully. The callback will be passed a WebRTC
+  //      Stream object.
+  //
+  // @param {function} failure
+  //      Called when getUserMedia fails to access a user stream. It will be passed an object
+  //      with a code property representing the error that occurred.
+  //
+  // @param {function} accessDialogOpened
+  //      Called when the access allow/deny dialog is opened.
+  //
+  // @param {function} accessDialogClosed
+  //      Called when the access allow/deny dialog is closed.
+  //
+  // @param {function} accessDenied
+  //      Called when access is denied to the camera/mic. This will be either because
+  //      the user has clicked deny or because a particular origin is permanently denied.
+  //
+
+  OT.$.getUserMedia = function(constraints, success, failure, accessDialogOpened,
+    accessDialogClosed, accessDenied, customGetUserMedia) {
+
+    var getUserMedia = nativeGetUserMedia;
+
+    if(OT.$.isFunction(customGetUserMedia)) {
+      getUserMedia = customGetUserMedia;
+    }
 
-// A wrapper for the builtin navigator.getUserMedia. In addition to the usual
-// getUserMedia behaviour, this helper method also accepts a accessDialogOpened
-// and accessDialogClosed callback.
-//
-// @memberof TB.$
-// @private
-//
-// @param {Object} constraints
-//      A dictionary of constraints to pass to getUserMedia. See <a href='http://dev.w3.org/2011/webrtc/editor/getusermedia.html#idl-def-MediaStreamConstraints'>MediaStreamConstraints</a> in the Media Capture and Streams spec for more info.
-//
-// @param {function} success
-//      Called when getUserMedia completes successfully. The callback will be passed a WebRTC Stream object.
-//
-// @param {function} failure
-//      Called when getUserMedia fails to access a user stream. It will be passed an object with a code property representing the error that occurred.
-//
-// @param {function} accessDialogOpened
-//      Called when the access allow/deny dialog is opened.
-//
-// @param {function} accessDialogClosed
-//      Called when the access allow/deny dialog is closed.
-//
-// @param {function} accessDenied
-//      Called when access is denied to the camera/mic. This will be either because
-//      the user has clicked deny or because a particular origin is permanently denied.
-//
-OT.$.getUserMedia = function(constraints, success, failure, accessDialogOpened, accessDialogClosed, accessDenied) {
     // All constraints are false, we don't allow this. This may be valid later
     // depending on how/if we integrate data channels.
     if (areInvalidConstraints(constraints)) {
-        OT.error("Couldn't get UserMedia: All constraints were false");
-        // Using a ugly dummy-code for now.
-        failure.call(null, {
-            name: 'NO_VALID_CONSTRAINTS',
-            message: "Video and Audio was disabled, you need to enabled at least one"
-        });
+      OT.error('Couldn\'t get UserMedia: All constraints were false');
+      // Using a ugly dummy-code for now.
+      failure.call(null, {
+        name: 'NO_VALID_CONSTRAINTS',
+        message: 'Video and Audio was disabled, you need to enabled at least one'
+      });
 
-        return;
+      return;
     }
 
     var triggerOpenedTimer = null,
         displayedPermissionDialog = false,
 
         finaliseAccessDialog = function() {
-            if (triggerOpenedTimer) {
-                clearTimeout(triggerOpenedTimer);
-            }
+          if (triggerOpenedTimer) {
+            clearTimeout(triggerOpenedTimer);
+          }
 
-            if (displayedPermissionDialog && accessDialogClosed) accessDialogClosed();
+          if (displayedPermissionDialog && accessDialogClosed) accessDialogClosed();
         },
 
         triggerOpened = function() {
-            triggerOpenedTimer = null;
-            displayedPermissionDialog = true;
+          triggerOpenedTimer = null;
+          displayedPermissionDialog = true;
 
-            if (accessDialogOpened) accessDialogOpened();
+          if (accessDialogOpened) accessDialogOpened();
         },
 
         onStream = function(stream) {
-            finaliseAccessDialog();
-            success.call(null, stream);
+          finaliseAccessDialog();
+          success.call(null, stream);
         },
 
         onError = function(event) {
-            finaliseAccessDialog();
-            var error = parseErrorEvent(event);
+          finaliseAccessDialog();
+          var error = parseErrorEvent(event);
 
-            if (error.name === 'PERMISSION_DENIED' || error.name === 'PermissionDeniedError') {
-                accessDenied.call(null, error);
-            }
-            else {
-                failure.call(null, error);
+          // The error name 'PERMISSION_DENIED' is from an earlier version of the spec
+          if (error.name === 'PermissionDeniedError') {
+            var MST = window.MediaStreamTrack;
+            if(MST != null && OT.$.isFunction(MST.getSources)) {
+              window.MediaStreamTrack.getSources(function(sources) {
+                if(sources.length > 0) {
+                  accessDenied.call(null, error);
+                } else {
+                  failure.call(null, {
+                    name: 'NoDevicesFoundError',
+                    message: gumNamesToMessages.NoDevicesFoundError
+                  });
+                }
+              });
+            } else {
+              accessDenied.call(null, error);
             }
+
+          } else {
+            failure.call(null, error);
+          }
         };
 
     try {
-        getUserMedia(constraints, onStream, onError);
+      getUserMedia(constraints, onStream, onError);
     } catch (e) {
-        OT.error("Couldn't get UserMedia: " + e.toString());
-        onError();
-        return;
+      OT.error('Couldn\'t get UserMedia: ' + e.toString());
+      onError();
+      return;
     }
 
-    // The "remember me" functionality of WebRTC only functions over HTTPS, if
+    // The 'remember me' functionality of WebRTC only functions over HTTPS, if
     // we aren't on HTTPS then we should definitely be displaying the access
     // dialog.
     //
     // If we are on HTTPS, we'll wait 500ms to see if we get a stream
-    // immediately. If we do then the user had clicked "remember me". Otherwise
+    // immediately. If we do then the user had clicked 'remember me'. Otherwise
     // we assume that the accessAllowed dialog is visible.
     //
     // @todo benchmark and see if 500ms is a reasonable number. It seems like
     // we should know a lot quicker.
     //
     if (location.protocol.indexOf('https') === -1) {
-        // Execute after, this gives the client a chance to bind to the
-        // accessDialogOpened event.
-        triggerOpenedTimer = setTimeout(triggerOpened, 100);
-    }
-    else {
-        // wait a second and then trigger accessDialogOpened
-        triggerOpenedTimer = setTimeout(triggerOpened, 500);
-    }
-};
-
-OT.$.createPeerConnection = function (config, options) {
-  var NativeRTCPeerConnection = (window.webkitRTCPeerConnection || window.mozRTCPeerConnection);
-  return new NativeRTCPeerConnection(config, options);
-};
+      // Execute after, this gives the client a chance to bind to the
+      // accessDialogOpened event.
+      triggerOpenedTimer = setTimeout(triggerOpened, 100);
 
+    } else {
+      // wait a second and then trigger accessDialogOpened
+      triggerOpenedTimer = setTimeout(triggerOpened, 500);
+    }
+  };
+  
+  OT.$.createPeerConnection = function (config, options) {
+    var NativeRTCPeerConnection = (window.webkitRTCPeerConnection || window.mozRTCPeerConnection);
+    return new NativeRTCPeerConnection(config, options);
+  };
 
 })(window);
-(function(window) {
+!(function(window) {
 
-OT.VideoOrientation = {
-    ROTATED_NORMAL: "OTVideoOrientationRotatedNormal",
-    ROTATED_LEFT: "OTVideoOrientationRotatedLeft",
-    ROTATED_RIGHT: "OTVideoOrientationRotatedRight",
-    ROTATED_UPSIDE_DOWN: "OTVideoOrientationRotatedUpsideDown"
-};
+  var _videoErrorCodes = {},
+      VideoOrientationTransforms;
 
-//
-//
-//   var _videoElement = new OT.VideoElement({
-//     fallbackText: 'blah'
-//   });
-//
-//   _videoElement.on({
-//     streamBound: function() {...},
-//     loadError: function() {...},
-//     error: function() {...}
-//   });
-//
-//   _videoElement.bindToStream(webRtcStream);      // => VideoElement
-//   _videoElement.appendTo(DOMElement)             // => VideoElement
-//
-//   _videoElement.stream                           // => Web RTC stream
-//   _videoElement.domElement                       // => DomNode
-//   _videoElement.parentElement                    // => DomNode
-//
-//   _videoElement.imgData                          // => PNG Data string
-//
-//   _videoElement.orientation = OT.VideoOrientation.ROTATED_LEFT;
-//
-//   _videoElement.unbindStream();
-//   _videoElement.destroy()                        // => Completely cleans up and removes the video element
-//
-//
-OT.VideoElement = function(options) {
+  VideoOrientationTransforms = {
+    0: 'rotate(0deg)',
+    270: 'rotate(90deg)',
+    90: 'rotate(-90deg)',
+    180: 'rotate(180deg)'
+  };
+
+  OT.VideoOrientation = {
+    ROTATED_NORMAL: 0,
+    ROTATED_LEFT: 270,
+    ROTATED_RIGHT: 90,
+    ROTATED_UPSIDE_DOWN: 180
+  };
+
+  //   var _videoElement = new OT.VideoElement({
+  //     fallbackText: 'blah'
+  //   });
+  //
+  //   _videoElement.on({
+  //     streamBound: function() {...},
+  //     loadError: function() {...},
+  //     error: function() {...}
+  //   });
+  //
+  //   _videoElement.bindToStream(webRtcStream);      // => VideoElement
+  //   _videoElement.appendTo(DOMElement)             // => VideoElement
+  //
+  //   _videoElement.stream                           // => Web RTC stream
+  //   _videoElement.domElement                       // => DomNode
+  //   _videoElement.parentElement                    // => DomNode
+  //
+  //   _videoElement.imgData                          // => PNG Data string
+  //
+  //   _videoElement.orientation = OT.VideoOrientation.ROTATED_LEFT;
+  //
+  //   _videoElement.unbindStream();
+  //   _videoElement.destroy()                        // => Completely cleans up and
+  //                                                  // removes the video element
+  //
+  //
+  OT.VideoElement = function(options) {
     var _stream,
         _domElement,
         _parentElement,
         _streamBound = false,
         _videoElementMovedWarning = false,
-        _options = OT.$.defaults(options || {}, {
-            fallbackText: 'Sorry, Web RTC is not available in your browser'
-        });
+        _options,
+        _onVideoError,
+        _onStreamBound,
+        _onStreamBoundError,
+        _playVideoOnPause;
 
+    _options = OT.$.defaults(options || {}, {
+      fallbackText: 'Sorry, Web RTC is not available in your browser'
+    });
 
     OT.$.eventing(this);
 
     /// Private API
-    var _onVideoError = function(event) {
-            var reason = "There was an unexpected problem with the Video Stream: " + videoElementErrorCodeToStr(event.target.error.code);
-            this.trigger('error', null, reason, this);
-        }.bind(this),
+    _onVideoError = function(event) {
+      var reason = 'There was an unexpected problem with the Video Stream: ' +
+        videoElementErrorCodeToStr(event.target.error.code);
+      this.trigger('error', null, reason, this, 'VideoElement');
+    }.bind(this);
 
-        _onStreamBound = function() {
-            _streamBound = true;
-            _domElement.addEventListener('error', _onVideoError, false);
-            this.trigger('streamBound', this);
-        }.bind(this),
+    _onStreamBound = function() {
+      _streamBound = true;
+      _domElement.addEventListener('error', _onVideoError, false);
+      this.trigger('streamBound', this);
+    }.bind(this);
 
-        _onStreamBoundError = function(reason) {
-            this.trigger('loadError', OT.ExceptionCodes.P2P_CONNECTION_FAILED, reason, this);
-        }.bind(this),
+    _onStreamBoundError = function(reason) {
+      this.trigger('loadError', OT.ExceptionCodes.P2P_CONNECTION_FAILED, reason, this,
+        'VideoElement');
+    }.bind(this);
 
-        // The video element pauses itself when it's reparented, this is
-        // unfortunate. This function plays the video again and is triggered
-        // on the pause event.
-        _playVideoOnPause = function() {
-            if(!_videoElementMovedWarning) {
-                OT.warn("Video element paused, auto-resuming. If you intended to do this, use publishVideo(false) or subscribeToVideo(false) instead.");
-                _videoElementMovedWarning = true;
-            }
-            _domElement.play();
-        };
+    // The video element pauses itself when it's reparented, this is
+    // unfortunate. This function plays the video again and is triggered
+    // on the pause event.
+    _playVideoOnPause = function() {
+      if(!_videoElementMovedWarning) {
+        OT.warn('Video element paused, auto-resuming. If you intended to do this, use ' +
+          'publishVideo(false) or subscribeToVideo(false) instead.');
+        _videoElementMovedWarning = true;
+      }
+      _domElement.play();
+    };
 
 
     _domElement = createVideoElement(_options.fallbackText, _options.attributes);
@@ -3172,14 +3611,26 @@ OT.VideoElement = function(options) {
 
     /// Public Properties
     Object.defineProperties(this, {
-        stream: {get: function() {return _stream; }},
-        domElement: {get: function() {return _domElement; }},
-        parentElement: {get: function() {return _parentElement; }},
-        isBoundToStream: {get: function() { return _streamBound; }},
-        poster: {
-            get: function() { return _domElement.getAttribute('poster'); },
-            set: function(src) { _domElement.setAttribute('poster', src); }
+      stream: {
+        get: function() {return _stream; }
+      },
+      domElement: {
+        get: function() {return _domElement; }
+      },
+      parentElement: {
+        get: function() {return _parentElement; }
+      },
+      isBoundToStream: {
+        get: function() { return _streamBound; }
+      },
+      poster: {
+        get: function() {
+          return _domElement.getAttribute('poster');
+        },
+        set: function(src) {
+          _domElement.setAttribute('poster', src);
         }
+      }
     });
 
 
@@ -3187,594 +3638,596 @@ OT.VideoElement = function(options) {
 
     // Append the Video DOM element to a parent node
     this.appendTo = function(parentDomElement) {
-        _parentElement = parentDomElement;
-        _parentElement.appendChild(_domElement);
+      _parentElement = parentDomElement;
+      _parentElement.appendChild(_domElement);
 
-        return this;
+      return this;
     };
 
     // Bind a stream to the video element.
     this.bindToStream = function(webRtcStream) {
-        _streamBound = false;
-        _stream = webRtcStream;
+      _streamBound = false;
+      _stream = webRtcStream;
 
-        bindStreamToVideoElement(_domElement, _stream, _onStreamBound, _onStreamBoundError);
+      bindStreamToVideoElement(_domElement, _stream, _onStreamBound, _onStreamBoundError);
 
-        return this;
+      return this;
     };
 
     // Unbind the currently bound stream from the video element.
     this.unbindStream = function() {
-        if (!_stream) return this;
+      if (!_stream) return this;
 
-        if (_domElement) {
-            if (!navigator.mozGetUserMedia) {
-                // The browser would have released this on unload anyway, but
-                // we're being a good citizen.
-                window.URL.revokeObjectURL(_domElement.src);
-            }
-            else {
-                _domElement.mozSrcObject = null;
-            }
+      if (_domElement) {
+        if (!navigator.mozGetUserMedia) {
+          // The browser would have released this on unload anyway, but
+          // we're being a good citizen.
+          window.URL.revokeObjectURL(_domElement.src);
+        } else {
+          _domElement.mozSrcObject = null;
         }
+      }
 
-        _stream = null;
+      _stream = null;
 
-        return this;
+      return this;
     };
 
     this.setAudioVolume = function(value) {
-        if (_domElement) _domElement.volume = OT.$.roundFloat(value / 100, 2);
+      if (_domElement) _domElement.volume = OT.$.roundFloat(value / 100, 2);
     };
 
     this.getAudioVolume = function() {
-        // Return the actual volume of the DOM element
-        if (_domElement) return parseInt(_domElement.volume * 100, 10);
-        return 50;
+      // Return the actual volume of the DOM element
+      if (_domElement) return parseInt(_domElement.volume * 100, 10);
+      return 50;
     };
 
     this.whenTimeIncrements = function(callback, context) {
-        if(_domElement) {
-            var lastTime, handler = function() {
-                if(!lastTime || lastTime >= _domElement.currentTime) {
-                    lastTime = _domElement.currentTime;
-                } else {
-                    _domElement.removeEventListener('timeupdate', handler, false);
-                    callback.call(context, this);
-                }
-            }.bind(this);
-            _domElement.addEventListener('timeupdate', handler, false);
-        }
+      if(_domElement) {
+        var lastTime, handler;
+        handler = function() {
+          if(!lastTime || lastTime >= _domElement.currentTime) {
+            lastTime = _domElement.currentTime;
+          } else {
+            _domElement.removeEventListener('timeupdate', handler, false);
+            callback.call(context, this);
+          }
+        }.bind(this);
+        _domElement.addEventListener('timeupdate', handler, false);
+      }
     };
 
     this.destroy = function() {
-        // unbind all events so they don't fire after the object is dead
-        this.off();
+      // unbind all events so they don't fire after the object is dead
+      this.off();
 
-        this.unbindStream();
+      this.unbindStream();
 
-        if (_domElement) {
-            // Unbind this first, otherwise it will trigger when the
-            // video element is removed from the DOM.
-            _domElement.removeEventListener('pause', _playVideoOnPause);
+      if (_domElement) {
+        // Unbind this first, otherwise it will trigger when the
+        // video element is removed from the DOM.
+        _domElement.removeEventListener('pause', _playVideoOnPause);
 
-            OT.$.removeElement(_domElement);
-            _domElement = null;
-        }
+        OT.$.removeElement(_domElement);
+        _domElement = null;
+      }
 
-        _parentElement = null;
+      _parentElement = null;
 
-        return undefined;
+      return undefined;
     };
-};
+  };
 
-
-// Checking for window.defineProperty for IE compatibility, just so we don't throw exceptions when the script is included
-if (OT.$.canDefineProperty) {
+  // Checking for window.defineProperty for IE compatibility,
+  // just so we don't throw exceptions when the script is included
+  if (OT.$.canDefineProperty) {
     // Extracts a snapshot from a video element and returns it's as a PNG Data string.
     Object.defineProperties(OT.VideoElement.prototype, {
-        imgData: {
-            get: function() {
-                var canvas = OT.$.createElement('canvas', {
-                        width: this.domElement.videoWidth,
-                        height: this.domElement.videoHeight,
-                        style: {
-                            display: 'none'
-                        }
-                    });
-
-                document.body.appendChild(canvas);
-                try {
-                    canvas.getContext('2d').drawImage(this.domElement, 0, 0, canvas.width, canvas.height);
-                } catch(err) {
-                    OT.warn("Cannot get image data yet");
-                    return null;
-                }
-                var imgData = canvas.toDataURL('image/png');
-
-                OT.$.removeElement(canvas);
-
-                return imgData.replace("data:image/png;base64,", "").trim();
-            }
-        },
-
-        videoWidth: {
-            get: function() {
-                if(this._orientation && this._orientation.width) {
-                    return this._orientation.width;
-                }
-                return this.domElement['video' + (this.isRotated ? 'Height' : 'Width')];
-            }
-        },
-
-        videoHeight: {
-            get: function() {
-                if(this._orientation && this._orientation.height) {
-                    return this._orientation.height;
-                }
-                return this.domElement['video' + (this.isRotated ? 'Width' : 'Height')];
-            }
-        },
-
-        aspectRatio: {
-            get: function() {
-                return (this.videoWidth + 0.0) / this.videoHeight;
-            }
-        },
-
-        isRotated: {
-            get: function() {
-                return this._orientation && (this._orientation.videoOrientation == 'OTVideoOrientationRotatedLeft' || this._orientation.videoOrientation == 'OTVideoOrientationRotatedRight');
-            }
-        }
-    });
-}
-
-
-var VideoOrientationTransforms = {
-    OTVideoOrientationRotatedNormal: "rotate(0deg)",
-    OTVideoOrientationRotatedLeft: "rotate(90deg)",
-    OTVideoOrientationRotatedRight: "rotate(-90deg)",
-    OTVideoOrientationRotatedUpsideDown: "rotate(180deg)"
-};
-
-// Checking for window.defineProperty for IE compatibility, just so we don't throw exceptions when the script is included
-if (OT.$.canDefineProperty) {
-    Object.defineProperty(OT.VideoElement.prototype,'orientation', {
+      imgData: {
         get: function() {
-            return this._orientation;
-        },
-        set: function(orientation) {
-            this._orientation = orientation;
+          var canvas,
+              imgData;
 
-            var transform = VideoOrientationTransforms[orientation.videoOrientation] || VideoOrientationTransforms.ROTATED_NORMAL;
-
-            switch(OT.$.browser()) {
-                case 'Chrome':
-                case 'Safari':
-                    this.domElement.style.webkitTransform = transform;
-                    break;
-
-                case 'IE':
-                    this.domElement.style.msTransform = transform;
-                    break;
-
-                default:
-                    // The standard version, just Firefox, Opera, and IE > 9
-                    this.domElement.style.transform = transform;
+          canvas = OT.$.createElement('canvas', {
+            width: this.domElement.videoWidth,
+            height: this.domElement.videoHeight,
+            style: {
+              display: 'none'
             }
+          });
 
-            this.trigger('orientationChanged');
+          document.body.appendChild(canvas);
+
+          try {
+            canvas.getContext('2d').drawImage(this.domElement, 0, 0, canvas.width, canvas.height);
+          } catch(err) {
+            OT.warn('Cannot get image data yet');
+            return null;
+          }
+
+          imgData = canvas.toDataURL('image/png');
+
+          OT.$.removeElement(canvas);
+
+          return imgData.replace('data:image/png;base64,', '').trim();
         }
+      },
+
+      videoWidth: {
+        get: function() {
+          return this.domElement['video' + (this.isRotated ? 'Height' : 'Width')];
+        }
+      },
+
+      videoHeight: {
+        get: function() {
+          return this.domElement['video' + (this.isRotated ? 'Width' : 'Height')];
+        }
+      },
+
+      aspectRatio: {
+        get: function() {
+          return (this.videoWidth + 0.0) / this.videoHeight;
+        }
+      },
+
+      isRotated: {
+        get: function() {
+          return this._orientation && (
+            this._orientation.videoOrientation === 270 ||
+            this._orientation.videoOrientation === 90
+          );
+        }
+      },
+
+      orientation: {
+        get: function() { return this._orientation; },
+        set: function(orientation) {
+          var transform = VideoOrientationTransforms[orientation.videoOrientation] ||
+              VideoOrientationTransforms.ROTATED_NORMAL;
+
+          this._orientation = orientation;
+
+          switch(OT.$.browser()) {
+            case 'Chrome':
+            case 'Safari':
+              this.domElement.style.webkitTransform = transform;
+              break;
+
+            case 'IE':
+              this.domElement.style.msTransform = transform;
+              break;
+
+            default:
+              // The standard version, just Firefox, Opera, and IE > 9
+              this.domElement.style.transform = transform;
+          }
+
+          this.trigger('orientationChanged');
+        }
+      }
     });
-}
-
-
+  }
 
 /// Private Helper functions
 
-function createVideoElement(fallbackText, attributes) {
+  function createVideoElement(fallbackText, attributes) {
     var videoElement = document.createElement('video');
     videoElement.setAttribute('autoplay', '');
     videoElement.innerHTML = fallbackText;
 
     if (attributes) {
-        if (attributes.muted === true) {
-            delete attributes.muted;
-            videoElement.muted = 'true';
-        }
+      if (attributes.muted === true) {
+        delete attributes.muted;
+        videoElement.muted = 'true';
+      }
 
-        for (var key in attributes) {
-            videoElement.setAttribute(key, attributes[key]);
-        }
+      for (var key in attributes) {
+        videoElement.setAttribute(key, attributes[key]);
+      }
     }
 
     return videoElement;
-}
+  }
 
 
-// See http://www.w3.org/TR/2010/WD-html5-20101019/video.html#error-codes
-var _videoErrorCodes = {};
-// Checking for window.MediaError for IE compatibility, just so we don't throw exceptions when the script is included
-if (window.MediaError) {
-    _videoErrorCodes[window.MediaError.MEDIA_ERR_ABORTED] = "The fetching process for the media resource was aborted by the user agent at the user's request.";
-    _videoErrorCodes[window.MediaError.MEDIA_ERR_NETWORK] = "A network error of some description caused the user agent to stop fetching the media resource, after the resource was established to be usable.";
-    _videoErrorCodes[window.MediaError.MEDIA_ERR_DECODE] = "An error of some description occurred while decoding the media resource, after the resource was established to be usable.";
-    _videoErrorCodes[window.MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED] = "The media resource indicated by the src attribute was not suitable. ";
-}
+  // See http://www.w3.org/TR/2010/WD-html5-20101019/video.html#error-codes
+  // Checking for window.MediaError for IE compatibility, just so we don't throw
+  // exceptions when the script is included
+  if (window.MediaError) {
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_ABORTED] = 'The fetching process for the media ' +
+      'resource was aborted by the user agent at the user\'s request.';
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_NETWORK] = 'A network error of some description ' +
+      'caused the user agent to stop fetching the media resource, after the resource was ' +
+      'established to be usable.';
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_DECODE] = 'An error of some description ' +
+      'occurred while decoding the media resource, after the resource was established to be ' +
+      ' usable.';
+    _videoErrorCodes[window.MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED] = 'The media resource ' +
+      'indicated by the src attribute was not suitable.';
+  }
 
-function videoElementErrorCodeToStr(errorCode) {
-    return _videoErrorCodes[parseInt(errorCode, 10)] || "An unknown error occurred.";
-}
+  function videoElementErrorCodeToStr(errorCode) {
+    return _videoErrorCodes[parseInt(errorCode, 10)] || 'An unknown error occurred.';
+  }
 
+  function bindStreamToVideoElement(videoElement, webRTCStream, onStreamBound, onStreamBoundError) {
+    var cleanup,
+        onLoad,
+        onError,
+        onStoppedLoading,
+        timeout;
 
-function bindStreamToVideoElement(videoElement, webRTCStream, onStreamBound, onStreamBoundError) {
     // Note: onloadedmetadata doesn't fire in Chrome for audio only crbug.com/110938
-    if (navigator.mozGetUserMedia || (webRTCStream.getVideoTracks().length > 0 && webRTCStream.getVideoTracks()[0].enabled)) {
+    if (navigator.mozGetUserMedia || (
+      webRTCStream.getVideoTracks().length > 0 && webRTCStream.getVideoTracks()[0].enabled)) {
 
-        var cleanup = function cleanup () {
-                clearTimeout(timeout);
-                videoElement.removeEventListener('loadedmetadata', onLoad, false);
-                videoElement.removeEventListener('error', onError, false);
-            },
+      cleanup = function cleanup () {
+        clearTimeout(timeout);
+        videoElement.removeEventListener('loadedmetadata', onLoad, false);
+        videoElement.removeEventListener('error', onError, false);
+        webRTCStream.onended = null;
+      };
 
-            onLoad = function onLoad (event) {
-                cleanup();
-                onStreamBound();
-            },
-
-            onError = function onError (event) {
-                cleanup();
-                onStreamBoundError("There was an unexpected problem with the Video Stream: " + videoElementErrorCodeToStr(event.target.error.code));
-            },
-
-            onStoppedLoading = function onStoppedLoading () {
-                // The stream ended before we fully bound it. Maybe the other end called
-                // stop on it or something else went wrong.
-                cleanup();
-                onStreamBoundError("Stream ended while trying to bind it to a video element.");
-            },
-
-            // Timeout if it takes too long
-            timeout = setTimeout(function() {
-                if (videoElement.currentTime === 0) {
-                    onStreamBoundError("The video stream failed to connect. Please notify the site owner if this continues to happen.");
-                } else {
-                    // This should never happen
-                    OT.warn("Never got the loadedmetadata event but currentTime > 0");
-                    onStreamBound();
-                }
-            }.bind(this), 30000);
-
-
-        videoElement.addEventListener('loadedmetadata', onLoad, false);
-        videoElement.addEventListener('error', onError, false);
-        webRTCStream.onended = onStoppedLoading;
-    } else {
+      onLoad = function onLoad () {
+        cleanup();
         onStreamBound();
+      };
+
+      onError = function onError (event) {
+        cleanup();
+        onStreamBoundError('There was an unexpected problem with the Video Stream: ' +
+          videoElementErrorCodeToStr(event.target.error.code));
+      };
+
+      onStoppedLoading = function onStoppedLoading () {
+        // The stream ended before we fully bound it. Maybe the other end called
+        // stop on it or something else went wrong.
+        cleanup();
+        onStreamBoundError('Stream ended while trying to bind it to a video element.');
+      };
+
+      // Timeout if it takes too long
+      timeout = setTimeout(function() {
+        if (videoElement.currentTime === 0) {
+          onStreamBoundError('The video stream failed to connect. Please notify the site ' +
+            'owner if this continues to happen.');
+        } else {
+          // This should never happen
+          OT.warn('Never got the loadedmetadata event but currentTime > 0');
+          onStreamBound();
+        }
+      }.bind(this), 30000);
+
+
+      videoElement.addEventListener('loadedmetadata', onLoad, false);
+      videoElement.addEventListener('error', onError, false);
+      webRTCStream.onended = onStoppedLoading;
+    } else {
+      onStreamBound();
     }
 
     // The official spec way is 'srcObject', we are slowly converging there.
     if (videoElement.srcObject !== void 0) {
-        videoElement.srcObject = webRTCStream;
-    }
-    else if (videoElement.mozSrcObject !== void 0) {
-        videoElement.mozSrcObject = webRTCStream;
-    }
-    else {
-        videoElement.src = window.URL.createObjectURL(webRTCStream);
+      videoElement.srcObject = webRTCStream;
+    } else if (videoElement.mozSrcObject !== void 0) {
+      videoElement.mozSrcObject = webRTCStream;
+    } else {
+      videoElement.src = window.URL.createObjectURL(webRTCStream);
     }
 
     videoElement.play();
-}
-
+  }
 
 })(window);
-(function(window) {
+!(function(window) {
 
-// Singleton interval
-var logQueue = [],
-    queueRunning = false;
+  // Singleton interval
+  var logQueue = [],
+      queueRunning = false;
 
 
-OT.Analytics = function() {
+  OT.Analytics = function() {
 
-    var endPoint = OT.properties.loggingURL + "/logging/ClientEvent",
-        endPointQos = OT.properties.loggingURL + "/logging/ClientQos",
+    var endPoint = OT.properties.loggingURL + '/logging/ClientEvent',
+        endPointQos = OT.properties.loggingURL + '/logging/ClientQos',
 
         reportedErrors = {},
 
         // Map of camel-cased keys to underscored
-        camelCasedKeys = {
-            payloadType: 'payload_type',
-            partnerId: 'partner_id',
-            streamId: 'stream_id',
-            sessionId: 'session_id',
-            connectionId: 'connection_id',
-            widgetType: 'widget_type',
-            widgetId: 'widget_id',
-            avgAudioBitrate: 'avg_audio_bitrate',
-            avgVideoBitrate: 'avg_video_bitrate',
-            localCandidateType: 'local_candidate_type',
-            remoteCandidateType: 'remote_candidate_type',
-            transportType: 'transport_type'
-        },
+        camelCasedKeys,
 
-        send = function(data, isQos, onSuccess, onError) {
-            OT.$.post(isQos ? endPointQos : endPoint, {
-                success: onSuccess,
-                error: onError,
-                data: data,
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                }
-            });
+        send = function(data, isQos, callback) {
+          OT.$.post(isQos ? endPointQos : endPoint, {
+            body: data,
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded'
+            }
+          }, callback);
         },
 
         throttledPost = function() {
-            // Throttle logs so that they only happen 1 at a time
-            if (!queueRunning && logQueue.length > 0) {
-                queueRunning = true;
-                var curr = logQueue[0];
+          // Throttle logs so that they only happen 1 at a time
+          if (!queueRunning && logQueue.length > 0) {
+            queueRunning = true;
+            var curr = logQueue[0];
 
-                // Remove the current item and send the next log
-                var processNextItem = function() {
-                    logQueue.shift();
-                    queueRunning = false;
-                    throttledPost();
-                };
+            // Remove the current item and send the next log
+            var processNextItem = function() {
+              logQueue.shift();
+              queueRunning = false;
+              throttledPost();
+            };
 
-                if (curr) {
-                    send(curr.data, curr.isQos, function() {
-                        curr.onComplete();
-                        setTimeout(processNextItem, 50);
-                    }, function() {
-                        OT.debug("Failed to send ClientEvent, moving on to the next item.");
-
-                        // There was an error, move onto the next item
-                        setTimeout(processNextItem, 50);
-                    });
+            if (curr) {
+              send(curr.data, curr.isQos, function(err) {
+                if(err) {
+                  OT.debug('Failed to send ClientEvent, moving on to the next item.');
+                } else {
+                  curr.onComplete();
                 }
+                setTimeout(processNextItem, 50);
+              });
             }
+          }
         },
 
         post = function(data, onComplete, isQos) {
-            logQueue.push({
-                data: data,
-                onComplete: onComplete,
-                isQos: isQos
-            });
+          logQueue.push({
+            data: data,
+            onComplete: onComplete,
+            isQos: isQos
+          });
 
-            throttledPost();
+          throttledPost();
         },
 
         shouldThrottleError = function(code, type, partnerId) {
-            if (!partnerId) return false;
+          if (!partnerId) return false;
 
-            var errKey = [partnerId, type, code].join('_'),
-                //msgLimit = DynamicConfig.get('exceptionLogging', 'messageLimitPerPartner', partnerId);
-                msgLimit = 100;
-            if (msgLimit === null || msgLimit === undefined) return false;
-
-            return (reportedErrors[errKey] || 0) <= msgLimit;
+          var errKey = [partnerId, type, code].join('_'),
+          //msgLimit = DynamicConfig.get('exceptionLogging', 'messageLimitPerPartner', partnerId);
+            msgLimit = 100;
+          if (msgLimit === null || msgLimit === undefined) return false;
+          return (reportedErrors[errKey] || 0) <= msgLimit;
         };
 
-        // Log an error via ClientEvents.
-        //
-        // @param [String] code
-        // @param [String] type
-        // @param [String] message
-        // @param [Hash] details additional error details
-        //
-        // @param [Hash] options the options to log the client event with.
-        // @option options [String] action The name of the Event that we are logging. E.g. "TokShowLoaded". Required.
-        // @option options [String] variation Usually used for Split A/B testing, when you have multiple variations of the +_action+.
-        // @option options [String] payloadType A text description of the payload. Required.
-        // @option options [String] payload The payload. Required.
-        // @option options [String] sessionId The active OpenTok session, if there is one
-        // @option options [String] connectionId The active OpenTok connectionId, if there is one
-        // @option options [String] partnerId
-        // @option options [String] guid ...
-        // @option options [String] widgetId ...
-        // @option options [String] streamId ...
-        // @option options [String] section ...
-        // @option options [String] build ...
-        //
-        // Reports will be throttled to X reports (see exceptionLogging.messageLimitPerPartner
-        // from the dynamic config for X) of each error type for each partner. Reports can be
-        // disabled/enabled globally or on a per partner basis (per partner settings
-        // take precedence) using exceptionLogging.enabled.
-        //
-        this.logError = function(code, type, message, details, options) {
-            if (!options) options = {};
-            var partnerId = options.partnerId;
+    camelCasedKeys = {
+      payloadType: 'payload_type',
+      partnerId: 'partner_id',
+      streamId: 'stream_id',
+      sessionId: 'session_id',
+      connectionId: 'connection_id',
+      widgetType: 'widget_type',
+      widgetId: 'widget_id',
+      avgAudioBitrate: 'avg_audio_bitrate',
+      avgVideoBitrate: 'avg_video_bitrate',
+      localCandidateType: 'local_candidate_type',
+      remoteCandidateType: 'remote_candidate_type',
+      transportType: 'transport_type'
+    };
 
-            if (OT.Config.get('exceptionLogging', 'enabled', partnerId) !== true) {
-                return;
-            }
+    // Log an error via ClientEvents.
+    //
+    // @param [String] code
+    // @param [String] type
+    // @param [String] message
+    // @param [Hash] details additional error details
+    //
+    // @param [Hash] options the options to log the client event with.
+    // @option options [String] action The name of the Event that we are logging. E.g. 
+    //  'TokShowLoaded'. Required.
+    // @option options [String] variation Usually used for Split A/B testing, when you 
+    //  have multiple variations of the +_action+.
+    // @option options [String] payloadType A text description of the payload. Required.
+    // @option options [String] payload The payload. Required.
+    // @option options [String] sessionId The active OpenTok session, if there is one
+    // @option options [String] connectionId The active OpenTok connectionId, if there is one
+    // @option options [String] partnerId
+    // @option options [String] guid ...
+    // @option options [String] widgetId ...
+    // @option options [String] streamId ...
+    // @option options [String] section ...
+    // @option options [String] build ...
+    //
+    // Reports will be throttled to X reports (see exceptionLogging.messageLimitPerPartner
+    // from the dynamic config for X) of each error type for each partner. Reports can be
+    // disabled/enabled globally or on a per partner basis (per partner settings
+    // take precedence) using exceptionLogging.enabled.
+    //
+    this.logError = function(code, type, message, details, options) {
+      if (!options) options = {};
+      var partnerId = options.partnerId;
 
-            if (shouldThrottleError(code, type, partnerId)) {
-                //OT.log("ClientEvents.error has throttled an error of type " + type + "." + code + " for partner " + (partnerId || 'No Partner Id'));
-                return;
-            }
+      if (OT.Config.get('exceptionLogging', 'enabled', partnerId) !== true) {
+        return;
+      }
 
-            var errKey = [partnerId, type, code].join('_'),
+      if (shouldThrottleError(code, type, partnerId)) {
+        //OT.log('ClientEvents.error has throttled an error of type ' + type + '.' + 
+        // code + ' for partner ' + (partnerId || 'No Partner Id'));
+        return;
+      }
 
-                payload = this.escapePayload(OT.$.extend(details || {}, {
-                    message: payload,
-                    userAgent: navigator.userAgent
-                }));
+      var errKey = [partnerId, type, code].join('_'),
+
+      payload = this.escapePayload(OT.$.extend(details || {}, {
+        message: payload,
+        userAgent: navigator.userAgent
+      }));
 
 
-            reportedErrors[errKey] = typeof(reportedErrors[errKey]) !== 'undefined' ?
-                                            reportedErrors[errKey] + 1 :
-                                            1;
+      reportedErrors[errKey] = typeof(reportedErrors[errKey]) !== 'undefined' ?
+        reportedErrors[errKey] + 1 : 1;
 
-            return this.logEvent(OT.$.extend(options, {
-                action: type + '.' + code,
-                payloadType: payload[0],
-                payload: payload[1]
-            }));
-        };
+      return this.logEvent(OT.$.extend(options, {
+        action: type + '.' + code,
+        payloadType: payload[0],
+        payload: payload[1]
+      }));
+    };
 
-        // Log a client event to the analytics backend.
-        //
-        // @example Logs a client event called 'foo'
-        //  OT.ClientEvents.log({
-        //      action: 'foo',
-        //      payload_type: "foo's payload",
-        //      payload: 'bar',
-        //      session_id: sessionId,
-        //      connection_id: connectionId
-        //  })
-        //
-        // @param [Hash] options the options to log the client event with.
-        // @option options [String] action The name of the Event that we are logging. E.g. "TokShowLoaded". Required.
-        // @option options [String] variation Usually used for Split A/B testing, when you have multiple variations of the +_action+.
-        // @option options [String] payloadType A text description of the payload. Required.
-        // @option options [String] payload The payload. Required.
-        // @option options [String] session_id The active OpenTok session, if there is one
-        // @option options [String] connection_id The active OpenTok connectionId, if there is one
-        // @option options [String] partner_id
-        // @option options [String] guid ...
-        // @option options [String] widget_id ...
-        // @option options [String] stream_id ...
-        // @option options [String] section ...
-        // @option options [String] build ...
-        //
-        this.logEvent = function(options) {
-            var partnerId = options.partnerId;
+    // Log a client event to the analytics backend.
+    //
+    // @example Logs a client event called 'foo'
+    //  OT.ClientEvents.log({
+    //      action: 'foo',
+    //      payload_type: 'foo's payload',
+    //      payload: 'bar',
+    //      session_id: sessionId,
+    //      connection_id: connectionId
+    //  })
+    //
+    // @param [Hash] options the options to log the client event with.
+    // @option options [String] action The name of the Event that we are logging. 
+    //  E.g. 'TokShowLoaded'. Required.
+    // @option options [String] variation Usually used for Split A/B testing, when 
+    //  you have multiple variations of the +_action+.
+    // @option options [String] payloadType A text description of the payload. Required.
+    // @option options [String] payload The payload. Required.
+    // @option options [String] session_id The active OpenTok session, if there is one
+    // @option options [String] connection_id The active OpenTok connectionId, if there is one
+    // @option options [String] partner_id
+    // @option options [String] guid ...
+    // @option options [String] widget_id ...
+    // @option options [String] stream_id ...
+    // @option options [String] section ...
+    // @option options [String] build ...
+    //
+    this.logEvent = function(options) {
+      var partnerId = options.partnerId;
 
-            if (!options) options = {};
+      if (!options) options = {};
 
-            // Set a bunch of defaults
-            var data = OT.$.extend({
-                    "variation" : "",
-                    'guid' : this.getClientGuid(),
-                    'widget_id' : "",
-                    'session_id': '',
-                    'connection_id': '',
-                    'stream_id' : "",
-                    'partner_id' : partnerId,
-                    'source' : window.location.href,
-                    'section' : "",
-                    'build' : ""
-                }, options),
+      // Set a bunch of defaults
+      var data = OT.$.extend({
+        'variation' : '',
+        'guid' : this.getClientGuid(),
+        'widget_id' : '',
+        'session_id': '',
+        'connection_id': '',
+        'stream_id' : '',
+        'partner_id' : partnerId,
+        'source' : window.location.href,
+        'section' : '',
+        'build' : ''
+      }, options),
 
-                onComplete = function(){
-                //  OT.log("logged: " + "{action: " + data["action"] + ", variation: " + data["variation"] + ", payload_type: " + data["payload_type"] + ", payload: " + data["payload"] + "}");
-                };
+      onComplete = function(){
+        //  OT.log('logged: ' + '{action: ' + data['action'] + ', variation: ' + data['variation']
+        //  + ', payload_type: ' + data['payload_type'] + ', payload: ' + data['payload'] + '}');
+      };
 
-            // We camel-case our names, but the ClientEvents backend wants them
-            // underscored...
-            for (var key in camelCasedKeys) {
-                if (camelCasedKeys.hasOwnProperty(key) && data[key]) {
-                    data[camelCasedKeys[key]] = data[key];
-                    delete data[key];
-                }
-            }
+      // We camel-case our names, but the ClientEvents backend wants them
+      // underscored...
+      for (var key in camelCasedKeys) {
+        if (camelCasedKeys.hasOwnProperty(key) && data[key]) {
+          data[camelCasedKeys[key]] = data[key];
+          delete data[key];
+        }
+      }
 
-            post(data, onComplete, false);
-        };
+      post(data, onComplete, false);
+    };
 
-        // Log a client QOS to the analytics backend.
-        //
-        this.logQOS = function(options) {
-            var partnerId = options.partnerId;
+    // Log a client QOS to the analytics backend.
+    //
+    this.logQOS = function(options) {
+      var partnerId = options.partnerId;
 
-            if (!options) options = {};
+      if (!options) options = {};
 
-            // Set a bunch of defaults
-            var data = OT.$.extend({
-                    'guid' : this.getClientGuid(),
-                    'widget_id' : "",
-                    'session_id': '',
-                    'connection_id': '',
-                    'stream_id' : "",
-                    'partner_id' : partnerId,
-                    'source' : window.location.href,
-                    'build' : "",
-                    'duration' : 0 //in milliseconds
-                }, options),
+      // Set a bunch of defaults
+      var data = OT.$.extend({
+        'guid' : this.getClientGuid(),
+        'widget_id' : '',
+        'session_id': '',
+        'connection_id': '',
+        'stream_id' : '',
+        'partner_id' : partnerId,
+        'source' : window.location.href,
+        'build' : '',
+        'duration' : 0 //in milliseconds
+      }, options),
 
-                onComplete = function(){
-                    //OT.log("logged: " + "{action: " + data["action"] + ", variation: " + data["variation"] + ", payload_type: " + data["payload_type"] + ", payload: " + data["payload"] + "}");
-                };
+      onComplete = function(){
+        // OT.log('logged: ' + '{action: ' + data['action'] + ', variation: ' + data['variation']
+        //  + ', payload_type: ' + data['payload_type'] + ', payload: ' + data['payload'] + '}');
+      };
 
-            // We camel-case our names, but the ClientEvents backend wants them
-            // underscored...
-            for (var key in camelCasedKeys) {
-                if (camelCasedKeys.hasOwnProperty(key) && data[key]) {
-                    data[camelCasedKeys[key]] = data[key];
-                    delete data[key];
-                }
-            }
+      // We camel-case our names, but the ClientEvents backend wants them
+      // underscored...
+      for (var key in camelCasedKeys) {
+        if (camelCasedKeys.hasOwnProperty(key) && data[key]) {
+          data[camelCasedKeys[key]] = data[key];
+          delete data[key];
+        }
+      }
 
-            post(data, onComplete, true);
-        };
+      post(data, onComplete, true);
+    };
 
-        // Converts +payload+ to two pipe seperated strings. Doesn't currently handle
-        // edgecases, e.g. escaping "\\|" will break stuff.
-        //
-        // *Note:* It strip any keys that have null values.
-        this.escapePayload = function(payload) {
-            var escapedPayload = [],
-                escapedPayloadDesc = [];
+    // Converts +payload+ to two pipe seperated strings. Doesn't currently handle
+    // edgecases, e.g. escaping '\\|' will break stuff.
+    //
+    // *Note:* It strip any keys that have null values.
+    this.escapePayload = function(payload) {
+      var escapedPayload = [],
+          escapedPayloadDesc = [];
 
-            for (var key in payload) {
-                if (payload.hasOwnProperty(key) && payload[key] !== null && payload[key] !== undefined) {
-                    escapedPayload.push( payload[key] ? payload[key].toString().replace('|', '\\|') : '' );
-                    escapedPayloadDesc.push( key.toString().replace('|', '\\|') );
-                }
-            }
+      for (var key in payload) {
+        if (payload.hasOwnProperty(key) && payload[key] !== null && payload[key] !== undefined) {
+          escapedPayload.push( payload[key] ? payload[key].toString().replace('|', '\\|') : '' );
+          escapedPayloadDesc.push( key.toString().replace('|', '\\|') );
+        }
+      }
 
-            return [
-                escapedPayloadDesc.join('|'),
-                escapedPayload.join('|')
-            ];
-        };
-        // Uses HTML5 local storage to save a client ID.
-        this.getClientGuid = function() {
-            var  guid = OT.$.getCookie("opentok_client_id");
-            if (!guid) {
-                guid = OT.$.uuid();
-                OT.$.setCookie("opentok_client_id", guid);
-            }
-            return guid;
-        };
-}
+      return [
+        escapedPayloadDesc.join('|'),
+        escapedPayload.join('|')
+      ];
+    };
+
+    // Uses HTML5 local storage to save a client ID.
+    this.getClientGuid = function() {
+      var  guid = OT.$.getCookie('opentok_client_id');
+      if (!guid) {
+        guid = OT.$.uuid();
+        OT.$.setCookie('opentok_client_id', guid);
+      }
+      return guid;
+    };
+  };
 
 })(window);
-(function(window) {
+!(function(window) {
 
-// This is not obvious, so to prevent end-user frustration we'll let them know
-// explicitly rather than failing with a bunch of permission errors. We don't
-// handle this using an OT Exception as it's really only a development thing.
-if (location.protocol === 'file:') {
-  alert("You cannot test a page using WebRTC through the file system due to browser permissions. You must run it over a web server.");
-}
+  // This is not obvious, so to prevent end-user frustration we'll let them know
+  // explicitly rather than failing with a bunch of permission errors. We don't
+  // handle this using an OT Exception as it's really only a development thing.
+  if (location.protocol === 'file:') {
+    /*global alert*/
+    alert('You cannot test a page using WebRTC through the file system due to browser ' +
+      'permissions. You must run it over a web server.');
+  }
 
-if (!window.OT) window.OT = {};
+  if (!window.OT) window.OT = {};
 
-if (!window.URL && window.webkitURL) {
+  if (!window.URL && window.webkitURL) {
     window.URL = window.webkitURL;
-}
+  }
 
-var _publisherCount = 0,
-
-    // Global parameters used by upgradeSystemRequirements
-    _intervalId,
-    _lastHash = document.location.hash,
-
-    // Cached DeviceManager
-    _deviceManager;
+  var // Global parameters used by upgradeSystemRequirements
+      _intervalId,
+      _lastHash = document.location.hash;
 
 
 /**
-* The first step in using the OpenTok API is to call the <code>TB.initSession()</code> method. Other methods of the TB object
-* check for system requirements and set up error logging.
+* The first step in using the OpenTok API is to call the <code>OT.initSession()</code>
+* method. Other methods of the OT object check for system requirements and set up error logging.
 *
-* @class TB
+* @class OT
 */
 
 /**
@@ -3783,8 +4236,8 @@ var _publisherCount = 0,
 * </p>
 * <p>
 * You connect to an OpenTok session using the <code>connect()</code> method
-* of the Session object returned by the <code>TB.initSession()</code> method.
-* Note that calling <code>TB.initSession()</code> does not initiate communications
+* of the Session object returned by the <code>OT.initSession()</code> method.
+* Note that calling <code>OT.initSession()</code> does not initiate communications
 * with the cloud. It simply initializes the Session object that you can use to
 * connect (and to perform other operations once connected).
 * </p>
@@ -3793,22 +4246,31 @@ var _publisherCount = 0,
 *    For an example, see <a href="Session.html#connect">Session.connect()</a>.
 *  </p>
 *
-* @method TB.initSession
-* @memberof TB
-* @param {String} sessionId The session ID identifying the OpenTok session. For more information, see
-* <a href="/opentok/tutorials/create-session/">Session creation</a>.
-* @returns {Session} The session object through which all further interactions with the session will occur.
+* @method OT.initSession
+* @memberof OT
+* @param {String} apiKey Your OpenTok API key (see <a href="https://dashboard.tokbox.com">the
+* OpenTok dashboard</a>).
+* @param {String} sessionId The session ID identifying the OpenTok session. For more
+* information, see <a href="/opentok/tutorials/create-session/">Session creation</a>.
+* @returns {Session} The session object through which all further interactions with
+* the session will occur.
 */
-OT.initSession = function(sessionId) {
+  OT.initSession = function(apiKey, sessionId) {
+
+    if(sessionId == null) {
+      sessionId = apiKey;
+      apiKey = null;
+    }
+
     var session = OT.sessions.get(sessionId);
 
     if (!session) {
-        session = new OT.Session(sessionId);
-        OT.sessions.add(session);
+      session = new OT.Session(apiKey, sessionId);
+      OT.sessions.add(session);
     }
 
     return session;
-};
+  };
 
 /**
 * <p class="mSummary">
@@ -3816,29 +4278,52 @@ OT.initSession = function(sessionId) {
 *   object to <code>Session.publish()</code> to publish a stream to a session.
 * </p>
 * <p>
-*   <i>Note:</i> If you intend to reuse a Publisher object created using <code>TB.initPublisher()</code>
-*   to publish to different sessions sequentially, call either <code>Session.disconnect()</code> or
-*   <code>Session.unpublish()</code>. Do not call both. Then call the <code>preventDefault()</code> method
-*   of the <code>streamDestroyed</code> or <code>sessionDisconnected</code> event object to prevent the
+*   <i>Note:</i> If you intend to reuse a Publisher object created using
+*   <code>OT.initPublisher()</code> to publish to different sessions sequentially,
+*   call either <code>Session.disconnect()</code> or <code>Session.unpublish()</code>.
+*   Do not call both. Then call the <code>preventDefault()</code> method of the
+*   <code>streamDestroyed</code> or <code>sessionDisconnected</code> event object to prevent the
 *   Publisher object from being removed from the page.
 * </p>
-* @param {String} apiKey The API key that TokBox provided you when you
-* <a href="https://dashboard.tokbox.com/users/sign_in">signed up</a> for an OpenTok account.
-* @param {String} targetElement The
-* <code>id</code> attribute of the existing DOM element that the Publisher video replaces.
-* If you do not specify a <code>targetElement</code>, the application
-* appends a new DOM element to the HTML <code>body</code>.
+*
+* @param {Object} targetElement (Optional) The DOM element or the <code>id</code> attribute of the
+* existing DOM element used to determine the location of the Publisher video in the HTML DOM. See
+* the <code>insertMode</code> property of the <code>properties</code> parameter. If you do not
+* specify a <code>targetElement</code>, the application appends a new DOM element to the HTML
+* <code>body</code>.
 *
 * <p>
-*       The application throws an error if an element with an ID set to the <code>targetElement</code>
-*       value does not exist in the HTML DOM.
+*       The application throws an error if an element with an ID set to the
+*       <code>targetElement</code> value does not exist in the HTML DOM.
 * </p>
 *
-* @param {Object} properties This is
-* an <em>optional</em> object that contains the following properties (each of which are optional):
+* @param {Object} properties (Optional) This object contains the following properties (each of which
+* are optional):
 * </p>
 * <ul>
 * <li>
+*   <strong>frameRate</strong> (Number) &#151; The desired frame rate, in frames per second,
+*   of the video. Valid values are 30, 15, 7, and 1. The published stream will use the closest
+*   value supported on the publishing client. The frame rate can differ slightly from the value
+*   you set, depending on the browser of the client. And the video will only use the desired
+*   frame rate if the client configuration supports it.
+*   <br><br><p>If the publisher specifies a frame rate, the actual frame rate of the video stream
+*   is set as the <code>frameRate</code> property of the Stream object, though the actual frame rate
+*   will vary based on changing network and system conditions. If the developer does not specify a
+*   frame rate, this property is undefined.
+*   <p>
+*   For OpenTok cloud-enabled sessions, lowering the frame rate or lowering the resolution reduces
+*   the maximum bandwidth the stream can use. However, in peer-to-peer sessions, lowering the frame 
+*   rate or resolution may not reduce the stream's bandwidth.
+*   </p>
+*   <p>
+*   You can also restrict the frame rate of a Subscriber's video stream. To restrict the frame rate
+*   a Subscriber, call the <code>restrictFrameRate()</code> method of the subscriber, passing in
+*   <code>true</code>.
+*   (See <a href="Subscriber.html#restrictFrameRate">Subscriber.restrictFrameRate()</a>.)
+*   </p>
+* </li>
+* <li>
 *   <strong>height</strong> (Number) &#151; The desired height, in pixels, of the
 *   displayed Publisher video stream (default: 198). <i>Note:</i> Use the
 *   <code>height</code> and <code>width</code> properties to set the dimensions
@@ -3846,15 +4331,33 @@ OT.initSession = function(sessionId) {
 *   (using CSS).
 * </li>
 * <li>
+*   <strong>insertMode</strong> (String) &#151; Specifies how the Publisher object will be
+*   inserted in the HTML DOM. See the <code>targetElement</code> parameter. This string can
+*   have the following values:
+*   <ul>
+*     <li><code>"replace"</code> &#151; The Publisher object replaces contents of the
+*       targetElement. This is the default.</li>
+*     <li><code>"after"</code> &#151; The Publisher object is a new element inserted after
+*       the targetElement in the HTML DOM. (Both the Publisher and targetElement have the
+*       same parent element.)</li>
+*     <li><code>"before"</code> &#151; The Publisher object is a new element inserted before
+*       the targetElement in the HTML DOM. (Both the Publisher and targetElement have the same
+*       parent element.)</li>
+*     <li><code>"append"</code> &#151; The Publisher object is a new element added as a child
+*       of the targetElement. If there are other child elements, the Publisher is appended as
+*       the last child element of the targetElement.</li>
+*   </ul>
+* </li>
+* <li>
 *   <strong>mirror</strong> (Boolean) &#151; Whether the publisher's video image
 *   is mirrored in the publisher's page<. The default value is <code>true</code>
 *   (the video image is mirrored). This property does not affect the display
 *   on other subscribers' web pages.
 * </li>
 * <li>
-*   <strong>name</strong> (String) &#151; The name for this stream. The name appears at the bottom of
-*   Subscriber videos. The default value is "" (an empty string). Setting this to a string longer than
-*   1000 characters results in an runtime exception.
+*   <strong>name</strong> (String) &#151; The name for this stream. The name appears at
+*   the bottom of Subscriber videos. The default value is "" (an empty string). Setting
+*   this to a string longer than 1000 characters results in an runtime exception.
 * </li>
 * <li>
 *   <strong>publishAudio</strong> (Boolean) &#151; Whether to initially publish audio
@@ -3867,12 +4370,62 @@ OT.initSession = function(sessionId) {
 *   the Publisher object in a call to the <code>Session.publish()</code> method.
 * </li>
 * <li>
+*   <strong>resolution</strong> (String) &#151; The desired resolution of the video. The format
+*   of the string is <code>"widthxheight"</code>, where the width and height are represented in
+*   pixels. Valid values are <code>"1280x720"</code>, <code>"640x480"</code>, and
+*   <code>"320x240"</code>. The published video will only use the desired resolution if the
+*   client configuration supports it.
+*   <br><br><p>
+*   The requested resolution of a video stream is set as the <code>videoDimensions.width</code> and
+*   <code>videoDimensions.height</code> properties of the Stream object.
+*   </p>
+*   <p>
+*   The default resolution for a stream (if you do not specify a resolution) is 640x480 pixels.
+*   If the client system cannot support the resolution you requested, the the stream will use the 
+*   next largest setting supported.
+*   </p>
+*   <p>
+*   The actual resolution used by the Publisher is set as the <code>videoHeight</code> and 
+*   <code>videoWidth</code> properties of the Publisher object. The actual resolution of a
+*   Subscriber video stream is set as the <code>videoWidth</code> and <code>videoHeight</code> 
+*   properties of the Subscriber object. These may differ from the values of the 
+*   <code>resolution</code> property passed in as the <code>properties</code> property of the
+*   <code>OT.initPublisher()</code> method, if the browser does not support the requested
+*   resolution.
+*   </p>
+*   <p>
+*   For OpenTok cloud-enabled sessions, lowering the frame rate or lowering the resolution reduces
+*   the maximum bandwidth the stream can use. However, in peer-to-peer sessions, lowering the frame
+*   rate or resolution may not reduce the stream's bandwidth.
+*   </p>
+* </li>
+* <li>
 *   <strong>style</strong> (Object) &#151; An object containing properties that define the initial
-*   appearance of user interface controls of the Publisher. Currently, the <code>style</code> object
-*   includes one property: <code>nameDisplayMode</code>. Possible values for the <code>style.nameDisplayMode</code>
-*   property are: <code>"auto"</code> (the name is displayed when the stream is first displayed
-*   and when the user mouses over the display), <code>"off"</code> (the name is not displayed),
-*   and <code>"on"</code> (the name is displayed).</li>
+*   appearance of user interface controls of the Publisher. The <code>style</code> object includes
+*   the following properties:
+*     <ul>
+*       <li><code>backgroundImageURI</code> (String) &mdash; A URI for an image to display as
+*       the background image when a video is not displayed. (A video may not be displayed if
+*       you call <code>publishVideo(false)</code> on the Publisher object). You can pass an http
+*       or https URI to a PNG, JPEG, or non-animated GIF file location. You can also use the
+*       <code>data</code> URI scheme (instead of http or https) and pass in base-64-encrypted
+*       PNG data, such as that obtained from the
+*       <a href="Publisher.html#getImgData">Publisher.getImgData()</a> method. For example,
+*       you could set the property to <code>"data:VBORw0KGgoAA..."</code>, where the portion of the
+*       string after <code>"data:"</code> is the result of a call to
+*       <code>Publisher.getImgData()</code>. If the URL or the image data is invalid, the property
+*       is ignored (the attempt to set the image fails silently).</li>
+*
+*       <li><code>buttonDisplayMode</code> (String) &mdash; How to display the microphone controls
+*       Possible values are: <code>"auto"</code> (controls are displayed when the stream is first
+*       displayed and when the user mouses over the display), <code>"off"</code> (controls are not
+*       displayed), and <code>"on"</code> (controls are always displayed).</li>
+*
+*       <li><code>nameDisplayMode</code> (String) &#151; Whether to display the stream name.
+*       Possible values are: <code>"auto"</code> (the name is displayed when the stream is first
+*       displayed and when the user mouses over the display), <code>"off"</code> (the name is not
+*       displayed), and <code>"on"</code> (the name is always displayed).</li>
+*   </ul>
 * </li>
 * <li>
 *   <strong>width</strong> (Number) &#151; The desired width, in pixels, of the
@@ -3882,159 +4435,225 @@ OT.initSession = function(sessionId) {
 *   (using CSS).
 * </li>
 * </ul>
+* @param {Function} completionHandler (Optional) A function to be called when the method succeeds
+* or fails in initializing a Publisher object. This function takes one parameter &mdash;
+* <code>error</code>. On success, the <code>error</code> object is set to <code>null</code>. On
+* failure, the <code>error</code> object has two properties: <code>code</code> (an integer) and
+* <code>message</code> (a string), which identify the cause of the failure. The method succeeds
+* when the user grants access to the camera and microphone. The method fails if the user denies
+* access to the camera and microphone. The <code>completionHandler</code> function is called
+* before the Publisher dispatches an <code>accessAllowed</code> (success) event or an
+* <code>accessDenied</code> (failure) event.
+* <p>
+* The following code adds a <code>completionHandler</code> when calling the
+* <code>OT.initPublisher()</code> method:
+* </p>
+* <pre>
+* var publisher = OT.initPublisher('publisher', null, function (error) {
+*   if (error) {
+*     console.log(error);
+*   } else {
+*     console.log("Publisher initialized.");
+*   }
+* });
+* </pre>
 *
 * @returns {Publisher} The Publisher object.
-* @see Session#publish
-* @method TB.initPublisher
-* @memberof TB
+* @see <a href="Session#publish>Session.publish()</a>
+* @method OT.initPublisher
+* @memberof OT
 */
-OT.initPublisher = function(apiKey, targetElement, properties, completionHandler) {
-    OT.debug("TB.initPublisher("+targetElement+")");
+  OT.initPublisher = function(targetElement, properties, completionHandler) {
+    OT.debug('OT.initPublisher('+targetElement+')');
 
-    var publisher = new OT.Publisher();;
+    if(targetElement != null && !(
+      (typeof targetElement === 'object' && targetElement.nodeType === Node.ELEMENT_NODE) ||
+      (typeof targetElement === 'string' && document.getElementById(targetElement))) &&
+      typeof targetElement !== 'function') {
+      targetElement = properties;
+      properties = completionHandler;
+      completionHandler = arguments[3];
+    }
+    
+    if(typeof targetElement === 'function') {
+      completionHandler = targetElement;
+      properties = undefined;
+      targetElement = undefined;
+    }
+
+    if(typeof properties === 'function') {
+      completionHandler = properties;
+      properties = undefined;
+    }
+
+    var publisher = new OT.Publisher();
     OT.publishers.add(publisher);
 
-    if (completionHandler && OT.$.isFunction(completionHandler)) {
-        var removeHandlersAndCallComplete = function removeHandlersAndCallComplete (error) {
-            publisher.off('initSuccess', removeHandlersAndCallComplete);
-            publisher.off('publishComplete', removeHandlersAndCallComplete);
+    var triggerCallback = function triggerCallback (err) {
+      if (err) {
+        OT.dispatchError(err.code, err.message, completionHandler, publisher.session);
+      } else if (completionHandler && OT.$.isFunction(completionHandler)) {
+        completionHandler.apply(null, arguments);
+      }
+    },
 
-            completionHandler.apply(null, arguments);
-        };
+    removeInitSuccessAndCallComplete = function removeInitSuccessAndCallComplete (err) {
+      publisher.off('publishComplete', removeHandlersAndCallComplete);
+      triggerCallback(err);
+    },
 
-        publisher.once('initSuccess', removeHandlersAndCallComplete);
-        publisher.once('publishComplete', removeHandlersAndCallComplete);
-    }
+    removeHandlersAndCallComplete = function removeHandlersAndCallComplete (err) {
+      publisher.off('initSuccess', removeInitSuccessAndCallComplete);
+
+      // We're only handling the error case here as we're just
+      // initing the publisher, not actually attempting to publish.
+      if (err) triggerCallback(err);
+    };
+
+
+    publisher.once('initSuccess', removeInitSuccessAndCallComplete);
+    publisher.once('publishComplete', removeHandlersAndCallComplete);
 
     publisher.publish(targetElement, properties);
 
     return publisher;
-};
+  };
 
 
 
 /**
 * Checks if the system supports OpenTok for WebRTC.
 * @return {Number} Whether the system supports OpenTok for WebRTC (1) or not (0).
-* @see <a href="#upgradeSystemRequirements">TB.upgradeSystemRequirements()</a>
-* @method TB.checkSystemRequirements
-* @memberof TB
+* @see <a href="#upgradeSystemRequirements">OT.upgradeSystemRequirements()</a>
+* @method OT.checkSystemRequirements
+* @memberof OT
 */
-OT.checkSystemRequirements = function() {
-    OT.debug("TB.checkSystemRequirements()");
+  OT.checkSystemRequirements = function() {
+    OT.debug('OT.checkSystemRequirements()');
 
-    var systemRequirementsMet = OT.$.supportsWebSockets() && OT.$.supportsWebRTC() ? this.HAS_REQUIREMENTS : this.NOT_HAS_REQUIREMENTS;
+    var systemRequirementsMet = OT.$.supportsWebSockets() && OT.$.supportsWebRTC() ?
+      this.HAS_REQUIREMENTS : this.NOT_HAS_REQUIREMENTS;
 
     OT.checkSystemRequirements = function() {
-      OT.debug("TB.checkSystemRequirements()");
+      OT.debug('OT.checkSystemRequirements()');
       return systemRequirementsMet;
     };
 
     return systemRequirementsMet;
-};
+  };
 
 
 /**
-* Displays information about system requirments for OpenTok for WebRTC. This information is displayed
-* in an iframe element that fills the browser window.
+* Displays information about system requirments for OpenTok for WebRTC. This
+* information is displayed in an iframe element that fills the browser window.
 * <p>
-* <i>Note:</i> this information is displayed automatically when you call the <code>TB.initSession()</code>
-* or the <code>TB.initPublisher()</code> method if the client does not support OpenTok for WebRTC.
+* <i>Note:</i> this information is displayed automatically when you call the
+* <code>OT.initSession()</code> or the <code>OT.initPublisher()</code> method
+* if the client does not support OpenTok for WebRTC.
 * </p>
-* @see <a href="#checkSystemRequirements">TB.checkSystemRequirements()</a>
-* @method TB.upgradeSystemRequirements
-* @memberof TB
+* @see <a href="#checkSystemRequirements">OT.checkSystemRequirements()</a>
+* @method OT.upgradeSystemRequirements
+* @memberof OT
 */
-OT.upgradeSystemRequirements = function(){
-    // trigger after the TB environment has loaded
+  OT.upgradeSystemRequirements = function(){
+    // trigger after the OT environment has loaded
     OT.onLoad( function() {
-        var id = '_upgradeFlash';
+      var id = '_upgradeFlash';
 
          // Load the iframe over the whole page.
-         document.body.appendChild((function(){
-             var d = document.createElement('iframe');
-             d.id = id;
-             d.style.position = 'absolute';
-             d.style.position = 'fixed';
-             d.style.height = '100%';
-             d.style.width = '100%';
-             d.style.top = '0px';
-             d.style.left = '0px';
-             d.style.right = '0px';
-             d.style.bottom = '0px';
-             d.style.zIndex = 1000;
-             try {
-                 d.style.backgroundColor = "rgba(0,0,0,0.2)";
-             } catch (err) {
-                 // Old IE browsers don't support rgba and we still want to show the upgrade message
-                 // but we just make the background of the iframe completely transparent.
-                 d.style.backgroundColor = "transparent";
-                 d.setAttribute("allowTransparency", "true");
-             }
-             d.setAttribute("frameBorder", "0");
-             d.frameBorder = "0";
-             d.scrolling = "no";
-             d.setAttribute("scrolling", "no");
-             d.src = OT.properties.assetURL + "/html/upgradeFlash.html#"+encodeURIComponent(document.location.href);
-             return d;
-         })());
+      document.body.appendChild((function() {
+        var d = document.createElement('iframe');
+        d.id = id;
+        d.style.position = 'absolute';
+        d.style.position = 'fixed';
+        d.style.height = '100%';
+        d.style.width = '100%';
+        d.style.top = '0px';
+        d.style.left = '0px';
+        d.style.right = '0px';
+        d.style.bottom = '0px';
+        d.style.zIndex = 1000;
+        try {
+          d.style.backgroundColor = 'rgba(0,0,0,0.2)';
+        } catch (err) {
+          // Old IE browsers don't support rgba and we still want to show the upgrade message
+          // but we just make the background of the iframe completely transparent.
+          d.style.backgroundColor = 'transparent';
+          d.setAttribute('allowTransparency', 'true');
+        }
+        d.setAttribute('frameBorder', '0');
+        d.frameBorder = '0';
+        d.scrolling = 'no';
+        d.setAttribute('scrolling', 'no');
+        var browser = OT.$.browserVersion(),
+            isSupportedButOld = OT.properties.minimumVersion[browser.browser.toLowerCase()];
+        d.src = OT.properties.assetURL + '/html/upgrade.html#' +
+                          encodeURIComponent(isSupportedButOld ? 'true' : 'false') + ',' +
+                          encodeURIComponent(JSON.stringify(OT.properties.minimumVersion)) + '|' +
+                          encodeURIComponent(document.location.href);
+        return d;
+      })());
 
-         // Now we need to listen to the event handler if the user closes this dialog.
-         // Since this is from an IFRAME within another domain we are going to listen to hash changes.
-         // The best cross browser solution is to poll for a change in the hashtag.
-         if (_intervalId) clearInterval(_intervalId);
-         _intervalId = setInterval(function(){
-             var hash = document.location.hash,
-                 re = /^#?\d+&/;
-             if (hash !== _lastHash && re.test(hash)) {
-                 _lastHash = hash;
-                 if( hash.replace(re, '') === 'close_window'){
-                     document.body.removeChild(document.getElementById(id));
-                     document.location.hash = '';
-                 }
-             }
-         }, 100);
+      // Now we need to listen to the event handler if the user closes this dialog.
+      // Since this is from an IFRAME within another domain we are going to listen to hash
+      // changes. The best cross browser solution is to poll for a change in the hashtag.
+      if (_intervalId) clearInterval(_intervalId);
+      _intervalId = setInterval(function(){
+        var hash = document.location.hash,
+            re = /^#?\d+&/;
+        if (hash !== _lastHash && re.test(hash)) {
+          _lastHash = hash;
+          if (hash.replace(re, '') === 'close_window'){
+            document.body.removeChild(document.getElementById(id));
+            document.location.hash = '';
+          }
+        }
+      }, 100);
     });
-};
+  };
 
 
-OT.reportIssue = function(){
-    OT.warn("ToDo: haven't yet implemented TB.reportIssue");
-};
+  OT.reportIssue = function(){
+    OT.warn('ToDo: haven\'t yet implemented OT.reportIssue');
+  };
 
-OT.components = {};
-OT.sessions = {};
+  OT.components = {};
+  OT.sessions = {};
 
-// namespaces
-OT.rtc = {};
+  // namespaces
+  OT.rtc = {};
 
 // Define the APIKEY this is a global parameter which should not change
-OT.APIKEY = (function(){
+  OT.APIKEY = (function(){
     // Script embed
-    var script_src = (function(){
-        var s = document.getElementsByTagName('script');
-        s = s[s.length - 1];
-        s = s.getAttribute('src') || s.src;
-        return s;
+    var scriptSrc = (function(){
+      var s = document.getElementsByTagName('script');
+      s = s[s.length - 1];
+      s = s.getAttribute('src') || s.src;
+      return s;
     })();
 
-    var m = script_src.match(/[\?\&]apikey=([^&]+)/i);
+    var m = scriptSrc.match(/[\?\&]apikey=([^&]+)/i);
     return m ? m[1] : '';
-})();
+  })();
 
-OT.HAS_REQUIREMENTS = 1;
-OT.NOT_HAS_REQUIREMENTS = 0;
+  OT.HAS_REQUIREMENTS = 1;
+  OT.NOT_HAS_REQUIREMENTS = 0;
 
 /**
-* Registers a method as an event listener for a specific event. Note that this is a static method of the TB class.
+* This method is deprecated. Use <a href="#on">on()</a> or <a href="#once">once()</a> instead.
+* 
+* <p>
+* Registers a method as an event listener for a specific event.
+* </p>
 *
 * <p>
-* The TB object dispatches one type of event &#151; an <code>exception</code> event. The following code adds an event
-* listener for the <code>exception</code> event:
+* The OT object dispatches one type of event &#151; an <code>exception</code> event. The
+* following code adds an event listener for the <code>exception</code> event:
 * </p>
 *
 * <pre>
-* TB.addEventListener("exception", exceptionHandler);
+* OT.addEventListener("exception", exceptionHandler);
 *
 * function exceptionHandler(event) {
 *    alert("exception event. \n  code == " + event.code + "\n  message == " + event.message);
@@ -4042,541 +4661,710 @@ OT.NOT_HAS_REQUIREMENTS = 0;
 * </pre>
 *
 * <p>
-* 	If a handler is not registered for an event, the event is ignored locally. If the event listener function does not exist,
-* 	the event is ignored locally.
+*   If a handler is not registered for an event, the event is ignored locally. If the event
+*   listener function does not exist, the event is ignored locally.
 * </p>
 * <p>
-* 	Throws an exception if the <code>listener</code> name is invalid.
+*   Throws an exception if the <code>listener</code> name is invalid.
 * </p>
 *
 * @param {String} type The string identifying the type of event.
 *
-* @param {Function} listener The function to be invoked when the TB object dispatches the event.
-* @memberOf TB
+* @param {Function} listener The function to be invoked when the OT object dispatches the event.
+* @see <a href="#on">on()</a>
+* @see <a href="#once">once()</a>
+* @memberof OT
 * @method addEventListener
 */
 
 /**
-* Removes an event listener for a specific event. Note that this is a static method of the TB class.
+* This method is deprecated. Use <a href="#off">off()</a> instead.
+* 
+* <p>
+* Removes an event listener for a specific event.
+* </p>
 *
 * <p>
-* 	Throws an exception if the <code>listener</code> name is invalid.
+*   Throws an exception if the <code>listener</code> name is invalid.
 * </p>
 *
 * @param {String} type The string identifying the type of event.
 *
 * @param {Function} listener The event listener function to remove.
 *
-* @memberOf TB
+* @see <a href="#off">off()</a>
+* @memberof OT
 * @method removeEventListener
 */
 
+
 /**
- * Dispatched by the TB class when the app encounters an exception.
+* Adds an event handler function for one or more events.
+*
+* <p>
+* The OT object dispatches one type of event &#151; an <code>exception</code> event. The following 
+* code adds an event
+* listener for the <code>exception</code> event:
+* </p>
+*
+* <pre>
+* OT.on("exception", function (event) {
+*   // This is the event handler.
+* });
+* </pre>
+*
+* <p>You can also pass in a third <code>context</code> parameter (which is optional) to define the 
+* value of
+* <code>this</code> in the handler method:</p>
+*
+* <pre>
+* OT.on("exception",
+*   function (event) {
+*     // This is the event handler.
+*   }),
+*   session
+* );
+* </pre>
+*
+* <p>
+* If you do not add a handler for an event, the event is ignored locally.
+* </p>
+*
+* @param {String} type The string identifying the type of event.
+* @param {Function} handler The handler function to process the event. This function takes the event
+* object as a parameter.
+* @param {Object} context (Optional) Defines the value of <code>this</code> in the event handler 
+* function.
+*
+* @memberof OT
+* @method on
+* @see <a href="#off">off()</a>
+* @see <a href="#once">once()</a>
+* @see <a href="#events">Events</a>
+*/
+
+/**
+* Adds an event handler function for an event. Once the handler is called, the specified handler 
+* method is
+* removed as a handler for this event. (When you use the <code>OT.on()</code> method to add an event
+* handler, the handler
+* is <i>not</i> removed when it is called.) The <code>OT.once()</code> method is the equivilent of 
+* calling the <code>OT.on()</code>
+* method and calling <code>OT.off()</code> the first time the handler is invoked.
+*
+* <p>
+* The following code adds a one-time event handler for the <code>exception</code> event:
+* </p>
+*
+* <pre>
+* OT.once("exception", function (event) {
+*   console.log(event);
+* }
+* </pre>
+*
+* <p>You can also pass in a third <code>context</code> parameter (which is optional) to define the 
+* value of
+* <code>this</code> in the handler method:</p>
+*
+* <pre>
+* OT.once("exception",
+*   function (event) {
+*     // This is the event handler.
+*   },
+*   session
+* );
+* </pre>
+*
+* <p>
+* The method also supports an alternate syntax, in which the first parameter is an object that is a 
+* hash map of
+* event names and handler functions and the second parameter (optional) is the context for this in 
+* each handler:
+* </p>
+* <pre>
+* OT.once(
+*   {exeption: function (event) {
+*     // This is the event handler.
+*     }
+*   },
+*   session
+* );
+* </pre>
+*
+* @param {String} type The string identifying the type of event. You can specify multiple event 
+* names in this string,
+* separating them with a space. The event handler will process the first occurence of the events. 
+* After the first event,
+* the handler is removed (for all specified events).
+* @param {Function} handler The handler function to process the event. This function takes the event
+* object as a parameter.
+* @param {Object} context (Optional) Defines the value of <code>this</code> in the event handler 
+* function.
+*
+* @memberof OT
+* @method once
+* @see <a href="#on">on()</a>
+* @see <a href="#once">once()</a>
+* @see <a href="#events">Events</a>
+*/
+
+
+/**
+* Removes an event handler.
+*
+* <p>Pass in an event name and a handler method, the handler is removed for that event:</p>
+*
+* <pre>OT.off("exceptionEvent", exceptionEventHandler);</pre>
+*
+* <p>If you pass in an event name and <i>no</i> handler method, all handlers are removed for that 
+* events:</p>
+*
+* <pre>OT.off("exceptionEvent");</pre>
+*
+* <p>
+* The method also supports an alternate syntax, in which the first parameter is an object that is a 
+* hash map of
+* event names and handler functions and the second parameter (optional) is the context for matching 
+* handlers:
+* </p>
+* <pre>
+* OT.off(
+*   {
+*     exceptionEvent: exceptionEventHandler
+*   },
+*   this
+* );
+* </pre>
+*
+* @param {String} type (Optional) The string identifying the type of event. You can use a space to 
+* specify multiple events, as in "eventName1 eventName2 eventName3". If you pass in no
+* <code>type</code> value (or other arguments), all event handlers are removed for the object.
+* @param {Function} handler (Optional) The event handler function to remove. If you pass in no 
+* <code>handler</code>, all event handlers are removed for the specified event <code>type</code>.
+* @param {Object} context (Optional) If you specify a <code>context</code>, the event handler is 
+* removed for all specified events and handlers that use the specified context.
+*
+* @memberof OT
+* @method off
+* @see <a href="#on">on()</a>
+* @see <a href="#once">once()</a>
+* @see <a href="#events">Events</a>
+*/
+
+/**
+ * Dispatched by the OT class when the app encounters an exception.
  * Note that you set up an event handler for the <code>exception</code> event by calling the
- * <code>TB.addEventListener()</code> method, which is a <i>static</i> method.
+ * <code>OT.on()</code> method.
  *
  * @name exception
  * @event
  * @borrows ExceptionEvent#message as this.message
- * @memberof TB
+ * @memberof OT
  * @see ExceptionEvent
  */
 
-if (!window.OT) window.OT = OT;
-if (!window.TB) window.TB = OT;
+  if (!window.OT) window.OT = OT;
+  if (!window.TB) window.TB = OT;
 
 })(window);
-(function(global) {
+!(function() {
 
-OT.Collection = function(idField) {
-  var _models = [],
-      _byId = {},
-      _idField = idField || 'id';
+  OT.Collection = function(idField) {
+    var _models = [],
+        _byId = {},
+        _idField = idField || 'id';
 
-  OT.$.eventing(this, true);
+    OT.$.eventing(this, true);
 
-  var onModelUpdate = function onModelUpdate (event) {
-        this.trigger('update', event);
-        this.trigger('update:'+event.target.id, event);
-      }.bind(this),
+    var onModelUpdate = function onModelUpdate (event) {
+          this.trigger('update', event);
+          this.trigger('update:'+event.target.id, event);
+        }.bind(this),
 
-      onModelIdUpdate = function onModelIdUpdate (oldId, newId) {
-        if (_byId[oldId] === void 0) return;
+        onModelIdUpdate = function onModelIdUpdate (oldId, newId) {
+          if (_byId[oldId] === void 0) return;
 
-        // Match their old index to their new id and remove any
-        // reference to the old one.
-        var index = _byId[oldId];
-        delete _byId[oldId];
-        _byId[newId] = index;
-      }.bind(this),
+          // Match their old index to their new id and remove any
+          // reference to the old one.
+          var index = _byId[oldId];
+          delete _byId[oldId];
+          _byId[newId] = index;
+        }.bind(this),
 
-      onModelDestroy = function onModelDestroyed (event) {
-        this.remove(event.target, event.reason);
-      }.bind(this);
+        onModelDestroy = function onModelDestroyed (event) {
+          this.remove(event.target, event.reason);
+        }.bind(this);
 
 
-  this.reset = function() {
-    // Stop listening on the models, they are no longer our problem
-    _models.forEach(function(model) {
-      model.off('updated', onModelUpdate, this);
-      model.off('destroyed', onModelDestroy, this)
-      model.off('idUpdated', onModelIdUpdate, this);
-    }, this);
+    this.reset = function() {
+      // Stop listening on the models, they are no longer our problem
+      _models.forEach(function(model) {
+        model.off('updated', onModelUpdate, this);
+        model.off('destroyed', onModelDestroy, this);
+        model.off('idUpdated', onModelIdUpdate, this);
+      }, this);
 
-    _models = [];
-    _byId = {};
-  };
+      _models = [];
+      _byId = {};
+    };
 
-  this.destroy = function() {
-    _models.forEach(function(model) {
-      model.destroy(void 0, true);
-    });
+    this.destroy = function() {
+      _models.forEach(function(model) {
+        if(model && typeof model.destroy === 'function') {
+          model.destroy(void 0, true);
+        }
+      });
 
-    this.reset();
-    this.off();
-  };
+      this.reset();
+      this.off();
+    };
 
-  this.get = function(id) { return id && _byId[id] !== void 0 ? _models[_byId[id]] : void 0; };
-  this.has = function(id) { return id && _byId[id] !== void 0; };
+    this.get = function(id) { return id && _byId[id] !== void 0 ? _models[_byId[id]] : void 0; };
+    this.has = function(id) { return id && _byId[id] !== void 0; };
 
-  this.toString = function() { return _models.toString(); };
+    this.toString = function() { return _models.toString(); };
 
-  // Return only models filtered by either a dict of properties
-  // or a filter function.
-  //
-  // @example Return all publishers with a streamId of 1
-  //   OT.publishers.where({streamId: 1})
-  //
-  // @example The same thing but filtering using a filter function
-  //   OT.publishers.where(function(publisher) {
-  //     return publisher.stream.id === 4;
-  //   });
-  //
-  // @example The same thing but filtering using a filter function
-  //          executed with a specific this
-  //   OT.publishers.where(function(publisher) {
-  //     return publisher.stream.id === 4;
-  //   }, self);
-  //
-  this.where = function(attrsOrFilterFn, context) {
-    if (OT.$.isFunction(attrsOrFilterFn)) return _models.filter(attrsOrFilterFn, context);
+    // Return only models filtered by either a dict of properties
+    // or a filter function.
+    //
+    // @example Return all publishers with a streamId of 1
+    //   OT.publishers.where({streamId: 1})
+    //
+    // @example The same thing but filtering using a filter function
+    //   OT.publishers.where(function(publisher) {
+    //     return publisher.stream.id === 4;
+    //   });
+    //
+    // @example The same thing but filtering using a filter function
+    //          executed with a specific this
+    //   OT.publishers.where(function(publisher) {
+    //     return publisher.stream.id === 4;
+    //   }, self);
+    //
+    this.where = function(attrsOrFilterFn, context) {
+      if (OT.$.isFunction(attrsOrFilterFn)) return _models.filter(attrsOrFilterFn, context);
 
-    return _models.filter(function(model) {
-      for (var key in attrsOrFilterFn) {
-        if (model[key] !== attrsOrFilterFn[key]) return false;
-      }
-
-      return true;
-    });
-  };
-
-  // Similar to where in behaviour, except that it only returns
-  // the first match.
-  this.find = function(attrsOrFilterFn, context) {
-    var filterFn;
-
-    if (OT.$.isFunction(attrsOrFilterFn)) {
-      filterFn = attrsOrFilterFn;
-    }
-    else {
-      filterFn = function(model) {
+      return _models.filter(function(model) {
         for (var key in attrsOrFilterFn) {
           if (model[key] !== attrsOrFilterFn[key]) return false;
         }
 
         return true;
-      };
-    }
+      });
+    };
 
-    filterFn = filterFn.bind(context);
+    // Similar to where in behaviour, except that it only returns
+    // the first match.
+    this.find = function(attrsOrFilterFn, context) {
+      var filterFn;
 
-    for (var i=0; i<_models.length; ++i) {
-      if (filterFn(_models[i]) === true) return _models[i];
-    }
+      if (OT.$.isFunction(attrsOrFilterFn)) {
+        filterFn = attrsOrFilterFn;
+      }
+      else {
+        filterFn = function(model) {
+          for (var key in attrsOrFilterFn) {
+            if (model[key] !== attrsOrFilterFn[key]) return false;
+          }
 
-    return null;
-  };
+          return true;
+        };
+      }
 
-  this.add = function(model) {
-    var id = model[_idField];
+      filterFn = filterFn.bind(context);
+
+      for (var i=0; i<_models.length; ++i) {
+        if (filterFn(_models[i]) === true) return _models[i];
+      }
+
+      return null;
+    };
+
+    this.add = function(model) {
+      var id = model[_idField];
+
+      if (this.has(id)) {
+        OT.warn('Model ' + id + ' is already in the collection', _models);
+        return this;
+      }
+
+      _byId[id] = _models.push(model) - 1;
+
+      model.on('updated', onModelUpdate, this);
+      model.on('destroyed', onModelDestroy, this);
+      model.on('idUpdated', onModelIdUpdate, this);
+
+      this.trigger('add', model);
+      this.trigger('add:'+id, model);
 
-    if (this.has(id)) {
-      OT.warn("Model " + id + ' is already in the collection', _models);
       return this;
-    }
+    };
 
-    _byId[id] = _models.push(model) - 1;
+    this.remove = function(model, reason) {
+      var id = model[_idField];
 
-    model.on('updated', onModelUpdate, this);
-    model.on('destroyed', onModelDestroy, this)
-    model.on('idUpdated', onModelIdUpdate, this);
+      _models.splice(_byId[id], 1);
 
-    this.trigger('add', model);
-    this.trigger('add:'+id, model);
+      // Shuffle everyone down one
+      for (var i=_byId[id]; i<_models.length; ++i) {
+        _byId[_models[i][_idField]] = i;
+      }
 
-    return this;
+      delete _byId[id];
+
+      model.off('updated', onModelUpdate, this);
+      model.off('destroyed', onModelDestroy, this);
+      model.off('idUpdated', onModelIdUpdate, this);
+
+      this.trigger('remove', model, reason);
+      this.trigger('remove:'+id, model, reason);
+
+      return this;
+    };
+
+    // Used by session connecto fire add events after adding listeners
+    this._triggerAddEvents = function() {
+      var models = this.where.apply(this, arguments);
+      models.forEach(function(model) {
+        this.trigger('add', model);
+        this.trigger('add:' + model[_idField], model);
+      }, this);
+    };
+
+    OT.$.defineGetters(this, {
+      length: function() { return _models.length; }
+    });
   };
 
-  this.remove = function(model, reason) {
-    var id = model[_idField];
-
-    _models.splice(_byId[id], 1);
-
-    // Shuffle everyone down one
-    for (var i=_byId[id]; i<_models.length; ++i) {
-      _byId[_models[i][_idField]] = i
-    }
-
-    delete _byId[id];
-
-    model.off('updated', onModelUpdate, this);
-    model.off('destroyed', onModelDestroy, this)
-    model.off('idUpdated', onModelIdUpdate, this);
-
-    this.trigger('remove', model, reason);
-    this.trigger('remove:'+id, model, reason);
-
-    return this;
-  };
-
-  OT.$.defineGetters(this, {
-    length: function() { return _models.length; }
-  });
-};
-
 }(this));
-(function(window) {
+!(function() {
 
-/**
- * The Event object defines the basic OpenTok event object that is passed to
- * event listeners. Other OpenTok event classes implement the properties and methods of
- * the Event object.</p>
- *
- * <p>For example, the Stream object dispatches a <code>streamPropertyChanged</code> event when
- * the stream's properties are updated. You register an event listener using the <code>addEventListener()</code>
- * method of the Stream object:</p>
- *
- * <pre>
- * stream.addEventListener("streamPropertyChanged", streamPropertyChangedHandler);
- *
- * function streamPropertyChangedHandler(event) {
- *     alert("Properties changed for stream " + event.target.streamId);
- * }</pre>
- *
- * @class Event
- * @property {Boolean} cancelable Whether the event has a default behavior that is cancelable (<code>true</code>)
- * or not (<code>false</code>). You can cancel the default behavior by calling the <code>preventDefault()</code> method
- * of the Event object in the event listener function. (See <a href="#preventDefault">preventDefault()</a>.)
- *
- * @property {Object} target The object that dispatched the event.
- *
- * @property {String} type  The type of event.
- */
-OT.Event = OT.$.eventing.Event();
-/**
-* Prevents the default behavior associated with the event from taking place.
-*
-* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of the event object. </p>
-*
-* <p>Call the <code>preventDefault()</code> method in the event listener function for the event.</p>
-*
-* <p>The following events have default behaviors:</p>
-*
-* <ul>
-*
-*   <li><code>sessionDisconnect</code> &#151; See <a href="SessionDisconnectEvent.html#preventDefault">
-*   SessionDisconnectEvent.preventDefault()</a>.</li>
-*
-*   <li><code>streamDestroyed</code> &#151; See <a href="StreamEvent.html#preventDefault">
-*   StreamEvent.preventDefault()</a>.</li>
-*
-* </ul>
-*
-* @method #preventDefault
-* @memberof Event
-*/
-/**
-* Whether the default event behavior has been prevented via a call to <code>preventDefault()</code> (<code>true</code>)
-* or not (<code>false</code>). See <a href="#preventDefault">preventDefault()</a>.
-* @method #isDefaultPrevented
-* @return {Boolean}
-* @memberof Event
-*/
+  /**
+   * The Event object defines the basic OpenTok event object that is passed to
+   * event listeners. Other OpenTok event classes implement the properties and methods of
+   * the Event object.</p>
+   *
+   * <p>For example, the Stream object dispatches a <code>streamPropertyChanged</code> event when
+   * the stream's properties are updated. You add a callback for an event using the
+   * <code>on()</code> method of the Stream object:</p>
+   *
+   * <pre>
+   * stream.on("streamPropertyChanged", function (event) {
+   *     alert("Properties changed for stream " + event.target.streamId);
+   * });</pre>
+   *
+   * @class Event
+   * @property {Boolean} cancelable Whether the event has a default behavior that is cancelable
+   * (<code>true</code>) or not (<code>false</code>). You can cancel the default behavior by
+   * calling the <code>preventDefault()</code> method of the Event object in the callback
+   * function. (See <a href="#preventDefault">preventDefault()</a>.)
+   *
+   * @property {Object} target The object that dispatched the event.
+   *
+   * @property {String} type  The type of event.
+   */
+  OT.Event = OT.$.eventing.Event();
+  /**
+  * Prevents the default behavior associated with the event from taking place.
+  *
+  * <p>To see whether an event has a default behavior, check the <code>cancelable</code> property
+  * of the event object. </p>
+  *
+  * <p>Call the <code>preventDefault()</code> method in the callback function for the event.</p>
+  *
+  * <p>The following events have default behaviors:</p>
+  *
+  * <ul>
+  *
+  *   <li><code>sessionDisconnect</code> &#151; See
+  *   <a href="SessionDisconnectEvent.html#preventDefault">
+  *   SessionDisconnectEvent.preventDefault()</a>.</li>
+  *
+  *   <li><code>streamDestroyed</code> &#151; See <a href="StreamEvent.html#preventDefault">
+  *   StreamEvent.preventDefault()</a>.</li>
+  *
+  * </ul>
+  *
+  * @method #preventDefault
+  * @memberof Event
+  */
+  /**
+  * Whether the default event behavior has been prevented via a call to
+  * <code>preventDefault()</code> (<code>true</code>) or not (<code>false</code>).
+  * See <a href="#preventDefault">preventDefault()</a>.
+  * @method #isDefaultPrevented
+  * @return {Boolean}
+  * @memberof Event
+  */
 
-// Event names lookup
-OT.Event.names = {
+  // Event names lookup
+  OT.Event.names = {
     // Activity Status for cams/mics
-    ACTIVE: "active",
-    INACTIVE: "inactive",
-    UNKNOWN: "unknown",
+    ACTIVE: 'active',
+    INACTIVE: 'inactive',
+    UNKNOWN: 'unknown',
 
     // Archive types
-    PER_SESSION: "perSession",
-    PER_STREAM: "perStream",
+    PER_SESSION: 'perSession',
+    PER_STREAM: 'perStream',
 
-    // TB Events
-    EXCEPTION: "exception",
-    ISSUE_REPORTED: "issueReported",
+    // OT Events
+    EXCEPTION: 'exception',
+    ISSUE_REPORTED: 'issueReported',
 
     // Session Events
-    SESSION_CONNECTED: "sessionConnected",
-    SESSION_DISCONNECTED: "sessionDisconnected",
-    STREAM_CREATED: "streamCreated",
-    STREAM_DESTROYED: "streamDestroyed",
-    CONNECTION_CREATED: "connectionCreated",
-    CONNECTION_DESTROYED: "connectionDestroyed",
-    SIGNAL: "signal",
-    STREAM_PROPERTY_CHANGED: "streamPropertyChanged",
-    MICROPHONE_LEVEL_CHANGED: "microphoneLevelChanged",
+    SESSION_CONNECTED: 'sessionConnected',
+    SESSION_DISCONNECTED: 'sessionDisconnected',
+    STREAM_CREATED: 'streamCreated',
+    STREAM_DESTROYED: 'streamDestroyed',
+    CONNECTION_CREATED: 'connectionCreated',
+    CONNECTION_DESTROYED: 'connectionDestroyed',
+    SIGNAL: 'signal',
+    STREAM_PROPERTY_CHANGED: 'streamPropertyChanged',
+    MICROPHONE_LEVEL_CHANGED: 'microphoneLevelChanged',
 
 
     // Publisher Events
-    RESIZE: "resize",
-    SETTINGS_BUTTON_CLICK: "settingsButtonClick",
-    DEVICE_INACTIVE: "deviceInactive",
-    INVALID_DEVICE_NAME: "invalidDeviceName",
-    ACCESS_ALLOWED: "accessAllowed",
-    ACCESS_DENIED: "accessDenied",
+    RESIZE: 'resize',
+    SETTINGS_BUTTON_CLICK: 'settingsButtonClick',
+    DEVICE_INACTIVE: 'deviceInactive',
+    INVALID_DEVICE_NAME: 'invalidDeviceName',
+    ACCESS_ALLOWED: 'accessAllowed',
+    ACCESS_DENIED: 'accessDenied',
     ACCESS_DIALOG_OPENED: 'accessDialogOpened',
     ACCESS_DIALOG_CLOSED: 'accessDialogClosed',
-    ECHO_CANCELLATION_MODE_CHANGED: "echoCancellationModeChanged",
+    ECHO_CANCELLATION_MODE_CHANGED: 'echoCancellationModeChanged',
     PUBLISHER_DESTROYED: 'destroyed',
 
     // Subscriber Events
     SUBSCRIBER_DESTROYED: 'destroyed',
 
     // DeviceManager Events
-    DEVICES_DETECTED: "devicesDetected",
+    DEVICES_DETECTED: 'devicesDetected',
 
     // DevicePanel Events
-    DEVICES_SELECTED: "devicesSelected",
-    CLOSE_BUTTON_CLICK: "closeButtonClick",
+    DEVICES_SELECTED: 'devicesSelected',
+    CLOSE_BUTTON_CLICK: 'closeButtonClick',
 
     MICLEVEL : 'microphoneActivityLevel',
     MICGAINCHANGED : 'microphoneGainChanged',
 
     // Environment Loader
     ENV_LOADED: 'envLoaded'
-};
+  };
 
-OT.ValueEvent = function (type,value){
-    OT.Event.call(this, type);
-    this.value = value;
+  OT.ExceptionCodes = {
+    JS_EXCEPTION: 2000,
+    AUTHENTICATION_ERROR: 1004,
+    INVALID_SESSION_ID: 1005,
+    CONNECT_FAILED: 1006,
+    CONNECT_REJECTED: 1007,
+    CONNECTION_TIMEOUT: 1008,
+    NOT_CONNECTED: 1010,
+    P2P_CONNECTION_FAILED: 1013,
+    API_RESPONSE_FAILURE: 1014,
+    UNABLE_TO_PUBLISH: 1500,
+    UNABLE_TO_SUBSCRIBE: 1501,
+    UNABLE_TO_SIGNAL: 1510,
+    UNABLE_TO_FORCE_DISCONNECT: 1520,
+    UNABLE_TO_FORCE_UNPUBLISH: 1530
+  };
 
-};
-
-OT.ExceptionCodes = {
-  JS_EXCEPTION: 2000,
-  AUTHENTICATION_ERROR: 1004,
-  INVALID_SESSION_ID: 1005,
-  CONNECT_FAILED: 1006,
-  CONNECT_REJECTED: 1007,
-  CONNECTION_TIMEOUT: 1008,
-  NOT_CONNECTED: 1010,
-  P2P_CONNECTION_FAILED: 1013,
-  API_RESPONSE_FAILURE: 1014,
-  UNABLE_TO_PUBLISH: 1500,
-  UNABLE_TO_SIGNAL: 1510,
-  UNABLE_TO_FORCE_DISCONNECT: 1520,
-  UNABLE_TO_FORCE_UNPUBLISH: 1530
-};
-
-/**
-* The {@link TB} class dispatches <code>exception</code> events when the OpenTok API encounters
-* an exception (error). The ExceptionEvent object defines the properties of the event
-* object that is dispatched.
-*
-* <p>Note that you set up an event handler for the <code>exception</code> event by calling the
-* <code>TB.addEventListener()</code> method, which is a <i>static</i> method.</p>
-*
-* @class ExceptionEvent
-* @property {Number} code The error code. The following is a list of error codes:</p>
-*
-* <table class="docs_table">
-*  <tbody><tr>
-*   <td>
-*   <b>code</b>
-*
-*   </td>
-*   <td>
-*   <b>title</b>
-*   </td>
-*  </tr>
-*  <tr>
-*   <td>
-*   1000
-*
-*   </td>
-*   <td>
-*   Failed To Load
-*   </td>
-*  </tr>
-*
-*  <tr>
-*   <td>
-*   1004
-*
-*   </td>
-*   <td>
-*   Authentication error
-*   </td>
-*  </tr>
-*
-*  <tr>
-*   <td>
-*   1005
-*
-*   </td>
-*   <td>
-*   Invalid Session ID
-*   </td>
-*  </tr>
-*  <tr>
-*   <td>
-*   1006
-*
-*   </td>
-*   <td>
-*   Connect Failed
-*   </td>
-*  </tr>
-*  <tr>
-*   <td>
-*   1007
-*
-*   </td>
-*   <td>
-*   Connect Rejected
-*   </td>
-*  </tr>
-*  <tr>
-*   <td>
-*   1008
-*
-*   </td>
-*   <td>
-*   Connect Time-out
-*   </td>
-*  </tr>
-*  <tr>
-*   <td>
-*   1009
-*
-*   </td>
-*   <td>
-*   Security Error
-*   </td>
-*  </tr>
-*   <tr>
-*    <td>
-*    1010
-*
-*    </td>
-*    <td>
-*    Not Connected
-*    </td>
-*   </tr>
-*   <tr>
-*    <td>
-*    1011
-*
-*    </td>
-*    <td>
-*    Invalid Parameter
-*    </td>
-*   </tr>
-*   <tr>
-*    <td>
-*    1013
-*    </td>
-*    <td>
-*    Connection Failed
-*    </td>
-*   </tr>
-*   <tr>
-*    <td>
-*    1014
-*    </td>
-*    <td>
-*    API Response Failure
-*    </td>
-*   </tr>
-*
-*  <tr>
-*    <td>
-*    1500
-*    </td>
-*    <td>
-*    Unable to Publish
-*    </td>
-*   </tr>
-*
-*  <tr>
-*    <td>
-*    1510
-*    </td>
-*    <td>
-*    Unable to Signal
-*    </td>
-*   </tr>
-*
-*  <tr>
-*    <td>
-*    1520
-*    </td>
-*    <td>
-*    Unable to Force Disconnect
-*    </td>
-*   </tr>
-*
-*  <tr>
-*    <td>
-*    1530
-*    </td>
-*    <td>
-*    Unable to Force Unpublish
-*    </td>
-*   </tr>
-*  <tr>
-*    <td>
-*    1535
-*    </td>
-*    <td>
-*    Force Unpublish on Invalid Stream
-*    </td>
-*   </tr>
-*
-*  <tr>
-*    <td>
-*    2000
-*
-*    </td>
-*    <td>
-*    Internal Error
-*    </td>
-*  </tr>
-*
-*  <tr>
-*    <td>
-*    2010
-*
-*    </td>
-*    <td>
-*    Report Issue Failure
-*    </td>
-*  </tr>
-*
-*
-*  </tbody></table>
-*
-*  <p>Check the <code>message</code> property for more details about the error.</p>
-*
-* @property {String} message The error message.
-* @property {String} title The error title.
-* @augments Event
-*/
-OT.ExceptionEvent = function (type, message, title, code, component, target) {
+  /**
+  * The {@link OT} class dispatches <code>exception</code> events when the OpenTok API encounters
+  * an exception (error). The ExceptionEvent object defines the properties of the event
+  * object that is dispatched.
+  *
+  * <p>Note that you set up a callback for the <code>exception</code> event by calling the
+  * <code>OT.on()</code> method.</p>
+  *
+  * @class ExceptionEvent
+  * @property {Number} code The error code. The following is a list of error codes:</p>
+  *
+  * <table class="docs_table">
+  *  <tbody><tr>
+  *   <td>
+  *   <b>code</b>
+  *
+  *   </td>
+  *   <td>
+  *   <b>title</b>
+  *   </td>
+  *  </tr>
+  *  <tr>
+  *   <td>
+  *   1000
+  *
+  *   </td>
+  *   <td>
+  *   Failed To Load
+  *   </td>
+  *  </tr>
+  *
+  *  <tr>
+  *   <td>
+  *   1004
+  *
+  *   </td>
+  *   <td>
+  *   Authentication error
+  *   </td>
+  *  </tr>
+  *
+  *  <tr>
+  *   <td>
+  *   1005
+  *
+  *   </td>
+  *   <td>
+  *   Invalid Session ID
+  *   </td>
+  *  </tr>
+  *  <tr>
+  *   <td>
+  *   1006
+  *
+  *   </td>
+  *   <td>
+  *   Connect Failed
+  *   </td>
+  *  </tr>
+  *  <tr>
+  *   <td>
+  *   1007
+  *
+  *   </td>
+  *   <td>
+  *   Connect Rejected
+  *   </td>
+  *  </tr>
+  *  <tr>
+  *   <td>
+  *   1008
+  *
+  *   </td>
+  *   <td>
+  *   Connect Time-out
+  *   </td>
+  *  </tr>
+  *  <tr>
+  *   <td>
+  *   1009
+  *
+  *   </td>
+  *   <td>
+  *   Security Error
+  *   </td>
+  *  </tr>
+  *   <tr>
+  *    <td>
+  *    1010
+  *
+  *    </td>
+  *    <td>
+  *    Not Connected
+  *    </td>
+  *   </tr>
+  *   <tr>
+  *    <td>
+  *    1011
+  *
+  *    </td>
+  *    <td>
+  *    Invalid Parameter
+  *    </td>
+  *   </tr>
+  *   <tr>
+  *    <td>
+  *    1013
+  *    </td>
+  *    <td>
+  *    Connection Failed
+  *    </td>
+  *   </tr>
+  *   <tr>
+  *    <td>
+  *    1014
+  *    </td>
+  *    <td>
+  *    API Response Failure
+  *    </td>
+  *   </tr>
+  *
+  *  <tr>
+  *    <td>
+  *    1500
+  *    </td>
+  *    <td>
+  *    Unable to Publish
+  *    </td>
+  *   </tr>
+  *
+  *  <tr>
+  *    <td>
+  *    1510
+  *    </td>
+  *    <td>
+  *    Unable to Signal
+  *    </td>
+  *   </tr>
+  *
+  *  <tr>
+  *    <td>
+  *    1520
+  *    </td>
+  *    <td>
+  *    Unable to Force Disconnect
+  *    </td>
+  *   </tr>
+  *
+  *  <tr>
+  *    <td>
+  *    1530
+  *    </td>
+  *    <td>
+  *    Unable to Force Unpublish
+  *    </td>
+  *   </tr>
+  *  <tr>
+  *    <td>
+  *    1535
+  *    </td>
+  *    <td>
+  *    Force Unpublish on Invalid Stream
+  *    </td>
+  *   </tr>
+  *
+  *  <tr>
+  *    <td>
+  *    2000
+  *
+  *    </td>
+  *    <td>
+  *    Internal Error
+  *    </td>
+  *  </tr>
+  *
+  *  <tr>
+  *    <td>
+  *    2010
+  *
+  *    </td>
+  *    <td>
+  *    Report Issue Failure
+  *    </td>
+  *  </tr>
+  *
+  *
+  *  </tbody></table>
+  *
+  *  <p>Check the <code>message</code> property for more details about the error.</p>
+  *
+  * @property {String} message The error message.
+  * @property {String} title The error title.
+  * @augments Event
+  */
+  OT.ExceptionEvent = function (type, message, title, code, component, target) {
     OT.Event.call(this, type);
 
     this.message = message;
@@ -4584,23 +5372,26 @@ OT.ExceptionEvent = function (type, message, title, code, component, target) {
     this.code = code;
     this.component = component;
     this.target = target;
-};
+  };
 
 
-OT.IssueReportedEvent = function (type, issueId) {
+  OT.IssueReportedEvent = function (type, issueId) {
     OT.Event.call(this, type);
-
     this.issueId = issueId;
-};
+  };
 
-// Triggered when the JS dynamic config and the DOM have loaded.
-OT.EnvLoadedEvent = function (type) {
+  // Triggered when the JS dynamic config and the DOM have loaded.
+  OT.EnvLoadedEvent = function (type) {
     OT.Event.call(this, type);
-};
+  };
 
 
 /**
- * The Session object dispatches a ConnectionEvent object when a connection is created or destroyed.
+ * Connection event is an event that can have type "connectionCreated" or "connectionDestroyed".
+ * These events are dispatched by the Session object when another client connects to or
+ * disconnects from a {@link Session}. For the local client, the Session object dispatches a
+ * "sessionConnected" or "sessionDisconnected" event, defined by the SessionConnectEvent and
+ * SessionDisconnectEvent classes.
  *
  * <h5><a href="example"></a>Example</h5>
  *
@@ -4615,26 +5406,20 @@ OT.EnvLoadedEvent = function (type) {
  *                 // See https://dashboard.tokbox.com/projects
  * var connectionCount = 0;
  *
- * var session = TB.initSession(sessionID);
- * session.addEventListener("sessionConnected", sessionConnectedHandler);
- * session.addEventListener("connectionCreated", connectionCreatedHandler);
- * session.addEventListener("connectionDestroyed", connectionDestroyedHandler);
- * session.connect(apiKey, token);
- *
- * function sessionConnectedHandler(event) {
- *    connectionCount = event.connections.length;
+ * var session = OT.initSession(apiKey, sessionID);
+ * session.on("sessionConnected", function(event) {
+ *    connectionCount = 1; // This represent's your client's connection to the session
  *    displayConnectionCount();
- * }
- *
- * function connectionCreatedHandler(event) {
- *    connectionCount += event.connections.length;
+ * });
+ * session.on("connectionCreated", function(event) {
+ *    connectionCount += 1;
  *    displayConnectionCount();
- * }
- *
- * function connectionDestroyedHandler(event) {
- *    connectionCount -= event.connections.length;
+ * });
+ * session.on("connectionDestroyed", function(event) {
+ *    connectionCount -= 1;
  *    displayConnectionCount();
- * }
+ * });
+ * session.connect(token);
  *
  * function displayConnectionCount() {
  *     document.getElementById("connectionCountField").value = connectionCount.toString();
@@ -4646,9 +5431,12 @@ OT.EnvLoadedEvent = function (type) {
  * <pre>&lt;input type="text" id="connectionCountField" value="0"&gt;&lt;/input&gt;</pre>
  *
  *
- * @property {Array} connections An array of Connection objects for the connections that were created or deleted.
- * You can compare the <code>connectionId</code> property to that of the <code>connection</code> property of the
- * Session object to see if a connection refers to the local web page.
+ * @property {Connection} connection A Connection objects for the connections that was
+ * created or deleted.
+ *
+ * @property {Array} connections Deprecated. Use the <code>connection</code> property. A
+ * <code>connectionCreated</code> or <code>connectionDestroyed</code> event is dispatched
+ * for each connection created and destroyed in the session.
  *
  * @property {String} reason For a <code>connectionDestroyed</code> event,
  *  a description of why the connection ended. This property can have two values:
@@ -4658,12 +5446,12 @@ OT.EnvLoadedEvent = function (type) {
  *     the <code>disconnect()</code> method of the Session object or by closing the browser.
  *     (See <a href="Session.html#disconnect">Session.disconnect()</a>.)</li>
  *
- *  <li><code>"forceDisconnected"</code> &#151; A moderator has disconnected the publisher from the session,
- *      by calling the <code>forceDisconnect()</code> method of the Session object.
- *      (See <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
+ *  <li><code>"forceDisconnected"</code> &#151; A moderator has disconnected the publisher
+ *      from the session, by calling the <code>forceDisconnect()</code> method of the Session
+ *      object. (See <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
  *
- *  <li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly (for example,
- *      the client lost their internet connection).</li>
+ *  <li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly
+ *      (for example, the client lost their internet connection).</li>
  * </ul>
  *
  * <p>Depending on the context, this description may allow the developer to refine
@@ -4674,88 +5462,97 @@ OT.EnvLoadedEvent = function (type) {
  * @class ConnectionEvent
  * @augments Event
  */
-OT.ConnectionEvent = function (type, connections, reason) {
-    OT.Event.call(this, type);
+  var connectionEventPluralDeprecationWarningShown = false;
+  OT.ConnectionEvent = function (type, connection, reason) {
+    OT.Event.call(this, type, false);
 
-    this.connections = connections;
+    if (OT.$.canDefineProperty) {
+      Object.defineProperty(this, 'connections', {
+        get: function() {
+          if(!connectionEventPluralDeprecationWarningShown) {
+            OT.warn('OT.ConnectionEvent connections property is deprecated, ' +
+              'use connection instead.');
+            connectionEventPluralDeprecationWarningShown = true;
+          }
+          return [connection];
+        }
+      });
+    } else {
+      this.connections = [connection];
+    }
+    
+    this.connection = connection;
     this.reason = reason;
-};
+  };
 
 /**
- * StreamEvent is an event that can have type "streamCreated" or "streamDestroyed". These events are dispatched when a client
- * starts or stops publishing to a {@link Session}. This includes remote clients publishing on the session as well as the local
- * client publishing to the session.
+ * StreamEvent is an event that can have the type "streamCreated" or "streamDestroyed".
+ * These events are dispatched by the Session object when another client starts or
+ * stops publishing a stream to a {@link Session}. For a local client's stream, the
+ * Publisher object dispatches the event.
  *
- * <h4><a href="example_streamCreated"></a>Example &#151; streamCreated event</h4>
+ * <h4><a href="example_streamCreated"></a>Example &#151; streamCreated event dispatched
+ * by the Session object</h4>
  *  <p>The following code initializes a session and sets up an event listener for when
- *    a stream is created:</p>
+ *    a stream published by another client is created:</p>
  *
- * <pre>var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
- * var sessionID = ""; // Replace with your own session ID.
- *                     // See https://dashboard.tokbox.com/projects
- * var token = ""; // Replace with a generated token that has been assigned the moderator role.
- *                 // See https://dashboard.tokbox.com/projects
+ * <pre>
+ * session.on("streamCreated", function(event) {
+ *   // streamContainer is a DOM element
+ *   subscriber = session.subscribe(event.stream, streamContainer);
+ * }).connect(token);
+ * </pre>
  *
- * var session = TB.initSession(sessionID);
- * session.addEventListener("streamCreated", streamCreatedHandler);
- * session.connect(apiKey, token);
+ *  <h4><a href="example_streamDestroyed"></a>Example &#151; streamDestroyed event dispatched
+ * by the Session object</h4>
  *
- * function streamCreatedHandler(event) {
- *     for (var i = 0; i &lt; event.streams.length; i++) {
- *         // Only display others' streams, not those that the client publishes.
- *         if (event.streams[i].connection.connectionId != event.target.connection.connectionId) {
- *                displayStream(stream);
- *         }
- *     }
- * }
+ *    <p>The following code initializes a session and sets up an event listener for when
+ *       other clients' streams end:</p>
  *
- * function displayStream(stream) {
- *     var div = document.createElement('div');
- *     div.setAttribute('id', 'stream' + stream.streamId);
+ * <pre>
+ * session.on("streamDestroyed", function(event) {
+ *     console.log("Stream " + event.stream.name + " ended. " + event.reason);
+ * }).connect(token);
+ * </pre>
  *
- *     var streamsContainer = document.getElementById('streamsContainer');
- *     streamsContainer.appendChild(div);
+ * <h4><a href="example_streamCreated_publisher"></a>Example &#151; streamCreated event dispatched
+ * by a Publisher object</h4>
+ *  <p>The following code publishes a stream and adds an event listener for when the streaming
+ * starts</p>
  *
- *     subscriber = session.subscribe(stream, 'stream' + stream.streamId);
- * }</pre>
+ * <pre>
+ * var publisher = session.publish(publisherContainer)
+ *   .on("streamCreated", function(event) {
+ *     console.log("Publisher started streaming.");
+ *   );
+ * </pre>
  *
- *  <p>For this example, in addition to the event handler for the <code>streamCreated</code>
- *  event, you would probably want to create an event handler for the <code>sessionConnected</code>
- *  event. This event handler can display the streams that are present when the session first
- *  connects. See {@link SessionConnectEvent}.</p>
+ *  <h4><a href="example_streamDestroyed_publisher"></a>Example &#151; streamDestroyed event
+ * dispatched by a Publisher object</h4>
  *
- *  <h4><a href="example_streamDestroyed"></a>Example &#151; streamDestroyed event</h4>
+ *  <p>The following code publishes a stream, and leaves the Publisher in the HTML DOM
+ * when the streaming stops:</p>
  *
- *    <p>The following code initializes a session and sets up an event listener for when a
- *       stream ends:</p>
- *
- * <pre>var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
- * var sessionID = ""; // Replace with your own session ID.
- *                     // See https://dashboard.tokbox.com/projects
- * var token = ""; // Replace with a generated token that has been assigned the moderator role.
- *                 // See https://dashboard.tokbox.com/projects
- *
- * var session = TB.initSession(sessionID);
- * session.addEventListener("streamDestroyed", streamDestroyedHandler);
- * session.connect(apiKey, token);
- *
- * function streamDestroyedHandler(event) {
- *     for (var i = 0; i &lt; event.streams.length; i++) {
- *         var stream = event.streams[i];
- *         alert("Stream " + stream.name + " ended. " + event.reason);
- *     }
- * }</pre>
+ * <pre>
+ * var publisher = session.publish(publisherContainer)
+ *   .on("streamDestroyed", function(event) {
+ *     event.preventDefault();
+ *     console.log("Publisher stopped streaming.");
+ *   );
+ * </pre>
  *
  * @class StreamEvent
- * @property {Array} streams An array of Stream objects
- * corresponding to the streams to which this event refers. This is usually an array containing only
- * one Stream object, corresponding to the stream that was added (in the case of a <code>streamCreated</code>
- * event) or deleted (in the case of a <code>streamDestroyed</code> event). However, the array may contain
- * multiple Stream objects if multiple streams were added or deleted. A stream may be published by the local client
- * or another client connected to the session.
+ * @property {Stream} stream A Stream object corresponding to the stream that was added (in the
+ * case of a <code>streamCreated</code> event) or deleted (in the case of a
+ * <code>streamDestroyed</code> event).
+ *
+ * @property {Array} streams Deprecated. Use the <code>stream</code> property. A
+ * <code>streamCreated</code> or <code>streamDestroyed</code> event is dispatched for
+ * each stream added or destroyed.
  *
  * @property {String} reason For a <code>streamDestroyed</code> event,
- *  a description of why the session disconnected. This property can have one of the following values:
+ *  a description of why the session disconnected. This property can have one of the following
+ *  values:
  * </p>
  * <ul>
  *  <li><code>"clientDisconnected"</code> &#151; A client disconnected from the session by calling
@@ -4763,15 +5560,15 @@ OT.ConnectionEvent = function (type, connections, reason) {
  *     (See <a href="Session.html#disconnect">Session.disconnect()</a>.)</li>
  *
  *  <li><code>"forceDisconnected"</code> &#151; A moderator has disconnected the publisher of the
- *   	stream from the session, by calling the <code>forceDisconnect()</code> method of the Session object.
- *      (See <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
+ *    stream from the session, by calling the <code>forceDisconnect()</code> method of the Session
+*     object. (See <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
  *
- *  <li><code>"forceUnpublished"</code> &#151; A moderator has forced the publisher of the stream to stop
- *   	publishing the stream, by calling the <code>forceUnpublish()</code> method of the Session object.
- *      (See <a href="Session.html#forceUnpublish">Session.forceUnpublish()</a>.)</li>
+ *  <li><code>"forceUnpublished"</code> &#151; A moderator has forced the publisher of the stream
+ *    to stop publishing the stream, by calling the <code>forceUnpublish()</code> method of the
+ *    Session object. (See <a href="Session.html#forceUnpublish">Session.forceUnpublish()</a>.)</li>
  *
- *  <li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly (for example,
- *      the client lost their internet connection).</li>
+ *  <li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly (for
+ *      example, the client lost their internet connection).</li>
  *
  * </ul>
  *
@@ -4781,38 +5578,57 @@ OT.ConnectionEvent = function (type, connections, reason) {
  * <p>For a <code>streamCreated</code> event, this string is undefined.</p>
  *
  *
- * @property {Boolean} cancelable 	Whether the event has a default behavior that is cancelable (<code>true</code>) or not (<code>false</code>).
- *  You can cancel the default behavior by calling the <code>preventDefault()</code> method of
- *  the StreamEvent object in the event listener function. The <code>streamDestroyed</code>
+ * @property {Boolean} cancelable   Whether the event has a default behavior that is cancelable
+ *  (<code>true</code>) or not (<code>false</code>). You can cancel the default behavior by calling
+ *  the <code>preventDefault()</code> method of the StreamEvent object in the event listener
+ *  function. The <code>streamDestroyed</code>
  *  event is cancelable. (See <a href="#preventDefault">preventDefault()</a>.)
  * @augments Event
  */
-OT.StreamEvent = function (type, streams, reason, cancelable) {
+
+  var streamEventPluralDeprecationWarningShown = false;
+  OT.StreamEvent = function (type, stream, reason, cancelable) {
     OT.Event.call(this, type, cancelable);
 
-    this.streams = streams;
+    if (OT.$.canDefineProperty) {
+      Object.defineProperty(this, 'streams', {
+        get: function() {
+          if(!streamEventPluralDeprecationWarningShown) {
+            OT.warn('OT.StreamEvent streams property is deprecated, use stream instead.');
+            streamEventPluralDeprecationWarningShown = true;
+          }
+          return [stream];
+        }
+      });
+    } else {
+      this.streams = [stream];
+    }
+
+    this.stream = stream;
     this.reason = reason;
-};
+  };
 
 /**
 * Prevents the default behavior associated with the event from taking place.
 *
-* <p>For the <code>streamDestroyed</code> event, if the <code>reason</code> is set to <code>"forceDisconnected"</code>
-* or <code>networkDisconnected</code>, the default behavior is that all Subscriber objects that are
-* subscribed to the stream are unsubscribed (and removed from the HTML DOM). If you call the <code>preventDefault()</code>
-* method in the event listener for the <code>streamDestroyed</code> event, the default behavior is prevented and
-* you can, optionally, clean up Subscriber objects using your own code. See
+* <p>For the <code>streamDestroyed</code> event dispatched by the Session object,
+* the default behavior is that all Subscriber objects that are subscribed to the stream are
+* unsubscribed and removed from the HTML DOM. Each Subscriber object dispatches a
+* <code>destroyed</code> event when the element is removed from the HTML DOM. If you call the
+* <code>preventDefault()</code> method in the event listener for the <code>streamDestroyed</code>
+* event, the default behavior is prevented and you can clean up Subscriber objects using your
+* own code. See
 * <a href="Session.html#getSubscribersForStream">Session.getSubscribersForStream()</a>.</p>
-*
-* <p>If the <code>reason</code> property is set to <code>"forceUnpublished"</code>, the default behavior
-* is that the associated Subscriber or Publisher objects corresponding with the stream are unsubscribed
-* or unpublished (and removed from the HTML DOM). If you call the <code>preventDefault()</code> method in the
-* event listener for the <code>streamDestroyed</code> event, the default behavior is prevented and
-* you can, optionally, clean up Subscriber or Publisher objects using your own code. See
-* <a href="Session.html#getPublisherForStream">Session.getPublisherForStream()</a> and
-* <a href="Session.html#getSubscribersForStream">Session.getSubscribersForStream()</a>.</p>
-*
-* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of the event object. </p>
+* <p>
+* For the <code>streamDestroyed</code> event dispatched by a Publisher object, the default
+* behavior is that the Publisher object is removed from the HTML DOM. The Publisher object
+* dispatches a <code>destroyed</code> event when the element is removed from the HTML DOM.
+* If you call the <code>preventDefault()</code> method in the event listener for the
+* <code>streamDestroyed</code> event, the default behavior is prevented, and you can
+* retain the Publisher for reuse or clean it up using your own code.
+*</p>
+* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of
+* the event object. </p>
 *
 * <p>Call the <code>preventDefault()</code> method in the event listener function for the event.</p>
 *
@@ -4820,39 +5636,100 @@ OT.StreamEvent = function (type, streams, reason, cancelable) {
 * @memberof StreamEvent
 */
 
-
 /**
- * The Session object dispatches SessionConnectEvent object when a session has successfully connected in response to a call to
- * the <code>connect()</code> method of the Session object.
- *
- *  <p>
- *  For an example, see <a href="Session.html#connect">Session.connect()</a>.
- *  </p>
+ * The Session object dispatches SessionConnectEvent object when a session has successfully
+ * connected in response to a call to the <code>connect()</code> method of the Session object.
+ * <p>
+ * In version 2.2, the completionHandler of the <code>Session.connect()</code> method
+ * indicates success or failure in connecting to the session.
  *
  * @class SessionConnectEvent
- * @property {Array} connections An array of Connection objects, representing connections to the session.
- * (Note that each connection can publish multiple streams.)
- * @property {Array} streams An array of Stream objects corresponding to the streams currently available in the session that has connected.
+ * @property {Array} connections Deprecated in version 2.2 (and set to an empty array). In
+ * version 2.2, listen for the <code>connectionCreated</code> event dispatched by the Session
+ * object. In version 2.2, the Session object dispatches a <code>connectionCreated</code> event
+ * for each connection other than that of your client. This includes connections
+ * present when you first connect to the session.
+ *
+ * @property {Array} streams Deprecated in version 2.2 (and set to an empty array). In version
+ * 2.2, listen for the <code>streamCreated</code> event dispatched by the Session object. In
+ * version 2.2, the Session object dispatches a <code>streamCreated</code> event for each stream
+ * other than those published by your client. This includes streams
+ * present when you first connect to the session.
+ *
+ * @see <a href="Session.html#connect">Session.connect()</a></p>
  * @augments Event
  */
-OT.SessionConnectEvent = function (type, connections, streams, archives) {
-    OT.Event.call(this, type);
 
-    this.connections = connections;
-    this.streams = streams;
-    this.archives = archives;
-    this.groups = []; // Deprecated in OpenTok v0.91.48
-};
+  var sessionConnectedConnectionsDeprecationWarningShown = false;
+  var sessionConnectedStreamsDeprecationWarningShown = false;
+  var sessionConnectedArchivesDeprecationWarningShown = false;
+  var sessionConnectedGroupsDeprecationWarningShown = false;
+
+  OT.SessionConnectEvent = function (type) {
+    OT.Event.call(this, type, false);
+    if (OT.$.canDefineProperty) {
+      Object.defineProperties(this, {
+        connections: {
+          get: function() {
+            if(!sessionConnectedConnectionsDeprecationWarningShown) {
+              OT.warn('OT.SessionConnectedEvent no longer includes connections. Listen ' +
+                'for connectionCreated events instead.');
+              sessionConnectedConnectionsDeprecationWarningShown = true;
+            }
+            return [];
+          }
+        },
+        streams: {
+          get: function() {
+            if(!sessionConnectedStreamsDeprecationWarningShown) {
+              OT.warn('OT.SessionConnectedEvent no longer includes streams. Listen for ' +
+                'streamCreated events instead.');
+              sessionConnectedConnectionsDeprecationWarningShown = true;
+            }
+            return [];
+          }
+        },
+        archives: {
+          get: function() {
+            if(!sessionConnectedArchivesDeprecationWarningShown) {
+              OT.warn('OT.SessionConnectedEvent no longer includes archives. Listen for ' +
+                'archiveStarted events instead.');
+              sessionConnectedArchivesDeprecationWarningShown = true;
+            }
+            return [];
+          }
+        },
+        groups: {
+          get: function() {
+            if(!sessionConnectedGroupsDeprecationWarningShown) {
+              OT.error('OT.SessionConnectedEvent no longer includes groups. There is no ' +
+                'equivelant in OpenTok v2.2');
+              sessionConnectedGroupsDeprecationWarningShown = true;
+            }
+            return [];
+          }
+        }
+      });
+    } else {
+      this.connections = [];
+      this.streams = [];
+      this.archives = [];
+      // Deprecated in OpenTok v0.91.48
+      this.groups = [];
+    }
+  };
 
 /**
- * The Session object dispatches SessionDisconnectEvent object when a session has disconnected. This event may be dispatched asynchronously in
- * response to a successful call to the <code>disconnect()</code> method of the session object.
+ * The Session object dispatches SessionDisconnectEvent object when a session has disconnected. 
+ * This event may be dispatched asynchronously in response to a successful call to the 
+ * <code>disconnect()</code> method of the session object.
  *
  *  <h4>
- *  	<a href="example"></a>Example
+ *    <a href="example"></a>Example
  *  </h4>
  *  <p>
- *  	The following code initializes a session and sets up an event listener for when a session is disconnected.
+ *    The following code initializes a session and sets up an event listener for when a session is 
+ * disconnected.
  *  </p>
  * <pre>var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
  *  var sessionID = ""; // Replace with your own session ID.
@@ -4860,47 +5737,47 @@ OT.SessionConnectEvent = function (type, connections, streams, archives) {
  *  var token = ""; // Replace with a generated token that has been assigned the moderator role.
  *                  // See https://dashboard.tokbox.com/projects
  *
- *  var session = TB.initSession(sessionID);
- *  session.addEventListener("sessionDisconnected", sessionDisconnectedHandler);
- *  session.connect(apiKey, token);
- *
- *  function sessionDisConnectedHandler(event) {
+ *  var session = OT.initSession(apiKey, sessionID);
+ *  session.on("sessionDisconnected", function(event) {
  *      alert("The session disconnected. " + event.reason);
- *  }
+ *  });
+ *  session.connect(token);
  *  </pre>
  *
  * @property {String} reason A description of why the session disconnected.
  *   This property can have two values:
  *  </p>
  *  <ul>
- *  	<li><code>"clientDisconnected"</code> &#151; A client disconnected from the session by calling
- *  	 the <code>disconnect()</code> method of the Session object or by closing the browser.
+ *    <li><code>"clientDisconnected"</code> &#151; A client disconnected from the session by calling
+ *     the <code>disconnect()</code> method of the Session object or by closing the browser.
  *      ( See <a href="Session.html#disconnect">Session.disconnect()</a>.)</li>
- *  	<li><code>"forceDisconnected"</code> &#151; A moderator has disconnected you from the session
- *   	 by calling the <code>forceDisconnect()</code> method of the Session object. (See
+ *    <li><code>"forceDisconnected"</code> &#151; A moderator has disconnected you from the session
+ *     by calling the <code>forceDisconnect()</code> method of the Session object. (See
  *       <a href="Session.html#forceDisconnect">Session.forceDisconnect()</a>.)</li>
- *  	<li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly (for example,
- *       the client lost their internet connection).</li>
+ *    <li><code>"networkDisconnected"</code> &#151; The network connection terminated abruptly 
+ *       (for example, the client lost their internet connection).</li>
  *  </ul>
  *
  * @class SessionDisconnectEvent
  * @augments Event
  */
-OT.SessionDisconnectEvent = function (type, reason, cancelable) {
+  OT.SessionDisconnectEvent = function (type, reason, cancelable) {
     OT.Event.call(this, type, cancelable);
-
     this.reason = reason;
-};
+  };
 
 /**
 * Prevents the default behavior associated with the event from taking place.
 *
-* <p>For the <code>sessionDisconnectEvent</code>, the default behavior is: all Subscriber objects are unsubscribed,
-* and Publisher objects are destroyed. If you call the <code>preventDefault()</code> method in the
-* event listener for the <code>sessionDisconnect</code> event, the default behavior is prevented (and
-* you can, optionally, clean up Subscriber and Publisher objects using your own code).
+* <p>For the <code>sessionDisconnectEvent</code>, the default behavior is that all Subscriber
+* objects are unsubscribed and removed from the HTML DOM. Each Subscriber object dispatches a
+* <code>destroyed</code> event when the element is removed from the HTML DOM. If you call the
+* <code>preventDefault()</code> method in the event listener for the <code>sessionDisconnect</code> 
+* event, the default behavior is prevented, and you can, optionally, clean up Subscriber objects 
+* using your own code).
 *
-* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of the event object. </p>
+* <p>To see whether an event has a default behavior, check the <code>cancelable</code> property of 
+* the event object. </p>
 *
 * <p>Call the <code>preventDefault()</code> method in the event listener function for the event.</p>
 *
@@ -4908,56 +5785,25 @@ OT.SessionDisconnectEvent = function (type, reason, cancelable) {
 * @memberof SessionDisconnectEvent
 */
 
-OT.VolumeEvent = function (type, streamId, volume) {
-    OT.Event.call(this, type);
-
-    this.streamId = streamId;
-    this.volume = volume;
-};
-
-
-OT.DeviceEvent = function (type, camera, microphone) {
-    OT.Event.call(this, type);
-
-    this.camera = camera;
-    this.microphone = microphone;
-};
-
-OT.DeviceStatusEvent = function (type, cameras, microphones, selectedCamera, selectedMicrophone) {
-    OT.Event.call(this, type);
-
-    this.cameras = cameras;
-    this.microphones = microphones;
-    this.selectedCamera = selectedCamera;
-    this.selectedMicrophone = selectedMicrophone;
-};
-
-OT.ResizeEvent = function (type, widthFrom, widthTo, heightFrom, heightTo) {
-    OT.Event.call(this, type);
-
-    this.widthFrom = widthFrom;
-    this.widthTo = widthTo;
-    this.heightFrom = heightFrom;
-    this.heightTo = heightTo;
-};
-
 /**
- * The Session object dispatches a <code>streamPropertyChanged</code> event in the following circumstances:
+ * The Session object dispatches a <code>streamPropertyChanged</code> event in the 
+ * following circumstances:
  *
  * <ul>
  *
- * 	<li>When a publisher starts or stops publishing audio or video. This change causes the <code>hasAudio</code>
- * 	or <code>hasVideo</code> property of the Stream object to change. This change results from a call to the
- * 	<code>publishAudio()</code> or <code>publishVideo()</code> methods of the Publish object.</li>
+ *  <li>When a publisher starts or stops publishing audio or video. This change causes 
+ *  the <code>hasAudio</code> or <code>hasVideo</code> property of the Stream object to 
+ *  change. This change results from a call to the <code>publishAudio()</code> or 
+ *  <code>publishVideo()</code> methods of the Publish object.</li>
  *
- * 	<li>When the <code>videoDimensions</code> property of a stream changes. For more information,
- * 	see <a href="Stream.html#properties">Stream.videoDimensions</a>.</li>
+ *  <li>When the <code>videoDimensions</code> property of a stream changes. For more information,
+ *  see <a href="Stream.html#properties">Stream.videoDimensions</a>.</li>
  *
  * </ul>
  *
  * @class StreamPropertyChangedEvent
- * @property {String} changedProperty The property of the stream that changed. This value is either <code>"hasAudio"</code>,
- * <code>"hasVideo"</code>, or <code>"videoDimensions"</code>.
+ * @property {String} changedProperty The property of the stream that changed. This value 
+ * is either <code>"hasAudio"</code>, <code>"hasVideo"</code>, or <code>"videoDimensions"</code>.
  * @property {Stream} stream The Stream object for which a property has changed.
  * @property {Object} newValue The new value of the property (after the change).
  * @property {Object} oldValue The old value of the property (before the change).
@@ -4967,82 +5813,68 @@ OT.ResizeEvent = function (type, widthFrom, widthTo, heightFrom, heightTo) {
  * @see <a href="Stream.html#properties">Stream.videoDimensions</a></p>
  * @augments Event
  */
-OT.StreamPropertyChangedEvent = function (type, stream, changedProperty, oldValue, newValue) {
-    OT.Event.call(this, type);
-
+  OT.StreamPropertyChangedEvent = function (type, stream, changedProperty, oldValue, newValue) {
+    OT.Event.call(this, type, false);
     this.type = type;
     this.stream = stream;
     this.changedProperty = changedProperty;
     this.oldValue = oldValue;
     this.newValue = newValue;
-};
-
-OT.ArchiveEvent = function (type, archives) {
-    OT.Event.call(this, type);
-
-    this.archives = archives;
-};
-
-OT.ArchiveStreamEvent = function (type, archive, streams) {
-    OT.Event.call(this, type);
+  };
 
+  OT.ArchiveEvent = function (type, archive) {
+    OT.Event.call(this, type, false);
+    this.type = type;
+    this.id = archive.id;
+    this.name = archive.name;
+    this.status = archive.status;
     this.archive = archive;
-    this.streams = streams;
-};
+  };
 
-OT.StateChangedEvent = function (type, changedValues) {
-    OT.Event.call(this, type);
-
-    this.changedValues = changedValues;
-};
-
-OT.ChangeFailedEvent = function (type, reasonCode, reason, failedValues) {
-    OT.Event.call(this, type);
-
-    this.reasonCode = reasonCode;
-    this.reason = reason;
-    this.failedValues = failedValues;
-};
+  OT.ArchiveUpdatedEvent = function (stream, key, oldValue, newValue) {
+    OT.Event.call(this, 'updated', false);
+    this.target = stream;
+    this.changedProperty = key;
+    this.oldValue = oldValue;
+    this.newValue = newValue;
+  };
 
 /**
  * The Session object dispatches a signal event when the client receives a signal from the session.
  *
  * @class SignalEvent
- * @property {String} type The type assigned to the signal (if there is one). Use the type to filter signals
- * received (by adding an event handler for signal:type1 or signal:type2, etc.)
- * @property {Object} data The data payload sent with the signal (if there is one).
+ * @property {String} type The type assigned to the signal (if there is one). Use the type to 
+ * filter signals received (by adding an event handler for signal:type1 or signal:type2, etc.)
+ * @property {String} data The data string sent with the signal (if there is one).
  * @property {Connection} from The Connection corresponding to the client that sent with the signal.
  *
  * @see <a href="Session.html#signal">Session.signal()</a></p>
  * @see <a href="Session.html#events">Session events (signal and signal:type)</a></p>
  * @augments Event
  */
-OT.SignalEvent = function(type, data, from) {
-    OT.Event.call(this, type ? "signal:" + type : OT.Event.names.SIGNAL, false);
-
+  OT.SignalEvent = function(type, data, from) {
+    OT.Event.call(this, type ? 'signal:' + type : OT.Event.names.SIGNAL, false);
     this.data = data;
     this.from = from;
-};
+  };
 
 
-OT.StreamUpdatedEvent = function (stream, key, oldValue, newValue) {
-    OT.Event.call(this, 'updated');
-
+  OT.StreamUpdatedEvent = function (stream, key, oldValue, newValue) {
+    OT.Event.call(this, 'updated', false);
     this.target = stream;
     this.changedProperty = key;
     this.oldValue = oldValue;
     this.newValue = newValue;
-};
+  };
 
-OT.DestroyedEvent = function(type, target, reason) {
+  OT.DestroyedEvent = function(type, target, reason) {
     OT.Event.call(this, type, false);
-
     this.target = target;
     this.reason = reason;
-};
-
+  };
 
 })(window);
+/* jshint ignore:start */
 // https://code.google.com/p/stringencoding/
 // An implementation of http://encoding.spec.whatwg.org/#api
 //
@@ -7500,643 +8332,706 @@ OT.DestroyedEvent = function(type, target, reason) {
   global['TextEncoder'] = global['TextEncoder'] || TextEncoder;
   global['TextDecoder'] = global['TextDecoder'] || TextDecoder;
 }(this));
-(function(global) {
+/* jshint ignore:end */
+!(function() {
 
-// Rumor Messaging for JS
-//
-// https://tbwiki.tokbox.com/index.php/Rumor_:_Messaging_FrameWork
-//
-// @todo Rumor {
-//     Add error codes for all the error cases
-//     Add Dependability commands
-// }
+  // Rumor Messaging for JS
+  //
+  // https://tbwiki.tokbox.com/index.php/Rumor_:_Messaging_FrameWork
+  //
+  // @todo Rumor {
+  //     Add error codes for all the error cases
+  //     Add Dependability commands
+  // }
 
-OT.Rumor = {
-  MessageType: {
-    // This is used to subscribe to address/addresses. The address/addresses the
-    // client specifies here is registered on the server. Once any message is sent to
-    // that address/addresses, the client receives that message.
-    SUBSCRIBE: 0,
+  OT.Rumor = {
+    MessageType: {
+      // This is used to subscribe to address/addresses. The address/addresses the
+      // client specifies here is registered on the server. Once any message is sent to
+      // that address/addresses, the client receives that message.
+      SUBSCRIBE: 0,
 
-    // This is used to unsubscribe to address / addresses. Once the client unsubscribe
-    // to an address, it will stop getting messages sent to that address.
-    UNSUBSCRIBE: 1,
+      // This is used to unsubscribe to address / addresses. Once the client unsubscribe
+      // to an address, it will stop getting messages sent to that address.
+      UNSUBSCRIBE: 1,
 
-    // This is used to send messages to arbitrary address/ addresses. Messages can be
-    // anything and Rumor will not care about what is included.
-    MESSAGE: 2,
+      // This is used to send messages to arbitrary address/ addresses. Messages can be
+      // anything and Rumor will not care about what is included.
+      MESSAGE: 2,
 
-    // This will be the first message that the client sends to the server. It includes
-    // the uniqueId for that client connection and a disconnect_notify address that will
-    // be notified once the client disconnects.
-    CONNECT: 3,
+      // This will be the first message that the client sends to the server. It includes
+      // the uniqueId for that client connection and a disconnect_notify address that will
+      // be notified once the client disconnects.
+      CONNECT: 3,
 
-    // This will be the message used by the server to notify an address that a client disconnected.
-    DISCONNECT: 4,
+      // This will be the message used by the server to notify an address that a
+      // client disconnected.
+      DISCONNECT: 4,
 
-    //Enhancements to support Keepalives
-    PING: 7,
-    PONG: 8,
-    STATUS: 9
-  }
-};
+      //Enhancements to support Keepalives
+      PING: 7,
+      PONG: 8,
+      STATUS: 9
+    }
+  };
 
 }(this));
-(function(global) {
+!(function() {
 
-var BUFFER_DRAIN_INTERVAL = 100,        // The interval between polling the websocket's send buffer
-    BUFFER_DRAIN_MAX_RETRIES = 10,      // The total number of times to retest the websocket's send buffer
-    WEB_SOCKET_KEEP_ALIVE_INTERVAL = 9000,
+  // The interval between polling the websocket's send buffer
+  var BUFFER_DRAIN_INTERVAL = 100,
+      // The total number of times to retest the websocket's send buffer
+      BUFFER_DRAIN_MAX_RETRIES = 10,
 
-    // Magic Connectivity Timeout Constant: We wait 3*the keep alive interval,
-    // on the third keep alive we trigger the timeout if we haven't received the
-    // server pong.
-    WEB_SOCKET_CONNECTIVITY_TIMEOUT = 5*WEB_SOCKET_KEEP_ALIVE_INTERVAL - 100
+      WEB_SOCKET_KEEP_ALIVE_INTERVAL = 9000,
+
+      // Magic Connectivity Timeout Constant: We wait 9*the keep alive interval,
+      // on the third keep alive we trigger the timeout if we haven't received the
+      // server pong.
+      WEB_SOCKET_CONNECTIVITY_TIMEOUT = 5*WEB_SOCKET_KEEP_ALIVE_INTERVAL - 100,
+
+      wsCloseErrorCodes;
 
 
 
-// https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent#Close_codes
-// http://docs.oracle.com/javaee/7/api/javax/websocket/CloseReason.CloseCodes.html
-var wsCloseErrorCodes = {
-  1002:  "The endpoint is terminating the connection due to a protocol error. (CLOSE_PROTOCOL_ERROR)",
-  1003:  "The connection is being terminated because the endpoint received data of a type it cannot accept (for example, a text-only endpoint received binary data). (CLOSE_UNSUPPORTED)",
-  1004:  "The endpoint is terminating the connection because a data frame was received that is too large. (CLOSE_TOO_LARGE)",
-  1005:  "Indicates that no status code was provided even though one was expected. (CLOSE_NO_STATUS)",
-  1006:  "Used to indicate that a connection was closed abnormally (that is, with no close frame being sent) when a status code is expected. (CLOSE_ABNORMAL)",
-  1007: "Indicates that an endpoint is terminating the connection because it has received data within a message that was not consistent with the type of the message (e.g., non-UTF-8 [RFC3629] data within a text message)",
-  1008: "Indicates that an endpoint is terminating the connection because it has received a message that violates its policy.  This is a generic status code that can be returned when there is no other more suitable status code (e.g., 1003 or 1009) or if there is a need to hide specific details about the policy",
-  1009: "Indicates that an endpoint is terminating the connection because it has received a message that is too big for it to process",
-  1011: "Indicates that a server is terminating the connection because it encountered an unexpected condition that prevented it from fulfilling the request",
+  // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent#Close_codes
+  // http://docs.oracle.com/javaee/7/api/javax/websocket/CloseReason.CloseCodes.html
+  wsCloseErrorCodes = {
+    1002:  'The endpoint is terminating the connection due to a protocol error. ' +
+      '(CLOSE_PROTOCOL_ERROR)',
+    1003:  'The connection is being terminated because the endpoint received data of ' +
+      'a type it cannot accept (for example, a text-only endpoint received binary data). ' +
+      '(CLOSE_UNSUPPORTED)',
+    1004:  'The endpoint is terminating the connection because a data frame was received ' +
+      'that is too large. (CLOSE_TOO_LARGE)',
+    1005:  'Indicates that no status code was provided even though one was expected. ' +
+    '(CLOSE_NO_STATUS)',
+    1006:  'Used to indicate that a connection was closed abnormally (that is, with no ' +
+      'close frame being sent) when a status code is expected. (CLOSE_ABNORMAL)',
+    1007: 'Indicates that an endpoint is terminating the connection because it has received ' +
+      'data within a message that was not consistent with the type of the message (e.g., ' +
+      'non-UTF-8 [RFC3629] data within a text message)',
+    1008: 'Indicates that an endpoint is terminating the connection because it has received a ' +
+      'message that violates its policy.  This is a generic status code that can be returned ' +
+      'when there is no other more suitable status code (e.g., 1003 or 1009) or if there is a ' +
+      'need to hide specific details about the policy',
+    1009: 'Indicates that an endpoint is terminating the connection because it has received a ' +
+      'message that is too big for it to process',
+    1011: 'Indicates that a server is terminating the connection because it encountered an ' +
+      'unexpected condition that prevented it from fulfilling the request',
 
-  // .... codes in the 4000-4999 range are available for use by applications.
-  4001:   "Connectivity loss was detected as it was too long since the socket received the last PONG message"
-};
+    // .... codes in the 4000-4999 range are available for use by applications.
+    4001:   'Connectivity loss was detected as it was too long since the socket received the ' +
+      'last PONG message'
+  };
 
-OT.Rumor.SocketError = function(code, message) {
-  this.code = code;
-  this.message = message;
-};
+  OT.Rumor.SocketError = function(code, message) {
+    this.code = code;
+    this.message = message;
+  };
 
-// The NativeSocket bit is purely to make testing simpler, it defaults to WebSocket
-// so in normal operation you would omit it.
-OT.Rumor.Socket = function(messagingServer, notifyDisconnectAddress, NativeSocket) {
-  var server = messagingServer,
-      webSocket,
-      id,
-      onOpen,
-      onError,
-      onClose,
-      onMessage,
-      connectCallback,
-      bufferDrainTimeout,           // Timer to poll whether th send buffer has been drained
-      connectTimeout,
-      lastMessageTimestamp,         // The timestamp of the last message received
-      keepAliveTimer;               // Timer for the connectivity checks
+  // The NativeSocket bit is purely to make testing simpler, it defaults to WebSocket
+  // so in normal operation you would omit it.
+  OT.Rumor.Socket = function(messagingServer, notifyDisconnectAddress, NativeSocket) {
+    var states = ['disconnected',  'error', 'connected', 'connecting', 'disconnecting'],
+        server = messagingServer,
+        webSocket,
+        id,
+        onOpen,
+        onError,
+        onClose,
+        onMessage,
+        connectCallback,
+        bufferDrainTimeout,           // Timer to poll whether th send buffer has been drained
+        connectTimeout,
+        lastMessageTimestamp,         // The timestamp of the last message received
+        keepAliveTimer;               // Timer for the connectivity checks
 
 
-  //// Private API
-  var stateChanged = function(newState) {
-        switch (newState) {
-          case 'disconnected':
-          case 'error':
-            webSocket = null;
-            if (onClose) {
-              var error;
-              if(hasLostConnectivity()) {
-                error = new Error(wsCloseErrorCodes[4001]);
-                error.code = 4001;
+    //// Private API
+    var stateChanged = function(newState) {
+          switch (newState) {
+            case 'disconnected':
+            case 'error':
+              webSocket = null;
+              if (onClose) {
+                var error;
+                if(hasLostConnectivity()) {
+                  error = new Error(wsCloseErrorCodes[4001]);
+                  error.code = 4001;
+                }
+                onClose(error);
               }
-              onClose(error);
-            }
-            break;
-        }
-      },
-
-      setState = OT.$.statable(this, ['disconnected',  'error', 'connected', 'connecting', 'disconnecting'], 'disconnected', stateChanged),
-
-      validateCallback = function validateCallback (name, callback) {
-        if (callback === null || !OT.$.isFunction(callback) ) {
-          throw new Error("The Rumor.Socket " + name + " callback must be a valid function or null");
-        }
-      },
-
-      error = function error (errorMessage) {
-        OT.error("Rumor.Socket: " + errorMessage);
-
-        var error = new OT.Rumor.SocketError(null, errorMessage || "Unknown Socket Error");
-
-        if (connectTimeout) clearTimeout(connectTimeout);
-
-        setState('error');
-
-        if (this.previousState === 'connecting' && connectCallback) {
-          connectCallback(error, null);
-          connectCallback = null;
-        }
-
-        if (onError) onError(error);
-      }.bind(this),
-
-      // Immediately close the socket, only used by disconnectWhenSendBufferIsDrained
-      close = function close() {
-        setState('disconnecting');
-
-        if (bufferDrainTimeout) {
-          clearTimeout(bufferDrainTimeout);
-          bufferDrainTimeout = null;
-        }
-        console.info("CALLED CLOSE ON WEBSOCKET");
-        webSocket.close();
-      },
-
-      // Ensure that the WebSocket send buffer is fully drained before disconnecting
-      // the socket. If the buffer doesn't drain after a certain length of time
-      // we give up and close it anyway.
-      disconnectWhenSendBufferIsDrained = function disconnectWhenSendBufferIsDrained (bufferDrainRetries) {
-        if (!webSocket) return;
-
-        if (bufferDrainRetries === void 0) bufferDrainRetries = 0;
-        if (bufferDrainTimeout) clearTimeout(bufferDrainTimeout);
-
-        if (webSocket.bufferedAmount > 0 && (bufferDrainRetries + 1) <= BUFFER_DRAIN_MAX_RETRIES) {
-          bufferDrainTimeout = setTimeout(disconnectWhenSendBufferIsDrained, BUFFER_DRAIN_INTERVAL, bufferDrainRetries+1);
-        }
-        else {
-          close();
-        }
-      },
-
-      hasLostConnectivity = function hasLostConnectivity () {
-        if (!lastMessageTimestamp) return false;
-
-        return (OT.$.now() - lastMessageTimestamp) >= WEB_SOCKET_CONNECTIVITY_TIMEOUT;
-      },
-
-      sendKeepAlive = function sendKeepAlive () {
-        if (!this.is('connected')) return;
-
-        if ( hasLostConnectivity() ) {
-          webSocketDisconnected({code: 4001});
-        }
-        else  {
-          webSocket.send(OT.Rumor.Message.Ping().serialize());
-          keepAliveTimer = setTimeout(sendKeepAlive.bind(this), WEB_SOCKET_KEEP_ALIVE_INTERVAL);
-        }
-      }.bind(this);
-
-
-  //// Private Event Handlers
-  var webSocketConnected = function webSocketConnected () {
-        if (connectTimeout) clearTimeout(connectTimeout);
-
-        // Connect to Rumor by registering our connection id and the
-        // app server address to notify if we disconnect.
-        //
-        // We don't need to wait for a reply to this message.
-        webSocket.send(OT.Rumor.Message.Connect(id, notifyDisconnectAddress).serialize());
-
-        setState('connected');
-        if (connectCallback) {
-          connectCallback(null, id);
-          connectCallback = null;
-        }
-
-        if (onOpen) onOpen(id);
-
-        setTimeout(function() {
-          lastMessageTimestamp = OT.$.now();
-          sendKeepAlive();
-        }, WEB_SOCKET_KEEP_ALIVE_INTERVAL);
-      },
-
-      webSocketConnectTimedOut = function webSocketConnectTimedOut () {
-        error("Timed out while waiting for the Rumor socket to connect.");
-      },
-
-      webSocketError = function webSocketError (errorEvent) {
-        var errorMessage = "Unknown Socket Error";      // @fixme We MUST be able to do better than this!
-
-        // All errors seem to result in disconnecting the socket, the close event
-        // has a close reason and code which gives some error context. This,
-        // combined with the fact that the errorEvent argument contains no
-        // error info at all, means we'll delay triggering the error handlers
-        // until the socket is closed.
-        // error(errorMessage);
-      },
-
-      webSocketDisconnected = function webSocketDisconnected (closeEvent) {
-        if (connectTimeout) clearTimeout(connectTimeout);
-        if (keepAliveTimer) clearTimeout(keepAliveTimer);
-
-        if (closeEvent.code !== 1000 && closeEvent.code !== 1001) {
-          var reason = closeEvent.reason || closeEvent.message;
-          if (!reason && wsCloseErrorCodes.hasOwnProperty(closeEvent.code)) reason = wsCloseErrorCodes[closeEvent.code];
-
-          error("Rumor Socket Disconnected: " + reason);
-        }
-
-        if (this.isNot('error')) setState('disconnected');
-      }.bind(this),
-
-      webSocketReceivedMessage = function webSocketReceivedMessage (message) {
-        lastMessageTimestamp = OT.$.now();
-
-        if (onMessage) {
-          var msg = OT.Rumor.Message.deserialize(message.data);
-
-          if (msg.type !== OT.Rumor.MessageType.PONG) {
-            onMessage(msg.toAddress, msg.data);
+              break;
           }
-        }
-      };
+        },
+
+        setState = OT.$.statable(this, states, 'disconnected', stateChanged),
+
+        validateCallback = function validateCallback (name, callback) {
+          if (callback === null || !OT.$.isFunction(callback) ) {
+            throw new Error('The Rumor.Socket ' + name +
+              ' callback must be a valid function or null');
+          }
+        },
+
+        error = function error (errorMessage) {
+          OT.error('Rumor.Socket: ' + errorMessage);
+
+          var socketError = new OT.Rumor.SocketError(null, errorMessage || 'Unknown Socket Error');
+
+          if (connectTimeout) clearTimeout(connectTimeout);
+
+          setState('error');
+
+          if (this.previousState === 'connecting' && connectCallback) {
+            connectCallback(socketError, null);
+            connectCallback = null;
+          }
+
+          if (onError) onError(socketError);
+        }.bind(this),
+
+        // Immediately close the socket, only used by disconnectWhenSendBufferIsDrained
+        close = function close() {
+          setState('disconnecting');
+
+          if (bufferDrainTimeout) {
+            clearTimeout(bufferDrainTimeout);
+            bufferDrainTimeout = null;
+          }
+
+          webSocket.close();
+        },
+
+        // Ensure that the WebSocket send buffer is fully drained before disconnecting
+        // the socket. If the buffer doesn't drain after a certain length of time
+        // we give up and close it anyway.
+        disconnectWhenSendBufferIsDrained =
+          function disconnectWhenSendBufferIsDrained (bufferDrainRetries) {
+          if (!webSocket) return;
+
+          if (bufferDrainRetries === void 0) bufferDrainRetries = 0;
+          if (bufferDrainTimeout) clearTimeout(bufferDrainTimeout);
+
+          if (webSocket.bufferedAmount > 0 &&
+            (bufferDrainRetries + 1) <= BUFFER_DRAIN_MAX_RETRIES) {
+            bufferDrainTimeout = setTimeout(disconnectWhenSendBufferIsDrained,
+              BUFFER_DRAIN_INTERVAL, bufferDrainRetries+1);
+          }
+          else {
+            close();
+          }
+        },
+
+        hasLostConnectivity = function hasLostConnectivity () {
+          if (!lastMessageTimestamp) return false;
+
+          return (OT.$.now() - lastMessageTimestamp) >= WEB_SOCKET_CONNECTIVITY_TIMEOUT;
+        },
+
+        sendKeepAlive = function sendKeepAlive () {
+          if (!this.is('connected')) return;
+
+          if ( hasLostConnectivity() ) {
+            webSocketDisconnected({code: 4001});
+          }
+          else  {
+            webSocket.send(OT.Rumor.Message.Ping().serialize());
+            keepAliveTimer = setTimeout(sendKeepAlive.bind(this), WEB_SOCKET_KEEP_ALIVE_INTERVAL);
+          }
+        }.bind(this);
 
 
-  //// Public API
+    //// Private Event Handlers
+    var webSocketConnected = function webSocketConnected () {
+          if (connectTimeout) clearTimeout(connectTimeout);
 
-  this.publish = function (topics, message) {
-    webSocket.send(OT.Rumor.Message.Publish(topics, message).serialize());
-  };
+          // Connect to Rumor by registering our connection id and the
+          // app server address to notify if we disconnect.
+          //
+          // We don't need to wait for a reply to this message.
+          webSocket.send(OT.Rumor.Message.Connect(id, notifyDisconnectAddress).serialize());
 
-  this.subscribe = function(topics) {
-    webSocket.send(OT.Rumor.Message.Subscribe(topics).serialize());
-  };
+          setState('connected');
+          if (connectCallback) {
+            connectCallback(null, id);
+            connectCallback = null;
+          }
 
-  this.unsubscribe = function(topics) {
-    webSocket.send(OT.Rumor.Message.Unsubscribe(topics).serialize());
-  };
+          if (onOpen) onOpen(id);
 
-  this.connect = function (connectionId, complete) {
-    if (this.is('connecting', 'connected')) {
-      complete(new OT.Rumor.SocketError(null, "Rumor.Socket cannot connect when it is already connecting or connected."));
-      return;
-    }
+          setTimeout(function() {
+            lastMessageTimestamp = OT.$.now();
+            sendKeepAlive();
+          }, WEB_SOCKET_KEEP_ALIVE_INTERVAL);
+        },
 
-    id = connectionId;
-    connectCallback = complete;
+        webSocketConnectTimedOut = function webSocketConnectTimedOut () {
+          error('Timed out while waiting for the Rumor socket to connect.');
+        },
 
-    try {
-      setState('connecting');
+        webSocketError = function webSocketError () {},
+          // var errorMessage = 'Unknown Socket Error';
+          // @fixme We MUST be able to do better than this!
 
-      webSocket = new (NativeSocket || WebSocket)(server);
-      webSocket.binaryType = 'arraybuffer';
+          // All errors seem to result in disconnecting the socket, the close event
+          // has a close reason and code which gives some error context. This,
+          // combined with the fact that the errorEvent argument contains no
+          // error info at all, means we'll delay triggering the error handlers
+          // until the socket is closed.
+          // error(errorMessage);
 
-      webSocket.onopen = webSocketConnected;
-      webSocket.onclose = webSocketDisconnected;
-      webSocket.onerror = webSocketError;
-      webSocket.onmessage = webSocketReceivedMessage;
+        webSocketDisconnected = function webSocketDisconnected (closeEvent) {
+          if (connectTimeout) clearTimeout(connectTimeout);
+          if (keepAliveTimer) clearTimeout(keepAliveTimer);
 
-      connectTimeout = setTimeout(webSocketConnectTimedOut, OT.Rumor.Socket.CONNECT_TIMEOUT);
-    }
-    catch(e) {
-      OT.error(e);
+          if (closeEvent.code !== 1000 && closeEvent.code !== 1001) {
+            var reason = closeEvent.reason || closeEvent.message;
+            if (!reason && wsCloseErrorCodes.hasOwnProperty(closeEvent.code)) {
+              reason = wsCloseErrorCodes[closeEvent.code];
+            }
 
-      // @todo add an actual error message
-      error("Could not connect to the Rumor socket, possibly because of a blocked port.")
-    }
-  };
+            error('Rumor Socket Disconnected: ' + reason);
+          }
 
-  this.disconnect = function() {
-    if (connectTimeout) clearTimeout(connectTimeout);
-    if (keepAliveTimer) clearTimeout(keepAliveTimer);
+          if (this.isNot('error')) setState('disconnected');
+        }.bind(this),
 
-    if (!webSocket) {
-      if (this.isNot('error')) setState('disconnected');
-      return;
-    }
+        webSocketReceivedMessage = function webSocketReceivedMessage (message) {
+          lastMessageTimestamp = OT.$.now();
 
-    if (webSocket.readyState === 3/* CLOSED */) {
-      if (this.isNot('error')) setState('disconnected');
-    }
-    else {
-      if (this.is('connected')) {
-        // Look! We are nice to the rumor server ;-)
-        webSocket.send(OT.Rumor.Message.Disconnect().serialize());
+          if (onMessage) {
+
+            var msg = OT.Rumor.Message.deserialize(message.data);
+
+            if (msg.type !== OT.Rumor.MessageType.PONG) {
+              onMessage(msg);
+            }
+          }
+        };
+
+
+    //// Public API
+
+    this.publish = function (topics, message, headers) {
+      webSocket.send(OT.Rumor.Message.Publish(topics, message, headers).serialize());
+    };
+
+    this.subscribe = function(topics) {
+      webSocket.send(OT.Rumor.Message.Subscribe(topics).serialize());
+    };
+
+    this.unsubscribe = function(topics) {
+      webSocket.send(OT.Rumor.Message.Unsubscribe(topics).serialize());
+    };
+
+    this.connect = function (connectionId, complete) {
+      if (this.is('connecting', 'connected')) {
+        complete(new OT.Rumor.SocketError(null,
+            'Rumor.Socket cannot connect when it is already connecting or connected.'));
+        return;
       }
 
-      // Wait until the socket is ready to close
-      disconnectWhenSendBufferIsDrained();
+      id = connectionId;
+      connectCallback = complete;
+
+      try {
+        setState('connecting');
+
+        var TheWebSocket = NativeSocket || WebSocket;
+        webSocket = new TheWebSocket(server);
+        webSocket.binaryType = 'arraybuffer';
+
+        webSocket.onopen = webSocketConnected;
+        webSocket.onclose = webSocketDisconnected;
+        webSocket.onerror = webSocketError;
+        webSocket.onmessage = webSocketReceivedMessage;
+
+        connectTimeout = setTimeout(webSocketConnectTimedOut, OT.Rumor.Socket.CONNECT_TIMEOUT);
+      }
+      catch(e) {
+        OT.error(e);
+
+        // @todo add an actual error message
+        error('Could not connect to the Rumor socket, possibly because of a blocked port.');
+      }
+    };
+
+    this.disconnect = function() {
+      if (connectTimeout) clearTimeout(connectTimeout);
+      if (keepAliveTimer) clearTimeout(keepAliveTimer);
+
+      if (!webSocket) {
+        if (this.isNot('error')) setState('disconnected');
+        return;
+      }
+
+      if (webSocket.readyState === 3/* CLOSED */) {
+        if (this.isNot('error')) setState('disconnected');
+      }
+      else {
+        if (this.is('connected')) {
+          // Look! We are nice to the rumor server ;-)
+          webSocket.send(OT.Rumor.Message.Disconnect().serialize());
+        }
+
+        // Wait until the socket is ready to close
+        disconnectWhenSendBufferIsDrained();
+      }
+    };
+
+
+
+    Object.defineProperties(this, {
+      id: {
+        get: function() { return id; }
+      },
+
+      onOpen: {
+        set: function(callback) {
+          validateCallback('onOpen', callback);
+          onOpen = callback;
+        },
+
+        get: function() { return onOpen; }
+      },
+
+      onError: {
+        set: function(callback) {
+          validateCallback('onError', callback);
+          onError = callback;
+        },
+
+        get: function() { return onError; }
+      },
+
+      onClose: {
+        set: function(callback) {
+          validateCallback('onClose', callback);
+          onClose = callback;
+        },
+
+        get: function() { return onClose; }
+      },
+
+      onMessage: {
+        set: function(callback) {
+          validateCallback('onMessage', callback);
+          onMessage = callback;
+        },
+
+        get: function() { return onMessage; }
+      }
+    });
+  };
+
+  // The number of ms to wait for the websocket to connect
+  OT.Rumor.Socket.CONNECT_TIMEOUT = 15000;
+
+}(this));
+!(function() {
+
+  /*global TextEncoder, TextDecoder */
+
+  //
+  //
+  // @references
+  // * https://tbwiki.tokbox.com/index.php/Rumor_Message_Packet
+  // * https://tbwiki.tokbox.com/index.php/Rumor_Protocol
+  //
+  OT.Rumor.Message = function (type, toAddress, headers, data) {
+    this.type = type;
+    this.toAddress = toAddress;
+    this.headers = headers;
+    this.data = data;
+
+    this.transactionId = this.headers['TRANSACTION-ID'];
+    this.status = this.headers.STATUS;
+    this.isError = !(this.status && this.status[0] === '2');
+  };
+
+  OT.Rumor.Message.prototype.serialize = function () {
+    var offset = 8,
+        cBuf = 7,
+        address = [],
+        headerKey = [],
+        headerVal = [],
+        strArray,
+        dataView,
+        i,
+        j;
+
+    // The number of addresses
+    cBuf++;
+
+    // Write out the address.
+    for (i = 0; i < this.toAddress.length; i++) {
+      /*jshint newcap:false */
+      address.push(new TextEncoder('utf-8').encode(this.toAddress[i]));
+      cBuf += 2;
+      cBuf += address[i].length;
     }
+
+    // The number of parameters
+    cBuf++;
+
+    // Write out the params
+    i = 0;
+
+    for (var key in this.headers) {
+      headerKey.push(new TextEncoder('utf-8').encode(key));
+      headerVal.push(new TextEncoder('utf-8').encode(this.headers[key]));
+      cBuf += 4;
+      cBuf += headerKey[i].length;
+      cBuf += headerVal[i].length;
+
+      i++;
+    }
+
+    dataView = new TextEncoder('utf-8').encode(this.data);
+    cBuf += dataView.length;
+
+    // Let's allocate a binary blob of this size
+    var buffer = new ArrayBuffer(cBuf);
+    var uint8View = new Uint8Array(buffer, 0, cBuf);
+
+    // We don't include the header in the lenght.
+    cBuf -= 4;
+
+    // Write out size (in network order)
+    uint8View[0] = (cBuf & 0xFF000000) >>> 24;
+    uint8View[1] = (cBuf & 0x00FF0000) >>> 16;
+    uint8View[2] = (cBuf & 0x0000FF00) >>>  8;
+    uint8View[3] = (cBuf & 0x000000FF) >>>  0;
+
+    // Write out reserved bytes
+    uint8View[4] = 0;
+    uint8View[5] = 0;
+
+    // Write out message type
+    uint8View[6] = this.type;
+    uint8View[7] = this.toAddress.length;
+
+    // Now just copy over the encoded values..
+    for (i = 0; i < address.length; i++) {
+      strArray = address[i];
+      uint8View[offset++] = strArray.length >> 8 & 0xFF;
+      uint8View[offset++] = strArray.length >> 0 & 0xFF;
+      for (j = 0; j < strArray.length; j++) {
+        uint8View[offset++] = strArray[j];
+      }
+    }
+
+    uint8View[offset++] = headerKey.length;
+
+    // Write out the params
+    for (i = 0; i < headerKey.length; i++) {
+      strArray = headerKey[i];
+      uint8View[offset++] = strArray.length >> 8 & 0xFF;
+      uint8View[offset++] = strArray.length >> 0 & 0xFF;
+      for (j = 0; j < strArray.length; j++) {
+        uint8View[offset++] = strArray[j];
+      }
+
+      strArray = headerVal[i];
+      uint8View[offset++] = strArray.length >> 8 & 0xFF;
+      uint8View[offset++] = strArray.length >> 0 & 0xFF;
+      for (j = 0; j < strArray.length; j++) {
+        uint8View[offset++] = strArray[j];
+      }
+    }
+
+    // And finally the data
+    for (i = 0; i < dataView.length; i++) {
+      uint8View[offset++] = dataView[i];
+    }
+
+    return buffer;
+  };
+
+  function toArrayBuffer(buffer) {
+    var ab = new ArrayBuffer(buffer.length);
+    var view = new Uint8Array(ab);
+    for (var i = 0; i < buffer.length; ++i) {
+      view[i] = buffer[i];
+    }
+    return ab;
+  }
+
+  OT.Rumor.Message.deserialize = function (buffer) {
+
+    if(typeof Buffer !== 'undefined' &&
+      Buffer.isBuffer(buffer)) {
+      buffer = toArrayBuffer(buffer);
+    }
+    var cBuf = 0,
+        type,
+        offset = 8,
+        uint8View = new Uint8Array(buffer),
+        strView,
+        headerlen,
+        headers,
+        keyStr,
+        valStr,
+        length,
+        i;
+
+    // Write out size (in network order)
+    cBuf += uint8View[0] << 24;
+    cBuf += uint8View[1] << 16;
+    cBuf += uint8View[2] <<  8;
+    cBuf += uint8View[3] <<  0;
+
+    type = uint8View[6];
+    var address = [];
+
+    for (i = 0; i < uint8View[7]; i++) {
+      length = uint8View[offset++] << 8;
+      length += uint8View[offset++];
+      strView = new Uint8Array(buffer, offset, length);
+      /*jshint newcap:false */
+      address[i] = new TextDecoder('utf-8').decode(strView);
+      offset += length;
+    }
+
+    headerlen = uint8View[offset++];
+    headers = {};
+
+    for (i = 0; i < headerlen; i++) {
+      length = uint8View[offset++] << 8;
+      length += uint8View[offset++];
+      strView = new Uint8Array(buffer, offset, length);
+      keyStr = new TextDecoder('utf-8').decode(strView);
+      offset += length;
+
+      length = uint8View[offset++] << 8;
+      length += uint8View[offset++];
+      strView = new Uint8Array(buffer, offset, length);
+      valStr = new TextDecoder('utf-8').decode(strView);
+      headers[keyStr] = valStr;
+      offset += length;
+    }
+
+    var dataView = new Uint8Array(buffer, offset);
+    var data = new TextDecoder('utf-8').decode(dataView);
+
+    return new OT.Rumor.Message(type, address, headers, data);
   };
 
 
+  OT.Rumor.Message.Connect = function (uniqueId, notifyDisconnectAddress) {
+    var headers = {
+      uniqueId: uniqueId,
+      notifyDisconnectAddress: notifyDisconnectAddress
+    };
 
-  Object.defineProperties(this, {
-    id: {
-      get: function() { return id; }
-    },
+    return new OT.Rumor.Message(OT.Rumor.MessageType.CONNECT, [], headers, '');
+  };
 
-    onOpen: {
-      set: function(callback) {
-        validateCallback('onOpen', callback);
-        onOpen = callback;
-      },
+  OT.Rumor.Message.Disconnect = function () {
+    return new OT.Rumor.Message(OT.Rumor.MessageType.DISCONNECT, [], [], '');
+  };
 
-      get: function() { return onOpen; }
-    },
+  OT.Rumor.Message.Subscribe = function(topics) {
+    return new OT.Rumor.Message(OT.Rumor.MessageType.SUBSCRIBE, topics, [], '');
+  };
 
-    onError: {
-      set: function(callback) {
-        validateCallback('onError', callback);
-        onError = callback;
-      },
+  OT.Rumor.Message.Unsubscribe = function(topics) {
+    return new OT.Rumor.Message(OT.Rumor.MessageType.UNSUBSCRIBE, topics, [], '');
+  };
 
-      get: function() { return onError; }
-    },
+  OT.Rumor.Message.Publish = function(topics, message, headers) {
+    return new OT.Rumor.Message(OT.Rumor.MessageType.MESSAGE, topics, headers||[], message);
+  };
 
-    onClose: {
-      set: function(callback) {
-        validateCallback('onClose', callback);
-        onClose = callback;
-      },
-
-      get: function() { return onClose; }
-    },
-
-    onMessage: {
-      set: function(callback) {
-        validateCallback('onMessage', callback);
-        onMessage = callback;
-      },
-
-      get: function() { return onMessage; }
-    }
-  });
-};
-
-// The number of ms to wait for the websocket to connect
-OT.Rumor.Socket.CONNECT_TIMEOUT = 15000;
+  // This message is used to implement keepalives on the persistent
+  // socket connection between the client and server. Every time the
+  // client sends a PING to the server, the server will respond with
+  // a PONG.
+  OT.Rumor.Message.Ping = function() {
+    return new OT.Rumor.Message(OT.Rumor.MessageType.PING, [], [], '');
+  };
 
 }(this));
-(function(global) {
+!(function() {
 
-//
-//
-// @references
-// * https://tbwiki.tokbox.com/index.php/Rumor_Message_Packet
-// * https://tbwiki.tokbox.com/index.php/Rumor_Protocol
-//
-OT.Rumor.Message = function (type, toAddress, headers, data) {
-  this.type = type;
-  this.toAddress = toAddress;
-  this.headers = headers;
-  this.data = data;
-};
+  // Rumor Messaging for JS
+  //
+  // https://tbwiki.tokbox.com/index.php/Raptor_Messages_(Sent_as_a_RumorMessage_payload_in_JSON)
+  //
+  // @todo Raptor {
+  //     Look at disconnection cleanup: i.e. subscriber + publisher cleanup
+  //     Add error codes for all the error cases
+  //     Write unit tests for SessionInfo
+  //     Write unit tests for Session
+  //     Make use of the new DestroyedEvent
+  //     Remove dependency on OT.properties
+  //     OT.Capabilities must be part of the Raptor namespace
+  //     Add Dependability commands
+  //     Think about noConflict, or whether we should just use the OT namespace
+  //     Think about how to expose OT.publishers, OT.subscribers, and OT.sessions if messaging was
+  //        being included as a component
+  //     Another solution to the problem of having publishers/subscribers/etc would be to make
+  //        Raptor Socket a separate component from Dispatch (dispatch being more business logic)
+  //     Look at the coupling of OT.sessions to OT.Raptor.Socket
+  // }
+  //
+  // @todo Raptor Docs {
+  //   Document payload formats for incoming messages (what are the payloads for 
+  //    STREAM CREATED/MODIFIED for example)
+  //   Document how keepalives work
+  //   Document all the Raptor actions and types
+  //   Document the session connect flow (including error cases)
+  // }
 
+  OT.Raptor = {
+    Actions: {
+      //General
+      CONNECT: 100,
+      CREATE: 101,
+      UPDATE: 102,
+      DELETE: 103,
+      STATE: 104,
 
-OT.Rumor.Message.prototype.serialize = function () {
-  var bitStream = '',
-      str = "",
-      offset = 8,
-      cBuf = 7,
-      address = new Array(this.toAddress.length),
-      headerKey = new Array(this.headers.length),
-      headerVal = new Array(this.headers.length),
-      dataView;
+      //Moderation
+      FORCE_DISCONNECT: 105,
+      FORCE_UNPUBLISH: 106,
+      SIGNAL: 107,
 
-  // The number of addresses
-  cBuf++;
+      //Archives
+      CREATE_ARCHIVE: 108,
+      CLOSE_ARCHIVE: 109,
+      START_RECORDING_SESSION: 110,
+      STOP_RECORDING_SESSION: 111,
+      START_RECORDING_STREAM: 112,
+      STOP_RECORDING_STREAM: 113,
+      LOAD_ARCHIVE: 114,
+      START_PLAYBACK: 115,
+      STOP_PLAYBACK: 116,
 
-  // Write out the address.
-  for (var i = 0; i < this.toAddress.length; i++) {
-    address[i] = new TextEncoder('utf-8').encode(this.toAddress[i]);
-    cBuf += 2;
-    cBuf += address[i].length;
-  }
+      //AppState
+      APPSTATE_PUT: 117,
+      APPSTATE_DELETE: 118,
 
-  // The number of parameters
-  cBuf++;
+      // JSEP
+      OFFER: 119,
+      ANSWER: 120,
+      PRANSWER: 121,
+      CANDIDATE: 122,
+      SUBSCRIBE: 123,
+      UNSUBSCRIBE: 124,
+      QUERY: 125,
+      SDP_ANSWER: 126,
 
-  // Write out the params
-  for (var i = 0; i < this.headers.length; i++) {
-    headerKey[i] = new TextEncoder('utf-8').encode(this.headers[i].key);
-    headerVal[i] = new TextEncoder('utf-8').encode(this.headers[i].val);
-    cBuf += 4;
-    cBuf += headerKey[i].length;
-    cBuf += headerVal[i].length;
-  }
+      //KeepAlive
+      PONG: 127,
+      REGISTER: 128, //Used for registering streams.
 
-  dataView = new TextEncoder('utf-8').encode(this.data);
-  cBuf += dataView.length;
+      QUALITY_CHANGED: 129
+    },
 
-  // Let's allocate a binary blob of this size
-  var buffer = new ArrayBuffer(cBuf);
-  var uint8View = new Uint8Array(buffer, 0, cBuf);
-
-  // We don't include the header in the lenght.
-  cBuf -= 4;
-
-  // Write out size (in network order)
-  uint8View[0] = (cBuf & 0xFF000000) >>> 24;
-  uint8View[1] = (cBuf & 0x00FF0000) >>> 16;
-  uint8View[2] = (cBuf & 0x0000FF00) >>>  8;
-  uint8View[3] = (cBuf & 0x000000FF) >>>  0;
-
-  // Write out reserved bytes
-  uint8View[4] = 0;
-  uint8View[5] = 0;
-
-  // Write out message type
-  uint8View[6] = this.type;
-  uint8View[7] = this.toAddress.length;
-
-  // Now just copy over the encoded values..
-  for (var i = 0; i < address.length; i++) {
-    strArray = address[i];
-    uint8View[offset++] = strArray.length >> 8 & 0xFF;
-    uint8View[offset++] = strArray.length >> 0 & 0xFF;
-    for (var j = 0; j < strArray.length; j++) {
-      uint8View[offset++] = strArray[j];
-    }
-  }
-
-  uint8View[offset++] = headerKey.length;
-
-  // Write out the params
-  for (var i = 0; i < headerKey.length; i++) {
-    strArray = headerKey[i];
-    uint8View[offset++] = strArray.length >> 8 & 0xFF;
-    uint8View[offset++] = strArray.length >> 0 & 0xFF;
-    for (var j = 0; j < strArray.length; j++) {
-      uint8View[offset++] = strArray[j];
-    }
-
-    strArray = headerVal[i];
-    uint8View[offset++] = strArray.length >> 8 & 0xFF;
-    uint8View[offset++] = strArray.length >> 0 & 0xFF;
-    for (var j = 0; j < strArray.length; j++) {
-      uint8View[offset++] = strArray[j];
-    }
-  }
-
-  // And finally the data
-  for (var i = 0; i < dataView.length; i++) {
-    uint8View[offset++] = dataView[i];
-  }
-
-  return buffer;
-};
-
-OT.Rumor.Message.deserialize = function (buffer) {
-  var cBuf = 0;
-  var type;
-  var offset = 8;
-  var uint8View = new Uint8Array(buffer);
-
-  // Write out size (in network order)
-  cBuf += uint8View[0] << 24;
-  cBuf += uint8View[1] << 16;
-  cBuf += uint8View[2] <<  8;
-  cBuf += uint8View[3] <<  0;
-
-  type = uint8View[6];
-  var address = [];
-
-  for (var i = 0; i < uint8View[7]; i++) {
-    length = uint8View[offset++] << 8;
-    length += uint8View[offset++];
-    var strView = new Uint8Array(buffer, offset, length);
-    address[i] = new TextDecoder('utf-8').decode(strView);
-    offset += length;
-  }
-
-  var headerlen = uint8View[offset++];
-  var headers = [];
-
-  for (var i = 0; i < headerlen; i++) {
-    length = uint8View[offset++] << 8;
-    length += uint8View[offset++];
-    var strView = new Uint8Array(buffer, offset, length);
-    var keyStr = new TextDecoder('utf-8').decode(strView);
-    offset += length;
-
-    length = uint8View[offset++] << 8;
-    length += uint8View[offset++];
-    strView = new Uint8Array(buffer, offset, length);
-    var valStr = new TextDecoder('utf-8').decode(strView);
-    headers[i] =  { key : keyStr, val : valStr };
-    offset += length;
-  }
-
-  var dataView = new Uint8Array(buffer, offset);
-  var data = new TextDecoder('utf-8').decode(dataView);
-
- return new OT.Rumor.Message(type, address, headers, data);
-};
-
-
-OT.Rumor.Message.Connect = function (uniqueId, notifyDisconnectAddress) {
-  var headers = [
-    {key: 'uniqueId', val: uniqueId},
-    {key: 'notifyDisconnectAddress', val: notifyDisconnectAddress}
-  ];
-
-  return new OT.Rumor.Message(OT.Rumor.MessageType.CONNECT, [], headers, "");
-};
-
-OT.Rumor.Message.Disconnect = function () {
-  return new OT.Rumor.Message(OT.Rumor.MessageType.DISCONNECT, [], [], "");
-};
-
-OT.Rumor.Message.Subscribe = function(topics) {
-  return new OT.Rumor.Message(OT.Rumor.MessageType.SUBSCRIBE, topics, [], "");
-};
-
-OT.Rumor.Message.Unsubscribe = function(topics) {
-  return new OT.Rumor.Message(OT.Rumor.MessageType.UNSUBSCRIBE, topics, [], "");
-};
-
-OT.Rumor.Message.Publish = function(topics, message, headers) {
-  return new OT.Rumor.Message(OT.Rumor.MessageType.MESSAGE, topics, [], message);
-};
-
-// This message is used to implement keepalives on the persistent
-// socket connection between the client and server. Every time the
-// client sends a PING to the server, the server will respond with
-// a PONG.
-OT.Rumor.Message.Ping = function() {
-  return new OT.Rumor.Message(OT.Rumor.MessageType.PING, [], [], "");
-};
-
-}(this));
-(function(global) {
-
-// Rumor Messaging for JS
-//
-// https://tbwiki.tokbox.com/index.php/Raptor_Messages_(Sent_as_a_RumorMessage_payload_in_JSON)
-//
-// @todo Raptor {
-//     Look at disconnection cleanup: i.e. subscriber + publisher cleanup
-//     Add error codes for all the error cases
-//     Write unit tests for SessionInfo
-//     Write unit tests for Session
-//     Make use of the new DestroyedEvent
-//     Move Analytics out of Raptor into Session
-//     Remove dependency on OT.properties
-//     OT.Capabilities must be part of the Raptor namespace
-//     Add Dependability commands
-//     Think about noConflict, or whether we should just use the OT namespace
-//     Think about how to expose OT.publishers, OT.subscribers, and OT.sessions if messaging was
-//        being included as a component
-//     Another solution to the problem of having publishers/subscribers/etc would be to make
-//        Raptor Socket a separate component from Dispatch (dispatch being more business logic)
-//     Look at the coupling of OT.sessions to OT.Raptor.Socket
-// }
-//
-// @todo Raptor Docs {
-//   Document payload formats for incoming messages (what are the payloads for STREAM CREATED/MODIFIED for example)
-//   Document how keepalives work
-//   Document all the Raptor actions and types
-//   Document the session connect flow (including error cases)
-// }
-
-
-OT.Raptor = {
-  Actions: {
-    //General
-    CONNECT: 100,
-    CREATE: 101,
-    UPDATE: 102,
-    DELETE: 103,
-    STATE: 104,
-
-    //Moderation
-    FORCE_DISCONNECT: 105,
-    FORCE_UNPUBLISH: 106,
-    SIGNAL: 107,
-
-    //Archives
-    CREATE_ARCHIVE: 108,
-    CLOSE_ARCHIVE: 109,
-    START_RECORDING_SESSION: 110,
-    STOP_RECORDING_SESSION: 111,
-    START_RECORDING_STREAM: 112,
-    STOP_RECORDING_STREAM: 113,
-    LOAD_ARCHIVE: 114,
-    START_PLAYBACK: 115,
-    STOP_PLAYBACK: 116,
-
-    //AppState
-    APPSTATE_PUT: 117,
-    APPSTATE_DELETE: 118,
-
-    // JSEP
-    OFFER: 119,
-    ANSWER: 120,
-    PRANSWER: 121,
-    CANDIDATE: 122,
-    SUBSCRIBE: 123,
-    UNSUBSCRIBE: 124,
-    QUERY: 125,
-    SDP_ANSWER: 126,
-
-    //KeepAlive
-    PONG: 127,
-    REGISTER: 128, //Used for registering streams.
-
-    QUALITY_CHANGED: 129
-  },
-
-  Types: {
+    Types: {
       //RPC
       RPC_REQUEST: 100,
       RPC_RESPONSE: 101,
@@ -8153,1327 +9048,1744 @@ OT.Raptor = {
 
       //JSEP Protocol
       JSEP: 109
-  }
-};
-
-
-}(this));
-(function(global) {
-
-//// Some helper functions that are used for debugging and logging
-
-var typeToName = {},
-    actionToName = {};
-
-// Create a lookup table of Raptor message types (integer) to a human readable strings
-var messageTypes = OT.Raptor.Types;
-for (var name in messageTypes) {
-  typeToName[messageTypes[name]] = name;
-}
-
-// Create a lookup table of  Raptor message actions (integer) to a human readable strings
-var messageActions = OT.Raptor.Actions;
-for (var name in messageActions) {
-  actionToName[messageActions[name]] = name;
-}
-
-
-OT.Raptor.serializeMessage = function (message) {
-    return JSON.stringify(message);
-};
-
-
-// Deserialising a Raptor message mainly means doing a JSON.parse on it.
-// We do decorate the final message with a few extra helper properies though.
-//
-// These include:
-// * typeName: A human readable version of the Raptor type. E.g. STREAM instead of 102
-// * actionName: A human readable version of the Raptor action. E.g. CREATE instead of 101
-// * signature: typeName and actionName combined. This is mainly for debugging. E.g. A type
-//    of 102 and an action of 101 would result in a signature of "STREAM:CREATE"
-//
-OT.Raptor.deserializeMessage = function (msg) {
-  var message = JSON.parse(msg);
-
-  if (message.type) {
-    message.type = parseInt(message.type, 10);
-    message.typeName = typeToName[message.type] || null;
-  }
-
-  if (message.action) {
-    message.action = parseInt(message.action, 10);
-    message.actionName = actionToName[message.action] || null;
-  }
-
-  message.signature = message.typeName + ':' + message.actionName;
-
-  return message;
-};
-
-
-OT.Raptor.Message = {};
-OT.Raptor.Message.connect = function (widgetId, connectionId, sessionId, apiKey, token, p2pEnabled) {
-  var payload = {
-        credentials: {
-          connectionId: connectionId,
-          soAccessState: 2,
-          supportsWebRTC: true,
-          p2pEnabled: p2pEnabled,
-          GUID: widgetId,
-          widgetId: widgetId,
-          partnerId: apiKey
-        },
-        sessionId: sessionId,
-        params: {
-            tokenPermissions: {
-                apiKey: apiKey
-            },
-            token: token
-        },
-        uniqueId: connectionId
-      };
-
-  return OT.Raptor.serializeMessage({
-    id: OT.$.uuid(),
-    type: OT.Raptor.Types.RPC_REQUEST,
-    action: OT.Raptor.Actions.CONNECT,
-    payload: payload,
-    replyTo: connectionId
-  });
-};
-
-
-OT.Raptor.Message.getSessionState = function (connectionId, sessionId, connectionsRequired) {
-  return OT.Raptor.serializeMessage({
-    id: OT.$.uuid(),
-    type: OT.Raptor.Types.RPC_REQUEST,
-    action: OT.Raptor.Actions.STATE,
-    payload: {
-      sessionId: sessionId,
-      connectionsRequired: connectionsRequired || true
-    },
-    replyTo: connectionId
-  });
-};
-
-
-OT.Raptor.Message.forceDisconnect = function (fromConnectionId, connectionIdToDisconnect, sessionId) {
-  return OT.Raptor.serializeMessage({
-    id: fromConnectionId,
-    type: OT.Raptor.Types.RPC_REQUEST,
-    action: OT.Raptor.Actions.FORCE_DISCONNECT,
-    payload: {
-      connectionId: connectionIdToDisconnect,
-      sessionId: sessionId
-    },
-    replyTo: fromConnectionId
-  });
-};
-
-
-
-OT.Raptor.Message.streamCreate = function (connectionId, sessionId, publisherId, name, videoOrientation, videoWidth, videoHeight, hasAudio, hasVideo, p2pEnabled) {
-  var payload = {
-    key: sessionId,
-    value: {
-      p2pEnabled: p2pEnabled || false,
-      publisherId: publisherId,
-      connection: {
-          connectionId: connectionId
-      },
-      type: "WebRTC",
-      name: name || '',
-      creationTime: Date.now(),   // Unix timestamp, time in milliseconds since 1970 UTC
-      orientation: {
-          width: videoWidth,
-          height: videoHeight,
-          videoOrientation: videoOrientation || "OTVideoOrientationRotatedNormal"
-      },
-      hasAudio: hasAudio !== void 0 ? hasAudio : true,
-      hasVideo: hasVideo !== void 0 ? hasVideo : true
     }
   };
 
-  return OT.Raptor.serializeMessage({
-    id: connectionId, // HACK until buf fixed in symphony
-    type: OT.Raptor.Types.STREAM,
-    action: OT.Raptor.Actions.CREATE,
-    payload: payload,
-    replyTo: ''
-  });
-};
+}(this));
+!(function() {
 
 
-OT.Raptor.Message.streamDestroy = function (connectionId, sessionId, streamId) {
-  return OT.Raptor.serializeMessage({
-    id: connectionId,
-    type: OT.Raptor.Types.STREAM,
-    action: OT.Raptor.Actions.DELETE,
-    payload: {
-      key: sessionId + "/STREAMS/" + streamId
-    },
-    replyTo: connectionId
-  });
-};
-
-
-OT.Raptor.Message.streamModify = function (connectionId, sessionId, streamId, key, value) {
-  return OT.Raptor.serializeMessage({
-    id: connectionId,
-    type: OT.Raptor.Types.STREAM,
-    action: OT.Raptor.Actions.UPDATE,
-    payload: {
-      key: [sessionId, 'STREAMS', streamId, key].join('/'),
-      value: value
-    },
-    replyTo: connectionId
-  });
-};
-
-OT.Raptor.Message.forceUnpublish = function (fromConnectionId, sessionId, streamIdToUnpublish) {
-  return OT.Raptor.serializeMessage({
-    id: fromConnectionId,
-    type: OT.Raptor.Types.RPC_REQUEST,
-    action: OT.Raptor.Actions.FORCE_UNPUBLISH,
-    payload: {
-      sessionId: sessionId,
-      connectionId: fromConnectionId,
-      streamId: streamIdToUnpublish,
-      webRTCStream: true
-    },
-    replyTo: fromConnectionId
-  });
-};
-
-
-OT.Raptor.Message.jsepOffer = function (fromConnectionId, toConnectionId, streamId, sdp) {
-  return OT.Raptor.serializeMessage({
-    id: fromConnectionId,
-    type: OT.Raptor.Types.JSEP,
-    action: OT.Raptor.Actions.OFFER,
-    payload: {
-      fromAddress: fromConnectionId,
-      toAddresses: toConnectionId,
-      sdp: sdp,
-      streamId: streamId
-    },
-    replyTo: fromConnectionId
-  });
-};
-
-
-OT.Raptor.Message.jsepAnswer = function (fromConnectionId, toConnectionId, streamId, sdp) {
-  return OT.Raptor.serializeMessage({
-    id: fromConnectionId,
-    type: OT.Raptor.Types.JSEP,
-    action: OT.Raptor.Actions.ANSWER,
-    payload: {
-      fromAddress: fromConnectionId,
-      toAddresses: toConnectionId,
-      sdp: sdp,
-      streamId: streamId
-    },
-    replyTo: fromConnectionId
-  });
-};
-
-OT.Raptor.Message.jsepSubscribe = function (fromConnectionId, toConnectionId, streamId, subscribeToVideo, subscribeToAudio) {
-  return OT.Raptor.serializeMessage({
-    id: fromConnectionId,
-    type: OT.Raptor.Types.JSEP,
-    action: OT.Raptor.Actions.SUBSCRIBE,
-    payload: {
-      keyManagemenMethod: OT.$.supportedCryptoScheme(),
-      bundleSupport: OT.$.supportsBundle(),
-      rtcpMuxSupport: OT.$.supportsRtcpMux(),
-      fromAddress: fromConnectionId,
-      toAddresses: toConnectionId,
-      streamId: streamId,
-      hasVideo: subscribeToVideo,
-      hasAudio: subscribeToAudio
-    },
-    replyTo: fromConnectionId
-  });
-};
-
-
-
-OT.Raptor.Message.jsepUnsubscribe = function (fromConnectionId, toConnectionId, streamId) {
-  return OT.Raptor.serializeMessage({
-    id: fromConnectionId,
-    type: OT.Raptor.Types.JSEP,
-    action: OT.Raptor.Actions.UNSUBSCRIBE,
-    payload: {
-      fromAddress: fromConnectionId,
-      toAddresses: toConnectionId,
-      streamId: streamId
-    },
-    replyTo: fromConnectionId
-  });
-};
-
-OT.Raptor.Message.jsepCandidate = function (fromConnectionId, toConnectionId, streamId, candidate) {
-  return OT.Raptor.serializeMessage({
-    id: fromConnectionId,
-    type: OT.Raptor.Types.JSEP,
-    action: OT.Raptor.Actions.CANDIDATE,
-    payload: {
-      fromAddress: fromConnectionId,
-      toAddresses: toConnectionId,
-      candidate: candidate,
-      streamId: streamId
-    },
-    replyTo: fromConnectionId
-  });
-};
-
-OT.Raptor.Message.subscriberModify = function (connectionId, sessionId, streamId, subscriberId, key, value) {
-  return OT.Raptor.serializeMessage({
-    id: OT.$.uuid(),
-    type: OT.Raptor.Types.SUBSCRIBER,
-    action: OT.Raptor.Actions.UPDATE,
-    payload: {
-      key: [sessionId, 'SUBSCRIBER', streamId, connectionId, key].join('/'),
-      value: value
-    },
-    replyTo: connectionId
-  });
-};
-
-
-OT.Raptor.Message.signal = function(connectionId, sessionId, type, to, data) {
-  var payload = {
-    id: OT.$.uuid(),
-    fromAddress: connectionId
+  OT.Raptor.serializeMessage = function (message) {
+    return JSON.stringify(message);
   };
 
-  // Massage the to field into an array and default it to the session id
-  // if we're sending to no one
-  if (to && !Array.isArray(to)) {
-    payload.toAddresses = [to];
-  }
-  else if (!to || to.length === 0) {
-    // if it was omitted then we'll send the signal to the entire session.
-    payload.toAddresses = [sessionId];
-  }
-  else {
-    payload.toAddresses = to;
-  }
 
-  if (type !== void 0) payload.type = type;
-  if (data !== void 0) payload.data = data;
+  // Deserialising a Raptor message mainly means doing a JSON.parse on it.
+  // We do decorate the final message with a few extra helper properies though.
+  //
+  // These include:
+  // * typeName: A human readable version of the Raptor type. E.g. STREAM instead of 102
+  // * actionName: A human readable version of the Raptor action. E.g. CREATE instead of 101
+  // * signature: typeName and actionName combined. This is mainly for debugging. E.g. A type
+  //    of 102 and an action of 101 would result in a signature of "STREAM:CREATE"
+  //
+  OT.Raptor.deserializeMessage = function (msg) {
+    if (msg.length === 0) return {};
 
-  return OT.Raptor.serializeMessage({
-    id: connectionId,
-    type: OT.Raptor.Types.SIGNAL,
-    action: OT.Raptor.Actions.SIGNAL,
-    payload: payload,
-    replyTo: connectionId
-  });
-};
+    var message = JSON.parse(msg),
+        bits = message.uri.substr(1).split('/');
 
-}(this));
-(function(global) {
+    // Remove the Raptor protocol version
+    bits.shift();
+    if (bits[bits.length-1] === '') bits.pop();
 
-var MAX_SIGNAL_DATA_LENGTH = 8192;
-var MAX_SIGNAL_TYPE_LENGTH = 128;
+    message.params = {};
+    for (var i=0, numBits=bits.length ; i<numBits-1; i+=2) {
+      message.params[bits[i]] = bits[i+1];
+    }
 
-//
-// Error Codes:
-// 413 - Type too long
-// 400 - Type is invalid
-// 413 - Data too long
-// 400 - Data is invalid (can't be parsed as JSON)
-// 429 - Rate limit exceeded
-// 500 - Websocket connection is down
-// 404 - To connection does not exist
-// 400 - To is invalid
-//
-OT.Signal = function(sessionId, fromConnectionId, options) {
-  var isInvalidType = function(type) {
-      // Our format matches the unreserved characters from the URI RFC: http://www.ietf.org/rfc/rfc3986
-      return !/^[a-zA-Z0-9\-\._~]+$/.exec(type);
-    },
-
-    validateTo = function(toAddress) {
-      if (!toAddress) {
-        return {code: 400, reason: "The signal type was null or an empty String. Either set it to a non-empty String value or omit it"};
+    // extract the resource name. We special case 'channel' slightly, as
+    // 'subscriber_channel' or 'stream_channel' is more useful for us
+    // than 'channel' alone.
+    if (bits.length % 2 === 0) {
+      if (bits[bits.length-2] === 'channel' && bits.length > 6) {
+        message.resource = bits[bits.length-4] + '_' + bits[bits.length-2];
+      } else {
+        message.resource = bits[bits.length-2];
       }
-      else if ( !Array.isArray(toAddress) ) {
-        return {code: 400, reason: "The To field was invalid"};
+    }
+    else {
+      if (bits[bits.length-1] === 'channel' && bits.length > 5) {
+        message.resource = bits[bits.length-3] + '_' + bits[bits.length-1];
+      } else {
+        message.resource = bits[bits.length-1];
       }
+    }
 
-      for (var i=0; i<toAddress.length; i++) {
-        if ( !(toAddress[i] instanceof OT.Connection || toAddress[i] instanceof OT.Session) ) {
-          return {code: 400, reason: "The To field was invalid"};
-        }
+    message.signature = message.resource + '#' + message.method;
+    return message;
+  };
+
+  OT.Raptor.unboxFromRumorMessage = function (rumorMessage) {
+    var message = OT.Raptor.deserializeMessage(rumorMessage.data);
+    message.transactionId = rumorMessage.transactionId;
+    message.fromAddress = rumorMessage.headers['X-TB-FROM-ADDRESS'];
+
+    return message;
+  };
+
+
+  OT.Raptor.Message = {};
+
+
+  OT.Raptor.Message.connections = {};
+
+  OT.Raptor.Message.connections.create = function (apiKey, sessionId, connectionId) {
+    return OT.Raptor.serializeMessage({
+      method: 'create',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/connection/' + connectionId,
+      content: {
+        userAgent: navigator.userAgent
       }
+    });
+  };
 
-      return null;
-    },
-
-    validateType = function(type) {
-      var error = null;
-
-      if (type === null || type === void 0) {
-        error = {code: 400, reason: "The signal type was null or undefined. Either set it to a String value or omit it"};
-      }
-      else if (type.length > MAX_SIGNAL_TYPE_LENGTH) {
-        error = {code: 413, reason: "The signal type was too long, the maximum length of it is " + MAX_SIGNAL_TYPE_LENGTH + " characters"};
-      }
-      else if ( isInvalidType(type) ) {
-        error = {code: 400, reason: "The signal type was invalid, it can only contain letters, numbers, '-', '_', and '~'."};
-      }
-
-      return error;
-    },
-
-    validateData = function(data) {
-      var error = null;
-      if (data === null || data === void 0) {
-        error = {code: 400, reason: "The signal data was null or undefined. Either set it to a String value or omit it"};
-      }
-      else {
-        try {
-          if (JSON.stringify(data).length > MAX_SIGNAL_DATA_LENGTH) {
-            error = {code: 413, reason: "The data field was too long, the maximum size of it is " + MAX_SIGNAL_DATA_LENGTH + " characters"};
-          }
-        }
-        catch(e) {
-          error = {code: 400, reason: "The data field was not valid JSON"};
-        }
-      }
-
-      return error;
-    };
+  OT.Raptor.Message.connections.destroy = function (apiKey, sessionId, connectionId) {
+    return OT.Raptor.serializeMessage({
+      method: 'delete',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/connection/' + connectionId,
+      content: {}
+    });
+  };
 
 
-  this.toRaptorMessage = function() {
-    var to;
+  OT.Raptor.Message.sessions = {};
 
-    if (this.to) {
-      to = this.to.map(function(thing) {
-        return typeof(thing) === 'string' ? thing : thing.id;
+  OT.Raptor.Message.sessions.get = function (apiKey, sessionId) {
+    return OT.Raptor.serializeMessage({
+      method: 'read',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId,
+      content: {}
+    });
+  };
+
+
+  OT.Raptor.Message.streams = {};
+
+  OT.Raptor.Message.streams.get = function (apiKey, sessionId, streamId) {
+    return OT.Raptor.serializeMessage({
+      method: 'read',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/stream/' + streamId,
+      content: {}
+    });
+  };
+
+  OT.Raptor.Message.streams.create = function (apiKey, sessionId, streamId, name, videoOrientation,
+    videoWidth, videoHeight, hasAudio, hasVideo, frameRate, minBitrate, maxBitrate) {
+    var channels = [];
+
+    if (hasAudio !== void 0) {
+      channels.push({
+        id: 'audio1',
+        type: 'audio',
+        active: hasAudio
       });
     }
 
-    return OT.Raptor.Message.signal(fromConnectionId, sessionId, this.type, to, this.data);
+    if (hasVideo !== void 0) {
+      var channel = {
+        id: 'video1',
+        type: 'video',
+        active: hasVideo,
+        width: videoWidth,
+        height: videoHeight,
+        orientation: videoOrientation
+      };
+      if (frameRate) channel.frameRate = frameRate;
+      channels.push(channel);
+    }
+    
+    var messageContent = {
+      id: streamId,
+      name: name,
+      channel: channels
+    };
+    
+    if (minBitrate) messageContent.minBitrate = minBitrate;
+    if (maxBitrate) messageContent.maxBitrate = maxBitrate;
+
+    return OT.Raptor.serializeMessage({
+      method: 'create',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/stream/' + streamId,
+      content: messageContent
+    });
   };
 
-  this.toHash = function() {
-    var h = OT.$.clone(options);
-    if (h.to === void 0) h.to = null;
-    if (h.data === void 0) h.data = null;
+  OT.Raptor.Message.streams.destroy = function (apiKey, sessionId, streamId) {
+    return OT.Raptor.serializeMessage({
+      method: 'delete',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/stream/' + streamId,
+      content: {}
+    });
+  };
 
-    return h;
+  OT.Raptor.Message.streams.offer = function (apiKey, sessionId, streamId, offerSdp) {
+    return OT.Raptor.serializeMessage({
+      method: 'offer',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/stream/' + streamId,
+      content: {
+        sdp: offerSdp
+      }
+    });
+  };
+
+  OT.Raptor.Message.streams.answer = function (apiKey, sessionId, streamId, answerSdp) {
+    return OT.Raptor.serializeMessage({
+      method: 'answer',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/stream/' + streamId,
+      content: {
+        sdp: answerSdp
+      }
+    });
+  };
+
+  OT.Raptor.Message.streams.candidate = function (apiKey, sessionId, streamId, candidate) {
+    return OT.Raptor.serializeMessage({
+      method: 'candidate',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/stream/' + streamId,
+      content: candidate
+    });
+  };
+
+  OT.Raptor.Message.streamChannels = {};
+  OT.Raptor.Message.streamChannels.update =
+    function (apiKey, sessionId, streamId, channelId, attributes) {
+    return OT.Raptor.serializeMessage({
+      method: 'update',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId + '/stream/' +
+        streamId + '/channel/' + channelId,
+      content: attributes
+    });
   };
 
 
-  this.error = null;
+  OT.Raptor.Message.subscribers = {};
 
-  if (options) {
-    if (options.hasOwnProperty('data')) {
-      this.data = OT.$.clone(options.data);
-      this.error = validateData(this.data);
-    }
+  OT.Raptor.Message.subscribers.create =
+    function (apiKey, sessionId, streamId, subscriberId, connectionId, channelsToSubscribeTo) {
+    var content = {
+      id: subscriberId,
+      connection: connectionId,
+      keyManagementMethod: OT.$.supportedCryptoScheme(),
+      bundleSupport: OT.$.supportsBundle(),
+      rtcpMuxSupport: OT.$.supportsRtcpMux()
+    };
+    if (channelsToSubscribeTo) content.channel = channelsToSubscribeTo;
 
-    if (options.hasOwnProperty('to')) {
-      if (!Array.isArray(options.to)) {
-        this.to = [options.to];
+    return OT.Raptor.serializeMessage({
+      method: 'create',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+        '/stream/' + streamId + '/subscriber/' + subscriberId,
+      content: content
+    });
+  };
+
+  OT.Raptor.Message.subscribers.destroy = function (apiKey, sessionId, streamId, subscriberId) {
+    return OT.Raptor.serializeMessage({
+      method: 'delete',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+        '/stream/' + streamId + '/subscriber/' + subscriberId,
+      content: {}
+    });
+  };
+
+  OT.Raptor.Message.subscribers.update =
+    function (apiKey, sessionId, streamId, subscriberId, attributes) {
+    return OT.Raptor.serializeMessage({
+      method: 'update',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+      '/stream/' + streamId + '/subscriber/' + subscriberId,
+      content: attributes
+    });
+  };
+
+
+  OT.Raptor.Message.subscribers.candidate =
+    function (apiKey, sessionId, streamId, subscriberId, candidate) {
+    return OT.Raptor.serializeMessage({
+      method: 'candidate',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+        '/stream/' + streamId + '/subscriber/' + subscriberId,
+      content: candidate
+    });
+  };
+
+  OT.Raptor.Message.subscribers.offer =
+    function (apiKey, sessionId, streamId, subscriberId, offerSdp) {
+    return OT.Raptor.serializeMessage({
+      method: 'offer',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+        '/stream/' + streamId + '/subscriber/' + subscriberId,
+      content: {
+        sdp: offerSdp
       }
-      else {
-        this.to = OT.$.clone(options.to);
+    });
+  };
+
+  OT.Raptor.Message.subscribers.answer =
+    function (apiKey, sessionId, streamId, subscriberId, answerSdp) {
+    return OT.Raptor.serializeMessage({
+      method: 'answer',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+      '/stream/' + streamId + '/subscriber/' + subscriberId,
+      content: {
+        sdp: answerSdp
       }
+    });
+  };
 
-      if (!this.error) this.error = validateTo(this.to)
-    }
 
-    if (options.hasOwnProperty('type')) {
-      if (!this.error) this.error = validateType(options.type)
-      this.type = options.type;
-    }
-  }
+  OT.Raptor.Message.subscriberChannels = {};
 
-  this.valid = this.error === null;
-};
+  OT.Raptor.Message.subscriberChannels.update =
+    function (apiKey, sessionId, streamId, subscriberId, channelId, attributes) {
+    return OT.Raptor.serializeMessage({
+      method: 'update',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+      '/stream/' + streamId + '/subscriber/' + subscriberId + '/channel/' + channelId,
+      content: attributes
+    });
+  };
+
+
+  OT.Raptor.Message.signals = {};
+
+  OT.Raptor.Message.signals.create = function (apiKey, sessionId, toAddress, type, data) {
+    var content = {};
+    if (type !== void 0) content.type = type;
+    if (data !== void 0) content.data = data;
+
+    return OT.Raptor.serializeMessage({
+      method: 'signal',
+      uri: '/v2/partner/' + apiKey + '/session/' + sessionId +
+        (toAddress !== void 0 ? '/connection/' + toAddress : '') + '/signal/' + OT.$.uuid(),
+      content: content
+    });
+  };
 
 }(this));
-(function(global) {
+!(function() {
 
+  var MAX_SIGNAL_DATA_LENGTH = 8192,
+      MAX_SIGNAL_TYPE_LENGTH = 128;
 
-function SignalError(code, reason, signal) {
-    this.code = code;
-    this.reason = reason;
-    this.signal = signal;
-}
-
-// The Dispatcher bit is purely to make testing simpler, it defaults to OT.Raptor.Dispatcher
-// so in normal operation you would omit it. Note: it takes a constructor, not an instance.
-OT.Raptor.Socket = function(widgetId, messagingServer, Dispatcher) {
-  var _socketUrl = OT.properties.messagingProtocol + "://" + messagingServer + ":" + OT.properties.messagingPort + "/rumorwebsocketsv2",
-      _symphony = "symphony." + messagingServer,
-      _sessionId,
-      _rumor,
-      _dispatcher,
-      _completion,
-      _capabilities = new OT.Capabilities([]),
-      _analytics = new OT.Analytics();
-
-
-  //// Private API
-  var setState = OT.$.statable(this, ['disconnected', 'connecting', 'connected', 'error', 'disconnecting'], 'disconnected'),
-
-      logAnalyticsEvent = function logAnalyticsEvent (variation, payloadType, payload, options) {
-        var event = {
-          action: 'Connect',
-          variation: variation,
-          payload_type: payloadType,
-          payload: payload,
-          session_id: _sessionId,
-          partner_id: OT.APIKEY,
-          widget_id: widgetId,
-          widget_type: 'Controller'
-        };
-
-        if (options) event = OT.$.extend(options, event);
-        _analytics.logEvent(event);
+  //
+  // Error Codes:
+  // 413 - Type too long
+  // 400 - Type is invalid
+  // 413 - Data too long
+  // 400 - Data is invalid (can't be parsed as JSON)
+  // 429 - Rate limit exceeded
+  // 500 - Websocket connection is down
+  // 404 - To connection does not exist
+  // 400 - To is invalid
+  //
+  OT.Signal = function(sessionId, fromConnectionId, options) {
+    var isInvalidType = function(type) {
+        // Our format matches the unreserved characters from the URI RFC:
+        // http://www.ietf.org/rfc/rfc3986
+        return !/^[a-zA-Z0-9\-\._~]+$/.exec(type);
       },
 
-      onConnectComplete = function onConnectComplete (error, sessionState, prefix) {
-        if (error) {
-          logAnalyticsEvent('Failure', "reason|webSocketServerUrl", prefix + error.code + ':' + error.message + '|' + _socketUrl);
+      validateTo = function(toAddress) {
+        if (!toAddress) {
+          return {
+            code: 400,
+            reason: 'The signal type was null or an empty String. Either set it to a non-empty ' +
+              'String value or omit it'
+          };
+        }
 
-          setState('error');
+        if ( !(toAddress instanceof OT.Connection || toAddress instanceof OT.Session) ) {
+          return {
+            code: 400,
+            reason: 'The To field was invalid'
+          };
+        }
+
+        return null;
+      },
+
+      validateType = function(type) {
+        var error = null;
+
+        if (type === null || type === void 0) {
+          error = {
+            code: 400,
+            reason: 'The signal type was null or undefined. Either set it to a String value or ' +
+              'omit it'
+          };
+        }
+        else if (type.length > MAX_SIGNAL_TYPE_LENGTH) {
+          error = {
+            code: 413,
+            reason: 'The signal type was too long, the maximum length of it is ' +
+              MAX_SIGNAL_TYPE_LENGTH + ' characters'
+          };
+        }
+        else if ( isInvalidType(type) ) {
+          error = {
+            code: 400,
+            reason: 'The signal type was invalid, it can only contain letters, ' +
+              'numbers, \'-\', \'_\', and \'~\'.'
+          };
+        }
+
+        return error;
+      },
+
+      validateData = function(data) {
+        var error = null;
+        if (data === null || data === void 0) {
+          error = {
+            code: 400,
+            reason: 'The signal data was null or undefined. Either set it to a String value or ' +
+              'omit it'
+          };
         }
         else {
-          logAnalyticsEvent('Success', "webSocketServerUrl", _socketUrl, {connectionId: _rumor.id});
-
-          setState('connected');
-          _capabilities = new OT.Capabilities(sessionState.permissions);
+          try {
+            if (JSON.stringify(data).length > MAX_SIGNAL_DATA_LENGTH) {
+              error = {
+                code: 413,
+                reason: 'The data field was too long, the maximum size of it is ' +
+                  MAX_SIGNAL_DATA_LENGTH + ' characters'
+              };
+            }
+          }
+          catch(e) {
+            error = {code: 400, reason: 'The data field was not valid JSON'};
+          }
         }
 
-        _completion.apply(null, arguments);
-      },
-
-      onClose = function onClose (err) {
-        var session = OT.sessions.get(_sessionId),
-            connection = session.connection,
-            reason = this.is('disconnecting') ? "clientDisconnected" : "networkDisconnected";
-
-        if(err && err.code == 4001) {
-          reason = "networkTimedout";
-        }
-
-        setState('disconnected');
-
-        if (!connection) return;
-
-        if (connection.destroyedReason) {
-          console.debug("OT.Raptor.Socket: Socket was closed but the connection had already been destroyed. Reason: " + connection.destroyedReason);
-          return;
-        }
-
-        connection.destroy( reason );
-      }.bind(this),
-
-      onError = function onError () {
-        // @todo what does having an error mean? Are they always fatal? Are we disconnected now?
+        return error;
       };
 
 
-  //// Public API
+    this.toRaptorMessage = function() {
+      var to = this.to;
+
+      if (to && typeof(to) !== 'string') {
+        to = to.id;
+      }
+
+      return OT.Raptor.Message.signals.create(OT.APIKEY, sessionId, to, this.type, this.data);
+    };
+
+    this.toHash = function() {
+      return options;
+    };
 
 
-  // Check whether this socket connection has permissions to perform a particular
-  // action.
-  this.permittedTo = function (action) {
-      return _capabilities[action] === 1;
-  };
+    this.error = null;
 
-  this.connect = function (token, sessionInfo, completion) {
-    if (!this.is('disconnected', 'error')) {
-      OT.warn("Cannot connect the Raptor Socket as it is currently connected. You should disconnect first.");
-      return;
+    if (options) {
+      if (options.hasOwnProperty('data')) {
+        this.data = OT.$.clone(options.data);
+        this.error = validateData(this.data);
+      }
+
+      if (options.hasOwnProperty('to')) {
+        this.to = options.to;
+
+        if (!this.error) {
+          this.error = validateTo(this.to);
+        }
+      }
+
+      if (options.hasOwnProperty('type')) {
+        if (!this.error) {
+          this.error = validateType(options.type);
+        }
+        this.type = options.type;
+      }
     }
 
-    setState('connecting');
-    _sessionId = sessionInfo.sessionId;
-    _completion = completion;
+    this.valid = this.error === null;
+  };
 
-    var connectionId = OT.$.uuid(),
-        session = OT.sessions.get(_sessionId);
+}(this));
+!(function() {
+
+  function SignalError(code, reason) {
+    this.code = code;
+    this.reason = reason;
+  }
+
+  // The Dispatcher bit is purely to make testing simpler, it defaults to a new OT.Raptor.Dispatcher
+  // so in normal operation you would omit it.
+  OT.Raptor.Socket = function(widgetId, messagingSocketUrl, symphonyUrl, dispatcher) {
+    var _states = ['disconnected', 'connecting', 'connected', 'error', 'disconnecting'],
+        _sessionId,
+        _token,
+        _rumor,
+        _dispatcher,
+        _completion;
 
 
-    var analyticsPayload = [_socketUrl, navigator.userAgent, OT.properties.version, window.externalHost ? "yes" : "no"];
-    logAnalyticsEvent(
-      'Attempt',
-      "webSocketServerUrl|userAgent|sdkVersion|chromeFrame",
-      analyticsPayload.map(function(e) { return e.replace('|', '\\|'); }).join('|')
-    );
+    //// Private API
+    var setState = OT.$.statable(this, _states, 'disconnected'),
 
-    _rumor = new OT.Rumor.Socket(_socketUrl, _symphony);
-    _rumor.onClose = onClose;
-    _rumor.onMessage = _dispatcher.dispatch.bind(_dispatcher);
+        onConnectComplete = function onConnectComplete (error) {
+          if (error) {
+            setState('error');
+          }
+          else {
+            setState('connected');
+          }
 
-    _rumor.connect(connectionId, function(error) {
-      if (error) {
-        onConnectComplete(error, null, "RumorConnection:");
+          _completion.apply(null, arguments);
+        },
+
+        onClose = function onClose (err) {
+          var reason = this.is('disconnecting') ? 'clientDisconnected' : 'networkDisconnected';
+
+          if(err && err.code === 4001) {
+            reason = 'networkTimedout';
+          }
+
+          setState('disconnected');
+
+          _dispatcher.onClose(reason);
+
+        }.bind(this),
+
+        onError = function onError () {};
+        // @todo what does having an error mean? Are they always fatal? Are we disconnected now?
+
+
+    //// Public API
+
+    this.connect = function (token, sessionInfo, completion) {
+      if (!this.is('disconnected', 'error')) {
+        OT.warn('Cannot connect the Raptor Socket as it is currently connected. You should ' +
+          'disconnect first.');
         return;
       }
 
-      // we do this here to avoid getting connect errors twice
-      _rumor.onError = onError;
+      setState('connecting');
+      _sessionId = sessionInfo.sessionId;
+      _token = token;
+      _completion = completion;
 
-      OT.debug("Raptor Socket connected to " + _sessionId + " on " + messagingServer);
+      var connectionId = OT.$.uuid(),
+          rumorChannel = '/v2/partner/' + OT.APIKEY + '/session/' + _sessionId;
 
-      _rumor.subscribe([_sessionId]);
+      _rumor = new OT.Rumor.Socket(messagingSocketUrl, symphonyUrl);
+      _rumor.onClose = onClose;
+      _rumor.onMessage = _dispatcher.dispatch.bind(_dispatcher);
 
-      //connect to session
-      var connectMessage = OT.Raptor.Message.connect(widgetId, _rumor.id, _sessionId, OT.APIKEY, token, sessionInfo.p2pEnabled);
-      this.publish(connectMessage);
-    }.bind(this));
-  };
+      _rumor.connect(connectionId, function(error) {
+        if (error) {
+          error.message = 'WebSocketConnection:' + error.code + ':' + error.message;
+          onConnectComplete(error);
+          return;
+        }
+
+        // we do this here to avoid getting connect errors twice
+        _rumor.onError = onError;
+
+        OT.debug('Raptor Socket connected. Subscribing to ' +
+          rumorChannel + ' on ' + messagingSocketUrl);
+
+        _rumor.subscribe([rumorChannel]);
+
+        //connect to session
+        var connectMessage = OT.Raptor.Message.connections.create(OT.APIKEY, _sessionId, _rumor.id);
+        this.publish(connectMessage, {'X-TB-TOKEN-AUTH': _token}, function(error) {
+          if (error) {
+            error.message = 'ConnectToSession:' + error.code +
+                ':Received error response to connection create message.';
+            onConnectComplete(error);
+            return;
+          }
+
+          this.publish( OT.Raptor.Message.sessions.get(OT.APIKEY, _sessionId),
+            function (error) {
+            if (error) error.message = 'GetSessionState:' + error.code +
+                      ':Received error response to session read';
+            onConnectComplete.apply(null, arguments);
+          });
+        }.bind(this));
+
+      }.bind(this));
+    };
 
 
-  this.disconnect = function () {
-    if (this.is('disconnected')) return;
+    this.disconnect = function () {
+      if (this.is('disconnected')) return;
 
-    setState('disconnecting');
-    _rumor.disconnect();
-  };
+      setState('disconnecting');
+      _rumor.disconnect();
+    };
 
-  // Publishs +message+ to the Symphony app server.
-  this.publish = function (message) {
-    if (_rumor.isNot('connected')) {
-      OT.error("OT.Raptor.Socket: cannot publish until the socket is connected." + message);
-      return;
-    }
-
-    OT.debug("OT.Raptor.Socket Publish: " + message);
-    _rumor.publish([_symphony], message);
-  };
-
-  // Register a new stream against _sessionId
-  this.createStream = function(publisherId, name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo) {
-    var session = OT.sessions.get(_sessionId),
-        message = OT.Raptor.Message.streamCreate( _rumor.id,
-                                                  _sessionId,
-                                                  publisherId,
-                                                  name,
-                                                  orientation,
-                                                  encodedWidth,
-                                                  encodedHeight,
-                                                  hasAudio,
-                                                  hasVideo,
-                                                  session.sessionInfo.p2pEnabled );
-
-    this.publish(message);
-  };
-
-  this.updateStream = function(streamId, key, value) {
-    this.publish( OT.Raptor.Message.streamModify(_rumor.id, _sessionId, streamId, key, value) );
-  };
-
-  this.destroyStream = function(streamId) {
-    this.publish( OT.Raptor.Message.streamDestroy(_rumor.id, _sessionId, streamId) );
-  };
-
-  this.modifySubscriber = function(subscriber, key, value) {
-    this.publish( OT.Raptor.Message.subscriberModify(_rumor.id, _sessionId, subscriber.streamId, subscriber.widgetId, key, value) );
-  };
-
-  this.forceDisconnect = function(connectionIdToDisconnect) {
-    this.publish( OT.Raptor.Message.forceDisconnect(_rumor.id, connectionIdToDisconnect, _sessionId) );
-  };
-
-  this.forceUnpublish = function(streamId) {
-    this.publish( OT.Raptor.Message.forceUnpublish(_rumor.id, _sessionId, streamId) );
-  };
-
-  this.jsepSubscribe = function(toConnectionId, streamId, subscribeToVideo, subscribeToAudio) {
-    this.publish( OT.Raptor.Message.jsepSubscribe(_rumor.id, toConnectionId, streamId, subscribeToVideo, subscribeToAudio) );
-  };
-
-  this.jsepUnsubscribe = function(toConnectionId, streamId) {
-    this.publish( OT.Raptor.Message.jsepUnsubscribe(_rumor.id, toConnectionId, streamId) );
-  };
-
-  this.jsepCandidate = function(toConnectionId, streamId, candidate) {
-    this.publish( OT.Raptor.Message.jsepCandidate(_rumor.id, toConnectionId, streamId, candidate) );
-  };
-
-  this.jsepOffer = function(toConnectionId, streamId, offerSDP) {
-    this.publish( OT.Raptor.Message.jsepOffer(_rumor.id, toConnectionId, streamId, offerSDP) );
-  };
-
-  this.jsepAnswer = function(toConnectionId, streamId, answerSDP) {
-    this.publish( OT.Raptor.Message.jsepAnswer(_rumor.id, toConnectionId, streamId, answerSDP) );
-  };
-
-
-  this.signal = function(options, completion) {
-    var signal = new OT.Signal(_sessionId, _rumor.id, options || {});
-
-    if (!signal.valid) {
-      if (completion && OT.$.isFunction(completion)) {
-        completion( new SignalError(signal.error.code, signal.error.reason, signal.toHash()) );
+    // Publishs +message+ to the Symphony app server.
+    //
+    // The completion handler is optional, as is the headers
+    // dict, but if you provide the completion handler it must
+    // be the last argument.
+    //
+    this.publish = function (message, headers, completion) {
+      if (_rumor.isNot('connected')) {
+        OT.error('OT.Raptor.Socket: cannot publish until the socket is connected.' + message);
+        return;
       }
 
-      return;
+      var transactionId = OT.$.uuid(),
+          _headers = {},
+          _completion;
+
+      // Work out if which of the optional arguments (headers, completion)
+      // have been provided.
+      if (headers) {
+        if (OT.$.isFunction(headers)) {
+          _headers = {};
+          _completion = headers;
+        }
+        else {
+          _headers = headers;
+        }
+      }
+      if (!_completion && completion && OT.$.isFunction(completion)) _completion = completion;
+
+
+      if (_completion) _dispatcher.registerCallback(transactionId, _completion);
+
+      OT.debug('OT.Raptor.Socket Publish (ID:' + transactionId + ') ');
+      OT.debug(message);
+
+      _rumor.publish([symphonyUrl], message, OT.$.extend(_headers, {
+        'Content-Type': 'application/x-raptor+v2',
+        'TRANSACTION-ID': transactionId,
+        'X-TB-FROM-ADDRESS': _rumor.id
+      }));
+
+      return transactionId;
+    };
+
+    // Register a new stream against _sessionId
+    this.streamCreate = function(name, orientation, encodedWidth, encodedHeight,
+      hasAudio, hasVideo, frameRate, minBitrate, maxBitrate, completion) {
+      var streamId = OT.$.uuid(),
+          message = OT.Raptor.Message.streams.create( OT.APIKEY,
+                                                      _sessionId,
+                                                      streamId,
+                                                      name,
+                                                      orientation,
+                                                      encodedWidth,
+                                                      encodedHeight,
+                                                      hasAudio,
+                                                      hasVideo,
+                                                      frameRate,
+                                                      minBitrate,
+                                                      maxBitrate);
+
+      this.publish(message, function(error) {
+        completion(error, streamId);
+      });
+    };
+
+    this.streamDestroy = function(streamId) {
+      this.publish( OT.Raptor.Message.streams.destroy(OT.APIKEY, _sessionId, streamId) );
+    };
+
+    this.streamChannelUpdate = function(streamId, channelId, attributes) {
+      this.publish( OT.Raptor.Message.streamChannels.update(OT.APIKEY, _sessionId,
+        streamId, channelId, attributes) );
+    };
+
+    this.subscriberCreate = function(streamId, subscriberId, channelsToSubscribeTo, completion) {
+      this.publish( OT.Raptor.Message.subscribers.create(OT.APIKEY, _sessionId,
+        streamId, subscriberId, _rumor.id, channelsToSubscribeTo), completion );
+    };
+
+    this.subscriberDestroy = function(streamId, subscriberId) {
+      this.publish( OT.Raptor.Message.subscribers.destroy(OT.APIKEY, _sessionId,
+        streamId, subscriberId) );
+    };
+
+    this.subscriberUpdate = function(streamId, subscriberId, attributes) {
+      this.publish( OT.Raptor.Message.subscribers.update(OT.APIKEY, _sessionId,
+        streamId, subscriberId, attributes) );
+    };
+
+    this.subscriberChannelUpdate = function(streamId, subscriberId, channelId, attributes) {
+      this.publish( OT.Raptor.Message.subscriberChannels.update(OT.APIKEY, _sessionId,
+        streamId, subscriberId, channelId, attributes) );
+    };
+
+    this.forceDisconnect = function(connectionIdToDisconnect, completion) {
+      this.publish( OT.Raptor.Message.connections.destroy(OT.APIKEY, _sessionId,
+        connectionIdToDisconnect), completion );
+    };
+
+    this.forceUnpublish = function(streamIdToUnpublish, completion) {
+      this.publish( OT.Raptor.Message.streams.destroy(OT.APIKEY, _sessionId,
+        streamIdToUnpublish), completion );
+    };
+
+    this.jsepCandidate = function(streamId, candidate) {
+      this.publish(
+        OT.Raptor.Message.streams.candidate(OT.APIKEY, _sessionId, streamId, candidate)
+      );
+    };
+
+    this.jsepCandidateP2p = function(streamId, subscriberId, candidate) {
+      this.publish(
+        OT.Raptor.Message.subscribers.candidate(OT.APIKEY, _sessionId, streamId,
+          subscriberId, candidate)
+      );
+    };
+
+    this.jsepOffer = function(streamId, offerSdp) {
+      this.publish( OT.Raptor.Message.streams.offer(OT.APIKEY, _sessionId, streamId, offerSdp) );
+    };
+
+    this.jsepOfferP2p = function(streamId, subscriberId, offerSdp) {
+      this.publish( OT.Raptor.Message.subscribers.offer(OT.APIKEY, _sessionId, streamId,
+        subscriberId, offerSdp) );
+    };
+
+    this.jsepAnswer = function(streamId, answerSdp) {
+      this.publish( OT.Raptor.Message.streams.answer(OT.APIKEY, _sessionId, streamId, answerSdp) );
+    };
+
+    this.jsepAnswerP2p = function(streamId, subscriberId, answerSdp) {
+      this.publish( OT.Raptor.Message.subscribers.answer(OT.APIKEY, _sessionId, streamId,
+        subscriberId, answerSdp) );
+    };
+
+    this.signal = function(options, completion) {
+      var signal = new OT.Signal(_sessionId, _rumor.id, options || {});
+
+      if (!signal.valid) {
+        if (completion && OT.$.isFunction(completion)) {
+          completion( new SignalError(signal.error.code, signal.error.reason), signal.toHash() );
+        }
+
+        return;
+      }
+
+      this.publish( signal.toRaptorMessage(), function(err) {
+        var error;
+        if (err) error = new SignalError(err.code, err.message);
+
+        if (completion && OT.$.isFunction(completion)) completion(error, signal.toHash());
+      });
+    };
+
+    OT.$.defineGetters(this, {
+      id: function() {
+        return _rumor && _rumor.id;
+      },
+      sessionId: function() {
+        return _sessionId;
+      },
+      dispatcher: function() {
+        return _dispatcher;
+      }
+    });
+
+    if(dispatcher == null) {
+      dispatcher = new OT.Raptor.Dispatcher();
     }
-
-    this.publish( signal.toRaptorMessage() );
-    if (completion && OT.$.isFunction(completion)) completion(null, signal.toHash());
+    _dispatcher = dispatcher;
   };
 
-  OT.$.defineGetters(this, {
-    id: function() { return _rumor.id; },
-    capabilities: function() { return _capabilities; },
-    sessionId: function() { return _sessionId; }
-  });
-
-  _dispatcher = new (Dispatcher || OT.Raptor.Dispatcher)(this, function (error, sessionState) {
-    onConnectComplete.call(this, error, sessionState, "ConnectToSession:");
-  });
-};
-
-
 }(this));
-(function(global) {
+!(function() {
+  /*global EventEmitter, util*/
 
-// Connect error codes and reasons that Raptor can return.
-var connectErrorReasons = {
-  409: "This P2P session already has 2 participants.",
-  410: "The session already has four participants.",
-  1004: "The token passed is invalid."
-};
+  // Connect error codes and reasons that Raptor can return.
+  var connectErrorReasons;
+
+  connectErrorReasons = {
+    409: 'This P2P session already has 2 participants.',
+    410: 'The session already has four participants.',
+    1004: 'The token passed is invalid.'
+  };
 
 
-// @todo hide these
-OT.publishers = new OT.Collection('guid');          // Publishers are id'd by their guid
-OT.subscribers = new OT.Collection('widgetId');     // Subscribers are id'd by their widgetId
-OT.sessions = new OT.Collection();
+  OT.Raptor.Dispatcher = function () {
 
-function parseStream(dict, session) {
-  var stream = new OT.Stream( dict.streamId,
-                              session.connections.get(dict.connection.connectionId),
-                              dict.name,
-                              dict.streamData,
-                              dict.type,
-                              dict.creationTime,
-                              dict.hasAudio,
-                              dict.hasVideo,
-                              dict.orientation ? dict.orientation.videoOrientation : null,
-                              dict.peerId,
-                              dict.quality,
-                              dict.orientation ? dict.orientation.width : null,
-                              dict.orientation ? dict.orientation.height : null );
+    if(typeof EventEmitter !== 'undefined') {
+      EventEmitter.call(this);
+    } else {
+      OT.$.eventing(this, true);
+      this.emit = this.trigger;
+    }
 
-  // This is a code smell, but it's necessary for now as the part of the code
-  // that re-parents streams to publishers is in a different object that cannot
-  // access the raw stream packet
-  if (dict.publisherId) {
-    stream.publisherId = dict.publisherId;
+    this.callbacks = {};
+  };
+
+  if(typeof EventEmitter !== 'undefined') {
+    util.inherits(OT.Raptor.Dispatcher, EventEmitter);
   }
 
-  return stream;
-}
+  OT.Raptor.Dispatcher.prototype.registerCallback = function (transactionId, completion) {
+    this.callbacks[transactionId] = completion;
+  };
 
-function parseAndAddStreamToSession(dict, session) {
-  if (session.streams.has(dict.streamId)) return;
+  OT.Raptor.Dispatcher.prototype.triggerCallback = function (transactionId) {
+    /*, arg1, arg2, argN-1, argN*/
+    if (!transactionId) return;
 
-  var stream = parseStream(dict, session);
-  session.streams.add( stream );
+    var completion = this.callbacks[transactionId];
 
-  return stream;
-}
+    if (completion && OT.$.isFunction(completion)) {
+      var args = Array.prototype.slice.call(arguments);
+      args.shift();
+
+      completion.apply(null, args);
+    }
+
+    delete this.callbacks[transactionId];
+  };
+
+  OT.Raptor.Dispatcher.prototype.onClose = function(reason) {
+    this.trigger('close', reason);
+  };
 
 
-OT.Raptor.Dispatcher = function (socket, connectionCompletion) {
-  this.socket = socket;
-  this.connectionCompletion = connectionCompletion;
-};
+  OT.Raptor.Dispatcher.prototype.dispatch = function(rumorMessage) {
+    // The special casing of STATUS messages is ugly. Need to think about
+    // how to better integrate this.
 
-OT.Raptor.Dispatcher.prototype.dispatch = function(addresses, encodedMessage) {
-  var message = OT.Raptor.deserializeMessage(encodedMessage);
+    if (rumorMessage.type === OT.Rumor.MessageType.STATUS) {
+      OT.debug('OT.Raptor.dispatch: STATUS');
+      OT.debug(rumorMessage);
 
-  if (!message.typeName) {
-    OT.error("OT.Raptor.dispatch: Invalid message type (" + message.type + ")");
-    return;
-  }
+      var error;
 
-  if (!message.actionName) {
-    OT.error("OT.Raptor.dispatch: Invalid action (" + message.action + ") for " + message.typeName);
-    OT.error(message);
-    return;
-  }
-
-  OT.debug("OT.Raptor.dispatch " + message.signature + ": " + encodedMessage);
-
-  switch(message.type) {
-    case OT.Raptor.Types.RPC_RESPONSE:
-      this.dispatchRPCResponse(message);
-      break;
-
-    case OT.Raptor.Types.CONNECTION:
-      this.dispatchConnection(message);
-      break;
-
-    case OT.Raptor.Types.CONNECTIONCOUNT:
-      this.dispatchConnectionCount(message);
-      break;
-
-    case OT.Raptor.Types.STREAM:
-      this.dispatchStream(message);
-      break;
-
-    case OT.Raptor.Types.SUBSCRIBER:
-      this.dispatchSubscriber(message);
-      break;
-
-    case OT.Raptor.Types.MODERATION:
-      this.dispatchModeration(message);
-      break;
-
-    case OT.Raptor.Types.JSEP:
-      this.dispatchJsep(message);
-      break;
-
-    case OT.Raptor.Types.SIGNAL:
-      this.dispatchSignal(message);
-      break;
-
-
-
-    default:
-      OT.warn("OT.Raptor.dispatch: Type " + message.typeName + " is not currently implemented");
-  }
-};
-
-
-OT.Raptor.Dispatcher.prototype.dispatchRPCResponse = function (message) {
-  switch (message.action) {
-    case OT.Raptor.Actions.CONNECT:
-      if (message.payload.connectSuccess == false) {
-        var error = new OT.Error(OT.ExceptionCodes.CONNECT_REJECTED, connectErrorReasons[message.payload.reason] || "Failed to connect");
-        this.connectionCompletion.call(null, error);
+      if (rumorMessage.isError) {
+        // error = new OT.Error(OT.ExceptionCodes.CONNECT_REJECTED,
+        //   connectErrorReasons[message.payload.reason] || "Failed to connect");
+        // @todo This is wrong. We don't know what operation was actually failing,
+        //        we can only blindly trigger the completion handler
+        error = new OT.Error(rumorMessage.status);
       }
-      else {
-        this.socket.publish(OT.Raptor.Message.getSessionState(this.socket.id, message.payload.sessionId, true));
+
+      this.triggerCallback(rumorMessage.transactionId, error, rumorMessage);
+
+      return;
+    }
+
+    var message = OT.Raptor.unboxFromRumorMessage(rumorMessage);
+    OT.debug('OT.Raptor.dispatch ' + message.signature);
+    OT.debug(message);
+
+    switch(message.resource) {
+      case 'session':
+        this.dispatchSession(message);
+        break;
+
+      case 'connection':
+        this.dispatchConnection(message);
+        break;
+
+      case 'stream':
+        this.dispatchStream(message);
+        break;
+
+      case 'stream_channel':
+        this.dispatchStreamChannel(message);
+        break;
+
+      case 'subscriber':
+        this.dispatchSubscriber(message);
+        break;
+
+      case 'subscriber_channel':
+        this.dispatchSubscriberChannel(message);
+        break;
+
+      case 'signal':
+        this.dispatchSignal(message);
+        break;
+
+      case 'archive':
+        this.dispatchArchive(message);
+        break;
+
+      default:
+        OT.warn('OT.Raptor.dispatch: Type ' + message.resource + ' is not currently implemented');
+    }
+  };
+
+  OT.Raptor.Dispatcher.prototype.dispatchSession = function (message) {
+    switch (message.method) {
+      case 'read':
+
+        this.emit('session#read', message.content, message.transactionId);
+        break;
+
+
+      default:
+        OT.warn('OT.Raptor.dispatch: ' + message.signature + ' is not currently implemented');
+    }
+  };
+
+  OT.Raptor.Dispatcher.prototype.dispatchConnection = function (message) {
+
+    switch (message.method) {
+      case 'created':
+        this.emit('connection#created', message.content);
+        break;
+
+
+      case 'deleted':
+        this.emit('connection#deleted', message.params.connection, message.reason);
+        break;
+
+      default:
+        OT.warn('OT.Raptor.dispatch: ' + message.signature + ' is not currently implemented');
+    }
+  };
+
+  OT.Raptor.Dispatcher.prototype.dispatchStream = function (message) {
+
+    switch (message.method) {
+      case 'created':
+        this.emit('stream#created', message.content, message.transactionId);
+        break;
+
+      case 'deleted':
+        this.emit('stream#deleted', message.params.stream,
+          message.reason);
+        break;
+
+
+      case 'updated':
+        this.emit('stream#updated', message.params.stream,
+          message.content);
+        break;
+
+
+      // The JSEP process
+      case 'generateoffer':
+      case 'answer':
+      case 'pranswer':
+      case 'offer':
+      case 'candidate':
+        this.dispatchJsep(message.method, message);
+        break;
+
+      default:
+        OT.warn('OT.Raptor.dispatch: ' + message.signature + ' is not currently implemented');
+    }
+  };
+
+  OT.Raptor.Dispatcher.prototype.dispatchStreamChannel = function (message) {
+    switch (message.method) {
+      case 'updated':
+        this.emit('streamChannel#updated', message.params.stream,
+          message.params.channel, message.content);
+        break;
+
+      default:
+        OT.warn('OT.Raptor.dispatch: ' + message.signature + ' is not currently implemented');
+    }
+  };
+
+  // Dispatch JSEP messages
+  //
+  // generateoffer:
+  // Request to generate a offer for another Peer (or Prism). This kicks
+  // off the JSEP process.
+  //
+  // answer:
+  // generate a response to another peers offer, this contains our constraints
+  // and requirements.
+  //
+  // pranswer:
+  // a provisional answer, i.e. not the final one.
+  //
+  // candidate
+  //
+  //
+  OT.Raptor.Dispatcher.prototype.dispatchJsep = function (method, message) {
+    this.emit('jsep#' + method, message.params.stream, message.fromAddress, message);
+  };
+
+
+  OT.Raptor.Dispatcher.prototype.dispatchSubscriberChannel = function (message) {
+    switch (message.method) {
+      case 'updated':
+        this.emit('subscriberChannel#updated', message.params.stream,
+          message.params.channel, message.content);
+        break;
+
+
+      case 'update': // subscriberId, streamId, content
+        this.emit('subscriberChannel#update', message.params.subscriber,
+          message.params.stream, message.content);
+        break;
+
+
+      default:
+        OT.warn('OT.Raptor.dispatch: ' + message.signature + ' is not currently implemented');
+    }
+  };
+
+  OT.Raptor.Dispatcher.prototype.dispatchSubscriber = function (message) {
+
+    switch (message.method) {
+      case 'created':
+        this.emit('subscriber#created', message.params.stream, message.fromAddress,
+          message.content.id);
+        break;
+
+
+      case 'deleted':
+        this.dispatchJsep('unsubscribe', message);
+        this.emit('subscriber#deleted', message.params.stream,
+          message.fromAddress);
+        break;
+
+
+      // The JSEP process
+      case 'generateoffer':
+      case 'answer':
+      case 'pranswer':
+      case 'offer':
+      case 'candidate':
+        this.dispatchJsep(message.method, message);
+        break;
+
+
+      default:
+        OT.warn('OT.Raptor.dispatch: ' + message.signature + ' is not currently implemented');
+    }
+  };
+
+  OT.Raptor.Dispatcher.prototype.dispatchSignal = function (message) {
+    if (message.method !== 'signal') {
+      OT.warn('OT.Raptor.dispatch: ' + message.signature + ' is not currently implemented');
+      return;
+    }
+    this.emit('signal', message.fromAddress, message.content.type,
+      message.content.data);
+  };
+
+  OT.Raptor.Dispatcher.prototype.dispatchArchive = function (message) {
+    switch (message.method) {
+      case 'create':
+        this.emit('archive#create', message.content);
+        break;
+      
+      case 'updated':
+        this.emit('archive#updated', message.params.archive, message.content);
+        break;
+    }
+  };
+
+}(this));
+(function(window) {
+
+  // @todo hide these
+  OT.publishers = new OT.Collection('guid');          // Publishers are id'd by their guid
+  OT.subscribers = new OT.Collection('widgetId');     // Subscribers are id'd by their widgetId
+  OT.sessions = new OT.Collection();
+
+  function parseStream(dict, session) {
+    var channel = dict.channel.map(function(channel) {
+      return new OT.StreamChannel(channel);
+    });
+
+    return  new OT.Stream(  dict.id,
+                            dict.name,
+                            dict.creationTime,
+                            session.connections.get(dict.connection.id),
+                            session,
+                            channel );
+  }
+
+  function parseAndAddStreamToSession(dict, session) {
+    if (session.streams.has(dict.id)) return;
+
+    var stream = parseStream(dict, session);
+    session.streams.add( stream );
+
+    return stream;
+  }
+
+  function parseArchive(dict) {
+    return new OT.Archive( dict.id,
+                           dict.name,
+                           dict.status );
+  }
+
+  function parseAndAddArchiveToSession(dict, session) {
+    if (session.archives.has(dict.id)) return;
+
+    var archive = parseArchive(dict);
+    session.archives.add(archive);
+
+    return archive;
+  }
+
+  window.OT.SessionDispatcher = function(session) {
+
+    var dispatcher = new OT.Raptor.Dispatcher();
+
+    dispatcher.on('close', function(reason) {
+
+      var connection = session.connection;
+
+      if (!connection) {
+        return;
       }
-      break;
 
+      if (connection.destroyedReason) {
+        OT.debug('OT.Raptor.Socket: Socket was closed but the connection had already ' +
+          'been destroyed. Reason: ' + connection.destroyedReason);
+        return;
+      }
 
-    case OT.Raptor.Actions.STATE:
-      var state = message.payload.value,
-          session = OT.sessions.get(message.payload.key),
+      connection.destroy( reason );
+
+    });
+
+    dispatcher.on('session#read', function(content, transactionId) {
+
+      var state = {},
           connection;
 
       state.streams = [];
       state.connections = [];
       state.archives = [];
 
-      if (state.hasOwnProperty("CONNECTIONS")) {
-        for (var id in state.CONNECTIONS) {
-          var connection = OT.Connection.fromHash(state.CONNECTIONS[id]);
-          state.connections.push(connection);
-          session.connections.add(connection)
-        }
+      content.connection.forEach(function(connectionParams) {
+        connection = OT.Connection.fromHash(connectionParams);
+        state.connections.push(connection);
+        session.connections.add(connection);
+      });
 
-        delete state.CONNECTIONS;
+      content.stream.forEach(function(streamParams) {
+        state.streams.push( parseAndAddStreamToSession(streamParams, session) );
+      });
+      
+      content.archives.forEach(function(archiveParams) {
+        state.archives.push( parseAndAddArchiveToSession(archiveParams, session) );
+      });
+
+      session._.subscriberMap = {};
+
+      dispatcher.triggerCallback(transactionId, null, state);
+    });
+
+    dispatcher.on('connection#created', function(connection) {
+      connection = OT.Connection.fromHash(connection);
+      if (session.connection && connection.id !== session.connection.id) {
+        session.connections.add( connection );
+      }
+    });
+
+    dispatcher.on('connection#deleted', function(connection, reason) {
+      connection = session.connections.get(connection);
+      connection.destroy(reason);
+    });
+
+    dispatcher.on('stream#created', function(stream, transactionId) {
+      stream = parseAndAddStreamToSession(stream, session);
+
+      if (stream.publisher) {
+        stream.publisher.stream = stream;
       }
 
-      if (state.hasOwnProperty("STREAMS")) {
-        for (var id in state.STREAMS) {
-          state.streams.push( parseAndAddStreamToSession(state.STREAMS[id], session) );
-        }
+      dispatcher.triggerCallback(transactionId, null, stream);
+    });
 
-        delete state.STREAMS;
-      }
-
-
-      this.connectionCompletion.call(null, null, state);
-      break;
-
-
-    default:
-      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-  }
-};
-
-
-OT.Raptor.Dispatcher.prototype.dispatchConnection = function (message) {
-  var session = OT.sessions.get(message.payload.value.sessionId),
-      connection;
-
-  if (!session) {
-    OT.error("OT.Raptor.dispatch: Unable to determine session for " + message.payload.value.sessionId + ' on ' + message.signature + " message!");
-    // @todo error
-    return;
-  }
-
-  switch (message.action) {
-    case OT.Raptor.Actions.CREATE:
-      connection = OT.Connection.fromHash(message.payload.value);
-      if (session.connection && connection.id !== session.connection.id) session.connections.add( connection );
-      break;
-
-
-    case OT.Raptor.Actions.DELETE:
-      connection = session.connections.get(message.payload.value.connectionId);
-      connection.destroy(message.payload.reason);
-      break;
-
-
-    default:
-      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-  }
-};
-
-OT.Raptor.Dispatcher.prototype.dispatchConnectionCount = function (message) {
-  // Note: we don't use any of this in the client right now.
-
-  // switch (message.action) {
-  //   case OT.Raptor.Actions.UPDATE:
-  //     connectionCount = message.payload.value;
-  //     OT.debug("OT.Raptor.dispatch: Connection count: " + connectionCount);
-  //     break;
-
-
-  //   default:
-  //     OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-  // }
-};
-
-
-OT.Raptor.Dispatcher.prototype.dispatchStream = function (message) {
-  var key = message.payload.key.split('/'),
-      sessionId = key[0],
-      session,
-      stream;
-
-
-  if (sessionId) session = OT.sessions.get(sessionId);
-
-  if (!session) {
-    OT.error("OT.Raptor.dispatch: Unable to determine sessionId, or the session does not exist, for " + message.signature + " message!");
-    // @todo error
-    return;
-  }
-
-  switch (message.action) {
-    case OT.Raptor.Actions.REGISTER:
-      stream = parseStream(message.payload.value, session);
-
-      // @todo refactor this later
-      if (stream.publisherId) {
-        var publisher = OT.publishers.get(stream.publisherId);
-
-        if (publisher) {
-          publisher._.streamRegisteredHandler(stream);
-        }
-        else {
-          OT.warn("OT.Raptor.dispatch: Could find a publisher " + stream.publisherId + " for " + message.signature);
-        }
-      }
-      break;
-
-
-    case OT.Raptor.Actions.CREATE:
-      parseAndAddStreamToSession(message.payload.value, session)
-      break;
-
-
-    case OT.Raptor.Actions.UPDATE:
-      if (key[1]) stream = session.streams.get(key[1]);
+    dispatcher.on('stream#deleted', function(streamId, reason) {
+      var stream = session.streams.get(streamId);
 
       if (!stream) {
-        OT.error("OT.Raptor.dispatch: Unable to determine streamId, or the stream does not exist, for " + message.signature + " message!");
+        OT.error('OT.Raptor.dispatch: A stream does not exist with the id of ' +
+          streamId + ', for stream#deleted message!');
         // @todo error
         return;
       }
 
-      stream.update(key[2], message.payload.value);
-      break;
+      stream.destroy(reason);
+    });
 
-
-    case OT.Raptor.Actions.DELETE:
-      if (key[2]) stream = session.streams.get(key[2]);
+    dispatcher.on('stream#updated', function(streamId, content) {
+      var stream = session.streams.get(streamId);
 
       if (!stream) {
-        OT.error("OT.Raptor.dispatch: Unable to determine streamId, or the stream does not exist, for " + message.signature + " message!");
+        OT.error('OT.Raptor.dispatch: A stream does not exist with the id of ' +
+          streamId + ', for stream#updated message!');
         // @todo error
         return;
       }
 
-      stream.destroy(message.payload.reason);
-      break;
+      stream._.update(content);
+
+    });
+
+    dispatcher.on('streamChannel#updated', function(streamId, channelId, content) {
+      var stream;
+      if (!(streamId && (stream = session.streams.get(streamId)))) {
+        OT.error('OT.Raptor.dispatch: Unable to determine streamId, or the stream does not ' +
+          'exist, for streamChannel message!');
+        // @todo error
+        return;
+      }
+      stream._.updateChannel(channelId, content);
+    });
+
+    // Dispatch JSEP messages
+    //
+    // generateoffer:
+    // Request to generate a offer for another Peer (or Prism). This kicks
+    // off the JSEP process.
+    //
+    // answer:
+    // generate a response to another peers offer, this contains our constraints
+    // and requirements.
+    //
+    // pranswer:
+    // a provisional answer, i.e. not the final one.
+    //
+    // candidate
+    //
+    //
+    var jsepHandler = function(method, streamId, fromAddress, message) {
+
+      var fromConnection,
+          actors;
+
+      switch (method) {
+        // Messages for Subscribers
+        case 'offer':
+          actors = [];
+          var subscriber = OT.subscribers.find({streamId: streamId});
+          if (subscriber) actors.push(subscriber);
+          break;
 
 
-    default:
-      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-  }
-};
+        // Messages for Publishers
+        case 'answer':
+        case 'pranswer':
+        case 'generateoffer':
+        case 'unsubscribe':
+          console.warn('generateoffer maybe?');
+          actors = OT.publishers.where({streamId: streamId});
+          break;
 
 
-
-OT.Raptor.Dispatcher.prototype.dispatchModeration = function (message) {
-  // Force disconnect and unpublish are handled in CONNECTION:DELETE and STREAM:DELETE respectively.
-  return;
-
-  // var session = OT.sessions.get(this.socket.sessionId);
-
-  // if (!session) {
-  //     OT.error("OT.Raptor.dispatch: " + message.signature + " ERROR - sessionId must be provided and be valid");
-  //     return;
-  // }
-
-  // switch (message.action) {
-  //   case OT.Raptor.Actions.FORCE_DISCONNECT:
-  //     if (!message.payload.connectionId) {
-  //         OT.error("OT.Raptor.dispatch: " + message.signature + " ERROR - connectionId must be provided");
-  //         return;
-  //     }
-
-  //     var connection = session.connections.get(message.payload.connectionId);
-  //     connection.destroy("forceDisconnected");
-  //     break;
+        // Messages for Publishers and Subscribers
+        case 'candidate':
+          // send to whichever of your publisher or subscribers are
+          // subscribing/publishing that stream
+          actors = OT.publishers.where({streamId: streamId})
+            .concat(OT.subscribers.where({streamId: streamId}));
+          break;
 
 
-  //   case OT.Raptor.Actions.FORCE_UNPUBLISH:
-  //     if (!message.payload.streamId) {
-  //         OT.error("OT.Raptor.dispatch " + message.signature + " ERROR - streamId must be provided");
-  //         return;
-  //     }
+        default:
+          OT.warn('OT.Raptor.dispatch: jsep#' + method +
+            ' is not currently implemented');
+          return;
+      }
 
-  //     var stream = session.streams.get(message.payload.streamId);
-  //     stream.destroy("forceUnpublished");
-  //     break;
+      if (actors.length === 0) return;
 
+      // This is a bit hacky. We don't have the session in the message so we iterate
+      // until we find the actor that the message relates to this stream, and then
+      // we grab the session from it.
+      fromConnection = actors[0].session.connections.get(fromAddress);
+      if(!fromConnection && fromAddress.match(/^symphony\./)) {
+        fromConnection = OT.Connection.fromHash({
+          id: fromAddress,
+          creationTime: Date.now()
+        });
 
-  //   default:
-  //     OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-  // }
-};
+        actors[0].session.connections.add(fromConnection);
+      } else if(!fromConnection) {
+        OT.warn('OT.Raptor.dispatch: Messsage comes from a connection (' +
+          fromAddress + ') that we do not know about. The message was ignored.');
+        return;
+      }
 
+      actors.forEach(function(actor) {
+        actor.processMessage(method, fromConnection, message);
+      });
+    };
 
+    dispatcher.on('jsep#offer', jsepHandler.bind(null, 'offer'));
+    dispatcher.on('jsep#answer', jsepHandler.bind(null, 'answer'));
+    dispatcher.on('jsep#pranswer', jsepHandler.bind(null, 'pranswer'));
+    dispatcher.on('jsep#generateoffer', jsepHandler.bind(null, 'generateoffer'));
+    dispatcher.on('jsep#unsubscribe', jsepHandler.bind(null, 'unsubscribe'));
+    dispatcher.on('jsep#candidate', jsepHandler.bind(null, 'candidate'));
 
-OT.Raptor.Dispatcher.prototype.dispatchJsep = function (message) {
-  var fromConnection,
-      streamId = message.payload.streamId,
-      actors;
+    dispatcher.on('subscriberChannel#updated', function(streamId, channelId, content) {
 
-  switch (message.action) {
-    // Messages for Subscribers
-    case OT.Raptor.Actions.OFFER:
-      actors = [];
-      var subscriber = OT.subscribers.find({streamId: streamId});
-      if (subscriber) actors.push(subscriber);
-      break;
+      if (!streamId || !session.streams.has(streamId)) {
+        OT.error('OT.Raptor.dispatch: Unable to determine streamId, or the stream does not ' +
+          'exist, for subscriberChannel#updated message!');
+        // @todo error
+        return;
+      }
 
+      session.streams.get(streamId)._
+        .updateChannel(channelId, content);
 
-    // Messages for Publishers
-    case OT.Raptor.Actions.ANSWER:
-    case OT.Raptor.Actions.PRANSWER:
-    case OT.Raptor.Actions.SUBSCRIBE:
-    case OT.Raptor.Actions.UNSUBSCRIBE:
-      actors = OT.publishers.where({streamId: streamId});
-      break;
+    });
 
+    dispatcher.on('subscriberChannel#update', function(subscriberId, streamId, content) {
 
-    // Messages for Publishers and Subscribers
-    case OT.Raptor.Actions.CANDIDATE:
-      // send to whichever of your publisher or subscribers are subscribing/publishing that stream
-      actors = OT.publishers.where({streamId: streamId}).concat(OT.subscribers.where({streamId: streamId}));
-      break;
+      if (!streamId || !session.streams.has(streamId)) {
+        OT.error('OT.Raptor.dispatch: Unable to determine streamId, or the stream does not ' +
+          'exist, for subscriberChannel#update message!');
+        // @todo error
+        return;
+      }
 
+      // Hint to update for congestion control from the Media Server
+      if (!OT.subscribers.has(subscriberId)) {
+        OT.error('OT.Raptor.dispatch: Unable to determine subscriberId, or the subscriber ' +
+          'does not exist, for subscriberChannel#update message!');
+        // @todo error
+        return;
+      }
 
-    default:
-      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-      return;
-  }
+      // We assume that an update on a Subscriber channel is to disableVideo
+      // we may need to be more specific in the future
+      OT.subscribers.get(subscriberId).disableVideo(content.active);
 
-  if (actors.length) {
-    // This is a bit hacky. We don't have the session in the message so we iterate
-    // until we find the actor that the message relates to this stream, and then
-    // we grab the session from it.
-    fromConnection = actors[0].session.connections.get(message.payload.fromAddress);
-    if(!fromConnection && message.payload.fromAddress.match(/^symphony\./)) {
-      fromConnection = new OT.Connection(message.payload.fromAddress,
-          Date.now(), null, { supportsWebRTC: true });
-      actors[0].session.connections.add(fromConnection);
-    } else if(!fromConnection) {
-      OT.warn("Messsage comes from a connection (" + message.payload.fromAddress + ") that we do not know about.");
-    }
-  }
+    });
 
-  actors.forEach(function(actor) {
-    actor.processMessage(message.action, fromConnection, message.payload);
-  });
-};
+    dispatcher.on('subscriber#created', function(streamId, fromAddress, subscriberId) {
 
+      var stream = streamId ? session.streams.get(streamId) : null;
 
-// The payload is:
-//    key:    "{session_id}}/SUBSCRIBER/{stream_id}/{subscriber_id}"
-//    value:  Integer                 { Value between 0 and some non-zero max ( Max not decided yet )  }*
-//
-// * The complete range need not be used but this provision is just so that future facing we might need to have more granularity.
-//
-OT.Raptor.Dispatcher.prototype.dispatchSubscriber = function (message) {
-  var key = message.payload.key.split('/'),
-      session = OT.sessions.get(key[0]),
-      subscriber,
-      stream;
+      if (!stream) {
+        OT.error('OT.Raptor.dispatch: Unable to determine streamId, or the stream does ' +
+          'not exist, for subscriber#created message!');
+        // @todo error
+        return;
+      }
 
-  if (!session) {
-    OT.error("OT.Raptor.dispatch: Unable to determine sessionId, or the session does not exist, for " + message.signature + " message!");
-    // @todo error
-    return;
-  }
+      session._.subscriberMap[fromAddress + '_' + stream.id] = subscriberId;
+    });
 
-  stream = key[2] ? session.streams.get(key[2]) : null;
+    dispatcher.on('subscriber#deleted', function(streamId, fromAddress) {
+      var stream = streamId ? session.streams.get(streamId) : null;
 
-  if (!stream) {
-    OT.error("OT.Raptor.dispatch: Unable to determine streamId, or the stream does not exist, for " + message.signature + " message!");
-    // @todo error
-    return;
-  }
+      if (!stream) {
+        OT.error('OT.Raptor.dispatch: Unable to determine streamId, or the stream does ' +
+          'not exist, for subscriber#created message!');
+        // @todo error
+        return;
+      }
 
-  // Find the subscriber that matches this stream, connection, and session
-  subscriber = OT.subscribers.find(function(subscriber) {
-                  return subscriber.streamId === stream.id
-                          && subscriber.session.id === session.id
-                });
+      delete session._.subscriberMap[fromAddress + '_' + stream.id];
+    });
 
-  if (!subscriber) {
-    OT.error("OT.Raptor.dispatch: Unable to determine subscriberId, or the subscriber does not exist, for " + message.signature + " message!");
-    // @todo error
-    return;
-  }
+    dispatcher.on('signal', function(fromAddress, signalType, data) {
+      session._.dispatchSignal(session.connections.get(fromAddress),
+                               signalType, data);
+    });
 
+    dispatcher.on('archive#create', function(archive) {
+      parseAndAddArchiveToSession(archive, session);
+    });
 
-  switch (message.action) {
-    case OT.Raptor.Actions.QUALITY_CHANGED:
-      subscriber.updateQuality(parseInt(message.payload.value, 10));
-      break;
+    dispatcher.on('archive#updated', function(archiveId, update) {
+      var archive = session.archives.get(archiveId);
 
+      if (!archive) {
+        OT.error('OT.Raptor.dispatch: An archive does not exist with the id of ' +
+          archiveId + ', for archive#updated message!');
+        // @todo error
+        return;
+      }
 
-    default:
-      OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-  }
-};
+      archive._.update(update);
+    });
 
+    return dispatcher;
 
-OT.Raptor.Dispatcher.prototype.dispatchSignal = function (message) {
-  if (message.action !== OT.Raptor.Actions.SIGNAL) {
-    OT.warn("OT.Raptor.dispatch: " + message.signature + " is not currently implemented");
-    return;
-  }
+  };
 
-  var session = OT.sessions.get(this.socket.sessionId);
+})(window);
+!(function(window) {
 
-  if (!session) {
-      OT.error("OT.Raptor.dispatch: " + message.signature + " ERROR - sessionId must be provided and be valid");
-      return;
-  }
-
-  session._.dispatchSignal( session.connections.get(message.payload.fromAddress),
-                            message.payload.type,
-                            message.payload.data);
-};
-
-}(this));
-(function(window) {
-
-// Helper to synchronise several startup tasks and then dispatch a unified
-// 'envLoaded' event.
-//
-// This depends on:
-// * OT
-// * OT.Config
-//
-function EnvironmentLoader() {
+  // Helper to synchronise several startup tasks and then dispatch a unified
+  // 'envLoaded' event.
+  //
+  // This depends on:
+  // * OT
+  // * OT.Config
+  //
+  function EnvironmentLoader() {
     var _configReady = false,
         _domReady = false,
 
         isReady = function() {
-            return _domReady && _configReady;
+          return _domReady && _configReady;
         },
 
         onLoaded = function() {
-            if (isReady()) {
-                OT.dispatchEvent(new OT.EnvLoadedEvent(OT.Event.names.ENV_LOADED));
-            }
+          if (isReady()) {
+            OT.dispatchEvent(new OT.EnvLoadedEvent(OT.Event.names.ENV_LOADED));
+          }
         },
 
         onDomReady = function() {
-            _domReady = true;
+          _domReady = true;
 
-            // This is making an assumption about there being only one "window"
-            // that we care about.
-            OT.$.on(window, "unload", function() {
-                OT.publishers.destroy();
-                OT.subscribers.destroy();
-                OT.sessions.destroy();
-            });
+          // This is making an assumption about there being only one "window"
+          // that we care about.
+          OT.$.on(window, 'unload', function() {
+            OT.publishers.destroy();
+            OT.subscribers.destroy();
+            OT.sessions.destroy();
+          });
 
-            // The Dynamic Config won't load until the DOM is ready
-            OT.Config.load(OT.properties.configURL);
+          // The Dynamic Config won't load until the DOM is ready
+          OT.Config.load(OT.properties.configURL);
 
-            onLoaded();
+          onLoaded();
         },
 
         configLoaded = function() {
-            _configReady = true;
-            OT.Config.off('dynamicConfigChanged', configLoaded);
-            OT.Config.off('dynamicConfigLoadFailed', configLoadFailed);
+          _configReady = true;
+          OT.Config.off('dynamicConfigChanged', configLoaded);
+          OT.Config.off('dynamicConfigLoadFailed', configLoadFailed);
 
-            onLoaded();
+          onLoaded();
         },
 
         configLoadFailed = function() {
-            configLoaded();
+          configLoaded();
         };
 
     OT.Config.on('dynamicConfigChanged', configLoaded);
     OT.Config.on('dynamicConfigLoadFailed', configLoadFailed);
-    if (document.readyState == "complete" || (document.readyState == "interactive" && document.body)) {
-        onDomReady();
+    if (document.readyState === 'complete' ||
+      (document.readyState === 'interactive' && document.body)) {
+      onDomReady();
     } else {
-        if (document.addEventListener) {
-            document.addEventListener("DOMContentLoaded", onDomReady, false);
-        } else if (document.attachEvent) {
-            // This is so onLoad works in IE, primarily so we can show the upgrade to Chrome popup
-            document.attachEvent("onreadystatechange", function() {
-                if (document.readyState == "complete") onDomReady();
-            });
-        }
+      if (document.addEventListener) {
+        document.addEventListener('DOMContentLoaded', onDomReady, false);
+      } else if (document.attachEvent) {
+        // This is so onLoad works in IE, primarily so we can show the upgrade to Chrome popup
+        document.attachEvent('onreadystatechange', function() {
+          if (document.readyState === 'complete') onDomReady();
+        });
+      }
     }
 
     this.onLoad = function(cb) {
-        if (isReady()) {
-            cb();
-            return;
-        }
+      if (isReady()) {
+        cb();
+        return;
+      }
 
-        OT.on(OT.Event.names.ENV_LOADED, cb);
+      OT.on(OT.Event.names.ENV_LOADED, cb);
     };
-}
+  }
 
-var EnvLoader = new EnvironmentLoader();
+  var EnvLoader = new EnvironmentLoader();
 
-OT.onLoad = function(cb, context) {
+  OT.onLoad = function(cb, context) {
     if (!context) {
-        EnvLoader.onLoad(cb);
+      EnvLoader.onLoad(cb);
+    } else {
+      EnvLoader.onLoad(
+        cb.bind(context)
+      );
     }
-    else {
-        EnvLoader.onLoad(
-            cb.bind(context)
-        );
-    }
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-OT.Error = function(code, message) {
+  /**
+   * The Error class is used to define the error object passed into completion handlers.
+   * Each of the following methods, which execute asynchronously, includes a
+   * <code>completionHandler</code> parameter:
+   *
+   * <ul>
+   *   <li><a href="Session.html#connect">Session.connect()</a></li>
+   *   <li><a href="Session.html#forceDisconnect">Session.forceDisconnect()</a></li>
+   *   <li><a href="Session.html#forceUnpublish">Session.forceUnpublish()</a></li>
+   *   <li><a href="Session.html#publish">Session.publish()</a></li>
+   *   <li><a href="Session.html#subscribe">Session.subscribe()</a></li>
+   *   <li><a href="OT.html#initPublisher">OT.initPublisher()</a></li>
+   * </ul>
+   *
+   * <p>
+   * The <code>completionHandler</code> parameter is a function that is called when the call to
+   * the asynchronous method succeeds or fails. If the asynchronous call fails, the completion
+   * handler function is passes an error object (defined by the Error class). The <code>code</code>
+   * and <code>message</code> properties of the error object provide details about the error.
+   *
+   * @property {Number} code The error code, defining the error.
+   *
+   *   <p>
+   *   In the event of an error, the <code>code</code> value of the <code>error</code> parameter can
+   *   have one of the following values:
+   * </p>
+   *
+   * <p>Errors when calling <code>Session.connect()</code>:</p>
+   *
+   * <table class="docs_table"><tbody>
+   * <tr>
+   *   <td><b><code>code</code></b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1004</td>
+   *   <td>Authentication error. Check the error message for details. This error can result if you
+   *     in an expired token when trying to connect to a session. It can also occur if you pass
+   *     in an invalid token or API key. Make sure that you are generating the token using the
+   *     current version of one of the
+   *     <a href="(http://tokbox.com/opentok/libraries/server">OpenTok server SDKs</a>.</td>
+   * </tr>
+   * <tr>
+   *   <td>1005</td>
+   *   <td>Invalid Session ID. Make sure you generate the session ID using the current version of
+   *     one of the <a href="(http://tokbox.com/opentok/libraries/server">OpenTok server
+   *     SDKs</a>.</td>
+   * </tr>
+   * <tr>
+   *   <td>1006</td>
+   *   <td>Connect Failed. Unable to connect to the session. You may want to have the client check
+   *     the network connection.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * <p>Errors when calling <code>Session.forceDisconnect()</code>:</p>
+   *
+   * <table class="docs_table"><tbody>
+   * <tr>
+   *   <td><b>
+   *       <code>code</code>
+   *     </b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1520</td>
+   *   <td>Unable to force disconnect. The client's token does not have the role set to moderator.
+   *     Once the client has connected to the session, the <code>capabilities</code> property of
+   *     the Session object lists the client's capabilities.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * <p>Errors when calling <code>Session.forceUnpublish()</code>:</p>
+   *
+   * <table class="docs_table"><tbody>
+   * <tr>
+   *   <td><b><code>code</code></b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1530</td>
+   *   <td>Unable to force unpublish. The client's token does not have the role set to moderator.
+   *     Once the client has connected to the session, the <code>capabilities</code> property of
+   *     the Session object lists the client's capabilities.</td>
+   * </tr>
+   * <tr>
+   *   <td>1535</td>
+   *   <td>Force Unpublish on an invalid stream. Make sure that the stream has not left the
+   *     session before you call the <code>forceUnpublish()</code> method.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * <p>Errors when calling <code>Session.publish()</code>:</p>
+   *
+   * <table class="docs_table"><tbody>
+   * <tr>
+   *   <td><b><code>code</code></b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1010</td>
+   *   <td>Cannot publish: the client is not connected to the OpenTok session. Check that your
+   *     application makes the client connect successfully before trying to publish. And check
+   *     that the client has not disconnected before trying to publish.</td>
+   * </tr>
+   * <tr>
+   *   <td>1500</td>
+   *   <td>Unable to Publish. The client's token does not have the role set to to publish or
+   *     moderator. Once the client has connected to the session, the <code>capabilities</code>
+   *     property of the Session object lists the client's capabilities.</td>
+   * </tr>
+   * <tr>
+   *   <td>1601</td>
+   *   <td>Internal error -- WebRTC publisher error. Try republishing or reconnecting to the
+   *     session.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * <p>Errors when calling <code>Session.signal()</code>:</p>
+   *
+   * <table class="docs_table" style="width:100%"><tbody>
+   * <tr>
+   *   <td><b><code>code</code></b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1510</td>
+   *   <td>Unable to signal. Check that the <code>to</code> property of the signal parameter is
+   *     set to a valid Connection object. Also, make sure that you are connected to the
+   *     session.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * <p>Errors when calling <code>Session.subscribe()</code>:</p>
+   *
+   * <table class="docs_table" style="width:100%"><tbody>
+   * <tr>
+   *   <td><b>
+   *       Errors when calling <code>Session.subscribe()</code>:
+   *     </b></td>
+   * </tr>
+   * <tr>
+   *   <td><b>
+   *       <code>code</code>
+   *     </b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1600</td>
+   *   <td>Internal error -- WebRTC subscriber error. Try resubscribing to the stream or
+   *     reconnecting to the session.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * <p>Errors when calling <code>TB.initPublisher()</code>:</p>
+   *
+   * <table class="docs_table"><tbody>
+   * <tr>
+   *   <td><b><code>code</code></b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1004</td>
+   *   <td>Authentication error. Check the error message for details. This error can result if you
+   *     pass in an expired token when trying to connect to a session. It can also occur if you
+   *     pass in an invalid token or API key. Make sure that you are generating the token using
+   *     the current version of one of the
+   *     <a href="(http://tokbox.com/opentok/libraries/server">OpenTok server SDKs</a>.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * <p>General errors that can occur when calling any method:</p>
+   *
+   * <table class="docs_table" style="width:100%"><tbody>
+   * <tr>
+   *   <td><b><code>code</code></b></td>
+   *   <td><b>Description</b></td>
+   * </tr>
+   * <tr>
+   *   <td>1011</td>
+   *   <td>Invalid Parameter. Check that you have passed valid parameter values into the method
+   *     call.</td>
+   * </tr>
+   * <tr>
+   *   <td>2000</td>
+   *   <td>Internal Error. Try reconnecting to the OpenTok session and trying the action again.</td>
+   * </tr>
+   * </tbody></table>
+   *
+   * @property {String} message The message string provides details about the error.
+   *
+   * @class Error
+   * @augments Event
+   */
+  OT.Error = function(code, message) {
     this.code = code;
     this.message = message;
-};
+  };
 
-var errorsCodesToTitle = {
-    1000: "Failed To Load",
-    1004: "Authentication error",
-    1005: "Invalid Session ID",
-    1006: "Connect Failed",
-    1007: "Connect Rejected",
-    1008: "Connect Time-out",
-    1009: "Security Error",
-    1010: "Not Connected",
-    1011: "Invalid Parameter",
-    1012: "Peer-to-peer Stream Play Failed",
-    1013: "Connection Failed",
-    1014: "API Response Failure",
-    1500: "Unable to Publish",
-    1510: "Unable to Signal",
-    1520: "Unable to Force Disconnect",
-    1530: "Unable to Force Unpublish",
-    1540: "Unable to record archive",
-    1550: "Unable to play back archive",
-    1560: "Unable to create archive",
-    1570: "Unable to load archive",
-    2000: "Internal Error",
-    2001: "Embed Failed",
-    3000: "Archive load exception",
-    3001: "Archive create exception",
-    3002: "Playback stop exception",
-    3003: "Playback start exception",
-    3004: "Record start exception",
-    3005: "Record stop exception",
-    3006: "Archive load exception",
-    3007: "Session recording in progress",
-    3008: "Archive recording internal failure",
-    4000: "WebSocket Connection Failed",
-    4001: "WebSocket Network Disconnected"
-};
+  var errorsCodesToTitle = {
+    1000: 'Failed To Load',
+    1004: 'Authentication error',
+    1005: 'Invalid Session ID',
+    1006: 'Connect Failed',
+    1007: 'Connect Rejected',
+    1008: 'Connect Time-out',
+    1009: 'Security Error',
+    1010: 'Not Connected',
+    1011: 'Invalid Parameter',
+    1012: 'Peer-to-peer Stream Play Failed',
+    1013: 'Connection Failed',
+    1014: 'API Response Failure',
+    1500: 'Unable to Publish',
+    1510: 'Unable to Signal',
+    1520: 'Unable to Force Disconnect',
+    1530: 'Unable to Force Unpublish',
+    1540: 'Unable to record archive',
+    1550: 'Unable to play back archive',
+    1560: 'Unable to create archive',
+    1570: 'Unable to load archive',
+    2000: 'Internal Error',
+    2001: 'Embed Failed',
+    3000: 'Archive load exception',
+    3001: 'Archive create exception',
+    3002: 'Playback stop exception',
+    3003: 'Playback start exception',
+    3004: 'Record start exception',
+    3005: 'Record stop exception',
+    3006: 'Archive load exception',
+    3007: 'Session recording in progress',
+    3008: 'Archive recording internal failure',
+    4000: 'WebSocket Connection Failed',
+    4001: 'WebSocket Network Disconnected'
+  };
 
-var analytics;
+  var analytics;
 
-function _exceptionHandler(component, msg, errorCode, context) {
+  function _exceptionHandler(component, msg, errorCode, context) {
     var title = errorsCodesToTitle[errorCode],
         contextCopy = context ? OT.$.clone(context) : {};
 
-    OT.error("TB.exception :: title: " + title + " (" + errorCode + ") msg: " + msg);
+    OT.error('OT.exception :: title: ' + title + ' (' + errorCode + ') msg: ' + msg);
 
     if (!contextCopy.partnerId) contextCopy.partnerId = OT.APIKEY;
 
     try {
-        if (!analytics) analytics = new OT.Analytics();
-        analytics.logError(errorCode, 'tb.exception', title, {details:msg}, contextCopy);
+      if (!analytics) analytics = new OT.Analytics();
+      analytics.logError(errorCode, 'tb.exception', title, {details:msg}, contextCopy);
 
-        OT.dispatchEvent(
-            new OT.ExceptionEvent(OT.Event.names.EXCEPTION, msg, title, errorCode, component, component)
-        );
+      OT.dispatchEvent(
+        new OT.ExceptionEvent(OT.Event.names.EXCEPTION, msg, title, errorCode, component, component)
+      );
     } catch(err) {
-        OT.error("TB.exception :: Failed to dispatch exception - " + err.toString());
-        // Don't throw an error because this is asynchronous
-        // don't do an exceptionHandler because that would be recursive
+      OT.error('OT.exception :: Failed to dispatch exception - ' + err.toString());
+      // Don't throw an error because this is asynchronous
+      // don't do an exceptionHandler because that would be recursive
     }
-}
+  }
 
 // @todo redo this when we have time to tidy up
 //
 // @example
 //
-//  TB.handleJsException("Descriptive error message", 2000, {
+//  OT.handleJsException("Descriptive error message", 2000, {
 //      session: session,
 //      target: stream|publisher|subscriber|session|etc
 //  });
 //
-OT.handleJsException = function(errorMsg, code, options) {
+  OT.handleJsException = function(errorMsg, code, options) {
     options = options || {};
 
     var context,
         session = options.session;
 
     if (session) {
-        context = {
-            sessionId: session.sessionId
-        };
+      context = {
+        sessionId: session.sessionId
+      };
 
-        if (session.connected) context.connectionId = session.connection.connectionId;
-        if (!options.target) options.target = session;
-    }
-    else if (options.sessionId) {
-        context = {
-            sessionId: options.sessionId
-        };
+      if (session.connected) context.connectionId = session.connection.connectionId;
+      if (!options.target) options.target = session;
 
-        if (!options.target) options.target = null;
+    } else if (options.sessionId) {
+      context = {
+        sessionId: options.sessionId
+      };
+
+      if (!options.target) options.target = null;
     }
 
     _exceptionHandler(options.target, errorMsg, code, context);
-};
+  };
 
 
 // @todo redo this when we have time to tidy up
@@ -9481,221 +10793,405 @@ OT.handleJsException = function(errorMsg, code, options) {
 // Public callback for exceptions from Flash.
 //
 // Called from Flash like:
-//  TB.exceptionHandler('publisher_1234,1234', "Descriptive Error Message", "Error Title", 2000, contextObj)
+//  OT.exceptionHandler('publisher_1234,1234',
+//  "Descriptive Error Message", "Error Title", 2000, contextObj)
 //
-OT.exceptionHandler = function(componentId, msg, errorTitle, errorCode, context) {
+  OT.exceptionHandler = function(componentId, msg, errorTitle, errorCode, context) {
     var target;
 
     if (componentId) {
-        target = OT.components[componentId];
+      target = OT.components[componentId];
 
-        if (!target) {
-            OT.warn("Could not find the component with component ID " + componentId);
-        }
+      if (!target) {
+        OT.warn('Could not find the component with component ID ' + componentId);
+      }
     }
 
     _exceptionHandler(target, msg, errorCode, context);
-};
+  };
+
+
+  // This is a placeholder until error handling can be rewritten
+  OT.dispatchError = function (code, message, completionHandler, session) {
+    OT.error(code, message);
+
+    if (completionHandler && OT.$.isFunction(completionHandler)) {
+      completionHandler.call(null, new OT.Error(code, message));
+    }
+
+    OT.handleJsException(message, code, {
+      session: session
+    });
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-OT.ConnectionCapabilities = function(capabilitiesHash) {
+  OT.ConnectionCapabilities = function(capabilitiesHash) {
     // Private helper methods
     var castCapabilities = function(capabilitiesHash) {
-            capabilitiesHash.supportsWebRTC = OT.$.castToBoolean(capabilitiesHash.supportsWebRTC);
-
-            return capabilitiesHash;
-        };
-
+      capabilitiesHash.supportsWebRTC = OT.$.castToBoolean(capabilitiesHash.supportsWebRTC);
+      return capabilitiesHash;
+    };
 
     // Private data
     var _caps = castCapabilities(capabilitiesHash);
-
-
     this.supportsWebRTC = _caps.supportsWebRTC;
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-/**
- * The Connection object represents a connection to an OpenTok session.
- * The Session object has a <code>connection</code> property that is a Connection object.
- * It represents the local client's connection. (A client only has a connection once the
- * client has successfully called the <code>connect()</code> method of the {@link Session} object.)
- * The Stream object has a <code>connection</code> property that is a Connection object.
- * It represents the stream publisher's connection.
- *
- * @class Connection
- * @property {String} id The ID of this connection.
- * @property {Number} creationTime The timestamp for the creation of the connection. This value is calculated in milliseconds.
-	You can convert this value to a Date object by calling <code>new Date(creationTime)</code>, where <code>creationTime</code>
-	is the <code>creationTime</code> property of the Connection object.
- * @property {String} data 	A string containing metadata describing the
-	connection. When you generate a user token string pass the connection data string to the
-	<code>generate_token()</code> method of our
-	<a href="/opentok/libraries/server/">server-side libraries</a>. You can also generate a token and define connection data on the
-	<a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
- */
-OT.Connection = function(id, creationTime, data, capabilitiesHash) {
+  /**
+   * The Connection object represents a connection to an OpenTok session. Each client that connects
+   * to a session has a unique connection, with a unique connection ID (represented by the
+   * <code>id</code> property of the Connection object for the client).
+   * <p>
+   * The Session object has a <code>connection</code> property that is a Connection object.
+   * It represents the local client's connection. (A client only has a connection once the
+   * client has successfully called the <code>connect()</code> method of the {@link Session}
+   * object.)
+   * <p>
+   * The Session object dispatches a <code>connectionCreated</code> event when each client (other
+   * than your own) connects to a session (and for clients that are present in the session when you
+   * connect). The <code>connectionCreated</code> event object has a <code>connection</code>
+   * property, which is a Connection object corresponding to the client the event pertains to.
+   * <p>
+   * The Stream object has a <code>connection</code> property that is a Connection object.
+   * It represents the connection of the client that is publishing the stream.
+   *
+   * @class Connection
+   * @property {String} connectionId The ID of this connection.
+   * @property {Number} creationTime The timestamp for the creation of the connection. This
+   * value is calculated in milliseconds.
+   * You can convert this value to a Date object by calling <code>new Date(creationTime)</code>,
+   * where <code>creationTime</code>
+   * is the <code>creationTime</code> property of the Connection object.
+   * @property {String} data A string containing metadata describing the
+   * connection. When you generate a user token string pass the connection data string to the
+   * <code>generate_token()</code> method of our
+   * <a href="/opentok/libraries/server/">server-side libraries</a>. You can also generate a token
+   * and define connection data on the
+   * <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
+   */
+  OT.Connection = function(id, creationTime, data, capabilitiesHash, permissionsHash) {
     var destroyedReason;
 
     this.id = this.connectionId = id;
     this.creationTime = creationTime ? Number(creationTime) : null;
     this.data = data;
     this.capabilities = new OT.ConnectionCapabilities(capabilitiesHash);
+    this.permissions = new OT.Capabilities(permissionsHash);
     this.quality = null;
 
     OT.$.eventing(this);
 
     this.destroy = function(reason, quiet) {
-        destroyedReason = reason || 'clientDisconnected';
+      destroyedReason = reason || 'clientDisconnected';
 
-        if (quiet !== true) {
-            this.dispatchEvent(
-              new OT.DestroyedEvent(
-                'destroyed',      // This should be OT.Event.names.CONNECTION_DESTROYED, but
-                                  // the value of that is currently shared with Session
-                this,
-                destroyedReason
-              )
-            );
-        }
+      if (quiet !== true) {
+        this.dispatchEvent(
+          new OT.DestroyedEvent(
+            'destroyed',      // This should be OT.Event.names.CONNECTION_DESTROYED, but
+                              // the value of that is currently shared with Session
+            this,
+            destroyedReason
+          )
+        );
+      }
     }.bind(this);
 
     Object.defineProperties(this, {
-        destroyed: {
-            get: function() { return destroyedReason !== void 0; },
-            enumerable: true
-        },
+      destroyed: {
+        get: function() { return destroyedReason !== void 0; },
+        enumerable: true
+      },
 
-        destroyedReason: {
-            get: function() { return destroyedReason; },
-            enumerable: true
-        }
+      destroyedReason: {
+        get: function() { return destroyedReason; },
+        enumerable: true
+      }
     });
-};
+  };
 
-OT.Connection.fromHash = function(hash) {
-  return new OT.Connection(hash.connectionId,
-                            hash.creationTime,
-                            hash.data,
-                            { supportsWebRTC: hash.supportsWebRTC } );
-
-};
+  OT.Connection.fromHash = function(hash) {
+    return new OT.Connection(hash.id,
+                             hash.creationTime,
+                             hash.data,
+                             OT.$.extend(hash.capablities || {}, { supportsWebRTC: true }),
+                             hash.permissions || [] );
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-var validPropertyNames = ['hasAudio', 'hasVideo', 'quality', 'name', 'videoDimensions', 'orientation'];
+  // id: String                           | mandatory | immutable
+  // type: String {video/audio/data/...}  | mandatory | immutable
+  // active: Boolean                      | mandatory | mutable
+  // orientation: Integer?                | optional  | mutable
+  // frameRate: Float                     | optional  | mutable
+  // height: Integer                      | optional  | mutable
+  // width: Integer                       | optional  | mutable
+  OT.StreamChannel = function(options) {
+    this.id = options.id;
+    this.type = options.type;
+    this.active = OT.$.castToBoolean(options.active);
+    this.orientation = options.orientation || OT.VideoOrientation.ROTATED_NORMAL;
+    if (options.frameRate) this.frameRate = parseFloat(options.frameRate, 10);
+    this.width = parseInt(options.width, 10);
+    this.height = parseInt(options.height, 10);
 
+    OT.$.eventing(this, true);
+
+    // Returns true if a property was updated.
+    this.update = function(attributes) {
+      var videoDimensions = {},
+          oldVideoDimensions = {};
+
+      for (var key in attributes) {
+        // we shouldn't really read this before we know the key is valid
+        var oldValue = this[key];
+
+        switch(key) {
+          case 'active':
+            this.active = OT.$.castToBoolean(attributes[key]);
+            break;
+
+          case 'frameRate':
+            this.frameRate = parseFloat(attributes[key], 10);
+            break;
+
+          case 'width':
+          case 'height':
+            this[key] = parseInt(attributes[key], 10);
+
+            videoDimensions[key] = this[key];
+            oldVideoDimensions[key] = oldValue;
+            break;
+
+          case 'orientation':
+            this[key] = attributes[key];
+
+            videoDimensions[key] = this[key];
+            oldVideoDimensions[key] = oldValue;
+            break;
+
+          default:
+            OT.warn('Tried to update unknown key ' + key + ' on ' + this.type +
+              ' channel ' + this.id);
+            return;
+        }
+
+        this.trigger('update', this, key, oldValue, this[key]);
+      }
+
+      if (Object.keys(videoDimensions).length) {
+        // To make things easier for the public API, we broadcast videoDimensions changes,
+        // which is an aggregate of width, height, and orientation changes.
+        this.trigger('update', this, 'videoDimensions', oldVideoDimensions, videoDimensions);
+      }
+
+      return true;
+    };
+  };
+
+})(window);
+!(function() {
+
+  var validPropertyNames = ['name', 'archiving'];
 
 /**
- * Specifies a stream. A stream is a representation of a published stream in a session. When a client calls the
- * <a href="Session.html#publish">Session.publish() method</a>, a new stream is created. Properties of the Stream
- * object provide information about the stream.
+ * Specifies a stream. A stream is a representation of a published stream in a session. When a
+ * client calls the <a href="Session.html#publish">Session.publish() method</a>, a new stream is
+ * created. Properties of the Stream object provide information about the stream.
  *
- *  <p>When a stream is added to a session, the Session object dispatches a <code>streamCreatedEvent</code>.
- *  When a stream is destroyed, the Session object dispatches a <code>streamDestroyed</code> event. The
- *  StreamEvent object, which defines these event objects, has a <code>stream</code> property, which is an
- *  array of Stream object. For details and a code example, see {@link StreamEvent}.</p>
+ *  <p>When a stream is added to a session, the Session object dispatches a
+ * <code>streamCreatedEvent</code>. When a stream is destroyed, the Session object dispatches a
+ * <code>streamDestroyed</code> event. The StreamEvent object, which defines these event objects,
+ * has a <code>stream</code> property, which is an array of Stream object. For details and a code
+ * example, see {@link StreamEvent}.</p>
  *
- *  <p>When a connection to a session is made, the Session object dispatches a <code>sessionConnected</code>
- *  event, defined by the SessionConnectEvent object. The SessionConnectEvent object has a <code>streams</code>
- *  property, which is an array of Stream objects pertaining to the streams in the session at that time.
- *  For details and a code example, see {@link SessionConnectEvent}.</p>
+ *  <p>When a connection to a session is made, the Session object dispatches a
+ * <code>sessionConnected</code> event, defined by the SessionConnectEvent object. The
+ * SessionConnectEvent object has a <code>streams</code> property, which is an array of Stream
+ * objects pertaining to the streams in the session at that time. For details and a code example,
+ * see {@link SessionConnectEvent}.</p>
  *
  * @class Stream
  * @property {Connection} connection The Connection object corresponding
- * to the connection that is publishing the stream. You can compare this to to the <code>connection</code>
- * property of the Session object to see if the stream is being published by the local web page.
+ * to the connection that is publishing the stream. You can compare this to to the
+ * <code>connection</code> property of the Session object to see if the stream is being published
+ * by the local web page.
  *
  * @property {Number} creationTime The timestamp for the creation
  * of the stream. This value is calculated in milliseconds. You can convert this value to a
- * Date object by calling <code>new Date(creationTime)</code>, where <code>creationTime</code> is the
- * <code>creationTime</code> property of the Stream object.
+ * Date object by calling <code>new Date(creationTime)</code>, where <code>creationTime</code> is
+ * the <code>creationTime</code> property of the Stream object.
  *
- * @property {Boolean} hasAudio Whether the stream has audio. This property can change if the publisher
- * turns on or off audio (by calling <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a>).
- * When this occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event
- * (see {@link StreamPropertyChangedEvent}.)
+ * @property {Number} fps The frame rate of the video stream.
  *
- * @property {Boolean} hasVideo Whether the stream has video. This property can change if the publisher
- * turns on or off video (by calling <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a>).
- * When this occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event
- * (see {@link StreamPropertyChangedEvent}.)
- *
- * @property {Object} videoDimensions This object has two properties: <code>width</code> and <code>height</code>. Both are
- * numbers. The <code>width</code> property is the width of the encoded stream; the <code>height</code> property is the
- * height of the encoded stream. (These are independent of the actual width of Publisher and Subscriber objects corresponding
- * to the stream.) This property can change if a stream published from an iOS device resizes, based on a change in the device
- * orientation. When this occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event (see
+ * @property {Boolean} hasAudio Whether the stream has audio. This property can change if the
+ * publisher turns on or off audio (by calling
+ * <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a>). When this occurs, the
+ * {@link Session} object dispatches a <code>streamPropertyChanged</code> event (see
  * {@link StreamPropertyChangedEvent}.)
  *
- * @property {String} name The name of the stream. Publishers can specify a name when publishing a stream
- * (using the <code>publish()</code> method of the publisher's Session object).
+ * @property {Boolean} hasVideo Whether the stream has video. This property can change if the
+ * publisher turns on or off video (by calling
+ * <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a>). When this occurs, the
+ * {@link Session} object dispatches a <code>streamPropertyChanged</code> event (see
+ * {@link StreamPropertyChangedEvent}.)
+ *
+ * @property {Object} videoDimensions This object has two properties: <code>width</code> and
+ * <code>height</code>. Both are numbers. The <code>width</code> property is the width of the
+ * encoded stream; the <code>height</code> property is the height of the encoded stream. (These
+ * are independent of the actual width of Publisher and Subscriber objects corresponding to the
+ * stream.) The height and width of the <code>videoDimensions</code> of a Stream object may differ
+ * from the <code>videoHeight</code> dimensions of a Subcriber object using the stream, if the
+ * browser does not support the resolution of the stream. This property can change if a stream
+ * published from an iOS device resizes, based on a change in the device orientation. When this
+ * occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event (see
+ * {@link StreamPropertyChangedEvent}.)
+ *
+ * @property {String} name The name of the stream. Publishers can specify a name when publishing
+ * a stream (using the <code>publish()</code> method of the publisher's Session object).
+ *
+ * @property {String} streamId The unique ID of the stream.
  */
-OT.Stream = function(id, connection, name, data, type, creationTime, hasAudio, hasVideo, orientation, peerId, quality, width, height) {
-  var destroyedReason;
 
-  this.id = this.streamId = id;
-  this.connection = connection;
-  this.name = name;
-  this.data = data;
-  this.type = type || 'basic';
-  this.creationTime = creationTime ? Number(creationTime) : null;
-  this.hasAudio = OT.$.castToBoolean(hasAudio, true);
-  this.hasVideo = OT.$.castToBoolean(hasVideo, true);
-  this.peerId = peerId;
-  this.quality = quality;
-  this.videoDimensions = { width: (width || 640), height: (height || 480), orientation: (orientation || OT.VideoOrientation.ROTATED_NORMAL) };
 
-  OT.$.eventing(this);
+  OT.Stream = function(id, name, creationTime, connection, session, channel) {
+    var destroyedReason;
 
-  // Confusingly, this should not be called when you want to change
-  // the stream properties. This is used by Raptor dispatch to notify
-  // the stream that it's properies have been successfully updated
-  //
-  // @todo make this sane. Perhaps use setters for the properties that can
-  // send the appropriate Raptor message. This would require that Streams
-  // have access to their session.
-  //
-  this.update = function(key, value) {
-    if (validPropertyNames.indexOf(key) === -1) {
-      OT.warn('Unknown stream property "' + key + '" was modified to "' + value + '".');
-      return;
+    this.id = this.streamId = id;
+    this.name = name;
+    this.creationTime = Number(creationTime);
+
+    this.connection = connection;
+    this.channel = channel;
+    this.publisher = OT.publishers.find({streamId: this.id});
+    this.publisherId = this.publisher ? this.publisher.id : null;
+
+    OT.$.eventing(this);
+
+    var onChannelUpdate = function(channel, key, oldValue, newValue) {
+      var _key = key;
+
+      switch(_key) {
+        case 'active':
+          _key = channel.type === 'audio' ? 'hasAudio' : 'hasVideo';
+          this[_key] = newValue;
+          break;
+
+        case 'orientation':
+        case 'width':
+        case 'height':
+          this.videoDimensions = {
+            width: channel.width,
+            height: channel.height,
+            orientation: channel.orientation
+          };
+
+          // We dispatch this via the videoDimensions key instead
+          return;
+      }
+
+      this.dispatchEvent( new OT.StreamUpdatedEvent(this, _key, oldValue, newValue) );
+    }.bind(this);
+
+    var associatedWidget = function() {
+      if(this.publisher) {
+        return this.publisher;
+      } else {
+        return OT.subscribers.find(function(subscriber) {
+          return subscriber.streamId === this.id &&
+            subscriber.session.id === session.id;
+        });
+      }
+    }.bind(this);
+
+    // Returns all channels that have a type of +type+.
+    this.getChannelsOfType = function (type) {
+      return this.channel.filter(function(channel) {
+        return channel.type === type;
+      });
+    };
+
+    this.getChannel = function (id) {
+      for (var i=0; i<this.channel.length; ++i) {
+        if (this.channel[i].id === id) return this.channel[i];
+      }
+
+      return null;
+    };
+
+
+    //// implement the following using the channels
+    // hasAudio
+    // hasVideo
+    // videoDimensions
+
+    var audioChannel = this.getChannelsOfType('audio')[0],
+        videoChannel = this.getChannelsOfType('video')[0];
+
+    // @todo this should really be: "has at least one video/audio track" instead of 
+    // "the first video/audio track"
+    this.hasAudio = audioChannel != null && audioChannel.active;
+    this.hasVideo = videoChannel != null && videoChannel.active;
+
+    this.videoDimensions = {};
+    if (videoChannel) {
+      this.videoDimensions.width = videoChannel.width;
+      this.videoDimensions.height = videoChannel.height;
+      this.videoDimensions.orientation = videoChannel.orientation;
+
+      videoChannel.on('update', onChannelUpdate);
     }
 
-    var oldValue = this[key],
-        newValue = value;
-
-    switch(key) {
-      case 'hasAudio':
-      case 'hasVideo':
-        newValue = OT.$.castToBoolean(newValue, true);
-        this[key] = newValue;
-        break;
-
-      case 'quality':
-      case 'name':
-        this[key] = newValue;
-        break;
-
-      case 'orientation':
-        this.videoDimensions = { width: newValue.width, height: newValue.height, orientation: newValue.videoOrientation };
+    if (audioChannel) {
+      audioChannel.on('update', onChannelUpdate);
     }
 
-    // We map the 'orientation' key (that comes from Raptor) to 'videoDimensions' when
-    // dispatching the updated event, as this is actual property that is modified on the stream
-    var event = new OT.StreamUpdatedEvent(this, key, oldValue, newValue);
-    this.dispatchEvent(event);
-  };
+    this.setChannelActiveState = function(channelType, activeState, activeReason) {
+      var attributes = {
+        active: activeState
+      };
+      if (activeReason) {
+        attributes.activeReason = activeReason;
+      }
+      updateChannelsOfType(channelType, attributes);
+    };
 
-  this.destroy = function(reason, quiet) {
-    destroyedReason = reason || 'clientDisconnected';
+    this.setRestrictFrameRate = function(restrict) {
+      updateChannelsOfType('video', {
+        restrictFrameRate: restrict
+      });
+    };
 
-    if (quiet !== true) {
+    var updateChannelsOfType = function(channelType, attributes) {
+      var setChannelActiveState;
+      if (!this.publisher) {
+        var subscriber = OT.subscribers.find(function(subscriber) {
+          return subscriber.streamId === this.id &&
+            subscriber.session.id === session.id;
+        }, this);
+
+        setChannelActiveState = function(channel) {
+          session._.subscriberChannelUpdate(this, subscriber, channel, attributes);
+        };
+      } else {
+        setChannelActiveState = function(channel) {
+          session._.streamChannelUpdate(this, channel, attributes);
+        };
+      }
+
+      this.getChannelsOfType(channelType).forEach(setChannelActiveState.bind(this));
+    }.bind(this);
+
+    this.destroy = function(reason, quiet) {
+      destroyedReason = reason || 'clientDisconnected';
+
+      if (quiet !== true) {
         this.dispatchEvent(
           new OT.DestroyedEvent(
             'destroyed',      // This should be OT.Event.names.STREAM_DESTROYED, but
@@ -9704,94 +11200,174 @@ OT.Stream = function(id, connection, name, data, type, creationTime, hasAudio, h
             destroyedReason
           )
         );
-    }
-  };
+      }
+    };
 
-  Object.defineProperties(this, {
+    Object.defineProperties(this, {
       destroyed: {
-          get: function() { return destroyedReason !== void 0; },
-          enumerable: true
+        get: function() { return destroyedReason !== void 0; },
+        enumerable: true
       },
 
       destroyedReason: {
-          get: function() { return destroyedReason; },
-          enumerable: true
-      }
-  });
-};
+        get: function() { return destroyedReason; },
+        enumerable: true
+      },
 
+      frameRate: {
+        get: function() { return this.getChannelsOfType('video')[0].frameRate; },
+        enumerable: true
+      }
+    });
+
+    /// PRIVATE STUFF CALLED BY Raptor.Dispatcher
+
+    // Confusingly, this should not be called when you want to change
+    // the stream properties. This is used by Raptor dispatch to notify
+    // the stream that it's properies have been successfully updated
+    //
+    // @todo make this sane. Perhaps use setters for the properties that can
+    // send the appropriate Raptor message. This would require that Streams
+    // have access to their session.
+    //
+    this._ = {};
+    this._.updateProperty = function (key, value) {
+      if (validPropertyNames.indexOf(key) === -1) {
+        OT.warn('Unknown stream property "' + key + '" was modified to "' + value + '".');
+        return;
+      }
+
+      var oldValue = this[key],
+          newValue = value;
+
+      switch(key) {
+        case 'name':
+          this[key] = newValue;
+          break;
+
+        case 'archiving':
+          var widget = associatedWidget();
+          if(widget) {
+            widget._.archivingStatus(newValue);
+          }
+          this[key] = newValue;
+          break;
+      }
+
+      var event = new OT.StreamUpdatedEvent(this, key, oldValue, newValue);
+      this.dispatchEvent(event);
+    }.bind(this);
+
+    // Mass update, called by Raptor.Dispatcher
+    this._.update = function (attributes) {
+      for (var key in attributes) {
+        this._.updateProperty(key, attributes[key]);
+      }
+    }.bind(this);
+
+    this._.updateChannel = function (channelId, attributes) {
+      this.getChannel(channelId).update(attributes);
+    }.bind(this);
+  };
 
 })(window);
-(function(window) {
+!(function() {
+  
 
-// Normalise these
-var NativeRTCSessionDescription = (window.mozRTCSessionDescription || window.RTCSessionDescription); // order is very important: "RTCSessionDescription" defined in Firefox Nighly but useless
-var NativeRTCIceCandidate = (window.mozRTCIceCandidate || window.RTCIceCandidate);
+  OT.Archive = function(id, name, status) {
+    
+    this.id = id;
+    this.name = name;
+    this.status = status;
+    
+    this._ = {};
 
-// Helper function to forward Ice Candidates via +messageDelegate+
-var iceCandidateForwarder = function(messageDelegate) {
+    OT.$.eventing(this);
+    
+    // Mass update, called by Raptor.Dispatcher
+    this._.update = function (attributes) {
+      for (var key in attributes) {
+        var oldValue = this[key];
+        this[key] = attributes[key];
+        
+        var event = new OT.ArchiveUpdatedEvent(this, key, oldValue, this[key]);
+        this.dispatchEvent(event);
+        
+      }
+    }.bind(this);
+
+    this.destroy = function() {};
+
+  };
+
+})(window);
+!(function(window) {
+
+  // order is very important: "RTCSessionDescription" defined in Firefox Nighly but useless
+  var NativeRTCSessionDescription = (window.mozRTCSessionDescription ||
+    window.RTCSessionDescription);
+  var NativeRTCIceCandidate = (window.mozRTCIceCandidate || window.RTCIceCandidate);
+
+  // Helper function to forward Ice Candidates via +messageDelegate+
+  var iceCandidateForwarder = function(messageDelegate) {
     return function(event) {
-        OT.debug("IceCandidateForwarder: Ice Candidate");
-
-        if (event.candidate) {
-            messageDelegate(OT.Raptor.Actions.CANDIDATE, event.candidate);
-        }
-        else {
-            OT.debug("IceCandidateForwarder: No more ICE candidates.");
-        }
+      if (event.candidate) {
+        messageDelegate(OT.Raptor.Actions.CANDIDATE, event.candidate);
+      } else {
+        OT.debug('IceCandidateForwarder: No more ICE candidates.');
+      }
     };
-};
+  };
 
 
-// Process incoming Ice Candidates from a remote connection (which have been
-// forwarded via iceCandidateForwarder). The Ice Candidates cannot be processed
-// until a PeerConnection is available. Once a PeerConnection becomes available
-// the pending PeerConnections can be processed by calling processPending.
-//
-// @example
-//
-//  var iceProcessor = new IceCandidateProcessor();
-//  iceProcessor.process(iceMessage1);
-//  iceProcessor.process(iceMessage2);
-//  iceProcessor.process(iceMessage3);
-//
-//  iceProcessor.peerConnection = peerConnection;
-//  iceProcessor.processPending();
-//
-var IceCandidateProcessor = function() {
+  // Process incoming Ice Candidates from a remote connection (which have been
+  // forwarded via iceCandidateForwarder). The Ice Candidates cannot be processed
+  // until a PeerConnection is available. Once a PeerConnection becomes available
+  // the pending PeerConnections can be processed by calling processPending.
+  //
+  // @example
+  //
+  //  var iceProcessor = new IceCandidateProcessor();
+  //  iceProcessor.process(iceMessage1);
+  //  iceProcessor.process(iceMessage2);
+  //  iceProcessor.process(iceMessage3);
+  //
+  //  iceProcessor.peerConnection = peerConnection;
+  //  iceProcessor.processPending();
+  //
+  var IceCandidateProcessor = function() {
     var _pendingIceCandidates = [],
         _peerConnection = null;
 
 
     Object.defineProperty(this, 'peerConnection', {
-        set: function(peerConnection) {
-            _peerConnection = peerConnection;
-        }
+      set: function(peerConnection) {
+        _peerConnection = peerConnection;
+      }
     });
 
     this.process = function(message) {
-        var iceCandidate = new NativeRTCIceCandidate(message.candidate);
+      var iceCandidate = new NativeRTCIceCandidate(message.content);
 
-        if (_peerConnection) {
-            _peerConnection.addIceCandidate(iceCandidate);
-        }
-        else {
-            _pendingIceCandidates.push(iceCandidate);
-        }
+      if (_peerConnection) {
+        _peerConnection.addIceCandidate(iceCandidate);
+      } else {
+        _pendingIceCandidates.push(iceCandidate);
+      }
     };
 
     this.processPending = function() {
-        while(_pendingIceCandidates.length) {
-            _peerConnection.addIceCandidate(_pendingIceCandidates.shift());
-        }
+      while(_pendingIceCandidates.length) {
+        _peerConnection.addIceCandidate(_pendingIceCandidates.shift());
+      }
     };
-};
+  };
 
-// Removes all Confort Noise from +sdp+.
-//
-// See https://jira.tokbox.com/browse/OPENTOK-7176
-//
-var removeComfortNoise = function removeComfortNoise (sdp) {
+  // Removes all Confort Noise from +sdp+.
+  //
+  // See https://jira.tokbox.com/browse/OPENTOK-7176
+  //
+  var removeComfortNoise = function removeComfortNoise (sdp) {
     // a=rtpmap:<payload type> <encoding name>/<clock rate> [/<encoding parameters>]
     var matcher = /a=rtpmap:(\d+) CN\/\d+/i,
         payloadTypes = [],
@@ -9804,168 +11380,182 @@ var removeComfortNoise = function removeComfortNoise (sdp) {
     //   1. extract all the payload types from the rtpmap CN lines
     //   2. find the index of the audio media line
     //
-    sdpLines = sdp.split("\r\n").filter(function(line, index) {
-        if (line.indexOf('m=audio') !== -1) audioMediaLineIndex = index;
+    sdpLines = sdp.split('\r\n').filter(function(line, index) {
+      if (line.indexOf('m=audio') !== -1) audioMediaLineIndex = index;
 
-        match = line.match(matcher);
-        if (match !== null) {
-            payloadTypes.push(match[1]);
+      match = line.match(matcher);
+      if (match !== null) {
+        payloadTypes.push(match[1]);
 
-            // remove this line as it contains CN
-            return false;
-        }
+        // remove this line as it contains CN
+        return false;
+      }
 
-        return true;
+      return true;
     });
 
     if (payloadTypes.length && audioMediaLineIndex) {
-        // Remove all CN payload types from the audio media line.
-        sdpLines[audioMediaLineIndex] = sdpLines[audioMediaLineIndex].replace( new RegExp(payloadTypes.join('|'), 'ig') , '').replace(/\s+/g, ' ');
+      // Remove all CN payload types from the audio media line.
+      sdpLines[audioMediaLineIndex] = sdpLines[audioMediaLineIndex].replace(
+        new RegExp(payloadTypes.join('|'), 'ig') , '').replace(/\s+/g, ' ');
     }
 
-    return sdpLines.join("\r\n");
-};
+    return sdpLines.join('\r\n');
+  };
 
-// Attempt to completely process +offer+. This will:
-// * set the offer as the remote description
-// * create an answer and
-// * set the new answer as the location description
-//
-// If there are no issues, the +success+ callback will be executed on completion.
-// Errors during any step will result in the +failure+ callback being executed.
-//
-var offerProcessor = function(peerConnection, offer, success, failure) {
-    var generateErrorCallback = function(message) {
-            return function(errorReason) {
-                if (failure) failure(message, errorReason);
-            };
-        },
+  // Attempt to completely process +offer+. This will:
+  // * set the offer as the remote description
+  // * create an answer and
+  // * set the new answer as the location description
+  //
+  // If there are no issues, the +success+ callback will be executed on completion.
+  // Errors during any step will result in the +failure+ callback being executed.
+  //
+  var offerProcessor = function(peerConnection, offer, success, failure) {
+    var generateErrorCallback,
+        setLocalDescription,
+        createAnswer;
 
-        setLocalDescription = function(answer) {
-            answer.sdp = removeComfortNoise(answer.sdp);
+    generateErrorCallback = function(message, prefix) {
+      return function(errorReason) {
+        OT.error(message);
+        OT.error(errorReason);
 
-            peerConnection.setLocalDescription(
-                answer,
+        if (failure) failure(message, errorReason, prefix);
+      };
+    };
 
-                // Success
-                function() {
-                    success(answer);
-                },
+    setLocalDescription = function(answer) {
+      answer.sdp = removeComfortNoise(answer.sdp);
 
-                // Failure
-                generateErrorCallback('SetLocalDescription:Error while setting LocalDescription')
-            );
-        },
-
-        createAnswer = function(onSuccess) {
-            peerConnection.createAnswer(
-                // Success
-                setLocalDescription,
-
-                // Failure
-                generateErrorCallback('CreateAnswer:Error while setting createAnswer'),
-
-                null, // MediaConstraints
-                false // createProvisionalAnswer
-            );
-        };
-
-    // Workaround for a Chrome issue. Add in the SDES crypto line into offers
-    // from Firefox
-    if (offer.sdp.indexOf('a=crypto') === -1) {
-        var crypto_line = "a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:FakeFakeFakeFakeFakeFakeFakeFakeFakeFake\\r\\n";
-
-        // insert the fake crypto line for every M line
-        offer.sdp = offer.sdp.replace(/^c=IN(.*)$/gmi, "c=IN$1\r\n"+crypto_line);
-    }
-
-    if (offer.sdp.indexOf('a=rtcp-fb') === -1) {
-        var rtcp_fb_line = "a=rtcp-fb:* ccm fir\r\na=rtcp-fb:* nack ";
-
-        // insert the fake crypto line for every M line
-        offer.sdp = offer.sdp.replace(/^m=video(.*)$/gmi, "m=video$1\r\n"+rtcp_fb_line);
-    }
-
-    peerConnection.setRemoteDescription(
-        offer,
+      peerConnection.setLocalDescription(
+        answer,
 
         // Success
-        createAnswer,
+        function() {
+          success(answer);
+        },
 
         // Failure
-        generateErrorCallback('SetRemoteDescription:Error while setting RemoteDescription')
-    );
+        generateErrorCallback('Error while setting LocalDescription', 'SetLocalDescription')
+      );
+    };
 
-};
-
-// Attempt to completely process a subscribe message. This will:
-// * create an Offer
-// * set the new offer as the location description
-//
-// If there are no issues, the +success+ callback will be executed on completion.
-// Errors during any step will result in the +failure+ callback being executed.
-//
-var suscribeProcessor = function(peerConnection, success, failure) {
-    var constraints = {
-            mandatory: {},
-            optional: []
-        },
-
-        generateErrorCallback = function(message) {
-            return function(errorReason) {
-                if (failure) failure(message, errorReason);
-            };
-        },
-
-        setLocalDescription = function(offer) {
-            offer.sdp = removeComfortNoise(offer.sdp);
-
-            peerConnection.setLocalDescription(
-                offer,
-
-                // Success
-                function() {
-                    success(offer);
-                },
-
-                // Failure
-                generateErrorCallback('SetLocalDescription:Error while setting LocalDescription')
-            );
-        };
-
-
-    // For interop with FireFox. Disable Data Channel in createOffer.
-    if (navigator.mozGetUserMedia) {
-        constraints.mandatory.MozDontOfferDataChannel = true;
-    }
-
-    peerConnection.createOffer(
+    createAnswer = function() {
+      peerConnection.createAnswer(
         // Success
         setLocalDescription,
 
         // Failure
-        generateErrorCallback('CreateOffer:Error while creating Offer'),
+        generateErrorCallback('Error while setting createAnswer', 'CreateAnswer'),
 
-        constraints
+        null, // MediaConstraints
+        false // createProvisionalAnswer
+      );
+    };
+
+    // Workaround for a Chrome issue. Add in the SDES crypto line into offers
+    // from Firefox
+    if (offer.sdp.indexOf('a=crypto') === -1) {
+      var cryptoLine = 'a=crypto:1 AES_CM_128_HMAC_SHA1_80 ' +
+        'inline:FakeFakeFakeFakeFakeFakeFakeFakeFakeFake\\r\\n';
+
+        // insert the fake crypto line for every M line
+      offer.sdp = offer.sdp.replace(/^c=IN(.*)$/gmi, 'c=IN$1\r\n'+cryptoLine);
+    }
+
+    if (offer.sdp.indexOf('a=rtcp-fb') === -1) {
+      var rtcpFbLine = 'a=rtcp-fb:* ccm fir\r\na=rtcp-fb:* nack ';
+
+      // insert the fake crypto line for every M line
+      offer.sdp = offer.sdp.replace(/^m=video(.*)$/gmi, 'm=video$1\r\n'+rtcpFbLine);
+    }
+
+    peerConnection.setRemoteDescription(
+      offer,
+
+      // Success
+      createAnswer,
+
+      // Failure
+      generateErrorCallback('Error while setting RemoteDescription', 'SetRemoteDescription')
     );
-};
 
-/**
- * Negotiates a WebRTC PeerConnection.
- *
- * Responsible for:
- * * offer-answer exchange
- * * iceCandidates
- * * notification of remote streams being added/removed
- *
- */
-OT.PeerConnection = function(config) {
+  };
+
+  // Attempt to completely process a subscribe message. This will:
+  // * create an Offer
+  // * set the new offer as the location description
+  //
+  // If there are no issues, the +success+ callback will be executed on completion.
+  // Errors during any step will result in the +failure+ callback being executed.
+  //
+  var suscribeProcessor = function(peerConnection, success, failure) {
+    var constraints,
+        generateErrorCallback,
+        setLocalDescription;
+
+    constraints = {
+      mandatory: {},
+      optional: []
+    },
+
+    generateErrorCallback = function(message, prefix) {
+      return function(errorReason) {
+        OT.error(message);
+        OT.error(errorReason);
+
+        if (failure) failure(message, errorReason, prefix);
+      };
+    };
+
+    setLocalDescription = function(offer) {
+      offer.sdp = removeComfortNoise(offer.sdp);
+
+      peerConnection.setLocalDescription(
+        offer,
+
+        // Success
+        function() {
+          success(offer);
+        },
+
+        // Failure
+        generateErrorCallback('Error while setting LocalDescription', 'SetLocalDescription')
+      );
+    };
+
+    // For interop with FireFox. Disable Data Channel in createOffer.
+    if (navigator.mozGetUserMedia) {
+      constraints.mandatory.MozDontOfferDataChannel = true;
+    }
+
+    peerConnection.createOffer(
+      // Success
+      setLocalDescription,
+
+      // Failure
+      generateErrorCallback('Error while creating Offer', 'CreateOffer'),
+
+      constraints
+    );
+  };
+
+  /**
+   * Negotiates a WebRTC PeerConnection.
+   *
+   * Responsible for:
+   * * offer-answer exchange
+   * * iceCandidates
+   * * notification of remote streams being added/removed
+   *
+   */
+  OT.PeerConnection = function(config) {
     var _peerConnection,
         _iceProcessor = new IceCandidateProcessor(),
         _offer,
         _answer,
         _state = 'new',
-        _iceCandidatesGathered = false,
         _messageDelegates = [],
         _gettingStats,
         _createTime = OT.$.now();
@@ -9979,147 +11569,133 @@ OT.PeerConnection = function(config) {
 
     // Private methods
     var delegateMessage = function(type, messagePayload) {
-            if (_messageDelegates.length) {
-                // We actually only ever send to the first delegate. This is because
-                // each delegate actually represents a Publisher/Subscriber that
-                // shares a single PeerConnection. If we sent to all delegates it
-                // would result in each message being processed multiple times by
-                // each PeerConnection.
-                _messageDelegates[0](type, messagePayload);
-            }
+          if (_messageDelegates.length) {
+            // We actually only ever send to the first delegate. This is because
+            // each delegate actually represents a Publisher/Subscriber that
+            // shares a single PeerConnection. If we sent to all delegates it
+            // would result in each message being processed multiple times by
+            // each PeerConnection.
+            _messageDelegates[0](type, messagePayload);
+          }
         }.bind(this),
 
-
         setupPeerConnection = function() {
-            if (!_peerConnection) {
-                try {
-                    OT.debug("Creating peer connection config \"" + JSON.stringify(config) + "\".");
+          if (!_peerConnection) {
+            try {
+              OT.debug('Creating peer connection config "' + JSON.stringify(config) + '".');
 
-
-                    _peerConnection = OT.$.createPeerConnection(config, {
-                        optional: [
-                            {DtlsSrtpKeyAgreement: true}
-                        ]
-                    });
-                } catch(e) {
-                    triggerError("NewPeerConnection: " + e.message);
-                    return null;
-                }
-
-                _iceProcessor.peerConnection = _peerConnection;
-
-                _peerConnection.onicecandidate = iceCandidateForwarder(delegateMessage);
-                _peerConnection.onaddstream = onRemoteStreamAdded.bind(this);
-                _peerConnection.onremovestream = onRemoteStreamRemoved.bind(this);
-
-                if (_peerConnection.onsignalingstatechange !== undefined) {
-                    _peerConnection.onsignalingstatechange = routeStateChanged.bind(this);
-                } else if (_peerConnection.onstatechange !== undefined) {
-                    _peerConnection.onstatechange = routeStateChanged.bind(this);
-                }
+              _peerConnection = OT.$.createPeerConnection(config, {
+                optional: [
+                  { DtlsSrtpKeyAgreement: true }
+                ]
+              });
+            } catch(e) {
+              triggerError('Failed to create PeerConnection, exception: ' +
+                  e.message, 'NewPeerConnection');
+              return null;
             }
 
-            return _peerConnection;
+            _peerConnection.onicecandidate = iceCandidateForwarder(delegateMessage);
+            _peerConnection.onaddstream = onRemoteStreamAdded.bind(this);
+            _peerConnection.onremovestream = onRemoteStreamRemoved.bind(this);
+
+            if (_peerConnection.onsignalingstatechange !== undefined) {
+              _peerConnection.onsignalingstatechange = routeStateChanged.bind(this);
+            } else if (_peerConnection.onstatechange !== undefined) {
+              _peerConnection.onstatechange = routeStateChanged.bind(this);
+            }
+            
+            if (_peerConnection.oniceconnectionstatechange !== undefined) {
+              var failedStateTimer;
+              _peerConnection.oniceconnectionstatechange = function (event) {
+                if (event.target.iceConnectionState === 'failed') {
+                  if (failedStateTimer) {
+                    clearTimeout(failedStateTimer);
+                  }
+                  // We wait 5 seconds and make sure that it's still in the failed state
+                  // before we trigger the error. This is because we sometimes see
+                  // 'failed' and then 'connected' afterwards.
+                  setTimeout(function () {
+                    if (event.target.iceConnectionState === 'failed') {
+                      triggerError('The stream was unable to connect due to a network error.' +
+                       ' Make sure your connection isn\'t blocked by a firewall.', 'ICEWorkflow');
+                    }
+                  }, 5000);
+                }
+              };
+            }
+          }
+
+          return _peerConnection;
         }.bind(this),
 
         // Clean up the Peer Connection and trigger the close event.
         // This function can be called safely multiple times, it will
         // only trigger the close event once (per PeerConnection object)
         tearDownPeerConnection = function() {
-            // Our connection is dead, stop processing ICE candidates
-            if (_iceProcessor) _iceProcessor.peerConnection = null;
+          // Our connection is dead, stop processing ICE candidates
+          if (_iceProcessor) _iceProcessor.peerConnection = null;
 
-            if (_peerConnection !== null) {
-                _peerConnection = null;
-                this.trigger('close');
-            }
+          if (_peerConnection !== null) {
+            _peerConnection = null;
+            this.trigger('close');
+          }
         },
 
         routeStateChanged = function(event) {
-            var newState;
+          var newState;
 
-            if (typeof(event) === 'string') {
-                // The newest version of the API
-                newState = event;
+          if (typeof(event) === 'string') {
+            // The newest version of the API
+            newState = event;
+
+          } else if (event.target && event.target.signalingState) {
+            // The slightly older version
+            newState = event.target.signalingState;
+
+          } else {
+            // At least six months old version. Positively ancient, yeah?
+            newState = event.target.readyState;
+          }
+
+          OT.debug('PeerConnection.stateChange: ' + newState);
+          if (newState && newState.toLowerCase() !== _state) {
+            _state = newState.toLowerCase();
+            OT.debug('PeerConnection.stateChange: ' + _state);
+
+            switch(_state) {
+              case 'closed':
+                tearDownPeerConnection.call(this);
+                break;
             }
-            else if (event.target && event.target.signalingState) {
-                // The slightly older version
-                newState = event.target.signalingState;
-            }
-            else {
-                // At least six months old version. Positively ancient, yeah?
-                newState = event.target.readyState;
-            }
-
-
-            OT.debug('PeerConnection.stateChange: ' + newState);
-            if (newState && newState.toLowerCase() !== _state) {
-                _state = newState.toLowerCase();
-                OT.debug('PeerConnection.stateChange: ' + _state);
-
-                switch(_state) {
-                    case 'closed':
-                        tearDownPeerConnection.call(this);
-
-                        break;
-                    case 'failed':
-                      triggerError('ICEWorkflow: Ice state failed');
-                      break;
-                }
-            }
-        },
-
-        getLocalStreams = function() {
-            var streams;
-
-            if (_peerConnection.getLocalStreams) {
-                streams = _peerConnection.getLocalStreams();
-            }
-            else if (_peerConnection.localStreams) {
-                streams = _peerConnection.localStreams;
-            }
-            else {
-                throw new Error("Invalid Peer Connection object implements no method for retrieving local streams");
-            }
-
-            // Force streams to be an Array, rather than a "Sequence" object,
-            // which is browser dependent and does not behaviour like an Array
-            // in every case.
-            return Array.prototype.slice.call(streams);
+          }
         },
 
         getRemoteStreams = function() {
-            var streams;
+          var streams;
 
-            if (_peerConnection.getRemoteStreams) {
-                streams = _peerConnection.getRemoteStreams();
-            }
-            else if (_peerConnection.remoteStreams) {
-                streams = _peerConnection.remoteStreams;
-            }
-            else {
-                throw new Error("Invalid Peer Connection object implements no method for retrieving remote streams");
-            }
+          if (_peerConnection.getRemoteStreams) {
+            streams = _peerConnection.getRemoteStreams();
+          } else if (_peerConnection.remoteStreams) {
+            streams = _peerConnection.remoteStreams;
+          } else {
+            throw new Error('Invalid Peer Connection object implements no ' +
+              'method for retrieving remote streams');
+          }
 
-            // Force streams to be an Array, rather than a "Sequence" object,
-            // which is browser dependent and does not behaviour like an Array
-            // in every case.
-            return Array.prototype.slice.call(streams);
-        },
-
-        generateErrorCallback = function(forMethod, message) {
-            return function(errorReason) {
-                triggerError.call(this, "PeerConnection." + forMethod + ": " + message + ": " + errorReason);
-            }.bind(this);
+          // Force streams to be an Array, rather than a "Sequence" object,
+          // which is browser dependent and does not behaviour like an Array
+          // in every case.
+          return Array.prototype.slice.call(streams);
         },
 
         /// PeerConnection signaling
         onRemoteStreamAdded = function(event) {
-            this.trigger('streamAdded', event.stream);
+          this.trigger('streamAdded', event.stream);
         },
 
         onRemoteStreamRemoved = function(event) {
-            this.trigger('streamRemoved', event.stream);
+          this.trigger('streamRemoved', event.stream);
         },
 
         // ICE Negotiation messages
@@ -10128,141 +11704,145 @@ OT.PeerConnection = function(config) {
         // Relays a SDP payload (+sdp+), that is part of a message of type +messageType+
         // via the registered message delegators
         relaySDP = function(messageType, sdp) {
-            delegateMessage(messageType, sdp);
+          delegateMessage(messageType, sdp);
         },
 
         // Process an offer that
         processOffer = function(message) {
-            var offer = new NativeRTCSessionDescription(message.sdp),
+          var offer = new NativeRTCSessionDescription({type: 'offer', sdp: message.content.sdp}),
 
-                // Relays +answer+ Answer
-                relayAnswer = function(answer) {
-                    relaySDP(OT.Raptor.Actions.ANSWER, answer);
-                },
+              // Relays +answer+ Answer
+              relayAnswer = function(answer) {
+                _iceProcessor.peerConnection = _peerConnection;
+                _iceProcessor.processPending();
+                relaySDP(OT.Raptor.Actions.ANSWER, answer);
+              },
 
-                reportError = function(message, errorReason) {
-                    triggerError(message + ":" + errorReason + ":PeerConnection.offerProcessor");
-                };
+              reportError = function(message, errorReason, prefix) {
+                triggerError('PeerConnection.offerProcessor ' + message + ': ' +
+                  errorReason, prefix);
+              };
 
-            setupPeerConnection();
+          setupPeerConnection();
 
-            _remoteDescriptionType = offer.type;
-            _remoteDescription = offer;
-
-            offerProcessor(
-                _peerConnection,
-                offer,
-                relayAnswer,
-                reportError
-            );
+          offerProcessor(
+            _peerConnection,
+            offer,
+            relayAnswer,
+            reportError
+          );
         },
 
         processAnswer = function(message) {
-            if (!message.sdp) {
-                OT.error("PeerConnection.processMessage: Weird message, no SDP.");
-                return;
+          if (!message.content.sdp) {
+            OT.error('PeerConnection.processMessage: Weird answer message, no SDP.');
+            return;
+          }
+
+          _answer = new NativeRTCSessionDescription({type: 'answer', sdp: message.content.sdp});
+
+          _peerConnection.setRemoteDescription(_answer,
+              function () {
+                OT.debug('setRemoteDescription Success');
+              }, function (errorReason) {
+                triggerError('Error while setting RemoteDescription ' + errorReason,
+                  'SetRemoteDescription');
+              });
+
+          _iceProcessor.peerConnection = _peerConnection;
+          _iceProcessor.processPending();
+        },
+
+        processSubscribe = function() {
+          OT.debug('PeerConnection.processSubscribe: Sending offer to subscriber.');
+
+          setupPeerConnection();
+
+          suscribeProcessor(
+            _peerConnection,
+
+            // Success: Relay Offer
+            function(offer) {
+              _offer = offer;
+              relaySDP(OT.Raptor.Actions.OFFER, _offer);
+            },
+
+            // Failure
+            function(message, errorReason, prefix) {
+              triggerError('PeerConnection.suscribeProcessor ' + message + ': ' +
+                errorReason, prefix);
             }
-
-            _answer = new NativeRTCSessionDescription(message.sdp);
-
-            _remoteDescriptionType = _answer.type;
-            _remoteDescription = _answer;
-
-            _peerConnection.setRemoteDescription(_answer, function () {
-              OT.debug("setRemoteDescription succeeded");
-            }, function (errReason) {
-              triggerError("SetRemoteDescription:Error while setting RemoteDescription: " + errReason);
-            });
-            _iceProcessor.processPending();
+          );
         },
 
-        processSubscribe = function(message) {
-            OT.debug("PeerConnection.processSubscribe: Sending offer to subscriber.");
-
-            setupPeerConnection();
-
-            suscribeProcessor(
-                _peerConnection,
-
-                // Success: Relay Offer
-                function(offer) {
-                    _offer = offer;
-                    relaySDP(OT.Raptor.Actions.OFFER, _offer);
-                },
-
-                // Failure
-                function(message, errorReason) {
-                    triggerError(message + ":" + errorReason + ": PeerConnection.suscribeProcessor");
-                }
-            );
-        },
-
-        triggerError = function(errorReason) {
-            OT.error(errorReason);
-            this.trigger('error', errorReason);
+        triggerError = function(errorReason, prefix) {
+          OT.error(errorReason);
+          this.trigger('error', errorReason, prefix);
         }.bind(this);
 
     this.addLocalStream = function(webRTCStream) {
-        setupPeerConnection();
-        _peerConnection.addStream(webRTCStream);
+      setupPeerConnection();
+      _peerConnection.addStream(webRTCStream);
     };
 
     this.disconnect = function() {
-        _iceProcessor = null;
+      _iceProcessor = null;
 
-        if (_peerConnection) {
-            var currentState = (_peerConnection.signalingState || _peerConnection.readyState);
-            if (currentState && currentState.toLowerCase() !== 'closed') _peerConnection.close();
+      if (_peerConnection) {
+        var currentState = (_peerConnection.signalingState || _peerConnection.readyState);
+        if (currentState && currentState.toLowerCase() !== 'closed') _peerConnection.close();
 
-            // In theory, calling close on the PeerConnection should trigger a statechange
-            // event with 'close'. For some reason I'm not seeing this in FF, hence we're
-            // calling it manually below
-            tearDownPeerConnection.call(this);
-        }
+          // In theory, calling close on the PeerConnection should trigger a statechange
+          // event with 'close'. For some reason I'm not seeing this in FF, hence we're
+          // calling it manually below
+        tearDownPeerConnection.call(this);
+      }
 
-        this.off();
+      this.off();
     };
 
     this.processMessage = function(type, message) {
-        OT.debug("PeerConnection.processMessage: Received " + type + " from " + message.fromAddress);
-        OT.debug(message);
+      OT.debug('PeerConnection.processMessage: Received ' +
+        type + ' from ' + message.fromAddress);
+      OT.debug(message);
 
-        switch(type) {
-            case OT.Raptor.Actions.SUBSCRIBE:
-                processSubscribe.call(this, message);
-                break;
+      switch(type) {
+        case 'generateoffer':
+          processSubscribe.call(this, message);
+          break;
 
-            case OT.Raptor.Actions.OFFER:
-                processOffer.call(this, message);
-                break;
+        case 'offer':
+          processOffer.call(this, message);
+          break;
 
-            case OT.Raptor.Actions.ANSWER:
-            // case OT.Raptor.Actions.PRANSWER:
-                processAnswer.call(this, message);
-                break;
+        case 'answer':
+        case 'pranswer':
+          processAnswer.call(this, message);
+          break;
 
-            case OT.Raptor.Actions.CANDIDATE:
-                _iceProcessor.process(message);
-                break;
+        case 'candidate':
+          _iceProcessor.process(message);
+          break;
 
-            default:
-                OT.debug("PeerConnection.processMessage: Received an unexpected message of type " + type + " from " + message.fromAddress + ": " + JSON.stringify(message));
-        }
+        default:
+          OT.debug('PeerConnection.processMessage: Received an unexpected message of type ' +
+            type + ' from ' + message.fromAddress + ': ' + JSON.stringify(message));
+      }
 
-        return this;
+      return this;
     };
 
     this.registerMessageDelegate = function(delegateFn) {
-        return _messageDelegates.push(delegateFn);
+      return _messageDelegates.push(delegateFn);
     };
 
     this.unregisterMessageDelegate = function(delegateFn) {
-        var index = _messageDelegates.indexOf(delegateFn);
+      var index = _messageDelegates.indexOf(delegateFn);
 
-        if ( index !== -1 ) {
-            _messageDelegates.splice(index, 1);
-        }
-        return _messageDelegates.length;
+      if ( index !== -1 ) {
+        _messageDelegates.splice(index, 1);
+      }
+      return _messageDelegates.length;
     };
 
     /**
@@ -10278,403 +11858,472 @@ OT.PeerConnection = function(config) {
      * if there is presently no stats.
      */
     this.getStats = function(prevStats, callback) {
-        // need to make sure that this isn't called again when in the middle of processing
-        if (_gettingStats == true) {
-            OT.warn("PeerConnection.getStats: Already getting the stats!");
-            return;
+      var parsedStats = {},
+          now,
+          timeDifference,
+          parseAvgVideoBitrate,
+          parseAvgAudioBitrate,
+          parseFrameRate,
+          parseStatsReports,
+          parseStats,
+          needsNewGetStats;
+
+      // need to make sure that this isn't called again when in the middle of processing
+      if (_gettingStats === true) {
+        OT.warn('PeerConnection.getStats: Already getting the stats!');
+        return;
+      }
+
+      // locking this function
+      _gettingStats = true;
+
+      // get the previous timestamp (seconds)
+      now = OT.$.now();
+      timeDifference = (now - prevStats.timeStamp) / 1000; // how many seconds has passed
+
+      // now update the date
+      prevStats.timeStamp = now;
+
+      /* this parses a result if there it contains the video bitrate */
+      parseAvgVideoBitrate = function(result) {
+        var lastBytesSent = prevStats.videoBytesTransferred || 0;
+
+        if (result.bytesSent || result.bytesReceived) {
+          prevStats.videoBytesTransferred = result.bytesSent || result.bytesReceived;
+          return Math.round((prevStats.videoBytesTransferred - lastBytesSent) * 8 / timeDifference);
+
+        } else if (result.stat('googFrameHeightSent')) {
+          prevStats.videoBytesTransferred = result.stat('bytesSent');
+          return Math.round((prevStats.videoBytesTransferred - lastBytesSent) * 8 / timeDifference);
+
+        } else if (result.stat('googFrameHeightReceived')) {
+          prevStats.videoBytesTransferred = result.stat('bytesReceived');
+          return Math.round((prevStats.videoBytesTransferred - lastBytesSent) * 8 / timeDifference);
+
+        } else {
+          return NaN;
         }
 
-        // locking this function
-        _gettingStats = true;
-
-        // get the previous timestamp (seconds)
-        var now = OT.$.now();
-        var time_difference = (now - prevStats["timeStamp"]) / 1000; // how many seconds has passed
-
-        // now update the date
-        prevStats["timeStamp"] = now;
-
-        /* this parses a result if there it contains the video bitrate */
-        var parseAvgVideoBitrate = function(result) {
-            var last_bytesSent = prevStats["videoBytesTransferred"] || 0;
-
-            if (result.stat("googFrameHeightSent")) {
-                prevStats["videoBytesTransferred"] = result.stat("bytesSent");
-                return Math.round((prevStats["videoBytesTransferred"] - last_bytesSent) * 8 / time_difference);
-            } else if (result.stat("googFrameHeightReceived")) {
-                prevStats["videoBytesTransferred"] = result.stat("bytesReceived");
-                return Math.round((prevStats["videoBytesTransferred"] - last_bytesSent) * 8 / time_difference);
-            } else {
-                return NaN;
-            }
-        };
+      };
 
         /* this parses a result if there it contains the audio bitrate */
-        var parseAvgAudioBitrate = function(result) {
-            var last_bytesSent = prevStats["audioBytesTransferred"] || 0;
+      parseAvgAudioBitrate = function(result) {
+        var lastBytesSent = prevStats.audioBytesTransferred || 0;
 
-            if (result.stat("audioInputLevel")) {
-                prevStats["audioBytesTransferred"] = result.stat("bytesSent");
-                return Math.round((prevStats["audioBytesTransferred"] - last_bytesSent) * 8 / time_difference);
-            } else if (result.stat("audioOutputLevel")) {
-                prevStats["audioBytesTransferred"] = result.stat("bytesReceived");
-                return Math.round((prevStats["audioBytesTransferred"] - last_bytesSent) * 8 / time_difference);
-            } else {
-                return NaN;
-            }
-        };
+        if (result.bytesSent || result.bytesReceived) {
+          prevStats.audioBytesTransferred = result.bytesSent || result.bytesReceived;
+          return Math.round((prevStats.audioBytesTransferred - lastBytesSent) * 8 / timeDifference);
 
-        var parsed_stats = {};
-        var parseStatsReports = function(stats) {
-            if (stats.result) {
-                var result_list = stats.result();
-                for (var result_index = 0; result_index < result_list.length; result_index++) {
-                    var report = {};
-                    var result = result_list[result_index];
-                    if (result.stat) {
+        } else if (result.stat('audioInputLevel')) {
+          prevStats.audioBytesTransferred = result.stat('bytesSent');
+          return Math.round((prevStats.audioBytesTransferred - lastBytesSent) * 8 / timeDifference);
 
-                        if(result.stat("googActiveConnection") === 'true') {
-                            parsed_stats.localCandidateType = result.stat('googLocalCandidateType');
-                            parsed_stats.remoteCandidateType = result.stat('googRemoteCandidateType');
-                            parsed_stats.transportType = result.stat('googTransportType');
-                        }
+        } else if (result.stat('audioOutputLevel')) {
+          prevStats.audioBytesTransferred = result.stat('bytesReceived');
+          return Math.round((prevStats.audioBytesTransferred - lastBytesSent) * 8 / timeDifference);
 
-                        var avgVideoBitrate = parseAvgVideoBitrate(result);
-                        if (!isNaN(avgVideoBitrate)) {
-                            parsed_stats["avgVideoBitrate"] = avgVideoBitrate;
-                        }
-
-                        var avgAudioBitrate = parseAvgAudioBitrate(result);
-                        if (!isNaN(avgAudioBitrate)) {
-                            parsed_stats["avgAudioBitrate"] = avgAudioBitrate;
-                        }
-                    }
-                }
-            }
-
-            _gettingStats = false;
-            callback(parsed_stats);
-        }
-        parsed_stats["duration"] = Math.round(now - _createTime);
-
-        var parseStats = function(stats) {
-            for (var key in stats) {
-                if (stats.hasOwnProperty(key) &&
-                    (stats[key].type === 'outboundrtp' || stats[key].type === 'inboundrtp')) {
-                    var res = stats[key];
-                    // Find the bandwidth info for video
-                    if (res.id.indexOf('video') !== -1) {
-                        var avgVideoBitrate = parseAvgVideoBitrate(res);
-                        if(!isNaN(avgVideoBitrate)) {
-                            parsed_stats.avgVideoBitrate = avgVideoBitrate;
-                        }
-
-                    } else if (res.id.indexOf('audio') !== -1) {
-                        var avgAudioBitrate = parseAvgAudioBitrate(res);
-                        if(!isNaN(avgAudioBitrate)) {
-                            parsed_stats.avgAudioBitrate = avgAudioBitrate;
-                        }
-                    }
-                }
-            }
-
-            _gettingStats = false;
-            callback(parsed_stats);
-        }
-
-
-        var needsNewGetStats = function() {
-            var firefoxVersion = window.navigator.userAgent.toLowerCase()
-            .match(/Firefox\/([0-9\.]+)/i);
-            var needs = (firefoxVersion !== null && parseFloat(firefoxVersion[1], 10) >= 27.0);
-            needsNewGetStats = function() { return needs; };
-            return needs;
-        };
-
-        if (_peerConnection && _peerConnection.getStats) {
-            if(needsNewGetStats()) {
-                _peerConnection.getStats(null, parseStats, function(err) {
-                    OT.warn('Error collecting stats', err);
-                    _gettingStats = false;
-                });
-            } else {
-                _peerConnection.getStats(parseStatsReports);
-            }
         } else {
-            // there was no peer connection yet or getStats isn't implemented in this enviroment
-            _gettingStats = false;
-            callback(parsed_stats);
+          return NaN;
         }
+
+      };
+        
+      parseFrameRate = function(result) {
+        if (result.stat('googFrameRateSent')) {
+          return result.stat('googFrameRateSent');
+        } else if (result.stat('googFrameRateReceived')) {
+          return result.stat('googFrameRateReceived');
+        }
+        return null;
+      };
+
+      parseStatsReports = function(stats) {
+        if (stats.result) {
+          var resultList = stats.result();
+          for (var resultIndex = 0; resultIndex < resultList.length; resultIndex++) {
+            var result = resultList[resultIndex];
+            if (result.stat) {
+
+              if(result.stat('googActiveConnection') === 'true') {
+                parsedStats.localCandidateType = result.stat('googLocalCandidateType');
+                parsedStats.remoteCandidateType = result.stat('googRemoteCandidateType');
+                parsedStats.transportType = result.stat('googTransportType');
+              }
+
+              var avgVideoBitrate = parseAvgVideoBitrate(result);
+              if (!isNaN(avgVideoBitrate)) {
+                parsedStats.avgVideoBitrate = avgVideoBitrate;
+              }
+
+              var avgAudioBitrate = parseAvgAudioBitrate(result);
+              if (!isNaN(avgAudioBitrate)) {
+                parsedStats.avgAudioBitrate = avgAudioBitrate;
+              }
+              var frameRate = parseFrameRate(result);
+              if (frameRate != null) {
+                parsedStats.frameRate = frameRate;
+              }
+            }
+          }
+        }
+
+        _gettingStats = false;
+        callback(parsedStats);
+      };
+      parsedStats.duration = Math.round(now - _createTime);
+
+      parseStats = function(stats) {
+        for (var key in stats) {
+          if (stats.hasOwnProperty(key) &&
+            (stats[key].type === 'outboundrtp' || stats[key].type === 'inboundrtp')) {
+            var res = stats[key];
+            // Find the bandwidth info for video
+            if (res.id.indexOf('video') !== -1) {
+
+              var avgVideoBitrate = parseAvgVideoBitrate(res);
+              if(!isNaN(avgVideoBitrate)) {
+                parsedStats.avgVideoBitrate = avgVideoBitrate;
+              }
+
+            } else if (res.id.indexOf('audio') !== -1) {
+
+              var avgAudioBitrate = parseAvgAudioBitrate(res);
+              if(!isNaN(avgAudioBitrate)) {
+                parsedStats.avgAudioBitrate = avgAudioBitrate;
+              }
+
+            }
+          }
+        }
+
+        _gettingStats = false;
+        callback(parsedStats);
+      };
+
+      needsNewGetStats = function() {
+        var firefoxVersion = window.navigator.userAgent.toLowerCase()
+        .match(/Firefox\/([0-9\.]+)/i);
+        var needs = (firefoxVersion !== null && parseFloat(firefoxVersion[1], 10) >= 27.0);
+        needsNewGetStats = function() { return needs; };
+        return needs;
+      };
+
+      if (_peerConnection && _peerConnection.getStats) {
+        if(needsNewGetStats()) {
+          _peerConnection.getStats(null, parseStats, function(err) {
+            OT.warn('Error collecting stats', err);
+            _gettingStats = false;
+          });
+        } else {
+          _peerConnection.getStats(parseStatsReports);
+        }
+      } else {
+        // there was no peer connection yet or getStats isn't implemented in this enviroment
+        _gettingStats = false;
+        callback(parsedStats);
+      }
     };
 
     Object.defineProperty(this, 'remoteStreams', {
-        get: function() {
-            return _peerConnection ? getRemoteStreams() : [];
-        }
+      get: function() {
+        return _peerConnection ? getRemoteStreams() : [];
+      }
     });
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-var _peerConnections = {};
+  var _peerConnections = {};
 
-OT.PeerConnections = {
-    add: function(remoteConnection, stream, config) {
-        var key = remoteConnection.id + "_" + stream.id,
-            ref = _peerConnections[key];
+  OT.PeerConnections = {
+    add: function(remoteConnection, streamId, config) {
+      var key = remoteConnection.id + '_' + streamId,
+          ref = _peerConnections[key];
 
-        if (!ref) {
-            ref = _peerConnections[key] = {
-                count: 0,
-                pc: new OT.PeerConnection(config)
-            };
-        }
+      if (!ref) {
+        ref = _peerConnections[key] = {
+          count: 0,
+          pc: new OT.PeerConnection(config)
+        };
+      }
 
-        // increase the PCs ref count by 1
-        ref.count += 1;
+      // increase the PCs ref count by 1
+      ref.count += 1;
 
-        return ref.pc;
+      return ref.pc;
     },
 
-    remove: function(remoteConnection, stream) {
-        var key = remoteConnection.id + "_" + stream.id,
-            ref = _peerConnections[key];
+    remove: function(remoteConnection, streamId) {
+      var key = remoteConnection.id + '_' + streamId,
+          ref = _peerConnections[key];
 
-        if (ref) {
-            ref.count -= 1;
+      if (ref) {
+        ref.count -= 1;
 
-            if (ref.count === 0) {
-                ref.pc.disconnect();
-                delete _peerConnections[key];
-            }
+        if (ref.count === 0) {
+          ref.pc.disconnect();
+          delete _peerConnections[key];
         }
+      }
     }
-};
-
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-/**
- * Abstracts PeerConnection related stuff away from OT.Publisher.
- *
- * Responsible for:
- * * setting up the underlying PeerConnection (delegates to OT.PeerConnections)
- * * triggering a connected event when the Peer connection is opened
- * * triggering a disconnected event when the Peer connection is closed
- * * providing a destroy method
- * * providing a processMessage method
- *
- * Once the PeerConnection is connected and the video element playing it triggers the connected event
- *
- * Triggers the following events
- * * connected
- * * disconnected
- */
-OT.PublisherPeerConnection = function(remoteConnection, session, stream, webRTCStream) {
+  /**
+   * Abstracts PeerConnection related stuff away from OT.Publisher.
+   *
+   * Responsible for:
+   * * setting up the underlying PeerConnection (delegates to OT.PeerConnections)
+   * * triggering a connected event when the Peer connection is opened
+   * * triggering a disconnected event when the Peer connection is closed
+   * * providing a destroy method
+   * * providing a processMessage method
+   *
+   * Once the PeerConnection is connected and the video element playing it triggers 
+   * the connected event
+   *
+   * Triggers the following events
+   * * connected
+   * * disconnected
+   */
+  OT.PublisherPeerConnection = function(remoteConnection, session, streamId, webRTCStream) {
     var _peerConnection,
-        _hasRelayCandidates = false;
+        _hasRelayCandidates = false,
+        _subscriberId = session._.subscriberMap[remoteConnection.id + '_' + streamId],
+        _onPeerClosed,
+        _onPeerError,
+        _relayMessageToPeer;
 
     // Private
-    var _onPeerClosed = function() {
-            this.destroy();
-            this.trigger('disconnected', this);
-        },
+    _onPeerClosed = function() {
+      this.destroy();
+      this.trigger('disconnected', this);
+    };
 
-        // Note: All Peer errors are fatal right now.
-        _onPeerError = function(errorReason) {
-            this.trigger('error', null, errorReason, this);
-            this.destroy();
-        },
+    // Note: All Peer errors are fatal right now.
+    _onPeerError = function(errorReason, prefix) {
+      this.trigger('error', null, errorReason, this, prefix);
+      this.destroy();
+    };
 
-        _relayMessageToPeer = function(type, payload) {
-            if (!_hasRelayCandidates){
-                var extractCandidates = type === OT.Raptor.Actions.CANDIDATE ||
-                                        type === OT.Raptor.Actions.OFFER ||
-                                        type === OT.Raptor.Actions.ANSWER ||
-                                        type === OT.Raptor.Actions.PRANSWER ;
+    _relayMessageToPeer = function(type, payload) {
+      if (!_hasRelayCandidates){
+        var extractCandidates = type === OT.Raptor.Actions.CANDIDATE ||
+                                type === OT.Raptor.Actions.OFFER ||
+                                type === OT.Raptor.Actions.ANSWER ||
+                                type === OT.Raptor.Actions.PRANSWER ;
 
-                if (extractCandidates) {
-                    var message = (type === OT.Raptor.Actions.CANDIDATE) ? payload.candidate : payload.sdp;
-                    _hasRelayCandidates = message.indexOf('typ relay') !== -1;
-                }
-            }
+        if (extractCandidates) {
+          var message = (type === OT.Raptor.Actions.CANDIDATE) ? payload.candidate : payload.sdp;
+          _hasRelayCandidates = message.indexOf('typ relay') !== -1;
+        }
+      }
 
-            switch(type) {
-            case OT.Raptor.Actions.ANSWER:
-            case OT.Raptor.Actions.PRANSWER:
-                session._.jsepAnswer(remoteConnection.id, stream, payload);
-                break;
+      switch(type) {
+        case OT.Raptor.Actions.ANSWER:
+        case OT.Raptor.Actions.PRANSWER:
+          if (session.sessionInfo.p2pEnabled) {
+            session._.jsepAnswerP2p(streamId, _subscriberId, payload.sdp);
+          } else {
+            session._.jsepAnswer(streamId, payload.sdp);
+          }
 
-            case OT.Raptor.Actions.OFFER:
-                this.trigger('connected');
-                session._.jsepOffer(remoteConnection.id, stream, payload);
-                break;
+          break;
 
-            case OT.Raptor.Actions.CANDIDATE:
-                session._.jsepCandidate(remoteConnection.id, stream, payload);
-            }
-        }.bind(this);
+        case OT.Raptor.Actions.OFFER:
+          this.trigger('connected');
 
+          if (session.sessionInfo.p2pEnabled) {
+            session._.jsepOfferP2p(streamId, _subscriberId, payload.sdp);
+
+          } else {
+            session._.jsepOffer(streamId, payload.sdp);
+          }
+
+          break;
+
+        case OT.Raptor.Actions.CANDIDATE:
+          if (session.sessionInfo.p2pEnabled) {
+            session._.jsepCandidateP2p(streamId, _subscriberId, payload);
+
+          } else {
+            session._.jsepCandidate(streamId, payload);
+          }
+      }
+    }.bind(this);
 
     OT.$.eventing(this);
 
     // Public
     this.destroy = function() {
-        // Clean up our PeerConnection
-        if (_peerConnection) {
-            OT.PeerConnections.remove(remoteConnection, stream);
-        }
+      // Clean up our PeerConnection
+      if (_peerConnection) {
+        OT.PeerConnections.remove(remoteConnection, streamId);
+      }
 
-        _peerConnection.off();
-        _peerConnection = null;
+      _peerConnection.off();
+      _peerConnection = null;
     };
 
     this.processMessage = function(type, message) {
-        _peerConnection.processMessage(type, message);
+      _peerConnection.processMessage(type, message);
     };
 
     this.getStats = function(prevStats, callback) {
-        _peerConnection.getStats(prevStats, callback);
-    }
+      _peerConnection.getStats(prevStats, callback);
+    };
 
     // Init
     this.init = function() {
-        var iceServers = session.sessionInfo.iceServers.map(function(is) {
-            var iceServer = OT.$.clone(is);
+      var iceServers = session.sessionInfo.iceServers.map(function(is) {
+        var iceServer = OT.$.clone(is);
 
-            if (iceServer.url.trim().substr(0, 5) === 'turn:') {
-                // Make the username sessionId:connectionId:streamId for tracking purposes.
-                iceServer.username = session.id + '.' + session.connection.id + '.' + stream.id;
-            }
+        if (iceServer.url.trim().substr(0, 5) === 'turn:') {
+          // Make the username sessionId:connectionId:streamId for tracking purposes.
+          iceServer.username = session.id + '.' + session.connection.id + '.' + streamId;
+        }
 
-            return iceServer;
-        });
+        return iceServer;
+      });
 
-        _peerConnection = OT.PeerConnections.add(remoteConnection, stream, {
-            iceServers: iceServers
-        });
+      _peerConnection = OT.PeerConnections.add(remoteConnection, streamId, {
+        iceServers: iceServers
+      });
 
-        _peerConnection.on({
-            close: _onPeerClosed,
-            error: _onPeerError
-        }, this);
+      _peerConnection.on({
+        close: _onPeerClosed,
+        error: _onPeerError
+      }, this);
 
-        _peerConnection.registerMessageDelegate(_relayMessageToPeer);
-        _peerConnection.addLocalStream(webRTCStream);
+      _peerConnection.registerMessageDelegate(_relayMessageToPeer);
+      _peerConnection.addLocalStream(webRTCStream);
 
-        Object.defineProperty(this, 'remoteConnection', {value: remoteConnection});
+      Object.defineProperty(this, 'remoteConnection', {
+        value: remoteConnection
+      });
 
-        Object.defineProperty(this, 'hasRelayCandidates', {
-            get: function() { return _hasRelayCandidates; }
-        });
-    }
-};
+      Object.defineProperty(this, 'hasRelayCandidates', {
+        get: function() { return _hasRelayCandidates; }
+      });
+    };
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-/**
- * Abstracts PeerConnection related stuff away from OT.Subscriber.
- *
- * Responsible for:
- * * setting up the underlying PeerConnection (delegates to OT.PeerConnections)
- * * triggering a connected event when the Peer connection is opened
- * * triggering a disconnected event when the Peer connection is closed
- * * creating a video element when a stream is added
- * * responding to stream removed intelligently
- * * providing a destroy method
- * * providing a processMessage method
- *
- * Once the PeerConnection is connected and the video element playing it triggers the connected event
- *
- * Triggers the following events
- * * connected
- * * disconnected
- * * remoteStreamAdded
- * * remoteStreamRemoved
- * * error
- *
- */
+  /**
+   * Abstracts PeerConnection related stuff away from OT.Subscriber.
+   *
+   * Responsible for:
+   * * setting up the underlying PeerConnection (delegates to OT.PeerConnections)
+   * * triggering a connected event when the Peer connection is opened
+   * * triggering a disconnected event when the Peer connection is closed
+   * * creating a video element when a stream is added
+   * * responding to stream removed intelligently
+   * * providing a destroy method
+   * * providing a processMessage method
+   *
+   * Once the PeerConnection is connected and the video element playing it
+   * triggers the connected event
+   *
+   * Triggers the following events
+   * * connected
+   * * disconnected
+   * * remoteStreamAdded
+   * * remoteStreamRemoved
+   * * error
+   *
+   */
 
-OT.SubscriberPeerConnection = function(remoteConnection, session, stream, properties) {
+  OT.SubscriberPeerConnection = function(remoteConnection, session, stream,
+    subscriber, properties) {
     var _peerConnection,
-        _hasRelayCandidates = false;
+        _hasRelayCandidates = false,
+        _onPeerClosed,
+        _onRemoteStreamAdded,
+        _onRemoteStreamRemoved,
+        _onPeerError,
+        _relayMessageToPeer,
+        _setEnabledOnStreamTracksCurry;
 
     // Private
-    var _onPeerClosed = function() {
-            this.destroy();
-            this.trigger('disconnected', this);
-        },
+    _onPeerClosed = function() {
+      this.destroy();
+      this.trigger('disconnected', this);
+    };
 
-        _onRemoteStreamAdded = function(remoteRTCStream) {
-            this.trigger('remoteStreamAdded', remoteRTCStream, this);
-        },
+    _onRemoteStreamAdded = function(remoteRTCStream) {
+      this.trigger('remoteStreamAdded', remoteRTCStream, this);
+    };
 
-        _onRemoteStreamRemoved = function(remoteRTCStream) {
-            this.trigger('remoteStreamRemoved', remoteRTCStream, this);
-        },
+    _onRemoteStreamRemoved = function(remoteRTCStream) {
+      this.trigger('remoteStreamRemoved', remoteRTCStream, this);
+    };
 
-        // Note: All Peer errors are fatal right now.
-        _onPeerError = function(errorReason) {
-            this.trigger('error', null, errorReason, this);
-        },
+    // Note: All Peer errors are fatal right now.
+    _onPeerError = function(errorReason, prefix) {
+      this.trigger('error', null, errorReason, this, prefix);
+    };
 
-        _relayMessageToPeer = function(type, payload) {
-            if (!_hasRelayCandidates){
-                var extractCandidates = type === OT.Raptor.Actions.CANDIDATE ||
-                                        type === OT.Raptor.Actions.OFFER ||
-                                        type === OT.Raptor.Actions.ANSWER ||
-                                        type === OT.Raptor.Actions.PRANSWER ;
+    _relayMessageToPeer = function(type, payload) {
+      if (!_hasRelayCandidates){
+        var extractCandidates = type === OT.Raptor.Actions.CANDIDATE ||
+                                type === OT.Raptor.Actions.OFFER ||
+                                type === OT.Raptor.Actions.ANSWER ||
+                                type === OT.Raptor.Actions.PRANSWER ;
 
-                if (extractCandidates) {
-                    var message = (type === OT.Raptor.Actions.CANDIDATE) ? payload.candidate : payload.sdp;
-                    _hasRelayCandidates = message.indexOf('typ relay') !== -1;
-                }
-            }
+        if (extractCandidates) {
+          var message = (type === OT.Raptor.Actions.CANDIDATE) ? payload.candidate : payload.sdp;
+          _hasRelayCandidates = message.indexOf('typ relay') !== -1;
+        }
+      }
 
-            switch(type) {
-            case OT.Raptor.Actions.ANSWER:
-            case OT.Raptor.Actions.PRANSWER:
-                this.trigger('connected');
-                session._.jsepAnswer(remoteConnection.id, stream, payload);
-                break;
+      switch(type) {
+        case OT.Raptor.Actions.ANSWER:
+        case OT.Raptor.Actions.PRANSWER:
+          this.trigger('connected');
 
-            case OT.Raptor.Actions.OFFER:
-                session._.jsepOffer(remoteConnection.id, stream, payload);
-                break;
+          session._.jsepAnswerP2p(stream.id, subscriber.widgetId, payload.sdp);
+          break;
 
-            case OT.Raptor.Actions.CANDIDATE:
-                session._.jsepCandidate(remoteConnection.id, stream, payload);
-            }
-        }.bind(this),
+        case OT.Raptor.Actions.OFFER:
+          session._.jsepOfferP2p(stream.id, subscriber.widgetId, payload.sdp);
+          break;
 
-        // Helper method used by subscribeToAudio/subscribeToVideo
-        _setEnabledOnStreamTracksCurry = function(isVideo) {
-            var method = 'get' + (isVideo ? 'Video' : 'Audio') + 'Tracks';
+        case OT.Raptor.Actions.CANDIDATE:
+          session._.jsepCandidateP2p(stream.id, subscriber.widgetId, payload);
+          break;
+      }
+    }.bind(this);
 
-            return function(enabled) {
-                var remoteStreams = _peerConnection.remoteStreams,
-                    tracks,
-                    stream;
+    // Helper method used by subscribeToAudio/subscribeToVideo
+    _setEnabledOnStreamTracksCurry = function(isVideo) {
+      var method = 'get' + (isVideo ? 'Video' : 'Audio') + 'Tracks';
 
-                if (remoteStreams.length === 0 || !remoteStreams[0][method]) {
-                    // either there is no remote stream or we are in a browser that doesn't
-                    // expose the media tracks (Firefox)
-                    return;
-                }
+      return function(enabled) {
+        var remoteStreams = _peerConnection.remoteStreams,
+            tracks,
+            stream;
 
-                for (var i=0, num=remoteStreams.length; i<num; ++i) {
-                    stream = remoteStreams[i];
-                    tracks = stream[method]();
+        if (remoteStreams.length === 0 || !remoteStreams[0][method]) {
+          // either there is no remote stream or we are in a browser that doesn't
+          // expose the media tracks (Firefox)
+          return;
+        }
 
-                    for (var k=0, numTracks=tracks.length; k < numTracks; ++k){
-                        tracks[k].enabled=enabled;
-                    }
-                }
-            };
-        };
+        for (var i=0, num=remoteStreams.length; i<num; ++i) {
+          stream = remoteStreams[i];
+          tracks = stream[method]();
+
+          for (var k=0, numTracks=tracks.length; k < numTracks; ++k){
+            tracks[k].enabled=enabled;
+          }
+        }
+      };
+    };
 
 
     OT.$.eventing(this);
@@ -10683,15 +12332,15 @@ OT.SubscriberPeerConnection = function(remoteConnection, session, stream, proper
     this.destroy = function() {
       if (_peerConnection) {
         var numDelegates = _peerConnection.unregisterMessageDelegate(_relayMessageToPeer);
-
+        
         // Only clean up the PeerConnection if there isn't another Subscriber using it
         if (numDelegates === 0) {
           // Unsubscribe us from the stream, if it hasn't already been destroyed
           if (session && session.connected && stream && !stream.destroyed) {
               // Notify the server components
-              session._.jsepUnsubscribe(stream);
+            session._.subscriberDestroy(stream, subscriber);
           }
-
+          
           // Ref: OPENTOK-2458 disable all audio tracks before removing it.
           this.subscribeToAudio(false);
         }
@@ -10702,108 +12351,135 @@ OT.SubscriberPeerConnection = function(remoteConnection, session, stream, proper
     };
 
     this.processMessage = function(type, message) {
-        _peerConnection.processMessage(type, message);
+      _peerConnection.processMessage(type, message);
     };
 
     this.getStats = function(prevStats, callback) {
-        _peerConnection.getStats(prevStats, callback);
+      _peerConnection.getStats(prevStats, callback);
     };
 
     this.subscribeToAudio = _setEnabledOnStreamTracksCurry(false);
     this.subscribeToVideo = _setEnabledOnStreamTracksCurry(true);
 
     Object.defineProperty(this, 'hasRelayCandidates', {
-        get: function() { return _hasRelayCandidates; }
+      get: function() { return _hasRelayCandidates; }
     });
 
-
     // Init
     this.init = function() {
-        var iceServers = session.sessionInfo.iceServers.map(function(is) {
-            var iceServer = OT.$.clone(is);
+      var iceServers = session.sessionInfo.iceServers.map(function(is) {
+        var iceServer = OT.$.clone(is);
 
-            if (iceServer.url.trim().substr(0, 5) === 'turn:') {
-                // Make the username sessionId:connectionId:streamId for tracking purposes.
-                iceServer.username = session.id + '.' + session.connection.id + '.' + stream.id;
-            }
+        if (iceServer.url.trim().substr(0, 5) === 'turn:') {
+          // Make the username sessionId:connectionId:streamId for tracking purposes.
+          iceServer.username = session.id + '.' + session.connection.id + '.' + stream.id;
+        }
 
-            return iceServer;
-        });
+        return iceServer;
+      });
 
-        _peerConnection = OT.PeerConnections.add(remoteConnection, stream.streamId, {
-            iceServers: iceServers
-        });
+      _peerConnection = OT.PeerConnections.add(remoteConnection, stream.streamId, {
+        iceServers: iceServers
+      });
 
-        _peerConnection.on({
-            close: _onPeerClosed,
-            streamAdded: _onRemoteStreamAdded,
-            streamRemoved: _onRemoteStreamRemoved,
-            error: _onPeerError
-        }, this);
+      _peerConnection.on({
+        close: _onPeerClosed,
+        streamAdded: _onRemoteStreamAdded,
+        streamRemoved: _onRemoteStreamRemoved,
+        error: _onPeerError
+      }, this);
 
-        var numDelegates = _peerConnection.registerMessageDelegate(_relayMessageToPeer);
+      var numDelegates = _peerConnection.registerMessageDelegate(_relayMessageToPeer);
 
         // If there are already remoteStreams, add them immediately
-        if (_peerConnection.remoteStreams.length > 0) {
-            _peerConnection.remoteStreams.forEach(_onRemoteStreamAdded, this);
-        }
-        else if (numDelegates === 1) {
-            // We only bother with the PeerConnection negotiation if we are the only delegate.
-            session._.jsepSubscribe(stream, properties.subscribeToVideo, properties.subscribeToAudio);
+      if (_peerConnection.remoteStreams.length > 0) {
+        _peerConnection.remoteStreams.forEach(_onRemoteStreamAdded, this);
+      } else if (numDelegates === 1) {
+        // We only bother with the PeerConnection negotiation if we don't already
+        // have a remote stream.
+
+        var channelsToSubscribeTo;
+
+        if (properties.subscribeToVideo || properties.subscribeToAudio) {
+          var audio = stream.getChannelsOfType('audio'),
+              video = stream.getChannelsOfType('video');
+
+          channelsToSubscribeTo = audio.map(function(channel) {
+            return {
+              id: channel.id,
+              type: channel.type,
+              active: properties.subscribeToAudio
+            };
+          }).concat(video.map(function(channel) {
+            return {
+              id: channel.id,
+              type: channel.type,
+              active: properties.subscribeToVideo,
+              restrictFrameRate: properties.restrictFrameRate !== void 0 ?
+                properties.restrictFrameRate : false
+            };
+          }));
         }
+
+        session._.subscriberCreate(stream, subscriber, channelsToSubscribeTo, function(err) {
+          if (err) {
+            this.trigger('error', null, err.message, this, 'Subscribe');
+          }
+        }.bind(this));
+      }
     };
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
 // Manages N Chrome elements
-OT.Chrome = function(properties) {
+  OT.Chrome = function(properties) {
     var _visible = false,
         _widgets = {},
 
         // Private helper function
         _set = function(name, widget) {
-            widget.parent = this;
-            widget.appendTo(properties.parent);
+          widget.parent = this;
+          widget.appendTo(properties.parent);
 
-            _widgets[name] = widget;
+          _widgets[name] = widget;
 
-            Object.defineProperty(this, name, {
-                get: function() { return _widgets[name]; }
-            });
+          Object.defineProperty(this, name, {
+            get: function() { return _widgets[name]; }
+          });
         };
 
     if (!properties.parent) {
-        // @todo raise an exception
-        return;
+      // @todo raise an exception
+      return;
     }
 
     OT.$.eventing(this);
 
     this.destroy = function() {
-        this.off();
-        this.hide();
+      this.off();
+      this.hide();
 
-        for (var name in _widgets) {
-            _widgets[name].destroy();
-        }
+      for (var name in _widgets) {
+        _widgets[name].destroy();
+      }
     };
 
     this.show = function() {
-        _visible = true;
+      _visible = true;
 
-        for (var name in _widgets) {
-            _widgets[name].show();
-        }
+      for (var name in _widgets) {
+        _widgets[name].show();
+      }
     };
 
     this.hide = function() {
-        _visible = false;
+      _visible = false;
 
-        for (var name in _widgets) {
-            _widgets[name].hide();
-        }
+      for (var name in _widgets) {
+        _widgets[name].hide();
+      }
     };
 
 
@@ -10822,31 +12498,31 @@ OT.Chrome = function(properties) {
     //  chrome.foo.setDisplayMode('on');
     //
     this.set = function(widgetName, widget) {
-        if (typeof(widgetName) === "string" && widget) {
-            _set.call(this, widgetName, widget);
-        }
-        else {
-          for (var name in widgetName) {
-            if (widgetName.hasOwnProperty(name)) {
-              _set.call(this, name, widgetName[name]);
-            }
+      if (typeof(widgetName) === 'string' && widget) {
+        _set.call(this, widgetName, widget);
+
+      } else {
+        for (var name in widgetName) {
+          if (widgetName.hasOwnProperty(name)) {
+            _set.call(this, name, widgetName[name]);
           }
         }
-
-        return this;
+      }
+      return this;
     };
-};
+
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-if (!OT.Chrome.Behaviour) OT.Chrome.Behaviour = {};
+  if (!OT.Chrome.Behaviour) OT.Chrome.Behaviour = {};
 
-// A mixin to encapsulate the basic widget behaviour. This needs a better name,
-// it's not actually a widget. It's actually "Behaviour that can be applied to
-// an object to make it support the basic Chrome widget workflow"...but that would
-// probably been too long a name.
-OT.Chrome.Behaviour.Widget = function(widget, options) {
+  // A mixin to encapsulate the basic widget behaviour. This needs a better name,
+  // it's not actually a widget. It's actually "Behaviour that can be applied to
+  // an object to make it support the basic Chrome widget workflow"...but that would
+  // probably been too long a name.
+  OT.Chrome.Behaviour.Widget = function(widget, options) {
     var _options = options || {},
         _mode,
         _previousMode;
@@ -10856,645 +12532,753 @@ OT.Chrome.Behaviour.Widget = function(widget, options) {
     //      'on', 'off', or 'auto'
     //
     widget.setDisplayMode = function(mode) {
-        var newMode = mode || 'auto';
-        if (_mode === newMode) return;
+      var newMode = mode || 'auto';
+      if (_mode === newMode) return;
 
-        OT.$.removeClass(this.domElement, 'OT_mode-' + _mode);
-        OT.$.addClass(this.domElement, 'OT_mode-' + newMode);
+      OT.$.removeClass(this.domElement, 'OT_mode-' + _mode);
+      OT.$.addClass(this.domElement, 'OT_mode-' + newMode);
 
-        _previousMode = _mode;
-        _mode = newMode;
+      _previousMode = _mode;
+      _mode = newMode;
     };
 
     widget.show = function() {
-        this.setDisplayMode(_previousMode);
-        if (_options.onShow) _options.onShow();
+      this.setDisplayMode(_previousMode);
+      if (_options.onShow) _options.onShow();
 
-        return this;
+      return this;
     };
 
     widget.hide = function() {
-        this.setDisplayMode('off');
-        if (_options.onHide) _options.onHide();
+      this.setDisplayMode('off');
+      if (_options.onHide) _options.onHide();
 
-        return this;
+      return this;
     };
 
     widget.destroy = function() {
-        if (_options.onDestroy) _options.onDestroy(this.domElement);
-        if (this.domElement) OT.$.removeElement(this.domElement);
+      if (_options.onDestroy) _options.onDestroy(this.domElement);
+      if (this.domElement) OT.$.removeElement(this.domElement);
 
-        return widget;
+      return widget;
     };
 
     widget.appendTo = function(parent) {
-        // create the element under parent
-        this.domElement = OT.$.createElement(_options.nodeName || 'div',
-                                            _options.htmlAttributes,
-                                            _options.htmlContent);
+      // create the element under parent
+      this.domElement = OT.$.createElement(_options.nodeName || 'div',
+                                          _options.htmlAttributes,
+                                          _options.htmlContent);
 
-        if (_options.onCreate) _options.onCreate(this.domElement);
+      if (_options.onCreate) _options.onCreate(this.domElement);
 
-        // if the mode isn't auto, then we can directly set it
-        if (_options.mode != "auto") {
-            widget.setDisplayMode(_options.mode);
-        } else {
-            // we set it to on at first, and then apply the desired mode
-            // this will let the proper widgets nicely fade away
-            widget.setDisplayMode('on');
-            setTimeout(function() {
-                widget.setDisplayMode(_options.mode);
-            }, 2000);
-        }
+      // if the mode isn't auto, then we can directly set it
+      if (_options.mode !== 'auto') {
+        widget.setDisplayMode(_options.mode);
+      } else {
+        // we set it to on at first, and then apply the desired mode
+        // this will let the proper widgets nicely fade away
+        widget.setDisplayMode('on');
+        setTimeout(function() {
+          widget.setDisplayMode(_options.mode);
+        }, 2000);
+      }
 
-        // add the widget to the parent
-        parent.appendChild(this.domElement);
+      // add the widget to the parent
+      parent.appendChild(this.domElement);
 
-        return widget;
+      return widget;
     };
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-// NamePanel Chrome Widget
-//
-// mode (String)
-// Whether to display the name. Possible values are: "auto" (the name is displayed
-// when the stream is first displayed and when the user mouses over the display),
-// "off" (the name is not displayed), and "on" (the name is displayed).
-//
-// displays a name
-// can be shown/hidden
-// can be destroyed
-OT.Chrome.NamePanel = function(options) {
-    var _name = options.name;
+  // BackingBar Chrome Widget
+  //
+  // nameMode (String)
+  // Whether or not the name panel is being displayed
+  // Possible values are: "auto" (the name is displayed
+  // when the stream is first displayed and when the user mouses over the display),
+  // "off" (the name is not displayed), and "on" (the name is displayed).
+  //
+  // muteMode (String)
+  // Whether or not the mute button is being displayed
+  // Possible values are: "auto" (the mute button is displayed
+  // when the stream is first displayed and when the user mouses over the display),
+  // "off" (the mute button is not displayed), and "on" (the mute button is displayed).
+  //
+  // displays a backing bar
+  // can be shown/hidden
+  // can be destroyed
+  OT.Chrome.BackingBar = function(options) {
+    var _nameMode = options.nameMode,
+        _muteMode = options.muteMode,
+        _domElement;
+
+    // This behaviour must be implemented to make the widget behaviour work.
+    // @fixme This is a nasty code smell
+    Object.defineProperty(this, 'domElement', {
+      get: function() { return _domElement; },
+      set: function(domElement) {
+        _domElement = domElement;
+      }
+    });
+
+    function getDisplayMode() {
+      if(_nameMode === 'on' || _muteMode === 'on') {
+        return 'on';
+      } else if(_nameMode === 'mini' || _muteMode === 'mini') {
+        return 'mini';
+      } else if(_nameMode === 'mini-auto' || _muteMode === 'mini-auto') {
+        return 'mini-auto';
+      } else if(_nameMode === 'auto' || _muteMode === 'auto') {
+        return 'auto';
+      } else {
+        return 'off';
+      }
+    }
+
+    // Mixin common widget behaviour
+    OT.Chrome.Behaviour.Widget(this, {
+      mode: getDisplayMode(),
+      nodeName: 'div',
+      htmlContent: '',
+      htmlAttributes: {
+        className: 'OT_bar OT_edge-bar-item'
+      }
+    });
+
+    this.setNameMode = function(nameMode) {
+      _nameMode = nameMode;
+      this.setDisplayMode(getDisplayMode());
+    };
+
+    this.setMuteMode = function(muteMode) {
+      _muteMode = muteMode;
+      this.setDisplayMode(getDisplayMode());
+    };
+
+  };
+
+})(window);
+!(function() {
+
+  // NamePanel Chrome Widget
+  //
+  // mode (String)
+  // Whether to display the name. Possible values are: "auto" (the name is displayed
+  // when the stream is first displayed and when the user mouses over the display),
+  // "off" (the name is not displayed), and "on" (the name is displayed).
+  //
+  // displays a name
+  // can be shown/hidden
+  // can be destroyed
+  OT.Chrome.NamePanel = function(options) {
+    var _name = options.name,
+        _bugMode = options.bugMode,
+        _domElement;
 
     if (!_name || _name.trim().length === '') {
-        _name = null;
+      _name = null;
 
-        // THere's no name, just flip the mode off
-        options.mode = 'off';
+      // THere's no name, just flip the mode off
+      options.mode = 'off';
     }
 
     // This behaviour must be implemented to make the widget behaviour work.
     // @fixme This is a nasty code smell
-    var _domElement;
     Object.defineProperty(this, 'domElement', {
-        get: function() { return _domElement; },
-        set: function(domElement) { _domElement = domElement; }
-    })
-
-    // Mixin common widget behaviour
-    OT.Chrome.Behaviour.Widget(this, {
-        mode: options.mode,
-        nodeName: 'h1',
-        htmlContent: _name,
-        htmlAttributes: {className: 'OT_name'}
+      get: function() { return _domElement; },
+      set: function(domElement) {
+        _domElement = domElement;
+      }
     });
 
     Object.defineProperty(this, 'name', {
-        set: function(name) {
-            if (!_name) this.setDisplayMode('auto');
-
-            _name = name;
-            _domElement.innerHTML = _name;
-        }.bind(this)
+      set: function(name) {
+        if (!_name) this.setDisplayMode('auto');
+        _name = name;
+        _domElement.innerHTML = _name;
+      }.bind(this)
     });
-};
+
+    this.setBugMode = function(bugMode) {
+      _bugMode = bugMode;
+      if(bugMode === 'off') {
+        OT.$.addClass(_domElement, 'OT_name-no-bug');
+      } else {
+        OT.$.removeClass(_domElement, 'OT_name-no-bug');
+      }
+    };
+
+    // Mixin common widget behaviour
+    OT.Chrome.Behaviour.Widget(this, {
+      mode: options.mode,
+      nodeName: 'h1',
+      htmlContent: _name,
+      htmlAttributes: {
+        className: 'OT_name OT_edge-bar-item'
+      },
+      onCreate: function() {
+        this.setBugMode(_bugMode);
+      }.bind(this)
+    });
+
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-OT.Chrome.MuteButton = function(options) {
+  OT.Chrome.MuteButton = function(options) {
     var _onClickCb,
-        _muted = options.muted || false;
+        _muted = options.muted || false,
+        _domElement,
+        updateClasses,
+        attachEvents,
+        detachEvents,
+        onClick;
 
     // This behaviour must be implemented to make the widget behaviour work.
     // @fixme This is a nasty code smell
-    var _domElement;
     Object.defineProperty(this, 'domElement', {
-        get: function() { return _domElement; },
-        set: function(domElement) { _domElement = domElement; }
-    })
+      get: function() { return _domElement; },
+      set: function(domElement) {
+        _domElement = domElement;
+      }
+    });
+
+    updateClasses = function() {
+      if (_muted) {
+        OT.$.addClass(_domElement, 'OT_active');
+      } else {
+        OT.$.removeClass(_domElement, 'OT_active ');
+      }
+    };
 
     // Private Event Callbacks
-    var attachEvents = function(elem) {
-            _onClickCb = onClick.bind(this);
-            elem.addEventListener('click', _onClickCb, false);
-        },
+    attachEvents = function(elem) {
+      _onClickCb = onClick.bind(this);
+      elem.addEventListener('click', _onClickCb, false);
+    };
 
-        detachEvents = function(elem) {
-            _onClickCb = null;
-            elem.removeEventListener('click', _onClickCb, false);
-        },
+    detachEvents = function(elem) {
+      _onClickCb = null;
+      elem.removeEventListener('click', _onClickCb, false);
+    };
 
-        onClick = function(event) {
-            _muted = !_muted;
+    onClick = function() {
+      _muted = !_muted;
 
-            if (_muted) {
-                OT.$.addClass(_domElement, 'OT_active');
-                this.parent.trigger('muted', this);
-            }
-            else {
-                OT.$.removeClass(_domElement, 'OT_active');
-                this.parent.trigger('unmuted', this);
-            }
+      updateClasses();
 
-            return false;
-        };
+      if (_muted) {
+        this.parent.trigger('muted', this);
+      } else {
+        this.parent.trigger('unmuted', this);
+      }
+
+      return false;
+    };
+
+    Object.defineProperty(this, 'muted', {
+      get: function() { return _muted; },
+      set: function(muted) {
+        _muted = muted;
+        updateClasses();
+      }
+    });
 
     // Mixin common widget behaviour
-    var classNames = _muted ? 'OT_mute OT_active' : 'OT_mute';
+    var classNames = _muted ? 'OT_edge-bar-item OT_mute OT_active' : 'OT_edge-bar-item OT_mute';
     OT.Chrome.Behaviour.Widget(this, {
-        mode: options.mode,
-        nodeName: 'button',
-        htmlContent: 'Mute',
-        htmlAttributes: {className: classNames},
-        onCreate: attachEvents.bind(this),
-        onDestroy: detachEvents.bind(this)
+      mode: options.mode,
+      nodeName: 'button',
+      htmlContent: 'Mute',
+      htmlAttributes: {
+        className: classNames
+      },
+      onCreate: attachEvents.bind(this),
+      onDestroy: detachEvents.bind(this)
     });
-};
+  };
 
 
 })(window);
-(function(window) {
+!(function() {
 
-OT.Chrome.MicVolume = function(options) {
-    var _onClickCb,
-        _muted = options.muted || false;
+  OT.Chrome.OpenTokButton = function(options) {
 
     // This behaviour must be implemented to make the widget behaviour work.
     // @fixme This is a nasty code smell
     var _domElement;
     Object.defineProperty(this, 'domElement', {
-        get: function() { return _domElement; },
-        set: function(domElement) { _domElement = domElement; }
-    })
-
-    // Private Event Callbacks
-    var attachEvents = function(elem) {
-            _onClickCb = onClick.bind(this);
-            elem.addEventListener('click', _onClickCb, false);
-        },
-
-        detachEvents = function(elem) {
-            _onClickCb = null;
-            elem.removeEventListener('click', _onClickCb, false);
-        },
-
-        onClick = function(event) {
-            _muted = !_muted;
-
-            if (_muted) {
-                OT.$.addClass(_domElement, 'active');
-                this.parent.trigger('muted', this);
-            }
-            else {
-                OT.$.removeClass(_domElement, 'active');
-                this.parent.trigger('unmuted', this);
-            }
-
-            return false;
-        };
+      get: function() { return _domElement; },
+      set: function(domElement) {
+        _domElement = domElement;
+      }
+    });
 
     // Mixin common widget behaviour
     OT.Chrome.Behaviour.Widget(this, {
-        mode: options.mode,
-        nodeName: 'button',
-        htmlContent: 'Mute',
-        htmlAttributes: {className: 'OT_mic-volume'},
-        onCreate: attachEvents.bind(this),
-        onDestroy: detachEvents.bind(this)
+      mode: options ? options.mode : null,
+      nodeName: 'span',
+      htmlContent: 'OpenTok',
+      htmlAttributes: {
+        className: 'OT_opentok OT_edge-bar-item'
+      }
     });
-};
 
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
-OT.Chrome.SettingsPanelButton = function(options) {
-    var _onClickCb;
-
-    // Private Event Callbacks
-    var attachEvents = function(elem) {
-            _onClickCb = onClick.bind(this);
-            elem.addEventListener('click', _onClickCb, false);
-        },
-
-        detachEvents = function(elem) {
-            _onClickCb = null;
-            elem.removeEventListener('click', _onClickCb, false);
-        },
-
-        onClick = function(event) {
-            this.parent.trigger('SettingsPanel:open', this);
-            return false;
-        };
+  // Archving Chrome Widget
+  //
+  // mode (String)
+  // Whether to display the archving widget. Possible values are: "on" (the status is displayed
+  // when archiving and briefly when archving ends) and "off" (the status is not displayed)
 
+  // Whether to display the archving widget. Possible values are: "auto" (the name is displayed
+  // when the status is first displayed and when the user mouses over the display),
+  // "off" (the name is not displayed), and "on" (the name is displayed).
+  //
+  // displays a name
+  // can be shown/hidden
+  // can be destroyed
+  OT.Chrome.Archiving = function(options) {
+    var _archiving = options.archiving,
+        _archivingStarted = options.archivingStarted || 'Archiving on',
+        _archivingEnded = options.archivingEnded || 'Archiving off',
+        _initialState = true,
+        _lightBox,
+        _light,
+        _text,
+        _domElement,
+        renderStageDelayedAction,
+        renderText,
+        renderStage;
 
     // This behaviour must be implemented to make the widget behaviour work.
     // @fixme This is a nasty code smell
-    var _domElement;
     Object.defineProperty(this, 'domElement', {
-        get: function() { return _domElement; },
-        set: function(domElement) { _domElement = domElement; }
-    })
+      get: function() { return _domElement; },
+      set: function(domElement) {
+        _domElement = domElement;
+      }
+    });
+
+    renderText = function(text) {
+      _text.innerText = text;
+      _lightBox.setAttribute('title', text);
+    };
+
+    renderStage = function() {
+      if(renderStageDelayedAction) {
+        clearTimeout(renderStageDelayedAction);
+        renderStageDelayedAction = null;
+      }
+
+      if(_archiving) {
+        OT.$.addClass(_light, 'OT_active');
+      } else {
+        OT.$.removeClass(_light, 'OT_active');
+      }
+
+      OT.$.removeClass(_domElement, 'OT_archiving-' + (!_archiving ? 'on' : 'off'));
+      OT.$.addClass(_domElement, 'OT_archiving-' + (_archiving ? 'on' : 'off'));
+      if(options.show && _archiving) {
+        renderText(_archivingStarted);
+        OT.$.addClass(_text, 'OT_mode-on');
+        OT.$.removeClass(_text, 'OT_mode-auto');
+        this.setDisplayMode('on');
+        renderStageDelayedAction = setTimeout(function() {
+          OT.$.addClass(_text, 'OT_mode-auto');
+          OT.$.removeClass(_text, 'OT_mode-on');
+        }.bind(this), 5000);
+      } else if(options.show && !_initialState) {
+        OT.$.addClass(_text, 'OT_mode-on');
+        OT.$.removeClass(_text, 'OT_mode-auto');
+        this.setDisplayMode('on');
+        renderText(_archivingEnded);
+        renderStageDelayedAction = setTimeout(function() {
+          this.setDisplayMode('off');
+        }.bind(this), 5000);
+      } else {
+        this.setDisplayMode('off');
+      }
+    }.bind(this);
 
     // Mixin common widget behaviour
     OT.Chrome.Behaviour.Widget(this, {
-        mode: options.mode,
-        nodeName: 'button',
-        htmlContent: 'Settings',
-        htmlAttributes: {className: 'OT_settings-panel'},
-        onCreate: attachEvents.bind(this),
-        onDestroy: detachEvents.bind(this)
+      mode: _archiving && options.show && 'on' || 'off',
+      nodeName: 'h1',
+      htmlAttributes: {className: 'OT_archiving OT_edge-bar-item OT_edge-bottom'},
+      onCreate: function() {
+        _lightBox = OT.$.createElement('div', {
+          className: 'OT_archiving-light-box'
+        }, '');
+        _light = OT.$.createElement('div', {
+          className: 'OT_archiving-light'
+        }, '');
+        _lightBox.appendChild(_light);
+        _text = OT.$.createElement('div', {
+          className: 'OT_archiving-status OT_mode-on OT_edge-bar-item OT_edge-bottom'
+        }, '');
+        _domElement.appendChild(_lightBox);
+        _domElement.appendChild(_text);
+        renderStage();
+      }
     });
-};
+
+    this.setShowArchiveStatus = function(show) {
+      options.show = show;
+      if(_domElement) {
+        renderStage.call(this);
+      }
+    };
+
+    this.setArchiving = function(status) {
+      _archiving = status;
+      _initialState = false;
+      if(_domElement) {
+        renderStage.call(this);
+      }
+    };
+
+  };
 
 })(window);
-(function(window) {
-
-OT.Chrome.SettingsPanel = function(options) {
-    if (!options.stream) {
-        // @todo raise error
-        return;
-    }
-
-    var webRTCStream = options.stream;
-
-    // This behaviour must be implemented to make the widget behaviour work.
-    // @fixme This is a nasty code smell
-    var _domElement;
-    Object.defineProperty(this, 'domElement', {
-        get: function() { return _domElement; },
-        set: function(domElement) { _domElement = domElement; }
-    })
-
-    var renderDialog = function() {
-            var camLabel = webRTCStream.getVideoTracks().length ? webRTCStream.getVideoTracks()[0].label : "None",
-                micLabel = webRTCStream.getAudioTracks().length ? webRTCStream.getAudioTracks()[0].label : "None";
-
-            _domElement.innerHTML = "<dl>\
-                                        <dt>Cam</dt>\
-                                        <dd>" + camLabel + "</dd>\
-                                        <dt>Mic</dt>\
-                                        <dd>" + micLabel + "</dd>\
-                                    </dl>";
-
-
-            var closeButton  = OT.$.createButton('Close', {
-                className: 'OT_close'
-            }, {
-                click: onClose.bind(this)
-            });
-
-            _domElement.appendChild(closeButton);
-        },
-
-        onShow = function() {
-            renderDialog.call(this);
-        },
-
-        onClose = function() {
-            this.parent.trigger('SettingsPanel:close', this);
-            return false;
-        };
-
-
-    // Mixin common widget behaviour
-    OT.Chrome.Behaviour.Widget(this, {
-        mode: options.mode,
-        nodeName: 'section',
-        htmlContent: 'Settings',
-        htmlAttributes: {className: 'OT_settings-panel'},
-        onCreate: renderDialog.bind(this),
-        onShow: onShow.bind(this)
-    });
-};
-
-})(window);
-(function(window) {
-
-OT.Chrome.OpenTokButton = function(options) {
-    // This behaviour must be implemented to make the widget behaviour work.
-    // @fixme This is a nasty code smell
-    var _domElement;
-    this.__defineGetter__("domElement", function() { return _domElement; });
-    this.__defineSetter__("domElement", function(domElement) { _domElement = domElement; });
-
-    // Mixin common widget behaviour
-    OT.Chrome.Behaviour.Widget(this, {
-        mode: options ? options.mode : null,
-        nodeName: 'span',
-        htmlContent: 'OpenTok',
-        htmlAttributes: {
-            className: 'OT_opentok'
-        }
-    });
-};
-
-})(window);
-(function(window) {
+(function() {
 /* Stylable Notes
+ * RTC doesn't need to wait until anything is loaded
+ * Some bits are controlled by multiple flags, i.e. buttonDisplayMode and nameDisplayMode.
+ * When there are multiple flags how is the final setting chosen?
+ * When some style bits are set updates will need to be pushed through to the Chrome
+ */
 
-* RTC doesn't need to wait until anything is loaded (flash needs to wait until the Flash component loads)
-* Some bits are controlled by multiple flags, i.e. buttonDisplayMode and nameDisplayMode.
-* When there are multiple flags how is the final setting chosen?
-* When some style bits are set updates will need to be pushed through to the Chrome
-*/
-
-// Mixes the StylableComponent behaviour into the +self+ object. It will
-// also set the default styles to +initialStyles+.
-//
-// @note This Mixin is dependent on OT.Eventing.
-//
-//
-// @example
-//
-//  function SomeObject {
-//      OT.StylableComponent(this, {
-//          name: 'SomeObject',
-//          foo: 'bar'
-//      });
-//  }
-//
-//  var obj = new SomeObject();
-//  obj.getStyle('foo');        // => 'bar'
-//  obj.setStyle('foo', 'baz')
-//  obj.getStyle('foo');        // => 'baz'
-//  obj.getStyle();             // => {name: 'SomeObject', foo: 'baz'}
-//
-OT.StylableComponent = function(self, initalStyles) {
+  // Mixes the StylableComponent behaviour into the +self+ object. It will
+  // also set the default styles to +initialStyles+.
+  //
+  // @note This Mixin is dependent on OT.Eventing.
+  //
+  //
+  // @example
+  //
+  //  function SomeObject {
+  //      OT.StylableComponent(this, {
+  //          name: 'SomeObject',
+  //          foo: 'bar'
+  //      });
+  //  }
+  //
+  //  var obj = new SomeObject();
+  //  obj.getStyle('foo');        // => 'bar'
+  //  obj.setStyle('foo', 'baz')
+  //  obj.getStyle('foo');        // => 'baz'
+  //  obj.getStyle();             // => {name: 'SomeObject', foo: 'baz'}
+  //
+  OT.StylableComponent = function(self, initalStyles) {
     if (!self.trigger) {
-        throw new Error("OT.StylableComponent is dependent on the mixin OT.$.eventing. Ensure that this is included in the object before StylableComponent.");
+      throw new Error('OT.StylableComponent is dependent on the mixin OT.$.eventing. ' +
+        'Ensure that this is included in the object before StylableComponent.');
     }
 
     // Broadcast style changes as the styleValueChanged event
     var onStyleChange = function(key, value, oldValue) {
-        if (oldValue) {
-            self.trigger('styleValueChanged', key, value, oldValue);
-        }
-        else {
-            self.trigger('styleValueChanged', key, value);
-        }
+      if (oldValue) {
+        self.trigger('styleValueChanged', key, value, oldValue);
+      } else {
+        self.trigger('styleValueChanged', key, value);
+      }
     };
 
     var _style = new Style(initalStyles, onStyleChange);
 
-    /**
-    * Returns an object that has the properties that define the current user interface controls of the Publisher.
-    * You can modify the properties of this object and pass the object to the <code>setStyle()</code> method of the
-    * Publisher object. (See the documentation for <a href="#setStyle">setStyle()</a> to see the styles that define
-    * this object.)
-    * @return {Object} The object that defines the styles of the Publisher.
-    * @see <a href="#setStyle">setStyle()</a>
-    * @method #getStyle
-    * @memberOf Publisher
-    */
+  /**
+   * Returns an object that has the properties that define the current user interface controls of 
+   * the Publisher. You can modify the properties of this object and pass the object to the 
+   * <code>setStyle()</code> method of thePublisher object. (See the documentation for 
+   * <a href="#setStyle">setStyle()</a> to see the styles that define this object.)
+   * @return {Object} The object that defines the styles of the Publisher.
+   * @see <a href="#setStyle">setStyle()</a>
+   * @method #getStyle
+   * @memberOf Publisher
+   */
 
 	/**
-	* Returns an object that has the properties that define the current user interface controls of the Subscriber.
-	* You can modify the properties of this object and pass the object to the <code>setStyle()</code> method of the
-	* Subscriber object. (See the documentation for <a href="#setStyle">setStyle()</a> to see the styles that define
-	* this object.)
-	* @return {Object} The object that defines the styles of the Subscriber.
-	* @see <a href="#setStyle">setStyle()</a>
-	* @method #getStyle
-	* @memberOf Subscriber
-	*/
+	 * Returns an object that has the properties that define the current user interface controls of 
+   * the Subscriber. You can modify the properties of this object and pass the object to the 
+   * <code>setStyle()</code> method of the Subscriber object. (See the documentation for 
+   * <a href="#setStyle">setStyle()</a> to see the styles that define this object.)
+	 * @return {Object} The object that defines the styles of the Subscriber.
+	 * @see <a href="#setStyle">setStyle()</a>
+	 * @method #getStyle
+	 * @memberOf Subscriber
+	 */
     // If +key+ is falsly then all styles will be returned.
     self.getStyle = function(key) {
-        return _style.get(key);
+      return _style.get(key);
     };
 
-    /**
-    * Sets properties that define the appearance of some user interface controls of the Publisher.
-    *
-    * <p>You can either pass one parameter or two parameters to this method.</p>
-    *
-    * <p>If you pass one parameter, <code>style</code>, it is an object that has one property: <code>nameDisplayMode</code>.
-    * Possible values for the <code>style.nameDisplayMode</code> property are: "auto" (the name is displayed when the stream
-    * is first displayed and when the user mouses over the display), "off" (the name is not displayed), and "on"
-    * (the name is displayed).
-    *
-    * <p>For example, the following code passes one parameter to the method:</p>
-    *
-    * <pre>myPublisher.setStyle({nameDisplayMode: "off"});</pre>
-    *
-    * <p>If you pass two parameters, <code>style</code> and <code>value</code>, they are key-value pair that
-    * define one property of the display style. For example, the following code passes two parameter values
-    * to the method:</p>
-    *
-    * <pre>myPublisher.setStyle("nameDisplayMode", "off");</pre>
-    *
-    * <p>You can set the initial settings when you call the <code>Session.publish()</code>
-    * or <code>TB.initPublisher()</code> method. Pass a <code>style</code> property as part of the
-    * <code>properties</code> parameter of the method.</p>
-    *
-    * <p>The TB object dispatches an <code>exception</code> event if you pass in an invalid style to the method.
-    * The <code>code</code> property of the ExceptionEvent object is set to 1011.</p>
-    *
-    * @param {Object} style Either an object containing properties that define the style, or a String defining this
-    * single style property to set.
-    * @param {String} value The value to set for the <code>style</code> passed in. Pass a value for this parameter
-    * only if the value of the <code>style</code> parameter is a String.</p>
-    *
-    * @see <a href="#getStyle">getStyle()</a>
-    * @return {Publisher} The Publisher object
-    * @see <a href="#setStyle">setStyle()</a>
-    *
-    * @see <a href="Session.html#subscribe">Session.publish()</a>
-    * @see <a href="TB.html#initPublisher">TB.initPublisher()</a>
-    * @method #setStyle
-    * @memberOf Publisher
-    */
+  /**
+   * Sets properties that define the appearance of some user interface controls of the Publisher.
+   *
+   * <p>You can either pass one parameter or two parameters to this method.</p>
+   *
+   * <p>If you pass one parameter, <code>style</code>, it is an object that has the following
+   * properties:
+   *
+   *     <ul>
+   *       <li><code>backgroundImageURI</code> (String) &mdash; A URI for an image to display as
+   *       the background image when a video is not displayed. (A video may not be displayed if
+   *       you call <code>publishVideo(false)</code> on the Publisher object). You can pass an http
+   *       or https URI to a PNG, JPEG, or non-animated GIF file location. You can also use the
+   *       <code>data</code> URI scheme (instead of http or https) and pass in base-64-encrypted
+   *       PNG data, such as that obtained from the
+   *       <a href="Publisher.html#getImgData">Publisher.getImgData()</a> method. For example,
+   *       you could set the property to <code>"data:VBORw0KGgoAA..."</code>, where the portion of
+   *       the string after <code>"data:"</code> is the result of a call to
+   *       <code>Publisher.getImgData()</code>. If the URL or the image data is invalid, the
+   *       property is ignored (the attempt to set the image fails silently).</li>
+   *
+   *       <li><code>buttonDisplayMode</code> (String) &mdash; How to display the microphone
+   *       controls. Possible values are: <code>"auto"</code> (controls are displayed when the
+   *       stream is first displayed and when the user mouses over the display), <code>"off"</code>
+   *       (controls are not displayed), and <code>"on"</code> (controls are always displayed).</li>
+   *
+   *       <li><code>nameDisplayMode</code> (String) &#151; Whether to display the stream name.
+   *       Possible values are: <code>"auto"</code> (the name is displayed when the stream is first
+   *       displayed and when the user mouses over the display), <code>"off"</code> (the name is not
+   *       displayed), and <code>"on"</code> (the name is always displayed).</li>
+   *   </ul>
+   * </p>
+   *
+   * <p>For example, the following code passes one parameter to the method:</p>
+   *
+   * <pre>myPublisher.setStyle({nameDisplayMode: "off"});</pre>
+   *
+   * <p>If you pass two parameters, <code>style</code> and <code>value</code>, they are 
+   * key-value pair that define one property of the display style. For example, the following 
+   * code passes two parameter values to the method:</p>
+   *
+   * <pre>myPublisher.setStyle("nameDisplayMode", "off");</pre>
+   *
+   * <p>You can set the initial settings when you call the <code>Session.publish()</code>
+   * or <code>OT.initPublisher()</code> method. Pass a <code>style</code> property as part of the
+   * <code>properties</code> parameter of the method.</p>
+   *
+   * <p>The OT object dispatches an <code>exception</code> event if you pass in an invalid style 
+   * to the method. The <code>code</code> property of the ExceptionEvent object is set to 1011.</p>
+   *
+   * @param {Object} style Either an object containing properties that define the style, or a 
+   * String defining this single style property to set.
+   * @param {String} value The value to set for the <code>style</code> passed in. Pass a value 
+   * for this parameter only if the value of the <code>style</code> parameter is a String.</p>
+   *
+   * @see <a href="#getStyle">getStyle()</a>
+   * @return {Publisher} The Publisher object
+   * @see <a href="#setStyle">setStyle()</a>
+   *
+   * @see <a href="Session.html#subscribe">Session.publish()</a>
+   * @see <a href="OT.html#initPublisher">OT.initPublisher()</a>
+   * @method #setStyle
+   * @memberOf Publisher
+   */
 
-    /**
-    * Sets properties that define the appearance of some user interface controls of the Subscriber.
-    *
-    * <p>You can either pass one parameter or two parameters to this method.</p>
-    *
-    * <p>If you pass one parameter, <code>style</code>, it is an object that has one property: <code>nameDisplayMode</code>.
-    * Possible values for the <code>style.nameDisplayMode</code> property are: "auto" (the name is displayed when the stream
-    * is first displayed and when the user mouses over the display), "off" (the name is not displayed), and "on"
-    * (the name is displayed).
-    *
-    * <p>For example, the following code passes one parameter to the method:</p>
-    *
-    * <pre>mySubscriber.setStyle({nameDisplayMode: "off"});</pre>
-    *
-    * <p>If you pass two parameters, <code>style</code> and <code>value</code>, they are key-value pair that
-    * define one property of the display style. For example, the following code passes two parameter values
-    * to the method:</p>
-    *
-    * <pre>mySubscriber.setStyle("nameDisplayMode", "off");</pre>
-    *
-    * <p>You can set the initial settings when you call the <code>Session.subscribe()</code> method.
-    * Pass a <code>style</code> property as part of the <code>properties</code> parameter of the method.</p>
-    *
-    * <p>The TB object dispatches an <code>exception</code> event if you pass in an invalid style to the method.
-    * The <code>code</code> property of the ExceptionEvent object is set to 1011.</p>
-    *
-    * @param {Object} style Either an object containing properties that define the style, or a String defining this
-    * single style property to set.
-    * @param {String} value The value to set for the <code>style</code> passed in. Pass a value for this parameter
-    * only if the value of the <code>style</code> parameter is a String.</p>
-    *
-    * @returns {Subscriber} The Subscriber object.
-    *
-    * @see <a href="#getStyle">getStyle()</a>
-    * @see <a href="#setStyle">setStyle()</a>
-    *
-    * @see <a href="Session.html#subscribe">Session.subscribe()</a>
-    * @method #setStyle
-    * @memberOf Subscriber
-    */
+  /**
+   * Sets properties that define the appearance of some user interface controls of the Subscriber.
+   *
+   * <p>You can either pass one parameter or two parameters to this method.</p>
+   *
+   * <p>If you pass one parameter, <code>style</code>, it is an object that has the following
+   * properties:
+   *
+   *     <ul>
+   *       <li><code>backgroundImageURI</code> (String) &mdash; A URI for an image to display as
+   *       the background image when a video is not displayed. (A video may not be displayed if
+   *       you call <code>subscribeToVideo(false)</code> on the Publisher object). You can pass an
+   *       http or https URI to a PNG, JPEG, or non-animated GIF file location. You can also use the
+   *       <code>data</code> URI scheme (instead of http or https) and pass in base-64-encrypted
+   *       PNG data, such as that obtained from the
+   *       <a href="Subscriber.html#getImgData">Subscriber.getImgData()</a> method. For example,
+   *       you could set the property to <code>"data:VBORw0KGgoAA..."</code>, where the portion of
+   *       the string after <code>"data:"</code> is the result of a call to
+   *       <code>Publisher.getImgData()</code>. If the URL or the image data is invalid, the
+   *       property is ignored (the attempt to set the image fails silently).</li>
+   *
+   *       <li><code>buttonDisplayMode</code> (String) &mdash; How to display the speaker
+   *       controls. Possible values are: <code>"auto"</code> (controls are displayed when the
+   *       stream is first displayed and when the user mouses over the display), <code>"off"</code>
+   *       (controls are not displayed), and <code>"on"</code> (controls are always displayed).</li>
+   *
+   *       <li><code>nameDisplayMode</code> (String) &#151; Whether to display the stream name.
+   *       Possible values are: <code>"auto"</code> (the name is displayed when the stream is first
+   *       displayed and when the user mouses over the display), <code>"off"</code> (the name is not
+   *       displayed), and <code>"on"</code> (the name is always displayed).</li>
+   *   </ul>
+   * </p>
+   *
+   * <p>For example, the following code passes one parameter to the method:</p>
+   *
+   * <pre>mySubscriber.setStyle({nameDisplayMode: "off"});</pre>
+   *
+   * <p>If you pass two parameters, <code>style</code> and <code>value</code>, they are key-value 
+   * pair that define one property of the display style. For example, the following code passes 
+   * two parameter values to the method:</p>
+   *
+   * <pre>mySubscriber.setStyle("nameDisplayMode", "off");</pre>
+   *
+   * <p>You can set the initial settings when you call the <code>Session.subscribe()</code> method.
+   * Pass a <code>style</code> property as part of the <code>properties</code> parameter of the 
+   * method.</p>
+   *
+   * <p>The OT object dispatches an <code>exception</code> event if you pass in an invalid style 
+   * to the method. The <code>code</code> property of the ExceptionEvent object is set to 1011.</p>
+   *
+   * @param {Object} style Either an object containing properties that define the style, or a 
+   * String defining this single style property to set.
+   * @param {String} value The value to set for the <code>style</code> passed in. Pass a value 
+   * for this parameter only if the value of the <code>style</code> parameter is a String.</p>
+   *
+   * @returns {Subscriber} The Subscriber object.
+   *
+   * @see <a href="#getStyle">getStyle()</a>
+   * @see <a href="#setStyle">setStyle()</a>
+   *
+   * @see <a href="Session.html#subscribe">Session.subscribe()</a>
+   * @method #setStyle
+   * @memberOf Subscriber
+   */
     self.setStyle = function(keyOrStyleHash, value, silent) {
-        if (typeof(keyOrStyleHash) !== 'string') {
-            _style.setAll(keyOrStyleHash, silent);
-        }
-        else {
-            _style.set(keyOrStyleHash, value);
-        }
-
-        return this;
+      if (typeof(keyOrStyleHash) !== 'string') {
+        _style.setAll(keyOrStyleHash, silent);
+      } else {
+        _style.set(keyOrStyleHash, value);
+      }
+      return this;
     };
-};
+  };
 
-var Style = function(initalStyles, onStyleChange) {
-    var _COMPONENT_STYLES = [
-            "showMicButton",
-            "showSpeakerButton",
-            "showSettingsButton",
-            "showCameraToggleButton",
-            "nameDisplayMode",
-            "buttonDisplayMode",
-            "showSaveButton",
-            "showRecordButton",
-            "showRecordStopButton",
-            "showReRecordButton",
-            "showPauseButton",
-            "showPlayButton",
-            "showPlayStopButton",
-            "showStopButton",
-            "backgroundImageURI",
-            "showControlPanel",
-            "showRecordCounter",
-            "showPlayCounter",
-            "showControlBar",
-            "showPreviewTime"
-        ],
+  var Style = function(initalStyles, onStyleChange) {
+    var _style = {},
+        _COMPONENT_STYLES,
+        _validStyleValues,
+        isValidStyle,
+        castValue;
 
-        _validStyleValues = {
-            buttonDisplayMode: ["auto", "off", "on"],
-            nameDisplayMode: ["auto", "off", "on"],
-            showSettingsButton: [true, false],
-            showMicButton: [true, false],
-            showCameraToggleButton: [true, false],
-            showSaveButton: [true, false],
-            backgroundImageURI: null,
-            showControlBar: [true, false],
-            showPlayCounter: [true, false],
-            showRecordCounter: [true, false],
-            showPreviewTime: [true, false]
-        },
+    _COMPONENT_STYLES = [
+      'showMicButton',
+      'showSpeakerButton',
+      'nameDisplayMode',
+      'buttonDisplayMode',
+      'backgroundImageURI',
+      'bugDisplayMode'
+    ];
 
-        _style = {},
+    _validStyleValues = {
+      buttonDisplayMode: ['auto', 'mini', 'mini-auto', 'off', 'on'],
+      nameDisplayMode: ['auto', 'off', 'on'],
+      bugDisplayMode: ['auto', 'off', 'on'],
+      showSettingsButton: [true, false],
+      showMicButton: [true, false],
+      backgroundImageURI: null,
+      showControlBar: [true, false],
+      showArchiveStatus: [true, false]
+    };
 
 
-        // Validates the style +key+ and also whether +value+ is valid for +key+
-        isValidStyle = function(key, value) {
-            return key === 'backgroundImageURI' ||
-                    (   _validStyleValues.hasOwnProperty(key) &&
-                        _validStyleValues[key].indexOf(value) !== -1 );
-        },
-
-        castValue = function(value) {
-            switch(value) {
-                case 'true':
-                    return true;
-                case 'false':
-                    return false;
-                default:
-                    return value;
-            }
-        };
+    // Validates the style +key+ and also whether +value+ is valid for +key+
+    isValidStyle = function(key, value) {
+      return key === 'backgroundImageURI' ||
+        (   _validStyleValues.hasOwnProperty(key) &&
+        _validStyleValues[key].indexOf(value) !== -1 );
+    };
 
+    castValue = function(value) {
+      switch(value) {
+        case 'true':
+          return true;
+        case 'false':
+          return false;
+        default:
+          return value;
+      }
+    };
 
     // Returns a shallow copy of the styles.
     this.getAll = function() {
-        var style = OT.$.clone(_style);
+      var style = OT.$.clone(_style);
 
-        for (var i in style) {
-            if (_COMPONENT_STYLES.indexOf(i) < 0) {
-                // Strip unnecessary properties out, should this happen on Set?
-                delete style[i];
-            }
+      for (var i in style) {
+        if (_COMPONENT_STYLES.indexOf(i) < 0) {
+          // Strip unnecessary properties out, should this happen on Set?
+          delete style[i];
         }
+      }
 
-        return style;
+      return style;
     };
 
     this.get = function(key) {
-        if (key) {
-            return _style[key];
-        }
+      if (key) {
+        return _style[key];
+      }
 
-        // We haven't been asked for any specific key, just return the lot
-        return this.getAll();
+      // We haven't been asked for any specific key, just return the lot
+      return this.getAll();
     };
 
     // *note:* this will not trigger onStyleChange if +silent+ is truthy
     this.setAll = function(newStyles, silent) {
-        var oldValue, newValue;
+      var oldValue, newValue;
 
-        for (var key in newStyles) {
-            newValue = castValue(newStyles[key]);
+      for (var key in newStyles) {
+        newValue = castValue(newStyles[key]);
 
-            if (isValidStyle(key, newValue)) {
-                oldValue = _style[key];
+        if (isValidStyle(key, newValue)) {
+          oldValue = _style[key];
 
-                if (newValue !== oldValue) {
-                    _style[key] = newValue;
-                    if (!silent) onStyleChange(key, newValue, oldValue);
-                }
-            }
-            else {
-                OT.warn("Style.setAll::Invalid style property passed " + key + " : " + newValue);
-            }
+          if (newValue !== oldValue) {
+            _style[key] = newValue;
+            if (!silent) onStyleChange(key, newValue, oldValue);
+          }
+
+        } else {
+          OT.warn('Style.setAll::Invalid style property passed ' + key + ' : ' + newValue);
         }
+      }
 
-        return this;
+      return this;
     };
 
     this.set = function(key, value) {
-        OT.debug("Publisher.setStyle: " + key.toString());
+      OT.debug('Publisher.setStyle: ' + key.toString());
 
-        var newValue = castValue(value),
-            oldValue;
-
-        if (!isValidStyle(key, newValue)) {
-            OT.warn("Style.set::Invalid style property passed " + key + " : " + newValue);
-            return this;
-        }
-
-        oldValue = _style[key];
-        if (newValue !== oldValue) {
-            _style[key] = newValue;
-
-            onStyleChange(key, value, oldValue);
-        }
+      var newValue = castValue(value),
+          oldValue;
 
+      if (!isValidStyle(key, newValue)) {
+        OT.warn('Style.set::Invalid style property passed ' + key + ' : ' + newValue);
         return this;
+      }
+
+      oldValue = _style[key];
+      if (newValue !== oldValue) {
+        _style[key] = newValue;
+
+        onStyleChange(key, value, oldValue);
+      }
+
+      return this;
     };
 
 
     if (initalStyles) this.setAll(initalStyles, true);
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
 
 /**
  * A Publishers Microphone.
@@ -11502,128 +13286,128 @@ var Style = function(initalStyles, onStyleChange) {
  * TODO
  * * bind to changes in mute/unmute/volume/etc and respond to them
  */
-OT.Microphone = function(webRTCStream, muted) {
+  OT.Microphone = function(webRTCStream, muted) {
     var _muted,
         _gain = 50;
 
 
     Object.defineProperty(this, 'muted', {
-        get: function() { return _muted; },
-        set: function(muted) {
-            if (_muted === muted) return;
+      get: function() { return _muted; },
+      set: function(muted) {
+        if (_muted === muted) return;
 
-            _muted = muted;
+        _muted = muted;
 
-            var audioTracks = webRTCStream.getAudioTracks();
+        var audioTracks = webRTCStream.getAudioTracks();
 
-            for (var i=0, num=audioTracks.length; i<num; ++i) {
-                audioTracks[i].enabled = !_muted;
-            }
+        for (var i=0, num=audioTracks.length; i<num; ++i) {
+          audioTracks[i].enabled = !_muted;
         }
+      }
     });
 
     Object.defineProperty(this, 'gain', {
-        get: function() { return _gain; },
-
-        set: function(gain) {
-            OT.warn("OT.Microphone.gain IS NOT YET IMPLEMENTED");
-
-            _gain = gain;
-        }
+      get: function() { return _gain; },
+      set: function(gain) {
+        OT.warn('OT.Microphone.gain IS NOT YET IMPLEMENTED');
+        _gain = gain;
+      }
     });
 
     // Set the initial value
     if (muted !== undefined) {
-        this.muted = muted === true;
+      this.muted = muted === true;
+
+    } else if (webRTCStream.getAudioTracks().length) {
+      this.muted = !webRTCStream.getAudioTracks()[0].enabled;
+
+    } else {
+      this.muted = false;
     }
-    else if (webRTCStream.getAudioTracks().length) {
-        this.muted = !webRTCStream.getAudioTracks()[0].enabled;
-    }
-    else {
-        this.muted = false;
-    }
-};
 
-})(window);
-(function(window) {
-
-// A Factory method for generating simple state machine classes.
-//
-// @usage
-//    var StateMachine = OT.generateSimpleStateMachine('start', ['start', 'middle', 'end', {
-//      start: ['middle'],
-//      middle: ['end'],
-//      end: ['start']
-//    }]);
-//
-//    var states = new StateMachine();
-//    state.current;            // <-- start
-//    state.set('middle');
-//
-OT.generateSimpleStateMachine = function(initialState, states, transitions) {
-  var validStates = states.slice(),
-      validTransitions = OT.$.clone(transitions);
-
-  var isValidState = function (state) {
-    return validStates.indexOf(state) !== -1;
-  }
-
-  var isValidTransition = function(fromState, toState) {
-    return validTransitions[fromState] && validTransitions[fromState].indexOf(toState) !== -1;
   };
 
-  return function(stateChangeFailed) {
-    var currentState = initialState,
-        previousState = null;
+})(window);
+!(function() {
 
-    function signalChangeFailed(message, newState) {
+  // A Factory method for generating simple state machine classes.
+  //
+  // @usage
+  //    var StateMachine = OT.generateSimpleStateMachine('start', ['start', 'middle', 'end', {
+  //      start: ['middle'],
+  //      middle: ['end'],
+  //      end: ['start']
+  //    }]);
+  //
+  //    var states = new StateMachine();
+  //    state.current;            // <-- start
+  //    state.set('middle');
+  //
+  OT.generateSimpleStateMachine = function(initialState, states, transitions) {
+    var validStates = states.slice(),
+        validTransitions = OT.$.clone(transitions);
+
+    var isValidState = function (state) {
+      return validStates.indexOf(state) !== -1;
+    };
+
+    var isValidTransition = function(fromState, toState) {
+      return validTransitions[fromState] && validTransitions[fromState].indexOf(toState) !== -1;
+    };
+
+    return function(stateChangeFailed) {
+      var currentState = initialState,
+          previousState = null;
+
+      function signalChangeFailed(message, newState) {
         stateChangeFailed({
           message: message,
           newState: newState,
           currentState: currentState,
           previousState: previousState
         });
-    }
-
-    // Validates +newState+. If it's invalid it triggers stateChangeFailed and returns false.
-    function handleInvalidStateChanges(newState) {
-      if (!isValidState(newState)) {
-        signalChangeFailed("'" + newState + "' is not a valid state", newState)
-
-        return false;
       }
 
-      if (!isValidTransition(currentState, newState)) {
-        signalChangeFailed("'" + currentState + "' cannot transition to '" + newState + "'", newState)
+      // Validates +newState+. If it's invalid it triggers stateChangeFailed and returns false.
+      function handleInvalidStateChanges(newState) {
+        if (!isValidState(newState)) {
+          signalChangeFailed('\'' + newState + '\' is not a valid state', newState);
 
-        return false;
+          return false;
+        }
+
+        if (!isValidTransition(currentState, newState)) {
+          signalChangeFailed('\'' + currentState + '\' cannot transition to \'' +
+            newState + '\'', newState);
+
+          return false;
+        }
+
+        return true;
       }
 
-      return true;
-    }
 
+      this.set = function(newState) {
+        if (!handleInvalidStateChanges(newState)) return;
 
-    this.set = function(newState) {
-      if (!handleInvalidStateChanges(newState)) return;
+        previousState = currentState;
+        currentState = newState;
+      };
 
-      previousState = currentState;
-      currentState = newState;
+      Object.defineProperties(this, {
+        current: {
+          get: function() { return currentState; }
+        },
+
+        subscribing: {
+          get: function() { return currentState === 'Subscribing'; }
+        }
+      });
     };
-
-    Object.defineProperties(this, {
-      current: {
-        get: function() { return currentState; }
-      },
-
-      subscribing: {
-        get: function() { return currentState === 'Subscribing'; }
-      }
-    });
   };
-};
 
 })(window);
-(function(window) {
+!(function() {
 
 // Models a Subscriber's subscribing State
 //
@@ -11631,9 +13415,11 @@ OT.generateSimpleStateMachine = function(initialState, states, transitions) {
 //     NotSubscribing            (the initial state
 //     Init                      (basic setup of DOM
 //     ConnectingToPeer          (Failure Cases -> No Route, Bad Offer, Bad Answer
-//     BindingRemoteStream       (Failure Cases -> Anything to do with the media being invalid, the media never plays
+//     BindingRemoteStream       (Failure Cases -> Anything to do with the media being 
+//                               (invalid, the media never plays
 //     Subscribing               (this is 'onLoad'
-//     Failed                    (terminal state, with a reason that maps to one of the failure cases above
+//     Failed                    (terminal state, with a reason that maps to one of the 
+//                               (failure cases above
 //
 //
 // Valid Transitions:
@@ -11642,7 +13428,8 @@ OT.generateSimpleStateMachine = function(initialState, states, transitions) {
 //
 //     Init ->
 //             ConnectingToPeer
-//           | BindingRemoteStream         (if we are subscribing to ourselves and we alreay have a stream
+//           | BindingRemoteStream         (if we are subscribing to ourselves and we alreay 
+//                                         (have a stream
 //           | NotSubscribing              (destroy()
 //
 //     ConnectingToPeer ->
@@ -11658,7 +13445,8 @@ OT.generateSimpleStateMachine = function(initialState, states, transitions) {
 //
 //     Subscribing ->
 //             NotSubscribing              (unsubscribe
-//           | Failed                      (probably a peer connection failure after we began subscribing
+//           | Failed                      (probably a peer connection failure after we began 
+//                                         (subscribing
 //
 //     Failed ->                           (terminal error state)
 //
@@ -11674,28 +13462,34 @@ OT.generateSimpleStateMachine = function(initialState, states, transitions) {
 //     state.set('Subscribing');      -> triggers stateChangeFailed and logs out the error message
 //
 //
+  var validStates,
+      validTransitions,
+      initialState = 'NotSubscribing';
 
-var validStates = [ 'NotSubscribing', 'Init', 'ConnectingToPeer', 'BindingRemoteStream', 'Subscribing', 'Failed' ],
+  validStates = [
+    'NotSubscribing', 'Init', 'ConnectingToPeer', 'BindingRemoteStream', 'Subscribing', 'Failed'
+  ];
 
-    validTransitions = {
-      NotSubscribing: ['NotSubscribing', 'Init'],
-      Init: ['NotSubscribing', 'ConnectingToPeer', 'BindingRemoteStream'],
-      ConnectingToPeer: ['NotSubscribing', 'BindingRemoteStream', 'Failed'],
-      BindingRemoteStream: ['NotSubscribing', 'Subscribing', 'Failed'],
-      Subscribing: ['NotSubscribing', 'Failed'],
-      Failed: []
-    },
+  validTransitions = {
+    NotSubscribing: ['NotSubscribing', 'Init'],
+    Init: ['NotSubscribing', 'ConnectingToPeer', 'BindingRemoteStream'],
+    ConnectingToPeer: ['NotSubscribing', 'BindingRemoteStream', 'Failed'],
+    BindingRemoteStream: ['NotSubscribing', 'Subscribing', 'Failed'],
+    Subscribing: ['NotSubscribing', 'Failed'],
+    Failed: []
+  };
 
-    initialState = 'NotSubscribing';
+  OT.SubscribingState = OT.generateSimpleStateMachine(initialState, validStates, validTransitions);
 
-OT.SubscribingState = OT.generateSimpleStateMachine(initialState, validStates, validTransitions);
-
-Object.defineProperty(OT.SubscribingState.prototype, 'attemptingToSubscribe', {
-  get: function() { return [ 'Init', 'ConnectingToPeer', 'BindingRemoteStream' ].indexOf(this.current) !== -1; }
-});
+  Object.defineProperty(OT.SubscribingState.prototype, 'attemptingToSubscribe', {
+    get: function() {
+      return [ 'Init', 'ConnectingToPeer', 'BindingRemoteStream' ]
+        .indexOf(this.current) !== -1;
+    }
+  });
 
 })(window);
-(function(window) {
+!(function() {
 
 // Models a Publisher's publishing State
 //
@@ -11715,37 +13509,45 @@ Object.defineProperty(OT.SubscribingState.prototype, 'attemptingToSubscribe', {
 //
 //    GetUserMedia ->
 //        BindingMedia
-//      | Failed                      (Failure Reasons -> stream error, constraints, permission denied
+//      | Failed                      (Failure Reasons -> stream error, constraints,
+//                                    (permission denied
 //      | NotPublishing               (destroy()
 //
 //
 //    BindingMedia ->
 //        MediaBound
-//      | Failed                      (Failure Reasons -> Anything to do with the media being invalid, the media never plays
+//      | Failed                      (Failure Reasons -> Anything to do with the media
+//                                    (being invalid, the media never plays
 //      | NotPublishing               (destroy()
 //
 //    MediaBound ->
-//        PublishingToSession         (MediaBound could transition to PublishingToSession if a stand-alone publish is bound to a session
+//        PublishingToSession         (MediaBound could transition to PublishingToSession
+//                                    (if a stand-alone publish is bound to a session
 //      | Failed                      (Failure Reasons -> media issues with a stand-alone publisher
 //      | NotPublishing               (destroy()
 //
 //    PublishingToSession
 //        Publishing
-//      | Failed                      (Failure Reasons -> timeout while waiting for ack of stream registered. We do not do this right now
+//      | Failed                      (Failure Reasons -> timeout while waiting for ack of
+//                                    (stream registered. We do not do this right now
 //      | NotPublishing               (destroy()
 //
 //
 //    Publishing ->
 //        NotPublishing               (Unpublish
-//      | Failed                      (Failure Reasons -> loss of network, media error, anything that causes *all* Peer Connections to fail (less than all failing is just an error, all is failure)
+//      | Failed                      (Failure Reasons -> loss of network, media error, anything
+//                                    (that causes *all* Peer Connections to fail (less than all
+//                                    (failing is just an error, all is failure)
 //      | NotPublishing               (destroy()
 //
 //    Failed ->                       (Terminal state
 //
 //
 
-
-var validStates = [ 'NotPublishing', 'GetUserMedia', 'BindingMedia', 'MediaBound', 'PublishingToSession', 'Publishing', 'Failed' ],
+  var validStates = [
+      'NotPublishing', 'GetUserMedia', 'BindingMedia', 'MediaBound',
+      'PublishingToSession', 'Publishing', 'Failed'
+    ],
 
     validTransitions = {
       NotPublishing: ['NotPublishing', 'GetUserMedia'],
@@ -11759,81 +13561,94 @@ var validStates = [ 'NotPublishing', 'GetUserMedia', 'BindingMedia', 'MediaBound
 
     initialState = 'NotPublishing';
 
-OT.PublishingState = OT.generateSimpleStateMachine(initialState, validStates, validTransitions);
+  OT.PublishingState = OT.generateSimpleStateMachine(initialState, validStates, validTransitions);
 
-Object.defineProperties(OT.PublishingState.prototype, {
-  attemptingToPublish: {
-    get: function() { return [ 'GetUserMedia', 'BindingMedia', 'MediaBound', 'PublishingToSession' ].indexOf(this.current) !== -1; }
-  },
+  Object.defineProperties(OT.PublishingState.prototype, {
+    attemptingToPublish: {
+      get: function() {
+        return [ 'GetUserMedia', 'BindingMedia', 'MediaBound', 'PublishingToSession' ]
+          .indexOf(this.current) !== -1;
+      }
+    },
 
-  publishing: {
-    get: function() { return this.current === 'Publishing'; }
-  }
-});
+    publishing: {
+      get: function() { return this.current === 'Publishing'; }
+    }
+  });
 
 
 })(window);
-(function(window) {
+!(function() {
 
-// The default constraints
-var defaultConstraints = {
+  // The default constraints
+  var defaultConstraints = {
     audio: true,
     video: true
-};
+  };
 
 /**
  * The Publisher object  provides the mechanism through which control of the
- * published stream is accomplished. Calling the <code>TB.initPublisher</code> method of a
- *  Session object creates a Publisher object. </p>
+ * published stream is accomplished. Calling the <code>OT.initPublisher()</code> method
+ * creates a Publisher object. </p>
  *
  *  <p>The following code instantiates a session, and publishes an audio-video stream
  *  upon connection to the session: </p>
  *
  *  <pre>
- *  var API_KEY = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
+ *  var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
  *  var sessionID = ""; // Replace with your own session ID.
  *                      // See https://dashboard.tokbox.com/projects
  *  var token = ""; // Replace with a generated token that has been assigned the moderator role.
  *                  // See https://dashboard.tokbox.com/projects
  *
- *  var session = TB.initSession(sessionID);
- *  session.addEventListener("sessionConnected", sessionConnectHandler);
- *  session.connect(API_KEY, token);
- *
- *  function sessionConnectHandler(event) {
- *      var div = document.createElement('div');
- *      div.setAttribute('id', 'publisher');
+ *  var session = OT.initSession(apiKey, sessionID);
+ *  session.on("sessionConnected", function(event) {
  *
  *      var publisherContainer = document.getElementById('publisherContainer');
  *          // This example assumes that a publisherContainer div exists
- *      publisherContainer.appendChild(div);
  *
  *      var publisherProperties = {width: 400, height:300, name:"Bob's stream"};
- *      publisher = TB.initPublisher(API_KEY, 'publisher', publisherProperties);
+ *      publisher = OT.initPublisher(publisherContainer, publisherProperties);
  *      session.publish(publisher);
- *  }
+ *  });
+ *  session.connect(token);
  *  </pre>
  *
- *      <p>This example creates a Publisher object and adds its video to a DOM element named <code>publisher</code>
- *      by calling the <code>TB.initPublisher()</code> method. It then publishes a stream to the session by calling
+ *      <p>This example creates a Publisher object and adds its video to a DOM element
+ *      named <code>publisherContainer</code> by calling the <code>OT.initPublisher()</code>
+ *      method. It then publishes a stream to the session by calling
  *      the <code>publish()</code> method of the Session object.</p>
  *
- * @property id The DOM ID of the Publisher.
- * @property stream The {@link Stream} object corresponding the the stream of the Publihser.
- * @property session The {@link Session} to which the Publisher belongs.
+ * @property {Boolean} accessAllowed Whether the user has granted access to the camera
+ * and microphone. The Publisher object dispatches an <code>accessAllowed</code> event when
+ * the user grants access. The Publisher object dispatches an <code>accessDenied</code> event
+ * when the user denies access.
+ * @property {Element} element The HTML DOM element containing the Publisher.
+ * @property {String} id The DOM ID of the Publisher.
+ * @property {Stream} stream The {@link Stream} object corresponding the the stream of
+ * the Publihser.
+ * @property {Session} session The {@link Session} to which the Publisher belongs.
+ * @property {Number} videoHeight The height, in pixels, of the Publisher video. This may
+ * differ from the <code>resolution</code> property passed in as the <code>properties</code>
+ * property of the <code>OT.initPublisher()</code> method, if the browser does not support
+ * the requested resolution.
+ * @property {Number} videoWidth The width, in pixels, of the Publisher video. This may differ
+ * from the <code>resolution</code> property passed in as the <code>properties</code> property
+ * of the <code>OT.initPublisher()</code> method, if the browser does not support the requested
+ * resolution.
  *
- * @see <a href="TB.html#initPublisher">TB.initPublisher</a>
+ * @see <a href="OT.html#initPublisher">OT.initPublisher</a>
  * @see <a href="Session.html#publish">Session.publish()</a>
  *
  * @class Publisher
  * @augments EventDispatcher
  */
-OT.Publisher = function() {
+  OT.Publisher = function() {
     // Check that the client meets the minimum requirements, if they don't the upgrade
     // flow will be triggered.
     if (!OT.checkSystemRequirements()) {
-        OT.upgradeSystemRequirements();
-        return;
+      OT.upgradeSystemRequirements();
+      return;
     }
 
     var _guid = OT.Publisher.nextId(),
@@ -11841,340 +13656,339 @@ OT.Publisher = function() {
         _container,
         _targetElement,
         _stream,
+        _streamId,
         _webRTCStream,
         _session,
         _peerConnections = {},
         _loaded = false,
         _publishProperties,
         _publishStartTime,
-        _streamCreatedTimeout,
         _microphone,
         _chrome,
         _analytics = new OT.Analytics(),
-        _validResolutions = [
-            {width: 320, height: 240},
-            {width: 640, height: 480},
-            {width: 1280, height: 720}
-        ],
+        _validResolutions,
+        _validFrameRates = [ 1, 7, 15, 30 ],
         _qosIntervals = {},
-        _gettingStats = 0,
-        _prevStats = {
-            "timeStamp" : OT.$.now()
-        },
+        _prevStats,
         _state;
 
+    _validResolutions = {
+      '320x240': {width: 320, height: 240},
+      '640x480': {width: 640, height: 480},
+      '1280x720': {width: 1280, height: 720}
+    };
+
+    _prevStats = {
+      'timeStamp' : OT.$.now()
+    };
+
     OT.$.eventing(this);
 
     OT.StylableComponent(this, {
-        showMicButton: true,
-        showSettingsButton: true,
-        showCameraToggleButton: true,
-        nameDisplayMode: "auto",
-        buttonDisplayMode: "auto",
-        backgroundImageURI: null
+      showMicButton: true,
+      showArchiveStatus: true,
+      nameDisplayMode: 'auto',
+      buttonDisplayMode: 'auto',
+      bugDisplayMode: 'auto',
+      backgroundImageURI: null
     });
 
         /// Private Methods
     var logAnalyticsEvent = function(action, variation, payloadType, payload) {
-            _analytics.logEvent({
-                action: action,
-                variation: variation,
-                payload_type: payloadType,
-                payload: payload,
-                session_id: _session ? _session.sessionId : null,
-                connection_id: _session && _session.connected ? _session.connection.connectionId : null,
-                partner_id: _session ? _session.apiKey : OT.APIKEY,
-                streamId: _stream ? _stream.id : null,
-                widget_id: _guid,
-                widget_type: 'Publisher'
-            });
+          _analytics.logEvent({
+            action: action,
+            variation: variation,
+            'payload_type': payloadType,
+            payload: payload,
+            'session_id': _session ? _session.sessionId : null,
+            'connection_id': _session &&
+              _session.connected ? _session.connection.connectionId : null,
+            'partner_id': _session ? _session.apiKey : OT.APIKEY,
+            streamId: _stream ? _stream.id : null,
+            'widget_id': _guid,
+            'widget_type': 'Publisher'
+          });
         },
 
-        isValidResolution = function(width, height) {
-            for (var i=0; i<_validResolutions.length; ++i) {
-                if (_validResolutions[i].width == width && _validResolutions[i].height == height) {
-                    return true;
-                }
+        recordQOS = function(connectionId) {
+          var QoSBlob = {
+            'widget_type': 'Publisher',
+            'stream_type': 'WebRTC',
+            sessionId: _session ? _session.sessionId : null,
+            connectionId: _session && _session.connected ? _session.connection.connectionId : null,
+            partnerId: _session ? _session.apiKey : OT.APIKEY,
+            streamId: _stream ? _stream.id : null,
+            widgetId: _guid,
+            version: OT.properties.version,
+            'media_server_name': _session ? _session.sessionInfo.messagingServer : null,
+            p2pFlag: _session ? _session.sessionInfo.p2pEnabled : false,
+            duration: _publishStartTime ? new Date().getTime() - _publishStartTime.getTime() : 0,
+            'remote_connection_id': connectionId
+          };
+
+          // get stats for each connection id
+          _peerConnections[connectionId].getStats(_prevStats, function(stats) {
+            var statIndex;
+            if (stats) {
+              for (statIndex in stats) {
+                QoSBlob[statIndex] = stats[statIndex];
+              }
             }
-            return false;
-        },
-
-        recordQOS = function(connection_id) {
-            var QoS_blob = {
-                widget_type: 'Publisher',
-                stream_type : 'WebRTC',
-                sessionId: _session ? _session.sessionId : null,
-                connectionId: _session && _session.connected ? _session.connection.connectionId : null,
-                partnerId: _session ? _session.apiKey : OT.APIKEY,
-                streamId: _stream ? _stream.id : null,
-                widgetId: _guid,
-                version: OT.properties.version,
-                media_server_name: _session ? _session.sessionInfo.messagingServer : null,
-                p2pFlag: _session ? _session.sessionInfo.p2pEnabled : false,
-                duration: new Date().getTime() -_publishStartTime.getTime(),
-                remote_connection_id: connection_id
-            };
-
-            // get stats for each connection id
-            _peerConnections[connection_id].getStats(_prevStats, function(stats) {
-                if (stats) {
-                    for (var stat_index in stats) {
-                        QoS_blob[stat_index] = stats[stat_index];
-                    }
-                }
-                _analytics.logQOS(QoS_blob);
-            });
+            _analytics.logQOS(QoSBlob);
+          });
         },
 
         /// Private Events
 
         stateChangeFailed = function(changeFailed) {
-            OT.error("Publisher State Change Failed: ", changeFailed.message);
-            OT.debug(changeFailed);
+          OT.error('Publisher State Change Failed: ', changeFailed.message);
+          OT.debug(changeFailed);
         },
 
         onLoaded = function() {
-            OT.debug("OT.Publisher.onLoaded");
+          OT.debug('OT.Publisher.onLoaded');
 
-            _state.set('MediaBound');
-            _container.loading = false;
-            _loaded = true;
+          _state.set('MediaBound');
+          _container.loading = false;
+          _loaded = true;
 
-            _createChrome.call(this);
+          _createChrome.call(this);
 
-            this.trigger('initSuccess', this);
-            this.trigger('loaded', this);
+          this.trigger('initSuccess');
+          this.trigger('loaded', this);
         },
 
         onLoadFailure = function(reason) {
-            logAnalyticsEvent('publish', 'Failure', 'reason', "Publisher PeerConnection Error: " + reason);
+          logAnalyticsEvent('publish', 'Failure', 'reason',
+            'Publisher PeerConnection Error: ' + reason);
 
-            _state.set('Failed');
-            this.trigger('publishError', "Publisher PeerConnection Error: " + reason);
+          _state.set('Failed');
+          this.trigger('publishComplete', new OT.Error(OT.ExceptionCodes.P2P_CONNECTION_FAILED,
+            'Publisher PeerConnection Error: ' + reason));
 
-            OT.handleJsException("Publisher PeerConnection Error: " + reason, OT.ExceptionCodes.P2P_CONNECTION_FAILED, {
-                session: _session,
-                target: this
-            });
+          OT.handleJsException('Publisher PeerConnection Error: ' + reason,
+            OT.ExceptionCodes.P2P_CONNECTION_FAILED, {
+            session: _session,
+            target: this
+          });
         },
 
         onStreamAvailable = function(webOTStream) {
-            OT.debug("OT.Publisher.onStreamAvailable");
+          OT.debug('OT.Publisher.onStreamAvailable');
 
-            _state.set('BindingMedia');
+          _state.set('BindingMedia');
 
-            cleanupLocalStream();
-            _webRTCStream = webOTStream;
+          cleanupLocalStream();
+          _webRTCStream = webOTStream;
 
-            _microphone = new OT.Microphone(_webRTCStream, !_publishProperties.publishAudio);
-            this.publishVideo(_publishProperties.publishVideo);
+          _microphone = new OT.Microphone(_webRTCStream, !_publishProperties.publishAudio);
+          this.publishVideo(_publishProperties.publishVideo &&
+            _webRTCStream.getVideoTracks().length > 0);
 
-            this.dispatchEvent(
-                new OT.Event(OT.Event.names.ACCESS_ALLOWED, false)
-            );
+          this.dispatchEvent(
+            new OT.Event(OT.Event.names.ACCESS_ALLOWED, false)
+          );
 
-            _targetElement = new OT.VideoElement({
-                attributes: {muted:true}
-            });
+          _targetElement = new OT.VideoElement({
+            attributes: {muted:true}
+          });
 
-            _targetElement.on({
-                    streamBound: onLoaded,
-                    loadError: onLoadFailure,
-                    error: onVideoError
-                }, this)
-                .bindToStream(_webRTCStream);
+          _targetElement.on({
+            streamBound: onLoaded,
+            loadError: onLoadFailure,
+            error: onVideoError
+          }, this)
+            .bindToStream(_webRTCStream);
 
-            _container.video = _targetElement;
+          _container.video = _targetElement;
         },
 
         onStreamAvailableError = function(error) {
-            OT.error('OT.Publisher.onStreamAvailableError ' + error.name + ': ' + error.message);
+          OT.error('OT.Publisher.onStreamAvailableError ' + error.name + ': ' + error.message);
 
-            _state.set('Failed');
-            this.trigger('publishError', error.message);
+          _state.set('Failed');
+          this.trigger('publishComplete', new OT.Error(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+              error.message));
 
-            if (_container) _container.destroy();
+          if (_container) _container.destroy();
 
-            logAnalyticsEvent('publish', 'Failure', 'reason', "Publisher failed to access camera/mic: " + error.message);
+          logAnalyticsEvent('publish', 'Failure', 'reason',
+            'GetUserMedia:Publisher failed to access camera/mic: ' + error.message);
 
-            OT.handleJsException("Publisher failed to access camera/mic: " + error.message, 2000, {
-                session: _session,
-                target: this
-            });
+          OT.handleJsException('Publisher failed to access camera/mic: ' + error.message,
+          OT.ExceptionCodes.UNABLE_TO_PUBLISH, {
+            session: _session,
+            target: this
+          });
         },
 
-        // The user has clicked the 'deny' button the the allow access dialog (or it's set to always deny)
+        // The user has clicked the 'deny' button the the allow access dialog
+        // (or it's set to always deny)
         onAccessDenied = function(error) {
-            OT.error('OT.Publisher.onStreamAvailableError Permission Denied');
+          OT.error('OT.Publisher.onStreamAvailableError Permission Denied');
 
-            _state.set('Failed');
-            this.trigger('publishError', error.message);
+          _state.set('Failed');
+          this.trigger('publishComplete', new OT.Error(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+              'Publisher Access Denied: Permission Denied' +
+                  (error.message ? ': ' + error.message : '')));
 
-            logAnalyticsEvent('publish', 'Failure', 'reason', 'Publisher Access Denied: Permission Denied');
+          logAnalyticsEvent('publish', 'Failure', 'reason',
+            'GetUserMedia:Publisher Access Denied: Permission Denied');
 
-            var event = new OT.Event(OT.Event.names.ACCESS_DENIED),
-                defaultAction = function() {
-                    if (!event.isDefaultPrevented() && _container) _container.destroy();
-                };
+          var event = new OT.Event(OT.Event.names.ACCESS_DENIED),
+            defaultAction = function() {
+              if (!event.isDefaultPrevented() && _container) _container.destroy();
+            };
 
-            this.dispatchEvent(event, defaultAction);
+          this.dispatchEvent(event, defaultAction);
         },
 
         onAccessDialogOpened = function() {
-            logAnalyticsEvent('accessDialog', 'Opened', '', '');
+          logAnalyticsEvent('accessDialog', 'Opened', '', '');
 
-            this.dispatchEvent(
-                new OT.Event(OT.Event.names.ACCESS_DIALOG_OPENED, false)
-            );
+          this.dispatchEvent(
+            new OT.Event(OT.Event.names.ACCESS_DIALOG_OPENED, false)
+          );
         },
 
         onAccessDialogClosed = function() {
-            logAnalyticsEvent('accessDialog', 'Closed', '', '');
+          logAnalyticsEvent('accessDialog', 'Closed', '', '');
 
-            this.dispatchEvent(
-                new OT.Event(OT.Event.names.ACCESS_DIALOG_CLOSED, false)
-            );
+          this.dispatchEvent(
+            new OT.Event(OT.Event.names.ACCESS_DIALOG_CLOSED, false)
+          );
         },
 
         onVideoError = function(errorCode, errorReason) {
-            OT.error('OT.Publisher.onVideoError');
+          OT.error('OT.Publisher.onVideoError');
 
-            var message = errorReason + (errorCode ? ' (' + errorCode + ')' : '');
-            logAnalyticsEvent('stream', null, 'reason', "Publisher while playing stream: " + message);
+          var message = errorReason + (errorCode ? ' (' + errorCode + ')' : '');
+          logAnalyticsEvent('stream', null, 'reason',
+            'Publisher while playing stream: ' + message);
 
-            _state.set('Failed');
+          _state.set('Failed');
 
-            if (_state.attemptingToPublish) {
-                this.trigger('publishError', message);
-            }
-            else {
-                this.trigger('error', message);
-            }
+          if (_state.attemptingToPublish) {
+            this.trigger('publishComplete', new OT.Error(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+                message));
+          } else {
+            this.trigger('error', message);
+          }
 
-            OT.handleJsException("Publisher error playing stream: " + message, 2000, {
-                session: _session,
-                target: this
-            });
+          OT.handleJsException('Publisher error playing stream: ' + message,
+          OT.ExceptionCodes.UNABLE_TO_PUBLISH, {
+            session: _session,
+            target: this
+          });
         },
 
         onPeerDisconnected = function(peerConnection) {
-            OT.debug("OT.Subscriber has been disconnected from the Publisher's PeerConnection");
+          OT.debug('OT.Subscriber has been disconnected from the Publisher\'s PeerConnection');
 
-            this.cleanupSubscriber(peerConnection.remoteConnection.id);
+          this.cleanupSubscriber(peerConnection.remoteConnection.id);
         },
 
-        onPeerConnectionFailure = function(code, reason, peerConnection) {
-            logAnalyticsEvent('publish', 'Failure', 'reason|hasRelayCandidates', [
-                reason + ": Publisher PeerConnection with connection " + (peerConnection && peerConnection.remoteConnection && peerConnection.remoteConnection.id)  + " failed",
-                peerConnection.hasRelayCandidates
-                ].join('|'));
+        onPeerConnectionFailure = function(code, reason, peerConnection, prefix) {
+          logAnalyticsEvent('publish', 'Failure', 'reason|hasRelayCandidates',
+            (prefix ? prefix : '') + [':Publisher PeerConnection with connection ' +
+              (peerConnection && peerConnection.remoteConnection &&
+              peerConnection.remoteConnection.id)  + ' failed: ' +
+              reason, peerConnection.hasRelayCandidates
+          ].join('|'));
 
-            OT.handleJsException("Publisher PeerConnection Error: " + reason, 2000, {
-                session: _session,
-                target: this
-            });
+          OT.handleJsException('Publisher PeerConnection Error: ' + reason,
+          OT.ExceptionCodes.UNABLE_TO_PUBLISH, {
+            session: _session,
+            target: this
+          });
 
-            // We don't call cleanupSubscriber as it also logs a
-            // disconnected analytics event, which we don't want in this
-            // instance. The duplication is crufty though and should
-            // be tidied up.
-            if (peerConnection.remoteConnection) {
-                clearInterval(_qosIntervals[peerConnection.remoteConnection.id]);
-                delete _qosIntervals[peerConnection.remoteConnection.id]
+          // We don't call cleanupSubscriber as it also logs a
+          // disconnected analytics event, which we don't want in this
+          // instance. The duplication is crufty though and should
+          // be tidied up.
+          clearInterval(_qosIntervals[peerConnection.remoteConnection.id]);
+          delete _qosIntervals[peerConnection.remoteConnection.id];
 
-                delete _peerConnections[peerConnection.remoteConnection.id];
-            }
-            peerConnection.off();
-        },
-
-        getStats = function(callback) {
-            if (_gettingStats > 0) {
-                OT.debug("Still getting stats");
-                return;
-            }
-
-            var getStatsBlob = {};
-
-            // loops through all the peer connections get get the stats for them
-            for (var conn_id in _peerConnections) {
-
-                // this locks the getStats function so it isn't accidentally called
-                // again while already in the middle of getting stats
-                _gettingStats++;
-
-                getStatsBlob[conn_id] = null;
-
-                // just so we don't lose the connection id
-                (function(connection_id) {
-                    _peerConnections[connection_id].getStats(function(parsed_stats) {
-
-                        // one down
-                        _gettingStats--;
-
-                        if (parsed_stats) {
-                            getStatsBlob[connection_id] = parsed_stats;
-                        }
-
-                        // if this reaches zero, that means all of the peer connections
-                        // have returned their stats reports
-                        if (_gettingStats == 0) {
-                            callback(getStatsBlob);
-                        }
-                    });
-                })(conn_id);
-            }
+          delete _peerConnections[peerConnection.remoteConnection.id];
         },
 
         /// Private Helpers
 
+        // Assigns +stream+ to this publisher. The publisher listens
+        // for a bunch of events on the stream so it can respond to
+        // changes.
+        assignStream = function(stream) {
+          _stream = stream;
+          _stream.on('destroyed', this.disconnect, this);
+
+          var oldGuid = _guid;
+          _guid = OT.Publisher.nextId();
+
+          // Our publisher has changed guids, let people that rely
+          // on the GUID be non-volatile know.
+          if (oldGuid) {
+            this.trigger('idUpdated', oldGuid, _guid);
+          }
+
+          _state.set('Publishing');
+          _publishStartTime = new Date();
+
+          this.trigger('publishComplete', null, this);
+      
+          this.dispatchEvent(new OT.StreamEvent('streamCreated', stream, null, false));
+          
+          logAnalyticsEvent('publish', 'Success', 'streamType:streamId', 'WebRTC:' + _streamId);
+        }.bind(this),
+
         // Clean up our LocalMediaStream
         cleanupLocalStream = function() {
-            if (_webRTCStream) {
-                // Stop revokes our access cam and mic access for this instance
-                // of localMediaStream.
-                _webRTCStream.stop();
-                _webRTCStream = null;
-            }
+          if (_webRTCStream) {
+            // Stop revokes our access cam and mic access for this instance
+            // of localMediaStream.
+            _webRTCStream.stop();
+            _webRTCStream = null;
+          }
         },
 
         createPeerConnectionForRemote = function(remoteConnection) {
-            var peerConnection = _peerConnections[remoteConnection.id];
+          var peerConnection = _peerConnections[remoteConnection.id];
 
-            if (!peerConnection) {
-                var startConnectingTime = OT.$.now();
+          if (!peerConnection) {
+            var startConnectingTime = OT.$.now();
 
-                logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
+            logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
 
-                // Cleanup our subscriber when they disconnect
-                remoteConnection.on('destroyed', this.cleanupSubscriber.bind(this, remoteConnection.id));
+            // Cleanup our subscriber when they disconnect
+            remoteConnection.on('destroyed',
+              this.cleanupSubscriber.bind(this, remoteConnection.id));
 
-                peerConnection = _peerConnections[remoteConnection.id] = new OT.PublisherPeerConnection(
-                    remoteConnection,
-                    _session,
-                    _stream,
-                    _webRTCStream
-                );
+            peerConnection = _peerConnections[remoteConnection.id] = new OT.PublisherPeerConnection(
+              remoteConnection,
+              _session,
+              _streamId,
+              _webRTCStream
+            );
 
-                peerConnection.on({
-                    connected: function() {
-                        logAnalyticsEvent('createPeerConnection', 'Success', 'pcc|hasRelayCandidates', [
-                            parseInt(OT.$.now() - startConnectingTime, 10),
-                            peerConnection.hasRelayCandidates
-                        ].join('|'));
+            peerConnection.on({
+              connected: function() {
+                logAnalyticsEvent('createPeerConnection', 'Success', 'pcc|hasRelayCandidates', [
+                  parseInt(OT.$.now() - startConnectingTime, 10),
+                  peerConnection.hasRelayCandidates
+                ].join('|'));
 
-                        // start recording the QoS for this peer connection
-                        _qosIntervals[remoteConnection.id] = setInterval(function() {
-                            recordQOS(remoteConnection.id)
-                        }, 30000);
-                    },
-                    disconnected: onPeerDisconnected,
-                    error: onPeerConnectionFailure
-                }, this);
+                // start recording the QoS for this peer connection
+                _qosIntervals[remoteConnection.id] = setInterval(function() {
+                  recordQOS(remoteConnection.id);
+                }, 30000);
+              },
+              disconnected: onPeerDisconnected,
+              error: onPeerConnectionFailure
+            }, this);
 
-                peerConnection.init();
-            }
+            peerConnection.init();
+          }
 
-            return peerConnection;
+          return peerConnection;
         },
 
         /// Chrome
@@ -12183,174 +13997,208 @@ OT.Publisher = function() {
         // definitely display  the button, but we'll defer the model to the
         // Publishers buttonDisplayMode style property.
         chromeButtonMode = function(mode) {
-            if (mode === false) return 'off';
+          if (mode === false) return 'off';
 
-            var defaultMode = this.getStyle('buttonDisplayMode');
+          var defaultMode = this.getStyle('buttonDisplayMode');
 
-            // The default model is false, but it's overridden by +mode+ being true
-            if (defaultMode === false) return 'on';
+          // The default model is false, but it's overridden by +mode+ being true
+          if (defaultMode === false) return 'on';
 
-            // defaultMode is either true or auto.
-            return defaultMode;
+          // defaultMode is either true or auto.
+          return defaultMode;
         },
 
-        updateChromeForStyleChange = function(key, value, oldValue) {
-            if (!_chrome) return;
+        updateChromeForStyleChange = function(key, value) {
+          if (!_chrome) return;
 
-            switch(key) {
-                case 'nameDisplayMode':
-                    _chrome.name.setDisplayMode(value);
-                    break;
+          switch(key) {
+            case 'nameDisplayMode':
+              _chrome.name.setDisplayMode(value);
+              _chrome.backingBar.nameMode = value;
+              break;
 
-                case 'buttonDisplayMode':
-                case 'showMicButton':
-                case 'showSettingsButton':
-                    // _chrome.settingsPanelButton.setDisplayMode(
-                    //     chromeButtonMode.call(this, this.getStyle('showSettingsButton'))
-                    // );
+            case 'showArchiveStatus':
+              logAnalyticsEvent('showArchiveStatus', 'styleChange', 'mode', value);
+              _chrome.archive.setShowArchiveStatus(value);
+              break;
 
-                    // _chrome.muteButton.setDisplayMode(
-                    //     chromeButtonMode.call(this, this.getStyle('showMicButton'))
-                    // );
-            }
+            case 'buttonDisplayMode':
+            case 'showMicButton':
+              // _chrome.muteButton.setDisplayMode(
+              //     chromeButtonMode.call(this, this.getStyle('showMicButton'))
+              // );
+            case 'bugDisplayMode':
+              // _chrome.name.bugMode = value;
+          }
         },
 
         _createChrome = function() {
-            _chrome = new OT.Chrome({
-                parent: _container.domElement
-            }).set({
-                name: new OT.Chrome.NamePanel({
-                    name: _publishProperties.name,
-                    mode: this.getStyle('nameDisplayMode')
-                }),
+          if(this.getStyle('bugDisplayMode') === 'off') {
+            logAnalyticsEvent('bugDisplayMode', 'createChrome', 'mode', 'off');
+          }
+          if(this.getStyle('showArchiveStatus') === 'off') {
+            logAnalyticsEvent('showArchiveStatus', 'createChrome', 'mode', 'off');
+          }
+          _chrome = new OT.Chrome({
+            parent: _container.domElement
+          }).set({
 
-                // settingsPanelButton: new OT.Chrome.SettingsPanelButton({
-                //     mode: chromeButtonMode.call(this, this.getStyle('showSettingsButton'))
-                // }),
+            backingBar: new OT.Chrome.BackingBar({
+              nameMode: this.getStyle('nameDisplayMode'),
+              muteMode: chromeButtonMode.call(this, this.getStyle('showMicButton'))
+            }),
 
-                // Disabled until we can change the mic Volume through WebRTC
-                muteButton: new OT.Chrome.MuteButton({
-                    muted: _publishProperties.publishAudio === false,
-                    mode: chromeButtonMode.call(this, this.getStyle('showMicButton'))
-                }),
+            name: new OT.Chrome.NamePanel({
+              name: _publishProperties.name,
+              mode: this.getStyle('nameDisplayMode'),
+              bugMode: this.getStyle('bugDisplayMode')
+            }),
 
-                opentokButton: new OT.Chrome.OpenTokButton()
-            }).on({
-                // 'SettingsPanel:open': function() {
-                //     if (!_chrome.settingsPanel) {
-                //         // Add the settings panel, hide it initially
-                //         _chrome.set(
-                //             'settingsPanel',
-                //             new OT.Chrome.SettingsPanel({
-                //                 stream: _webRTCStream,
-                //                 mode: 'on'
-                //             })
-                //         );
-                //     }
-                //     else {
-                //         _chrome.settingsPanel.setDisplayMode('on');
-                //     }
+            muteButton: new OT.Chrome.MuteButton({
+              muted: _publishProperties.publishAudio === false,
+              mode: chromeButtonMode.call(this, this.getStyle('showMicButton'))
+            }),
 
-                //     OT.$.addClass(_container, 'OT_reversed');
-                // },
+            opentokButton: new OT.Chrome.OpenTokButton({
+              mode: this.getStyle('bugDisplayMode')
+            }),
 
-                // 'SettingsPanel:close': function() {
-                //     OT.$.removeClass(_container, 'OT_reversed');
+            archive: new OT.Chrome.Archiving({
+              show: this.getStyle('showArchiveStatus'),
+              archiving: false
+            })
 
-                //     // Hide the settings panel after our animation is complete
-                //     setTimeout(function() {
-                //         _chrome.settingsPanel.setDisplayMode('off');
-                //     }, 3000);
-                // },
-
-
-                muted: this.publishAudio.bind(this, false),
-                unmuted: this.publishAudio.bind(this, true)
-            });
+          }).on({
+            muted: this.publishAudio.bind(this, false),
+            unmuted: this.publishAudio.bind(this, true)
+          });
         },
 
         reset = function() {
-            if (_chrome) {
-              _chrome.destroy();
-              _chrome = null;
-            }
+          if (_chrome) {
+            _chrome.destroy();
+            _chrome = null;
+          }
 
-            this.disconnect();
+          this.disconnect();
 
-            _microphone = null;
+          _microphone = null;
 
-            if (_targetElement) {
-                _targetElement.destroy();
-                _targetElement = null;
-            }
+          if (_targetElement) {
+            _targetElement.destroy();
+            _targetElement = null;
+          }
 
-            cleanupLocalStream();
+          cleanupLocalStream();
 
-            if (_container) {
-                _container.destroy();
-                _container = null;
-            }
+          if (_container) {
+            _container.destroy();
+            _container = null;
+          }
 
-            if (this.session) this._.unpublishFromSession(this.session);
+          if (this.session) {
+            this._.unpublishFromSession(this.session, 'reset');
+          }
 
-            // clear all the intervals
-            for (var conn_id in _qosIntervals) {
-                clearInterval(_qosIntervals[conn_id]);
-                delete _qosIntervals[conn_id];
-            }
+          // clear all the intervals
+          for (var connId in _qosIntervals) {
+            clearInterval(_qosIntervals[connId]);
+            delete _qosIntervals[connId];
+          }
 
-            _domId = null;
-            _stream = null;
-            _loaded = false;
+          _domId = null;
+          _stream = null;
+          _loaded = false;
 
-            _session = null;
-            _properties = null;
-
-            _state.set('NotPublishing');
+          _session = null;
+          
+          _state.set('NotPublishing');
         }.bind(this);
 
-
     this.publish = function(targetElement, properties) {
-        OT.debug("OT.Publisher: publish");
+      OT.debug('OT.Publisher: publish');
 
-        if ( _state.attemptingToPublish || _state.publishing ) reset();
-        _state.set('GetUserMedia');
+      if ( _state.attemptingToPublish || _state.publishing ) reset();
+      _state.set('GetUserMedia');
 
-        _publishProperties = OT.$.defaults(properties || {}, {
-            publishAudio : true,
-            publishVideo : true,
-            mirror: true
-        });
-
-        _publishProperties.constraints = OT.$.defaults(_publishProperties.constraints || {}, defaultConstraints);
-
-        if (_publishProperties.style) {
-            this.setStyle(_publishProperties.style, null, true);
+      _publishProperties = OT.$.defaults(properties || {}, {
+        publishAudio : true,
+        publishVideo : true,
+        mirror: true
+      });
+        
+      if (!_publishProperties.constraints) {
+        _publishProperties.constraints = OT.$.clone(defaultConstraints);
+        if (_publishProperties.resolution) {
+          if (_publishProperties.resolution !== void 0 &&
+            !_validResolutions.hasOwnProperty(_publishProperties.resolution)) {
+            OT.warn('Invalid resolution passed to the Publisher. Got: ' +
+              _publishProperties.resolution + ' expecting one of "' +
+              Object.keys(_validResolutions).join('","') + '"');
+          } else {
+            _publishProperties.videoDimensions = _validResolutions[_publishProperties.resolution];
+            _publishProperties.constraints.video = {
+              mandatory: {},
+              optional: [
+                {minWidth: _publishProperties.videoDimensions.width},
+                {maxWidth: _publishProperties.videoDimensions.width},
+                {minHeight: _publishProperties.videoDimensions.height},
+                {maxHeight: _publishProperties.videoDimensions.height}
+              ]
+            };
+          }
         }
-
-        if (_publishProperties.name) {
-            _publishProperties.name = _publishProperties.name.toString();
+    
+        if (_publishProperties.frameRate !== void 0 &&
+          _validFrameRates.indexOf(_publishProperties.frameRate) === -1) {
+          OT.warn('Invalid frameRate passed to the publisher got: ' +
+            _publishProperties.frameRate + ' expecting one of ' + _validFrameRates.join(','));
+          delete _publishProperties.frameRate;
+        } else if (_publishProperties.frameRate) {
+          if (!_publishProperties.constraints.video.optional) {
+            if (typeof _publishProperties.constraints.video !== 'object') {
+              _publishProperties.constraints.video = {};
+            }
+            _publishProperties.constraints.video.optional = [];
+          }
+          _publishProperties.constraints.video.optional.push({
+            minFrameRate: _publishProperties.frameRate
+          });
+          _publishProperties.constraints.video.optional.push({
+            maxFrameRate: _publishProperties.frameRate
+          });
         }
+      } else {
+        OT.warn('You have passed your own constraints not using ours');
+      }
 
-        _publishProperties.classNames = 'OT_root OT_publisher';
+      if (_publishProperties.style) {
+        this.setStyle(_publishProperties.style, null, true);
+      }
 
-        // Defer actually creating the publisher DOM nodes until we know
-        // the DOM is actually loaded.
-        OT.onLoad(function() {
-            _container = new OT.WidgetView(targetElement, _publishProperties);
-            _domId = _container.domId;
+      if (_publishProperties.name) {
+        _publishProperties.name = _publishProperties.name.toString();
+      }
 
-            OT.$.getUserMedia(
-                _publishProperties.constraints,
-                onStreamAvailable.bind(this),
-                onStreamAvailableError.bind(this),
-                onAccessDialogOpened.bind(this),
-                onAccessDialogClosed.bind(this),
-                onAccessDenied.bind(this)
-            );
-        }, this);
+      _publishProperties.classNames = 'OT_root OT_publisher';
 
-        return this;
+      // Defer actually creating the publisher DOM nodes until we know
+      // the DOM is actually loaded.
+      OT.onLoad(function() {
+        _container = new OT.WidgetView(targetElement, _publishProperties);
+        _domId = _container.domId;
+
+        OT.$.getUserMedia(
+          _publishProperties.constraints,
+          onStreamAvailable.bind(this),
+          onStreamAvailableError.bind(this),
+          onAccessDialogOpened.bind(this),
+          onAccessDialogClosed.bind(this),
+          onAccessDenied.bind(this)
+        );
+      }, this);
+
+      return this;
     };
 
  /**
@@ -12361,23 +14209,28 @@ OT.Publisher = function() {
   * @param {Boolean} value Whether to start publishing audio (<code>true</code>)
   * or not (<code>false</code>).
   *
-  * @see <a href="TB.html#initPublisher">TB.initPublisher()</a>
+  * @see <a href="OT.html#initPublisher">OT.initPublisher()</a>
   * @see <a href="Stream.html#hasAudio">Stream.hasAudio</a>
   * @see StreamPropertyChangedEvent
   * @method #publishAudio
   * @memberOf Publisher
   */
     this.publishAudio = function(value) {
-        _publishProperties.publishAudio = value;
+      _publishProperties.publishAudio = value;
 
-        if (_microphone) {
-            _microphone.muted = !value;
-        }
+      if (_microphone) {
+        _microphone.muted = !value;
+      }
+      
+      if (_chrome) {
+        _chrome.muteButton.muted = !value;
+      }
 
-        if (_session && _stream) {
-            _session._.modifyStream(_stream.streamId, "hasAudio", value);
-        }
-        return this;
+      if (_session && _stream) {
+        _stream.setChannelActiveState('audio', value);
+      }
+
+      return this;
     };
 
 
@@ -12389,66 +14242,69 @@ OT.Publisher = function() {
   * @param {Boolean} value Whether to start publishing video (<code>true</code>)
   * or not (<code>false</code>).
   *
-  * @see <a href="TB.html#initPublisher">TB.initPublisher()</a>
+  * @see <a href="OT.html#initPublisher">OT.initPublisher()</a>
   * @see <a href="Stream.html#hasVideo">Stream.hasVideo</a>
   * @see StreamPropertyChangedEvent
   * @method #publishVideo
   * @memberOf Publisher
   */
     this.publishVideo = function(value) {
-        var oldValue = _publishProperties.publishVideo;
-        _publishProperties.publishVideo = value;
+      var oldValue = _publishProperties.publishVideo;
+      _publishProperties.publishVideo = value;
 
-        if (_session && _stream && _publishProperties.publishVideo !== oldValue) {
-            _session._.modifyStream(_stream.streamId, "hasVideo", value);
+      if (_session && _stream && _publishProperties.publishVideo !== oldValue) {
+        _stream.setChannelActiveState('video', value);
+      }
+
+      // We currently do this event if the value of publishVideo has not changed
+      // This is because the state of the video tracks enabled flag may not match
+      // the value of publishVideo at this point. This will be tidied up shortly.
+      if (_webRTCStream) {
+        var videoTracks = _webRTCStream.getVideoTracks();
+        for (var i=0, num=videoTracks.length; i<num; ++i) {
+          videoTracks[i].enabled = value;
         }
+      }
 
-        // We currently do this event if the value of publishVideo has not changed
-        // This is because the state of the video tracks enabled flag may not match
-        // the value of publishVideo at this point. This will be tidied up shortly.
-        if (_webRTCStream) {
-            var videoTracks = _webRTCStream.getVideoTracks();
-            for (var i=0, num=videoTracks.length; i<num; ++i) {
-                videoTracks[i].enabled = value;
-            }
-        }
+      if(_container) {
+        _container.showPoster = !value;
+      }
 
-        if(_container) {
-            _container.showPoster = !value;
-        }
-
-        return this;
+      return this;
     };
 
     this.recordQOS = function() {
-
-        // have to record QoS for every peer connection
-        for (var conn_id in _peerConnections) {
-            recordQOS(conn_id);
-        }
+      // have to record QoS for every peer connection
+      for (var connId in _peerConnections) {
+        recordQOS(connId);
+      }
     };
 
     /**
     * Deletes the Publisher object and removes it from the HTML DOM.
+    * <p>
+    * The Publisher object dispatches a <code>destroyed</code> event when the DOM
+    * element is removed.
+    * </p>
     * @method #destroy
     * @memberOf Publisher
     * @return {Publisher} The Publisher.
     */
     this.destroy = function(/* unused */ reason, quiet) {
-        reset();
+      reset();
 
-        if (quiet !== true) {
-            this.dispatchEvent(
-              new OT.DestroyedEvent(
-                OT.Event.names.PUBLISHER_DESTROYED,
-                this,
-                reason
-              ),
-              this.off.bind(this)
-            );
-        }
+      if (quiet !== true) {
+        this.dispatchEvent(
+          new OT.DestroyedEvent(
+            OT.Event.names.PUBLISHER_DESTROYED,
+            this,
+            reason
+          ),
+          this.off.bind(this)
+        );
+      }
 
-        return this;
+      return this;
     };
 
     /**
@@ -12456,40 +14312,41 @@ OT.Publisher = function() {
     * @private
     */
     this.disconnect = function() {
-        // Close the connection to each of our subscribers
-        for (var fromConnectionId in _peerConnections) {
-            this.cleanupSubscriber(fromConnectionId);
-        }
+      // Close the connection to each of our subscribers
+      for (var fromConnectionId in _peerConnections) {
+        this.cleanupSubscriber(fromConnectionId);
+      }
     };
 
     this.cleanupSubscriber = function(fromConnectionId) {
-        var pc = _peerConnections[fromConnectionId];
+      var pc = _peerConnections[fromConnectionId];
 
-        clearInterval(_qosIntervals[fromConnectionId]);
-        delete _qosIntervals[fromConnectionId];
+      clearInterval(_qosIntervals[fromConnectionId]);
+      delete _qosIntervals[fromConnectionId];
 
-        if (pc) {
-            pc.destroy();
-            delete _peerConnections[fromConnectionId];
+      if (pc) {
+        pc.destroy();
+        delete _peerConnections[fromConnectionId];
 
-            logAnalyticsEvent('disconnect', 'PeerConnection', 'subscriberConnection', fromConnectionId);
-        }
+        logAnalyticsEvent('disconnect', 'PeerConnection',
+          'subscriberConnection', fromConnectionId);
+      }
     };
 
 
     this.processMessage = function(type, fromConnection, message) {
-        OT.debug("OT.Publisher.processMessage: Received " + type + " from " + fromConnection.id);
-        OT.debug(message);
+      OT.debug('OT.Publisher.processMessage: Received ' + type + ' from ' + fromConnection.id);
+      OT.debug(message);
 
-        switch (type) {
-            case OT.Raptor.Actions.UNSUBSCRIBE:
-                this.cleanupSubscriber(fromConnection.id);
-                break;
+      switch (type) {
+        case 'unsubscribe':
+          this.cleanupSubscriber(message.content.connection.id);
+          break;
 
-            default:
-                var peerConnection = createPeerConnectionForRemote.call(this, fromConnection);
-                peerConnection.processMessage(type, message);
-        }
+        default:
+          var peerConnection = createPeerConnectionForRemote.call(this, fromConnection);
+          peerConnection.processMessage(type, message);
+      }
     };
 
     /**
@@ -12514,185 +14371,227 @@ OT.Publisher = function() {
     */
 
     this.getImgData = function() {
-        if (!_loaded) {
-            OT.error("OT.Publisher.getImgData: Cannot getImgData before the Publisher is publishing.");
+      if (!_loaded) {
+        OT.error('OT.Publisher.getImgData: Cannot getImgData before the Publisher is publishing.');
 
-            return null;
-        }
+        return null;
+      }
 
-        return _targetElement.imgData;
+      return _targetElement.imgData;
     };
 
 
     // API Compatibility layer for Flash Publisher, this could do with some tidyup.
     this._ = {
-        publishToSession: function(session) {
-            // Add session property to Publisher
-            this.session = session;
+      publishToSession: function(session) {
+        // Add session property to Publisher
+        this.session = session;
 
-            var createStream = function() {
-                // Bail if this.session is gone, it means we were unpublished
-                // before createStream could finish.
-                if (!this.session) return;
+        var createStream = function() {
 
-                _state.set('PublishingToSession');
+          var streamWidth,
+              streamHeight;
 
-                if (_streamCreatedTimeout) {
-                  clearTimeout(_streamCreatedTimeout);
-                }
-                _streamCreatedTimeout = setTimeout(function () {
-                  logAnalyticsEvent('publish', 'Failure', 'reason', 'StreamCreated: Timed out waiting for streamRegistered');
-                  this.trigger('publishError', "StreamCreated: Timed out waiting for streamRegistered");
-                }.bind(this), 30000);
+          // Bail if this.session is gone, it means we were unpublished
+          // before createStream could finish.
+          if (!this.session) return;
 
-                session._.createStream( this.guid,
-                                        _publishProperties && _publishProperties.name ? _publishProperties.name : "",
-                                        OT.VideoOrientation.ROTATED_NORMAL,
-                                        _targetElement.videoWidth,                      // actual width and height
-                                        _targetElement.videoHeight,                     // of the video stream.
-                                        _publishProperties.publishAudio,
-                                        _publishProperties.publishVideo );
-            };
+          _state.set('PublishingToSession');
 
-            if (_loaded) createStream.call(this);
-            else this.on("initSuccess", createStream, this);
-
-            logAnalyticsEvent('publish', 'Attempt', 'streamType', 'WebRTC');
-
-            return this;
-        }.bind(this),
-
-        unpublishFromSession: function(session) {
-            if (!this.session || session.id !== this.session.id) {
-                OT.warn("The publisher " + this.guid + " is trying to unpublish from a session " + session.id + " it is not attached to");
-                return this;
+          var onStreamRegistered = function(err, streamId) {
+            if (err) {
+              // @todo we should respect err.code here and translate it to the local
+              // client equivalent.
+              logAnalyticsEvent('publish', 'Failure', 'reason',
+                'Publish:' + OT.ExceptionCodes.UNABLE_TO_PUBLISH + ':' + err.message);
+              if (_state.attemptingToPublish) {
+                this.trigger('publishComplete', new OT.Error(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+                  err.message));
+              }
+              return;
             }
 
-            if (session.connected && this.stream) {
-                session._.destroyStream(this.stream.id);
+            _streamId = streamId;
+          }.bind(this);
+              
+          // We set the streamWidth and streamHeight to be the minimum of the requested
+          // resolution and the actual resolution.
+          if (_publishProperties.videoDimensions) {
+            streamWidth = Math.min(_publishProperties.videoDimensions.width,
+              _targetElement.videoWidth || 640);
+            streamHeight = Math.min(_publishProperties.videoDimensions.height,
+              _targetElement.videoHeight || 480);
+          } else {
+            streamWidth = _targetElement.videoWidth || 640;
+            streamHeight = _targetElement.videoHeight || 480;
+          }
+
+          session._.streamCreate(
+            _publishProperties && _publishProperties.name ? _publishProperties.name : '',
+            OT.VideoOrientation.ROTATED_NORMAL,
+            streamWidth,
+            streamHeight,
+            _publishProperties.publishAudio,
+            _publishProperties.publishVideo,
+            _publishProperties.frameRate,
+            onStreamRegistered
+          );
+        };
+
+        if (_loaded) createStream.call(this);
+        else this.on('initSuccess', createStream, this);
+
+        logAnalyticsEvent('publish', 'Attempt', 'streamType', 'WebRTC');
+
+        return this;
+      }.bind(this),
+
+      unpublishFromSession: function(session, reason) {
+        if (!this.session || session.id !== this.session.id) {
+          OT.warn('The publisher ' + this.guid + ' is trying to unpublish from a session ' +
+            session.id + ' it is not attached to (' +
+            (this.session && this.session.id || 'no this.session') + ')');
+          return this;
+        }
+
+        if (session.connected && this.stream) {
+          session._.streamDestroy(this.stream.id);
+        }
+
+        // Disconnect immediately, rather than wait for the WebSocket to
+        // reply to our destroyStream message.
+        this.disconnect();
+        this.session = null;
+
+        // We're back to being a stand-alone publisher again.
+        _state.set('MediaBound');
+
+        logAnalyticsEvent('unpublish', 'Success', 'sessionId', session.id);
+
+        this._.streamDestroyed(reason);
+
+        return this;
+      }.bind(this),
+      
+      streamDestroyed: function(reason) {
+        if(['reset'].indexOf(reason) < 0) {
+          var event = new OT.StreamEvent('streamDestroyed', _stream, reason, true);
+          var defaultAction = function() {
+            if(!event.isDefaultPrevented()) {
+              this.destroy();
             }
+          }.bind(this);
+          this.dispatchEvent(event, defaultAction);
+        }
+      }.bind(this),
 
-            // Disconnect immediately, rather than wait for the WebSocket to
-            // reply to our destroyStream message.
-            this.disconnect();
-            this.session = null;
-
-            // We're back to being a stand-alone publisher again.
-            _state.set('MediaBound');
-
-            logAnalyticsEvent('unpublish', 'Success', 'sessionId', session.id);
-
-            return this;
-        }.bind(this),
-
-        // Called once our stream has been ack'd as created by the session
-        streamRegisteredHandler: function(stream) {
-            clearTimeout(_streamCreatedTimeout);
-            _streamCreatedTimeout = null;
-
-            logAnalyticsEvent('publish', 'Success', 'streamType', 'WebRTC');
-
-            this.stream = stream;
-            this.stream.on('destroyed', this.disconnect, this);
-
-            var oldGuid = _guid;
-            _guid = OT.Publisher.nextId();
-
-            // Our publisher has changed guids, let people that rely
-            // on the GUID be non-volatile know.
-            if (oldGuid) {
-                this.trigger('idUpdated', oldGuid, _guid);
-            }
-
-            _state.set('Publishing');
-            _publishStartTime = new Date();
-
-            this.trigger('publishSuccess');
-        }.bind(this)
+      archivingStatus: function(status) {
+        if(_chrome) {
+          _chrome.archive.setArchiving(status);
+        }
+        return status;
+      }.bind(this)
     };
 
     this.detectDevices = function() {
-        OT.warn("Fixme: Haven't implemented detectDevices");
+      OT.warn('Fixme: Haven\'t implemented detectDevices');
     };
 
     this.detectMicActivity = function() {
-        OT.warn("Fixme: Haven't implemented detectMicActivity");
+      OT.warn('Fixme: Haven\'t implemented detectMicActivity');
     };
 
     this.getEchoCancellationMode = function() {
-        OT.warn("Fixme: Haven't implemented getEchoCancellationMode");
-        return "fullDuplex";
+      OT.warn('Fixme: Haven\'t implemented getEchoCancellationMode');
+      return 'fullDuplex';
     };
 
-    this.setMicrophoneGain = function(value) {
-        OT.warn("Fixme: Haven't implemented setMicrophoneGain");
+    this.setMicrophoneGain = function() {
+      OT.warn('Fixme: Haven\'t implemented setMicrophoneGain');
     };
 
     this.getMicrophoneGain = function() {
-        OT.warn("Fixme: Haven't implemented getMicrophoneGain");
-        return 0.5;
+      OT.warn('Fixme: Haven\'t implemented getMicrophoneGain');
+      return 0.5;
     };
 
-    this.setCamera = function(value) {
-        OT.warn("Fixme: Haven't implemented setCamera");
+    this.setCamera = function() {
+      OT.warn('Fixme: Haven\'t implemented setCamera');
     };
 
-    this.setMicrophone = function(value) {
-        OT.warn("Fixme: Haven't implemented setMicrophone");
+    this.setMicrophone = function() {
+      OT.warn('Fixme: Haven\'t implemented setMicrophone');
     };
 
 
     Object.defineProperties(this, {
-        id: {
-            get: function() { return _domId; },
-            enumerable: true
+      id: {
+        get: function() { return _domId; },
+        enumerable: true
+      },
+        
+      element: {
+        get: function() { return _container.domElement; },
+        enumerable: true
+      },
+
+      guid: {
+        get: function() { return _guid; },
+        enumerable: true
+      },
+
+      stream: {
+        get: function() { return _stream; },
+        set: function(stream) {
+          assignStream(stream);
         },
+        enumerable: true
+      },
 
-        guid: {
-            get: function() { return _guid; },
-            enumerable: true
+      streamId: {
+        get: function() { return _streamId; },
+        enumerable: true
+      },
+
+      targetElement: {
+        get: function() { return _targetElement.domElement; }
+      },
+
+      domId: {
+        get: function() { return _domId; }
+      },
+
+      session: {
+        get: function() { return _session; },
+        set: function(session) {
+          _session = session;
         },
+        enumerable: true
+      },
 
-        stream: {
-            get: function() { return _stream; },
-            set: function(stream) { _stream = stream; },
-            enumerable: true
-        },
+      isWebRTC: {
+        get: function() { return true; }
+      },
 
-        streamId: {
-            get: function() {
-                if (!_stream) return null;
-
-                return _stream.id;
-            },
-            enumerable: true
-        },
-
-        targetElement: {
-            get: function() { return _targetElement.domElement; }
-        },
-
-        domId: {
-            get: function() { return _domId; }
-        },
-
-        session: {
-            get: function() { return _session; },
-            set: function(session) { _session = session; },
-            enumerable: true
-        },
-
-        isWebRTC: {
-            get: function() { return true; }
-        },
-
-        loading: {
-            get: function(){ return _container && _container.loading }
+      loading: {
+        get: function(){
+          return _container && _container.loading;
         }
+      },
+        
+      videoWidth: {
+        get: function() { return _targetElement.videoWidth; },
+        enumerable: true
+      },
+        
+      videoHeight: {
+        get: function() { return _targetElement.videoHeight; },
+        enumerable: true
+      }
     });
 
     Object.defineProperty(this._, 'webRtcStream', {
-        get: function() { return _webRTCStream; }
+      get: function() { return _webRTCStream; }
     });
 
     this.on('styleValueChanged', updateChromeForStyleChange, this);
@@ -12701,7 +14600,10 @@ OT.Publisher = function() {
 
 	/**
 	* Dispatched when the user has clicked the Allow button, granting the
-	* app access to the camera and microphone.
+	* app access to the camera and microphone. The Publisher object has an
+	* <code>accessAllowed</code> property which indicates whether the user
+	* has granted access to the camera and microphone.
+	* @see Event
 	* @name accessAllowed
 	* @event
 	* @memberof Publisher
@@ -12710,47 +14612,87 @@ OT.Publisher = function() {
 	/**
 	* Dispatched when the user has clicked the Deny button, preventing the
 	* app from having access to the camera and microphone.
+	* @see Event
 	* @name accessDenied
 	* @event
 	* @memberof Publisher
 	*/
 
 	/**
-	* Dispatched when the Allow/Deny dialog box is opened. (This is the dialog box in which the user can grant
-	* the app access to the camera and microphone.)
+	* Dispatched when the Allow/Deny dialog box is opened. (This is the dialog box in which
+	* the user can grant the app access to the camera and microphone.)
+	* @see Event
 	* @name accessDialogOpened
 	* @event
 	* @memberof Publisher
 	*/
 
 	/**
-	* Dispatched when the Allow/Deny box is closed. (This is the dialog box in which the user can grant
-	* the app access to the camera and microphone.)
+	* Dispatched when the Allow/Deny box is closed. (This is the dialog box in which the
+	* user can grant the app access to the camera and microphone.)
+	* @see Event
 	* @name accessDialogClosed
 	* @event
 	* @memberof Publisher
 	*/
 
-};
+	/**
+	 * The publisher has started streaming to the session.
+	 * @name streamCreated
+	 * @event
+	 * @memberof Publisher
+	 * @see StreamEvent
+	 * @see <a href="Session.html#publish">Session.publish()</a>
+	 */
 
-// Helper function to generate unique publisher ids
-OT.Publisher.nextId = OT.$.uuid;
+	/**
+	 * The publisher has stopped streaming to the session. The default behavior is that
+	 * the Publisher object is removed from the HTML DOM). The Publisher object dispatches a 
+	 * <code>destroyed</code> event when the element is removed from the HTML DOM. If you call the 
+	 * <code>preventDefault()</code> method in the event listener for the 
+	 * <code>streamDestroyed</code> event, the default behavior is prevented, and you 
+	 * can, optionally, retain the Publisher for reuse or clean it up using your own code.
+	 * @name streamDestroyed
+	 * @event
+	 * @memberof Publisher
+	 * @see StreamEvent
+	 */
+
+	/**
+	* Dispatched when the Publisher element is removed from the HTML DOM. When this event
+  * is dispatched, you may choose to adjust or remove HTML DOM elements related to the publisher.
+	* @name destroyed
+	* @event
+	* @memberof Publisher
+	*/
+  };
+
+  // Helper function to generate unique publisher ids
+  OT.Publisher.nextId = OT.$.uuid;
 
 })(window);
-(function(window) {
-
+!(function(window) {
 
 /**
- * The Subscriber object is a representation of the local video element that is playing back a remote stream.
- * The Subscriber object includes methods that let you disable and enable local audio playback for the subscribed stream.
- * The <code>subscribe()</code> method of the {@link Session} object returns a Subscriber object.
+ * The Subscriber object is a representation of the local video element that is playing back
+ * a remote stream. The Subscriber object includes methods that let you disable and enable
+ * local audio playback for the subscribed stream. The <code>subscribe()</code> method of the
+ * {@link Session} object returns a Subscriber object.
  *
+ * @property {Element} element The HTML DOM element containing the Subscriber.
  * @property {String} id The DOM ID of the Subscriber.
  * @property {Stream} stream The stream to which you are subscribing.
+ * @property {Number} videoHeight The height, in pixels, of the Subscriber video in the HTML DOM.
+ * This may differ from the <code>videoHeight</code> dimensions of the Stream object, if the
+ * browser does not support the resolution of the stream.
+ * @property {Number} videoWidth The width, in pixels, of the Subscriber video in the HTML DOM.
+ * This may differ from the <code>videoWidth</code> dimensions of the Stream object, if the
+ * browser does not support the resolution of the stream.
+ *
  * @class Subscriber
  * @augments EventDispatcher
  */
-OT.Subscriber = function(targetElement, options) {
+  OT.Subscriber = function(targetElement, options) {
     var _widgetId = OT.$.uuid(),
         _domId = targetElement || _widgetId,
         _container,
@@ -12766,509 +14708,595 @@ OT.Subscriber = function(targetElement, options) {
         _properties = OT.$.clone(options),
         _analytics = new OT.Analytics(),
         _audioVolume = 50,
-        _gettingStats = 0,
         _state,
         _subscribeAudioFalseWorkaround, // OPENTOK-6844
-        _prevStats = {
-            "timeStamp" : OT.$.now()
-        };
+        _prevStats,
+        _lastSubscribeToVideoReason;
 
+    _prevStats = {
+      timeStamp: OT.$.now()
+    };
 
     if (!_session) {
-        OT.handleJsException("Subscriber must be passed a session option", 2000, {
-            session: _session,
-            target: this
-        });
+      OT.handleJsException('Subscriber must be passed a session option', 2000, {
+        session: _session,
+        target: this
+      });
 
-        return;
+      return;
     }
 
     OT.$.eventing(this);
 
     OT.StylableComponent(this, {
-        nameDisplayMode: "auto",
-        buttonDisplayMode: "auto",
-        backgroundImageURI: null
+      nameDisplayMode: 'auto',
+      buttonDisplayMode: 'auto',
+      backgroundImageURI: null,
+      showArchiveStatus: true,
+      showMicButton: true
     });
 
     var logAnalyticsEvent = function(action, variation, payloadType, payload) {
-            _analytics.logEvent({
-                action: action,
-                variation: variation,
-                payload_type: payloadType,
-                payload: payload,
-                stream_id: _stream ? _stream.id : null,
-                session_id: _session ? _session.sessionId : null,
-                connection_id: _session && _session.connected ? _session.connection.connectionId : null,
-                partner_id: _session && _session.connected ? _session.sessionInfo.partnerId : null,
-                widget_id: _widgetId,
-                widget_type: 'Subscriber'
-            });
+          /* jshint camelcase:false*/
+          _analytics.logEvent({
+            action: action,
+            variation: variation,
+            payload_type: payloadType,
+            payload: payload,
+            stream_id: _stream ? _stream.id : null,
+            session_id: _session ? _session.sessionId : null,
+            connection_id: _session && _session.connected ? _session.connection.connectionId : null,
+            partner_id: _session && _session.connected ? _session.sessionInfo.partnerId : null,
+            widget_id: _widgetId,
+            widget_type: 'Subscriber'
+          });
         },
 
         recordQOS = function() {
-            if(_state.subscribing && _session && _session.connected) {
-                var QoS_blob = {
-                    widget_type: 'Subscriber',
-                    stream_type : 'WebRTC',
-                    session_id: _session ? _session.sessionId : null,
-                    connectionId: _session ? _session.connection.connectionId : null,
-                    media_server_name: _session ? _session.sessionInfo.messagingServer : null,
-                    p2pFlag: _session ? _session.sessionInfo.p2pEnabled : false,
-                    partner_id: _session ? _session.apiKey : null,
-                    stream_id: _stream.id,
-                    widget_id: _widgetId,
-                    version: OT.properties.version,
-                    duration: parseInt(OT.$.now() - _subscribeStartTime, 10),
-                    remote_connection_id: _stream.connection.connectionId
-                };
+          if(_state.subscribing && _session && _session.connected) {
+            /*jshint camelcase:false */
+            var QoSBlob = {
+              widget_type: 'Subscriber',
+              stream_type : 'WebRTC',
+              session_id: _session ? _session.sessionId : null,
+              connectionId: _session ? _session.connection.connectionId : null,
+              media_server_name: _session ? _session.sessionInfo.messagingServer : null,
+              p2pFlag: _session ? _session.sessionInfo.p2pEnabled : false,
+              partner_id: _session ? _session.apiKey : null,
+              stream_id: _stream.id,
+              widget_id: _widgetId,
+              version: OT.properties.version,
+              duration: parseInt(OT.$.now() - _subscribeStartTime, 10),
+              remote_connection_id: _stream.connection.connectionId
+            };
 
-
-                // get stats for each connection id
-                _peerConnection.getStats(_prevStats, function(stats) {
-                    if (stats) {
-                        for (stat_index in stats) {
-                            QoS_blob[stat_index] = stats[stat_index];
-                        }
-                    }
-                    _analytics.logQOS(QoS_blob);
-                });
-            }
+            // get stats for each connection id
+            _peerConnection.getStats(_prevStats, function(stats) {
+              var statIndex;
+              if (stats) {
+                for (statIndex in stats) {
+                  QoSBlob[statIndex] = stats[statIndex];
+                }
+              }
+              _analytics.logQOS(QoSBlob);
+            });
+          }
         },
 
         stateChangeFailed = function(changeFailed) {
-            OT.error("Subscriber State Change Failed: ", changeFailed.message);
-            OT.debug(changeFailed);
+          OT.error('Subscriber State Change Failed: ', changeFailed.message);
+          OT.debug(changeFailed);
         },
 
         onLoaded = function() {
-            if (_state.subscribing || !_streamContainer) return;
+          if (_state.subscribing || !_streamContainer) return;
 
-            OT.debug("OT.Subscriber.onLoaded");
+          OT.debug('OT.Subscriber.onLoaded');
 
-            _state.set('Subscribing');
-            _subscribeStartTime = OT.$.now();
+          _state.set('Subscribing');
+          _subscribeStartTime = OT.$.now();
 
-            logAnalyticsEvent('createPeerConnection', 'Success', 'pcc|hasRelayCandidates', [
-                parseInt(_subscribeStartTime - _startConnectingTime, 10),
-                _peerConnection && _peerConnection.hasRelayCandidates
-            ].join('|'));
+          logAnalyticsEvent('createPeerConnection', 'Success', 'pcc|hasRelayCandidates', [
+            parseInt(_subscribeStartTime - _startConnectingTime, 10),
+            _peerConnection && _peerConnection.hasRelayCandidates
+          ].join('|'));
 
-            _qosInterval = setInterval(recordQOS, 30000);
+          _qosInterval = setInterval(recordQOS, 30000);
 
-            if(_subscribeAudioFalseWorkaround) {
-                _subscribeAudioFalseWorkaround = null;
-                this.subscribeToVideo(false);
-            }
+          if(_subscribeAudioFalseWorkaround) {
+            _subscribeAudioFalseWorkaround = null;
+            this.subscribeToVideo(false);
+          }
 
-            _container.loading = false;
+          _container.loading = false;
 
-            _createChrome.call(this);
+          _createChrome.call(this);
 
-            this.trigger('subscribeSuccess', this);
-            this.trigger('loaded', this);
+          this.trigger('subscribeComplete', null, this);
+          this.trigger('loaded', this);
 
-
-            logAnalyticsEvent('subscribe', 'Success', 'streamId', _stream.id);
+          logAnalyticsEvent('subscribe', 'Success', 'streamId', _stream.id);
         },
 
         onDisconnected = function() {
-            OT.debug("OT.Subscriber has been disconnected from the Publisher's PeerConnection");
+          OT.debug('OT.Subscriber has been disconnected from the Publisher\'s PeerConnection');
 
-            if (_state.attemptingToSubscribe) {
-                // subscribing error
-                _state.set('Failed');
-                this.trigger('subscribeError', "ClientDisconnected");
-            }
-            else if (_state.subscribing) {
-                _state.set('Failed');
+          if (_state.attemptingToSubscribe) {
+            // subscribing error
+            _state.set('Failed');
+            this.trigger('subscribeComplete', new OT.Error(null, 'ClientDisconnected'));
 
-                // we were disconnected after we were already subscribing
-                // probably do nothing?
-            }
+          } else if (_state.subscribing) {
+            _state.set('Failed');
 
-            this.disconnect();
+            // we were disconnected after we were already subscribing
+            // probably do nothing?
+          }
+
+          this.disconnect();
         },
 
+        onPeerConnectionFailure = function(code, reason, peerConnection, prefix) {
+          if (_state.attemptingToSubscribe) {
+            // We weren't subscribing yet so this was a failure in setting
+            // up the PeerConnection or receiving the initial stream.
+            logAnalyticsEvent('createPeerConnection', 'Failure', 'reason|hasRelayCandidates', [
+              'Subscriber PeerConnection Error: ' + reason,
+              _peerConnection && _peerConnection.hasRelayCandidates
+            ].join('|'));
 
-        onPeerConnectionFailure = function(code, reason) {
-            if (_state.attemptingToSubscribe) {
-                // We weren't subscribing yet so this was a failure in setting
-                // up the PeerConnection or receiving the initial stream.
-                logAnalyticsEvent('createPeerConnection', 'Failure', 'reason|hasRelayCandidates', [
-                    "Subscriber PeerConnection Error: " + reason,
-                    _peerConnection && _peerConnection.hasRelayCandidates
-                ].join('|'));
+            _state.set('Failed');
+            this.trigger('subscribeComplete', new OT.Error(null, reason));
 
-                _state.set('Failed');
-                this.trigger('subscribeError', reason);
+          } else if (_state.subscribing) {
+            // we were disconnected after we were already subscribing
+            _state.set('Failed');
+            this.trigger('error', reason);
+          }
+
+          this.disconnect();
+
+          logAnalyticsEvent('subscribe', 'Failure', 'reason',
+            (prefix ? prefix : '') + ':Subscriber PeerConnection Error: ' + reason);
+
+          OT.handleJsException('Subscriber PeerConnection Error: ' + reason,
+            OT.ExceptionCodes.P2P_CONNECTION_FAILED, {
+              session: _session,
+              target: this
             }
-            else if (_state.subscribing) {
-                // we were disconnected after we were already subscribing
-                _state.set('Failed');
-                this.trigger('error', reason);
-            }
-
-            this.disconnect();
-
-            logAnalyticsEvent('subscribe', 'Failure', 'reason', reason + ":Subscriber PeerConnection Error");
-
-            OT.handleJsException("Subscriber PeerConnection Error: " + reason, OT.ExceptionCodes.P2P_CONNECTION_FAILED, {
-                session: _session,
-                target: this
-            });
-            _showError.call(this, reason);
+          );
+          _showError.call(this, reason);
         },
 
         onRemoteStreamAdded = function(webOTStream) {
-            OT.debug("OT.Subscriber.onRemoteStreamAdded");
+          OT.debug('OT.Subscriber.onRemoteStreamAdded');
 
-            _state.set('BindingRemoteStream');
+          _state.set('BindingRemoteStream');
 
-            // Disable the audio/video, if needed
-            this.subscribeToAudio(_properties.subscribeToAudio);
+          // Disable the audio/video, if needed
+          this.subscribeToAudio(_properties.subscribeToAudio);
 
-            var preserver = _subscribeAudioFalseWorkaround;
-            this.subscribeToVideo(_properties.subscribeToVideo);
-            _subscribeAudioFalseWorkaround = preserver;
+          var preserver = _subscribeAudioFalseWorkaround;
+          this.subscribeToVideo(_properties.subscribeToVideo);
+          _subscribeAudioFalseWorkaround = preserver;
 
-            var streamElement = new OT.VideoElement();
+          var streamElement = new OT.VideoElement();
 
-            // Initialize the audio volume
-            streamElement.setAudioVolume(_audioVolume);
-            streamElement.on({
-                    streamBound: onLoaded,
-                    loadError: onPeerConnectionFailure,
-                    error: onPeerConnectionFailure
-                }, this);
+          // Initialize the audio volume
+          streamElement.setAudioVolume(_audioVolume);
+          streamElement.on({
+            streamBound: onLoaded,
+            loadError: onPeerConnectionFailure,
+            error: onPeerConnectionFailure
+          }, this);
 
-            streamElement.bindToStream(webOTStream);
-             _container.video = streamElement;
+          streamElement.bindToStream(webOTStream);
+          _container.video = streamElement;
 
-            _streamContainer = streamElement;
+          _streamContainer = streamElement;
 
-            _streamContainer.orientation = {
-                width: _stream.videoDimensions.width,
-                height: _stream.videoDimensions.height,
-                videoOrientation: _stream.videoDimensions.orientation
-            };
+          _streamContainer.orientation = {
+            width: _stream.videoDimensions.width,
+            height: _stream.videoDimensions.height,
+            videoOrientation: _stream.videoDimensions.orientation
+          };
 
-            logAnalyticsEvent('createPeerConnection', 'StreamAdded', '', '');
-            this.trigger('streamAdded', this);
+          logAnalyticsEvent('createPeerConnection', 'StreamAdded', '', '');
+          this.trigger('streamAdded', this);
         },
 
         onRemoteStreamRemoved = function(webOTStream) {
-            OT.debug("OT.Subscriber.onStreamRemoved");
+          OT.debug('OT.Subscriber.onStreamRemoved');
 
-            if (_streamContainer.stream == webOTStream) {
-                _streamContainer.destroy();
-                _streamContainer = null;
-            }
+          if (_streamContainer.stream === webOTStream) {
+            _streamContainer.destroy();
+            _streamContainer = null;
+          }
 
 
-            this.trigger('streamRemoved', this);
+          this.trigger('streamRemoved', this);
+        },
+
+        streamDestroyed = function () {
+          this.disconnect();
         },
 
         streamUpdated = function(event) {
-            switch(event.changedProperty) {
-                case 'orientation':
-                    _streamContainer.orientation = {
-                        width: _stream.videoDimensions.width,
-                        height: _stream.videoDimensions.height,
-                        videoOrientation: _stream.videoDimensions.orientation
-                    };
-                    break;
 
-                case 'hasVideo':
-                    if(_container) {
-                        _container.showPoster = !(_stream.hasVideo && _properties.subscribeToVideo);
-                    }
+          switch(event.changedProperty) {
+            case 'videoDimensions':
+              _streamContainer.orientation = {
+                width: event.newValue.width,
+                height: event.newValue.height,
+                videoOrientation: event.newValue.orientation
+              };
+              break;
 
-                    break;
+            case 'hasVideo':
+              if(_container) {
+                _container.showPoster = !(_stream.hasVideo && _properties.subscribeToVideo);
+              }
+              break;
 
-                case 'hasAudio':
-                    // noop
-            }
+            case 'hasAudio':
+              // noop
+          }
         },
 
         /// Chrome
 
-        updateChromeForStyleChange = function(key, value, oldValue) {
-            if (!_chrome) return;
+        // If mode is false, then that is the mode. If mode is true then we'll
+        // definitely display  the button, but we'll defer the model to the
+        // Publishers buttonDisplayMode style property.
+        chromeButtonMode = function(mode) {
+          if (mode === false) return 'off';
 
-            switch(key) {
-                case 'nameDisplayMode':
-                    _chrome.name.setDisplayMode(value);
-                    break;
+          var defaultMode = this.getStyle('buttonDisplayMode');
 
-                case 'buttonDisplayMode':
-                    // _chrome.muteButton.setDisplayMode(value);
-            }
+          // The default model is false, but it's overridden by +mode+ being true
+          if (defaultMode === false) return 'on';
+
+          // defaultMode is either true or auto.
+          return defaultMode;
+        },
+
+        updateChromeForStyleChange = function(key, value/*, oldValue*/) {
+          if (!_chrome) return;
+
+          switch(key) {
+            case 'nameDisplayMode':
+              _chrome.name.setDisplayMode(value);
+              break;
+
+            case 'showArchiveStatus':
+              _chrome.archive.setShowArchiveStatus(value);
+              break;
+
+            case 'buttonDisplayMode':
+              // _chrome.muteButton.setDisplayMode(value);
+
+            case 'bugDisplayMode':
+              // _chrome.name.bugMode = value;
+          }
         },
 
         _createChrome = function() {
-            _chrome = new OT.Chrome({
-                parent: _container.domElement
-            }).set({
-                name: new OT.Chrome.NamePanel({
-                    name: _properties.name,
-                    mode: this.getStyle('nameDisplayMode')
-                }),
+          if(this.getStyle('bugDisplayMode') === 'off') {
+            logAnalyticsEvent('bugDisplayMode', 'createChrome', 'mode', 'off');
+          }
+          _chrome = new OT.Chrome({
+            parent: _container.domElement
+          }).set({
 
-                // // Disabled until we can change the mic Volume through WebRTC
-                // muteButton: new OT.Chrome.MicVolume({
-                //     muted: false,
-                //     mode: this.getStyle('buttonDisplayMode')
-                // }),
+            backingBar: new OT.Chrome.BackingBar({
+              nameMode: this.getStyle('nameDisplayMode'),
+              muteMode: chromeButtonMode.call(this, this.getStyle('showMuteButton'))
+            }),
 
-                opentokButton: new OT.Chrome.OpenTokButton()
-            }).on({
-                muted: function() {
-                    // @todo turn off audio on the web rtc stream
-                },
+            name: new OT.Chrome.NamePanel({
+              name: _properties.name,
+              mode: this.getStyle('nameDisplayMode'),
+              bugMode: this.getStyle('bugDisplayMode')
+            }),
 
-                unmuted: function() {
-                    // @todo turn on audio on the web rtc stream
-                }
-            });
+            muteButton: new OT.Chrome.MuteButton({
+              muted: _properties.muted,
+              mode: chromeButtonMode.call(this, this.getStyle('showMuteButton'))
+            }),
+
+            opentokButton: new OT.Chrome.OpenTokButton({
+              mode: this.getStyle('bugDisplayMode')
+            }),
+
+            archive: new OT.Chrome.Archiving({
+              show: this.getStyle('showArchiveStatus'),
+              archiving: false
+            })
+
+          }).on({
+            muted: function() {
+              muteAudio.call(this, true);
+            },
+
+            unmuted: function() {
+              muteAudio.call(this, false);
+            }
+          }, this);
         },
 
-        _showError = function(errorMsg) {
-            // Display the error message inside the container, assuming it's
-            // been created by now.
-            if (_container) _container.addError(errorMsg);
+        _showError = function() {
+          // Display the error message inside the container, assuming it's
+          // been created by now.
+          if (_container) {
+            _container.addError(
+              'The stream was unable to connect due to a network error.',
+              'Make sure your connection isn\'t blocked by a firewall.'
+            );
+          }
         };
 
 
     this.recordQOS = function() {
-        recordQOS();
+      recordQOS();
     };
 
+
     this.subscribe = function(stream) {
-        OT.debug("OT.Subscriber: subscribe to " + stream.id);
+      OT.debug('OT.Subscriber: subscribe to ' + stream.id);
 
-        if (_state.subscribing) {
-            // @todo error
-            OT.error("OT.Subscriber.Subscribe: Cannot subscribe, already subscribing.");
-            return false;
-        }
+      if (_state.subscribing) {
+        // @todo error
+        OT.error('OT.Subscriber.Subscribe: Cannot subscribe, already subscribing.');
+        return false;
+      }
 
-        _state.set('Init');
+      _state.set('Init');
 
-        if (!stream) {
-            // @todo error
-            OT.error("OT.Subscriber: No stream parameter.");
-            return false;
-        }
+      if (!stream) {
+        // @todo error
+        OT.error('OT.Subscriber: No stream parameter.');
+        return false;
+      }
 
-        if (_stream) {
-            // @todo error
-            OT.error("OT.Subscriber: Already subscribed");
-            return false;
-        }
+      if (_stream) {
+        // @todo error
+        OT.error('OT.Subscriber: Already subscribed');
+        return false;
+      }
 
-        _stream = stream;
-        _stream.on({
-            updated: streamUpdated,
-            destroyed: this.disconnect
+      _stream = stream;
+      _stream.on({
+        updated: streamUpdated,
+        destroyed: streamDestroyed
+      }, this);
+
+      _fromConnectionId = stream.connection.id;
+      _properties.name = _properties.name || _stream.name;
+      _properties.classNames = 'OT_root OT_subscriber';
+
+      if (_properties.style) {
+        this.setStyle(_properties.style, null, true);
+      }
+      if (_properties.audioVolume) {
+        this.setAudioVolume(_properties.audioVolume);
+      }
+
+      _properties.subscribeToAudio = OT.$.castToBoolean(_properties.subscribeToAudio, true);
+      _properties.subscribeToVideo = OT.$.castToBoolean(_properties.subscribeToVideo, true);
+
+      _container = new OT.WidgetView(targetElement, _properties);
+      _domId = _container.domId;
+
+      if(!_properties.subscribeToVideo && OT.$.browser() === 'Chrome') {
+        _subscribeAudioFalseWorkaround = true;
+        _properties.subscribeToVideo = true;
+      }
+
+      _startConnectingTime = OT.$.now();
+
+      if (_stream.connection.id !== _session.connection.id) {
+        logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
+
+        _state.set('ConnectingToPeer');
+
+        _peerConnection = new OT.SubscriberPeerConnection(_stream.connection, _session,
+          _stream, this, _properties);
+
+        _peerConnection.on({
+          disconnected: onDisconnected,
+          error: onPeerConnectionFailure,
+          remoteStreamAdded: onRemoteStreamAdded,
+          remoteStreamRemoved: onRemoteStreamRemoved
         }, this);
 
-        _fromConnectionId = stream.connection.connectionId;
-        _properties.name = _stream.name;
-        _properties.classNames = 'OT_root OT_subscriber';
+        // initialize the peer connection AFTER we've added the event listeners
+        _peerConnection.init();
+      } else {
+        logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
 
-        if (_properties.style) {
-            this.setStyle(_properties.style, null, true);
-        }
-        if (_properties.audioVolume) {
-            this.setAudioVolume(_properties.audioVolume);
+        var publisher = _session.getPublisherForStream(_stream);
+        if(!(publisher && publisher._.webRtcStream)) {
+          this.trigger('subscribeComplete', new OT.Error(null, 'InvalidStreamID'));
+          return this;
         }
 
-        _properties.subscribeToAudio = OT.$.castToBoolean(_properties.subscribeToAudio, true);
-        _properties.subscribeToVideo = OT.$.castToBoolean(_properties.subscribeToVideo, true);
+        // Subscribe to yourself edge-case
+        onRemoteStreamAdded.call(this, _session.getPublisherForStream(_stream)._.webRtcStream);
+      }
 
-        _container = new OT.WidgetView(targetElement, _properties);
-        _domId = _container.domId;
+      logAnalyticsEvent('subscribe', 'Attempt', 'streamId', _stream.id);
 
-        if(!_properties.subscribeToVideo && OT.$.browser() == 'Chrome') {
-            _subscribeAudioFalseWorkaround = true;
-            _properties.subscribeToVideo = true;
-        }
-
-        _startConnectingTime = OT.$.now();
-
-        if (_stream.connection.id !== _session.connection.id) {
-            logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
-
-            _state.set('ConnectingToPeer');
-
-            _peerConnection = new OT.SubscriberPeerConnection(_stream.connection, _session, _stream, _properties);
-
-            _peerConnection.on({
-                disconnected: onDisconnected,
-                error: onPeerConnectionFailure,
-                remoteStreamAdded: onRemoteStreamAdded,
-                remoteStreamRemoved: onRemoteStreamRemoved
-            }, this);
-
-            // initialize the peer connection AFTER we've added the event listeners
-            _peerConnection.init();
-        }
-        else {
-            logAnalyticsEvent('createPeerConnection', 'Attempt', '', '');
-
-            // Subscribe to yourself edge-case
-            onRemoteStreamAdded.call(this, _session.getPublisherForStream(_stream)._.webRtcStream);
-        }
-
-        logAnalyticsEvent('subscribe', 'Attempt', 'streamId', _stream.id);
-
-        return this;
+      return this;
     };
 
-    this.destroy = function(/* unused */ reason, quiet) {
-        clearInterval(_qosInterval);
-        _qosInterval = null;
+    this.destroy = function(reason, quiet) {
 
-        this.disconnect();
-
-        if (_chrome) {
-            _chrome.destroy();
-            _chrome = null;
+      if(reason === 'streamDestroyed') {
+        if (_state.attemptingToSubscribe) {
+          // We weren't subscribing yet so the stream was destroyed before we setup
+          // the PeerConnection or receiving the initial stream.
+          this.trigger('subscribeComplete', new OT.Error(null, 'InvalidStreamID'));
         }
+      }
 
-        if (_container) {
-            _container.destroy();
-            _container = null;
-        }
+      clearInterval(_qosInterval);
+      _qosInterval = null;
 
-        if (_stream && !_stream.destroyed) logAnalyticsEvent('unsubscribe', null, 'streamId', _stream.id);
+      this.disconnect();
 
-        _domId = null;
-        _stream = null;
+      if (_chrome) {
+        _chrome.destroy();
+        _chrome = null;
+      }
 
-        _session = null;
-        _properties = null;
+      if (_container) {
+        _container.destroy();
+        _container = null;
+      }
 
-        if (quiet !== true) {
-            this.dispatchEvent(
-              new OT.DestroyedEvent(
-                OT.Event.names.SUBSCRIBER_DESTROYED,
-                this,
-                reason
-              ),
-              this.off.bind(this)
-            );
-        }
+      if (_stream && !_stream.destroyed) {
+        logAnalyticsEvent('unsubscribe', null, 'streamId', _stream.id);
+      }
 
-        return this;
+      _domId = null;
+      _stream = null;
+
+      _session = null;
+      _properties = null;
+
+      if (quiet !== true) {
+        this.dispatchEvent(
+          new OT.DestroyedEvent(
+            OT.Event.names.SUBSCRIBER_DESTROYED,
+            this,
+            reason
+          ),
+          this.off.bind(this)
+        );
+      }
+
+      return this;
     };
 
-
     this.disconnect = function() {
-        _state.set('NotSubscribing');
+      _state.set('NotSubscribing');
 
-        if (_streamContainer) {
-            _streamContainer.destroy();
-            _streamContainer = null;
-        }
+      if (_streamContainer) {
+        _streamContainer.destroy();
+        _streamContainer = null;
+      }
 
-        if (_peerConnection) {
-            _peerConnection.destroy();
-            _peerConnection = null;
+      if (_peerConnection) {
+        _peerConnection.destroy();
+        _peerConnection = null;
 
-            logAnalyticsEvent('disconnect', 'PeerConnection', 'streamId', _stream.id);
-        }
+        logAnalyticsEvent('disconnect', 'PeerConnection', 'streamId', _stream.id);
+      }
     };
 
     this.processMessage = function(type, fromConnection, message) {
-        OT.debug("OT.Subscriber.processMessage: Received " + type + " message from " + fromConnection.id);
-        OT.debug(message);
+      OT.debug('OT.Subscriber.processMessage: Received ' + type + ' message from ' +
+        fromConnection.id);
+      OT.debug(message);
 
-        if (_fromConnectionId != fromConnection.id) {
-            _fromConnectionId = fromConnection.id;
-        }
+      if (_fromConnectionId !== fromConnection.id) {
+        _fromConnectionId = fromConnection.id;
+      }
 
-        if (_peerConnection) {
-          _peerConnection.processMessage(type, message);
-        }
+      if (_peerConnection) {
+        _peerConnection.processMessage(type, message);
+      }
     };
 
-    this.updateQuality = function(quality) {
-        // Currently, this only disables the video and disregards
-        // the quality.
-        OT.warn("Due to high packet loss and low bandwidth, video has been disabled");
-        this.subscribeToVideo(false);
-        this.dispatchEvent(new OT.Event("videoDisabled"));
+    this.disableVideo = function(active) {
+      if (!active) {
+        OT.warn('Due to high packet loss and low bandwidth, video has been disabled');
+      } else {
+        if (_lastSubscribeToVideoReason === 'auto') {
+          OT.info('Video has been re-enabled');
+        } else {
+          OT.info('Video was not re-enabled because it was manually disabled');
+          return;
+        }
+      }
+      this.subscribeToVideo(active, 'auto');
+      this.dispatchEvent(new OT.Event(active ? 'videoEnabled' : 'videoDisabled'));
+      logAnalyticsEvent('updateQuality', 'video', active ? 'videoEnabled' : 'videoDisabled', true);
     };
 
     /**
-    * Return the base-64-encoded string of PNG data representing the Subscriber video.
-    *
-    *  <p>You can use the string as the value for a data URL scheme passed to the src parameter of
-    *  an image file, as in the following:</p>
-    *
-    *  <pre>
-    *  var imgData = subscriber.getImgData();
-    *
-    *  var img = document.createElement("img");
-    *  img.setAttribute("src", "data:image/png;base64," + imgData);
-    *  var imgWin = window.open("about:blank", "Screenshot");
-    *  imgWin.document.write("&lt;body&gt;&lt;/body&gt;");
-    *  imgWin.document.body.appendChild(img);
-    *  </pre>
-    * @method #getImgData
-    * @memberOf Subscriber
-    * @return {String} The base-64 encoded string. Returns an empty string if there is no video.
-    */
+     * Return the base-64-encoded string of PNG data representing the Subscriber video.
+     *
+     *  <p>You can use the string as the value for a data URL scheme passed to the src parameter of
+     *  an image file, as in the following:</p>
+     *
+     *  <pre>
+     *  var imgData = subscriber.getImgData();
+     *
+     *  var img = document.createElement("img");
+     *  img.setAttribute("src", "data:image/png;base64," + imgData);
+     *  var imgWin = window.open("about:blank", "Screenshot");
+     *  imgWin.document.write("&lt;body&gt;&lt;/body&gt;");
+     *  imgWin.document.body.appendChild(img);
+     *  </pre>
+     * @method #getImgData
+     * @memberOf Subscriber
+     * @return {String} The base-64 encoded string. Returns an empty string if there is no video.
+     */
     this.getImgData = function() {
-        if (!this.subscribing) {
-            OT.error("OT.Subscriber.getImgData: Cannot getImgData before the Subscriber is subscribing.");
-            return null;
-        }
+      if (!this.subscribing) {
+        OT.error('OT.Subscriber.getImgData: Cannot getImgData before the Subscriber ' +
+          'is subscribing.');
+        return null;
+      }
 
-        return _streamContainer.imgData;
+      return _streamContainer.imgData;
     };
 
     /**
-    * Sets the audio volume, between 0 and 100, of the Subscriber.
-    *
-    * <p>You can set the initial volume when you call the <code>Session.subscribe()</code>
-    * method. Pass a <code>audioVolume</code> property of the <code>properties</code> parameter
-    * of the method.</p>
-    *
-    * @param {Number} value The audio volume, between 0 and 100.
-    *
-    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the following:
-    *
-    * <pre>mySubscriber.setAudioVolume(50).setStyle(newStyle);</pre>
-    *
-    * @see <a href="#getAudioVolume">getAudioVolume()</a>
-    * @see <a href="Session.html#subscribe">Session.subscribe()</a>
-    * @method #setAudioVolume
-    * @memberOf Subscriber
-    */
+     * Sets the audio volume, between 0 and 100, of the Subscriber.
+     *
+     * <p>You can set the initial volume when you call the <code>Session.subscribe()</code>
+     * method. Pass a <code>audioVolume</code> property of the <code>properties</code> parameter
+     * of the method.</p>
+     *
+     * @param {Number} value The audio volume, between 0 and 100.
+     *
+     * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the 
+     * following:
+     *
+     * <pre>mySubscriber.setAudioVolume(50).setStyle(newStyle);</pre>
+     *
+     * @see <a href="#getAudioVolume">getAudioVolume()</a>
+     * @see <a href="Session.html#subscribe">Session.subscribe()</a>
+     * @method #setAudioVolume
+     * @memberOf Subscriber
+     */
     this.setAudioVolume = function(value) {
-        value = parseInt(value, 10);
-        if (isNaN(value)) {
-            OT.error("OT.Subscriber.setAudioVolume: value should be an integer between 0 and 100");
-            return this;
-        }
-        _audioVolume = Math.max(0, Math.min(100, value));
-        if (_audioVolume != value) {
-            OT.warn("OT.Subscriber.setAudioVolume: value should be an integer between 0 and 100");
-        }
-        if (_streamContainer) {
-            _streamContainer.setAudioVolume(_audioVolume);
-        }
-
+      value = parseInt(value, 10);
+      if (isNaN(value)) {
+        OT.error('OT.Subscriber.setAudioVolume: value should be an integer between 0 and 100');
         return this;
+      }
+      _audioVolume = Math.max(0, Math.min(100, value));
+      if (_audioVolume !== value) {
+        OT.warn('OT.Subscriber.setAudioVolume: value should be an integer between 0 and 100');
+      }
+      if(_properties.muted && _audioVolume > 0) {
+        _properties.premuteVolume = value;
+        muteAudio.call(this, false);
+      }
+      if (_streamContainer) {
+        _streamContainer.setAudioVolume(_audioVolume);
+      }
+      return this;
     };
 
     /**
     * Returns the audio volume, between 0 and 100, of the Subscriber.
     *
-    * <p>Generally you use this method in conjunction with the <code>setAudioVolume()</code> method.</p>
+    * <p>Generally you use this method in conjunction with the <code>setAudioVolume()</code> 
+    * method.</p>
     *
     * @return {Number} The audio volume, between 0 and 100, of the Subscriber.
     * @see <a href="#setAudioVolume">setAudioVolume()</a>
@@ -13276,23 +15304,29 @@ OT.Subscriber = function(targetElement, options) {
     * @memberOf Subscriber
     */
     this.getAudioVolume = function() {
-        if (_streamContainer) return _streamContainer.getAudioVolume();
-        else return _audioVolume;
+      if(_properties.muted) {
+        return 0;
+      }
+      if (_streamContainer) return _streamContainer.getAudioVolume();
+      else return _audioVolume;
     };
 
     /**
-    * Toggles audio on and off. Starts subscribing to audio (if it is available and currently not being
-    * subscribed to) when the <code>value</code> is <code>true</code>; stops subscribing to audio
-    * (if it is currently being subscribed to) when the <code>value</code> is <code>false</code>.
+    * Toggles audio on and off. Starts subscribing to audio (if it is available and currently 
+    * not being subscribed to) when the <code>value</code> is <code>true</code>; stops 
+    * subscribing to audio (if it is currently being subscribed to) when the <code>value</code> 
+    * is <code>false</code>.
     * <p>
-    * <i>Note:</i> This method only affects the local playback of audio. It has no impact on the audio
-    * for other connections subscribing to the same stream. If the Publsher is not publishing audio,
-    * enabling the Subscriber audio will have no practical effect.
+    * <i>Note:</i> This method only affects the local playback of audio. It has no impact on the 
+    * audio for other connections subscribing to the same stream. If the Publsher is not 
+    * publishing audio, enabling the Subscriber audio will have no practical effect.
     * </p>
     *
-    * @param {Boolean} value Whether to start subscribing to audio (<code>true</code>) or not (<code>false</code>).
+    * @param {Boolean} value Whether to start subscribing to audio (<code>true</code>) or not 
+    * (<code>false</code>).
     *
-    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the following:
+    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the 
+    * following:
     *
     * <pre>mySubscriber.subscribeToAudio(true).subscribeToVideo(false);</pre>
     *
@@ -13303,36 +15337,61 @@ OT.Subscriber = function(targetElement, options) {
     * @method #subscribeToAudio
     * @memberOf Subscriber
     */
-    this.subscribeToAudio = function(p_value) {
-        var value = OT.$.castToBoolean(p_value, true);
+    this.subscribeToAudio = function(pValue) {
+      var value = OT.$.castToBoolean(pValue, true);
 
-        if (_peerConnection) {
-            _peerConnection.subscribeToAudio(value);
+      if (_peerConnection) {
+        _peerConnection.subscribeToAudio(value && !_properties.subscribeMute);
 
-            if (_session && _stream && value !== _properties.subscribeToAudio) {
-                _session._.modifySubscriber(this, "hasAudio", value);
-            }
+        if (_session && _stream && value !== _properties.subscribeToAudio) {
+          _stream.setChannelActiveState('audio', value && !_properties.subscribeMute);
         }
+      }
 
-        _properties.subscribeToAudio = value;
+      _properties.subscribeToAudio = value;
 
-        return this;
+      return this;
+    };
+
+    var muteAudio = function(_mute) {
+      _chrome.muteButton.muted = _mute;
+
+      if(_mute === _properties.mute) {
+        return;
+      }
+      if (window.navigator.userAgent.toLowerCase().indexOf('chrome') >= 0) {
+        _properties.subscribeMute = _properties.muted = _mute;
+        this.subscribeToAudio(_properties.subscribeToAudio);
+      } else {
+        if(_mute) {
+          _properties.premuteVolume = this.getAudioVolume();
+          _properties.muted = true;
+          this.setAudioVolume(0);
+        } else if(_properties.premuteVolume || _properties.audioVolume) {
+          _properties.muted = false;
+          this.setAudioVolume(_properties.premuteVolume || _properties.audioVolume);
+        }
+      }
+      _properties.mute = _properties.mute;
     };
 
 
     /**
-    * Toggles video on and off. Starts subscribing to video (if it is available and currently not being
-    * subscribed to) when the <code>value</code> is <code>true</code>; stops subscribing to video
-    * (if it is currently being subscribed to) when the <code>value</code> is <code>false</code>.
+    * Toggles video on and off. Starts subscribing to video (if it is available and 
+    * currently not being subscribed to) when the <code>value</code> is <code>true</code>; 
+    * stops subscribing to video (if it is currently being subscribed to) when the 
+    * <code>value</code> is <code>false</code>.
     * <p>
-    * <i>Note:</i> This method only affects the local playback of video. It has no impact on the video
-    * for other connections subscribing to the same stream. If the Publsher is not publishing video,
-    * enabling the Subscriber video will have no practical video.
+    * <i>Note:</i> This method only affects the local playback of video. It has no impact on 
+    * the video for other connections subscribing to the same stream. If the Publsher is not 
+    * publishing video, enabling the Subscriber video will have no practical video.
     * </p>
     *
-    * @param {Boolean} value Whether to start subscribing to video (<code>true</code>) or not (<code>false</code>).
+    * @param {Boolean} value Whether to start subscribing to video (<code>true</code>) or not 
+    * (<code>false</code>).
     *
-    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the following:
+    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the 
+    * following:
     *
     * <pre>mySubscriber.subscribeToVideo(true).subscribeToAudio(false);</pre>
     *
@@ -13343,86 +15402,159 @@ OT.Subscriber = function(targetElement, options) {
     * @method #subscribeToVideo
     * @memberOf Subscriber
     */
-    this.subscribeToVideo = function(p_value) {
-        if(_subscribeAudioFalseWorkaround && p_value == true) {
-            // Turn off the workaround if they enable the video
-            _subscribeAudioFalseWorkaround = false;
-            return;
+    this.subscribeToVideo = function(pValue, reason) {
+      if(_subscribeAudioFalseWorkaround && pValue === true) {
+        // Turn off the workaround if they enable the video
+        _subscribeAudioFalseWorkaround = false;
+        return;
+      }
+
+      var value = OT.$.castToBoolean(pValue, true);
+
+      if(_container) {
+        _container.showPoster = !(value && _stream.hasVideo);
+        if(value && _container.video) {
+          _container.loading = value;
+          _container.video.whenTimeIncrements(function(){
+            _container.loading = false;
+          }, this);
         }
+      }
 
-        var value = OT.$.castToBoolean(p_value, true);
+      if (_peerConnection) {
+        _peerConnection.subscribeToVideo(value);
 
-        if(_container) {
-            _container.showPoster = !(value && _stream.hasVideo);
-            if(value && _container.video) {
-                _container.loading = value;
-                _container.video.whenTimeIncrements(function(){
-                    _container.loading = false;
-                }, this);
-            }
+        if (_session && _stream && (value !== _properties.subscribeToVideo ||
+            reason !== _lastSubscribeToVideoReason)) {
+          _stream.setChannelActiveState('video', value, reason);
         }
+      }
 
-        if (_peerConnection) {
-            _peerConnection.subscribeToVideo(value);
+      _properties.subscribeToVideo = value;
+      _lastSubscribeToVideoReason = reason;
 
-            if (_session && _stream && value !== _properties.subscribeToVideo) {
-                _session._.modifySubscriber(this, "hasVideo", value);
-            }
-        }
-
-        _properties.subscribeToVideo = value;
-
-        return this;
+      return this;
     };
 
     Object.defineProperties(this, {
-        id: {
-            get: function() { return _domId; },
-            enumerable: true
+      id: {
+        get: function() { return _domId; },
+        enumerable: true
+      },
+        
+      element: {
+        get: function() { return _container.domElement; },
+        enumerable: true
+      },
+
+      widgetId: {
+        get: function() { return _widgetId; }
+      },
+
+      stream: {
+        get: function() { return _stream; },
+        enumerable: true
+      },
+
+      streamId: {
+        get: function() {
+          if (!_stream) return null;
+          return _stream.id;
         },
+        enumerable: true
+      },
 
-        widgetId: {
-            get: function() { return _widgetId; }
-        },
+      targetElement: {
+        get: function() { return _streamContainer ? _streamContainer.domElement : null; }
+      },
 
-        stream: {
-            get: function() { return _stream; },
-            enumerable: true
-        },
+      subscribing: {
+        get: function() { return _state.subscribing; },
+        enumerable: true
+      },
 
-        streamId: {
-            get: function() {
-                if (!_stream) return null;
+      isWebRTC: {
+        get: function() { return true; }
+      },
 
-                return _stream.id;
-            },
-            enumerable: true
-        },
+      loading: {
+        get: function(){ return _container && _container.loading; }
+      },
 
-        targetElement: {
-            get: function() { return _streamContainer ? _streamContainer.domElement : null; }
-        },
+      session: {
+        get: function() { return _session; }
+      },
 
-        subscribing: {
-            get: function() { return _state.subscribing; },
-            enumerable: true
-        },
+      videoWidth: {
+        get: function() { return _streamContainer.videoWidth; },
+        enumerable: true
+      },
 
-        isWebRTC: {
-            get: function() { return true; }
-        },
-
-        loading: {
-            get: function(){ return _container && _container.loading }
-        },
-
-        session: {
-            get: function() { return _session; }
-        }
+      videoHeight: {
+        get: function() { return _streamContainer.videoHeight; },
+        enumerable: true
+      }
     });
 
+    /**
+    * Restricts the frame rate of the Subscriber's video stream, when you pass in 
+    * <code>true</code>. When you pass in <code>false</code>, the frame rate of the video stream 
+    * is not restricted. 
+    * <p>
+    * When the frame rate is restricted, the Subscriber video frame will update once or less per 
+    * second.
+    * <p>
+    * This feature is only available in sessions that use the OpenTok media server, not in 
+    * peer-to-peer sessions. In peer-to-peer sessions, calling this method has no effect.
+    * <p>
+    * Restricting the subscriber frame rate has the following benefits:
+    * <ul>
+    *    <li>It reduces CPU usage.</li>
+    *    <li>It reduces the network bandwidth consumed.</li>
+    *    <li>It lets you subscribe to more streams simultaneously.</li>
+    * </ul>
+    * <p>
+    * Reducing a subscriber's frame rate has no effect on the frame rate of the video in
+    * other clients.
+    *
+    * @param {Boolean} value Whether to restrict the Subscriber's video frame rate 
+    * (<code>true</code>) or not (<code>false</code>).
+    *
+    * @return {Subscriber} The Subscriber object. This lets you chain method calls, as in the 
+    * following:
+    *
+    * <pre>mySubscriber.restrictFrameRate(false).subscribeToAudio(true);</pre>
+    *
+    * @method #restrictFrameRate
+    * @memberOf Subscriber
+    */
+    this.restrictFrameRate = function(val) {
+      OT.debug('OT.Subscriber.restrictFrameRate(' + val + ')');
+
+      logAnalyticsEvent('restrictFrameRate', val.toString(), 'streamId', _stream.id);
+
+      if (_session.sessionInfo.p2pEnabled) {
+        OT.warn('OT.Subscriber.restrictFrameRate: Cannot restrictFrameRate on a P2P session');
+      }
+
+      if (typeof val !== 'boolean') {
+        OT.error('OT.Subscriber.restrictFrameRate: expected a boolean value got a ' + typeof val);
+      } else {
+        _stream.setRestrictFrameRate(val);
+      }
+      return this;
+    };
+
     this.on('styleValueChanged', updateChromeForStyleChange, this);
 
+    this._ = {
+      archivingStatus: function(status) {
+        if(_chrome) {
+          _chrome.archive.setArchiving(status);
+        }
+      }
+    };
+
     _state = new OT.SubscribingState(stateChangeFailed);
 
 	/**
@@ -13431,266 +15563,224 @@ OT.Subscriber = function(targetElement, options) {
 	* when connectivity degrades. The subscriber continues to receive the audio stream,
 	* if there is one. This feature is only available in sessions that use the OpenTok
 	* media server, not in peer-to-peer sessions.
+	* @see Event
 	* @name videoDisabled
 	* @event
 	* @memberof Subscriber
 	*/
 
-};
+	/**
+	* Dispatched when the Subscriber element is removed from the HTML DOM. When this event is
+	* dispatched, you may choose to adjust or remove HTML DOM elements related to the subscriber.
+	* @see Event
+	* @name destroyed
+	* @event
+	* @memberof Subscriber
+	*/
+  };
 
 })(window);
-(function(window) {
-    OT.SessionInfo = function(xmlDocument) {
-        var sessionXML = null;
+!(function() {
 
-        this.sessionId = null;
-        this.partnerId = null;
-        this.sessionStatus = null;
-        this.p2pEnabled = false;
+  var parseErrorFromJSONDocument,
+      onGetResponseCallback,
+      onGetErrorCallback,
+      normaliseIceServers;
 
-        this.messagingServer = null;
-        this.iceServers = null;
+  OT.SessionInfo = function(jsonDocument) {
+    var sessionJSON = jsonDocument[0];
 
-        OT.log("SessionInfo Response:")
-        OT.log(xmlDocument);
+    OT.log('SessionInfo Response:');
+    OT.log(jsonDocument);
 
-        if (xmlDocument && xmlDocument.documentElement && xmlDocument.documentElement.firstElementChild !== null) {
-            sessionXML = xmlDocument.documentElement.firstElementChild;
-        }
+    /*jshint camelcase:false*/
 
-        var element = sessionXML.firstElementChild;
-        do {
-            switch (element.localName) {
-            case "session_id":
-                this.sessionId = element.textContent;
-                break;
+    this.sessionId = sessionJSON.session_id;
+    this.partnerId = sessionJSON.partner_id;
+    this.sessionStatus = sessionJSON.session_status;
 
-            case "partner_id":
-                this.partnerId = element.textContent;
-                break;
+    this.messagingServer = sessionJSON.messaging_server_url;
 
-            case "session_status":
-                this.sessionStatus = element.textContent;
-                break;
+    this.messagingURL = sessionJSON.messaging_url;
+    this.symphonyAddress = sessionJSON.symphony_address;
 
-            case "messaging_server_url":
-                this.messagingServer = element.textContent;
-                break;
+    this.p2pEnabled = sessionJSON.properties &&
+      sessionJSON.properties.p2p &&
+      sessionJSON.properties.p2p.preference &&
+      sessionJSON.properties.p2p.preference.value === 'enabled';
 
-            case "ice_servers":
-                // <ice_servers>
-                //     <ice_server url="foo.com" />
-                //     <ice_server url="bar.com" credential="xxx" />
-                // </ice_servers>
+    this.iceServers = sessionJSON.ice_servers ? normaliseIceServers(sessionJSON.ice_servers) : [];
 
-                this.iceServers = normaliseIceServers( parseIceServersXml(element.childNodes) );
-                break;
+    if(this.iceServers.length === 0) {
+      // We haven't got any ICE Servers from Anvil, default to something
+      OT.warn('SessionInfo contained not ICE Servers, using the default');
+      this.iceServers = [ {'url': 'stun:stun.l.google.com:19302'} ];
+    }
+  };
 
-            case "properties":
-                var property = element.firstElementChild;
-                if (property) {
-                    do {
-                        if (property.localName === "p2p" && property.firstElementChild !== null) {
-                            this.p2pEnabled = (property.firstElementChild.textContent === "enabled");
-                            break;
-                        }
-                    } while (property = property.nextElementSibling);
-                }
-
-                break;
-
-            default:
-                // OT.debug("OT.SessionInfo element was not handled (" + element.localName + ")");
-                break;
-            }
-
-        } while (element = element.nextElementSibling);
-
-        if (!this.iceServers || this.iceServers.length === 0) {
-            // We haven't got any ICE Servers from Anvil, default to something
-            OT.warn("SessionInfo contained not ICE Servers, using the default");
-            this.iceServers = [ {"url": "stun:stun.l.google.com:19302"} ];
-        }
-
-        //we've parsed the XML into the object
-
-        sessionXML = null;
-    };
-
-
-// Retrieves Session Info for +session+. The SessionInfo object will be passed
-// to the +onSuccess+ callback. The +onFailure+ callback will be passed an error
-// object and the DOMEvent that relates to the error.
-OT.SessionInfo.get = function(session, onSuccess, onFailure) {
-    var sessionInfoURL = OT.properties.apiURL + '/session/' + session.id + "?extended=true",
+  // Retrieves Session Info for +session+. The SessionInfo object will be passed
+  // to the +onSuccess+ callback. The +onFailure+ callback will be passed an error
+  // object and the DOMEvent that relates to the error.
+  OT.SessionInfo.get = function(session, onSuccess, onFailure) {
+    var sessionInfoURL = OT.properties.apiURL + '/session/' + session.id + '?extended=true',
 
         startTime = OT.$.now(),
 
         validateRawSessionInfo = function(sessionInfo) {
-            session.logEvent('Instrumentation', null, 'gsi', OT.$.now() - startTime);
-
-            var error = parseErrorFromXMLDocument(sessionInfo);
-
-            if (error === false) {
-                onGetResponseCallback(session, onSuccess, sessionInfo);
-            }
-            else {
-                onGetErrorCallback(session, onFailure, error);
-            }
+          session.logEvent('Instrumentation', null, 'gsi', OT.$.now() - startTime);
+          var error = parseErrorFromJSONDocument(sessionInfo);
+          if (error === false) {
+            onGetResponseCallback(session, onSuccess, sessionInfo);
+          } else {
+            onGetErrorCallback(session, onFailure, error);
+          }
         };
 
     session.logEvent('getSessionInfo', 'Attempt', 'api_url', OT.properties.apiURL);
 
-    OT.$.getXML(sessionInfoURL, {
-        headers: {"X-TB-TOKEN-AUTH": session.token, "X-TB-VERSION": 1},
-
-        success: validateRawSessionInfo,
-
-        error: function(event) {
-            onGetErrorCallback(session, onFailure, parseErrorFromXMLDocument(event.target.responseXML));
-        }
+    OT.$.getJSON(sessionInfoURL, {
+      headers: {
+        'X-TB-TOKEN-AUTH': session.token,
+        'X-TB-VERSION': 1
+      }
+    }, function(error, sessionInfo) {
+      if(error) {
+        console.log('getJSON said error:', error);
+        onGetErrorCallback(session, onFailure,
+          new OT.Error(error.target && error.target.status, error.message ||
+            'Could not connect to the OpenTok API Server.'));
+      } else {
+        validateRawSessionInfo(sessionInfo);
+      }
     });
-};
+  };
 
-var messageServerToClientErrorCodes = {};
-messageServerToClientErrorCodes['404'] = OT.ExceptionCodes.INVALID_SESSION_ID;
-messageServerToClientErrorCodes['403'] = OT.ExceptionCodes.AUTHENTICATION_ERROR;
+  var messageServerToClientErrorCodes = {};
+  messageServerToClientErrorCodes['404'] = OT.ExceptionCodes.INVALID_SESSION_ID;
+  messageServerToClientErrorCodes['409'] = OT.ExceptionCodes.INVALID_SESSION_ID;
+  messageServerToClientErrorCodes['400'] = OT.ExceptionCodes.INVALID_SESSION_ID;
+  messageServerToClientErrorCodes['403'] = OT.ExceptionCodes.AUTHENTICATION_ERROR;
 
-// Return the error in +xmlDocument+, if there is one. Otherwise it will return
-// false.
-parseErrorFromXMLDocument = function(xmlDocument) {
-    if (xmlDocument && xmlDocument.documentElement && xmlDocument.documentElement.firstElementChild !== null) {
-        var errorNodes = xmlDocument.evaluate('//error', xmlDocument.documentElement, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null ),
-            numErrorNodes = errorNodes.snapshotLength;
+  // Return the error in +jsonDocument+, if there is one. Otherwise it will return
+  // false.
+  parseErrorFromJSONDocument = function(jsonDocument) {
+    if(Array.isArray(jsonDocument)) {
+      var errors = jsonDocument.filter(function(node) {
+        return node.error != null;
+      });
 
-        if (numErrorNodes === 0) return false;
+      var numErrorNodes = errors.length;
+      if(numErrorNodes === 0) {
+        return false;
+      }
 
-        for (var i=0; i<numErrorNodes; ++i) {
-            var errorNode = errorNodes.snapshotItem(i);
+      var errorCode = errors[0].error.code;
+      if (messageServerToClientErrorCodes[errorCode.toString()]) {
+        errorCode = messageServerToClientErrorCodes[errorCode];
+      }
 
-            return {
-                code: errorNode.getAttribute('code'),
-                message: errorNode.firstElementChild.getAttribute('message')
-            };
-        }
-    }
-
-    // There was an error, but we couldn't find the error info.
-    return {
+      return {
+        code: errorCode,
+        message: errors[0].error.errorMessage && errors[0].error.errorMessage.message
+      };
+    } else {
+      return {
         code: null,
-        message: "Unknown error: getSessionInfo XML response was badly formed " +
-          (xmlDocument && xmlDocument.documentElement && xmlDocument.documentElement.innerHTML)
-    };
-};
-
-onGetResponseCallback = function(session, onSuccess, rawSessionInfo) {
-  session.logEvent('getSessionInfo', 'Success', 'api_url', OT.properties.apiURL);
-
-  onSuccess( new OT.SessionInfo(rawSessionInfo) );
-};
-
-onGetErrorCallback = function(session, onFailure, error) {
-    TB.handleJsException("TB.SessionInfoError :: Unable to get session info " + error.message, messageServerToClientErrorCodes[error.code], {
-        session: session
-    });
-
-    session.logEvent('Connect', 'Failure', 'errorMessage', "GetSessionInfo:" + error.code + ": Unable to get session info " + error.message);
-    onFailure(error, session);
-};
-
-parseIceServersXml = function (nodes) {
-    var iceServers = [],
-        iceServer,
-        attributes;
-
-    for (var i=0, numNodes=nodes.length; i<numNodes; ++i) {
-        if (nodes[i].localName === 'ice_server') {
-            // @todo parse either a URL node, or a URL and credentials
-            attributes = nodes[i].attributes;
-            iceServer = {
-                url: attributes.getNamedItem('url').nodeValue
-            };
-
-            if (attributes.getNamedItem('credential') && attributes.getNamedItem('credential').nodeValue.length) {
-                iceServer.credential = attributes.getNamedItem('credential').nodeValue;
-            }
-
-            iceServers.push(iceServer);
-        }
+        message: 'Unknown error: getSessionInfo JSON response was badly formed ' +
+            jsonDocument.toString.substring(0, 1000)
+      };
     }
+  };
 
-    return iceServers;
-};
+  onGetResponseCallback = function(session, onSuccess, rawSessionInfo) {
+    session.logEvent('getSessionInfo', 'Success', 'api_url', OT.properties.apiURL);
 
-// This is ugly. Here we are handling the following:
-// 1. Firefox doesn't support TURN until version 25. We fallback to STUN
-// in previous versions.
-//
-// 2. In FF >= 23 the new syntax for declaring Ice Servers with credentials
-// is used. i.e. url, credential, and username as opposed to just url and credential.
-//
-// 3. FF >= 27 supports the TURN transport parameter, in older versions we need
-// to strip it out.
-//
-normaliseIceServers = function (iceServers) {
-    var userAgent = navigator.userAgent.match(/(Firefox)\/([0-9]+\.[0-9]+)/),
+    onSuccess( new OT.SessionInfo(rawSessionInfo) );
+  };
+
+  onGetErrorCallback = function(session, onFailure, error) {
+    session.logEvent('Connect', 'Failure', 'errorMessage',
+      'GetSessionInfo:' + error.code + ':' + error.message);
+
+    onFailure(error, session);
+  };
+
+  // This is ugly. Here we are handling the following:
+  // 1. Firefox doesn't support TURN until version 25. We fallback to STUN
+  // in previous versions.
+  //
+  // 2. In FF >= 23 the new syntax for declaring Ice Servers with credentials
+  // is used. i.e. url, credential, and username as opposed to just url and credential.
+  //
+  // 3. FF >= 27 supports the TURN transport parameter, in older versions we need
+  // to strip it out.
+  //
+  normaliseIceServers = function (iceServers) {
+    if (!iceServers) return [];
+
+    var userAgent = (typeof navigator !== 'undefined') &&
+          navigator.userAgent.match(/(Firefox)\/([0-9]+\.[0-9]+)/),
         firefoxVersion = userAgent ? parseFloat(userAgent[2], 10) : void 0,
         bits;
 
     return iceServers.map(function(iceServer) {
-        // We don't need to normalise STUN, just pass it on through
-        if (iceServer.url.trim().substr(0, 5) !== 'turn:') {
-            return iceServer;
+      // We don't need to normalise STUN, just pass it on through
+      if (iceServer.url.trim().substr(0, 5) !== 'turn:') {
+        return iceServer;
+      }
+
+      if (userAgent !== null) {
+        // TURN is broken in these versions of FF: Fallback to STUN.
+        if (firefoxVersion < 25) {
+          return {url: iceServer.url.replace('turn:', 'stun:')};
         }
 
-        if (userAgent !== null) {
-            // TURN is broken in these versions of FF: Fallback to STUN.
-            if (firefoxVersion < 25) {
-                return {url: iceServer.url.replace("turn:", "stun:")};
-            }
-
-            // FF < 27 doesn't support the TURN transport parameter, so we strip it out
-            if (firefoxVersion < 27 && iceServer.url.indexOf('?') !== -1) {
-                iceServer.url = iceServer.url.trim().split('?')[0];
-            }
+        // FF < 27 doesn't support the TURN transport parameter, so we strip it out
+        if (firefoxVersion < 27 && iceServer.url.indexOf('?') !== -1) {
+          iceServer.url = iceServer.url.trim().split('?')[0];
         }
+      }
 
-        bits = iceServer.url.trim().split(/[:@]/);
+      bits = iceServer.url.trim().split(/[:@]/);
 
-        return {
-            username: bits[1],
-            credential: iceServer.credential,
-            url: bits[0] + ':' + bits[2] + (bits.length === 4 ? ':' + bits[3] : '')
-        };
+      return {
+        username: bits[1],
+        credential: iceServer.credential,
+        url: bits[0] + ':' + bits[2]
+      };
     });
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
 	/**
 	 * A class defining properties of the <code>capabilities</code> property of a
-     * Session object. See <a href="Session.html#capabilites">Session.capabilities</a>.
+   * Session object. See <a href="Session.html#properties">Session.capabilities</a>.
 	 * <p>
 	 * All Capabilities properties are undefined until you have connected to a session
 	 * and the Session object has dispatched the <code>sessionConnected</code> event.
 	 * <p>
-	 * For more information on token roles, see the <a href="server_side_libraries.html#generate_token">generate_token()</a>
-     * method of the OpenTok server-side libraries.
+	 * For more information on token roles, see the
+   * <a href="server_side_libraries.html#generate_token">generate_token()</a>
+   * method of the OpenTok server-side libraries.
 	 *
 	 * @class Capabilities
 	 *
 	 * @property {Number} forceDisconnect Specifies whether you can call
-     the <code>Session.forceDisconnect()</code> method (1) or not (0). To call the <code>Session.forceDisconnect()</code> method,
-     the user must have a token that is assigned the role of moderator.
+   * the <code>Session.forceDisconnect()</code> method (1) or not (0). To call the
+   * <code>Session.forceDisconnect()</code> method,
+   * the user must have a token that is assigned the role of moderator.
 	 * @property {Number} forceUnpublish Specifies whether you can call
-     the <code>Session.forceUnpublish()</code> method (1) or not (0). To call the <code>Session.forceUnpublish()</code> method,
-     the user must have a token that is assigned the role of moderator.
+   * the <code>Session.forceUnpublish()</code> method (1) or not (0). To call the
+   * <code>Session.forceUnpublish()</code> method, the user must have a token that
+   * is assigned the role of moderator.
 	 * @property {Number} publish Specifies whether you can publish to the session (1) or not (0).
-     The ability to publish is based on a few factors. To publish, the user must have a token that
-     is assigned a role that supports publishing. There must be a connected camera and microphone.
+   * The ability to publish is based on a few factors. To publish, the user must have a token that
+   * is assigned a role that supports publishing. There must be a connected camera and microphone.
 	 * @property {Number} subscribe Specifies whether you can subscribe to streams
-     in the session (1) or not (0). Currently, this capability is available for all users on all platforms.
-	 * @property {Number} supportsWebRTC Whether the client supports WebRTC (1) or not (0).
+   * in the session (1) or not (0). Currently, this capability is available for all users on all
+   * platforms.
+   * @property {Number} supportsWebRTC Whether the client supports WebRTC (1) or not (0).
 	 */
 	OT.Capabilities = function(permissions) {
 	    this.publish = permissions.indexOf('publish') !== -1 ? 1 : 0;
@@ -13698,399 +15788,451 @@ normaliseIceServers = function (iceServers) {
 	    this.forceUnpublish = permissions.indexOf('forceunpublish') !== -1 ? 1 : 0;
 	    this.forceDisconnect = permissions.indexOf('forcedisconnect') !== -1 ? 1 : 0;
 	    this.supportsWebRTC = OT.$.supportsWebRTC() ? 1 : 0;
+
+      this.permittedTo = function(action) {
+        return this.hasOwnProperty(action) && this[action] === 1;
+      };
     };
 
 })(window);
-(function(window) {
-
-// Wraps up some common error handling for implementing callbacks
-// for work requests made to the OT backend via the Messenger.
-var RemoteWork = function RemoteWork (parent, success, error, options) {
-  var REQUEST_TIMEOUT = 30000,
-      timeoutInterval,
-      exceptionCodesIndicatingFailure = {};
-
-  var destroy = function() {
-        clearTimeout(timeoutInterval);
-        parent.off('exception', onException);
-      },
-
-      onException = function(event) {
-        if (!exceptionCodesIndicatingFailure.hasOwnProperty(event.code)) return;
-
-        // We don't even know if this relates to this particular forceDisconnct...
-        this.failed(exceptionCodesIndicatingFailure[event.code]);
-      },
-
-      onTimeout = function() {
-        var reason = options && options.timeoutMessage ? options.timeoutMessage : "Timed out while waiting for the server to respond.";
-        this.failed(reason);
-      };
-
-
-  this.failsOnExceptionCodes = function(codes) {
-    exceptionCodesIndicatingFailure = codes;
-  };
-
-  this.succeeded = function() {
-    destroy();
-    if (completionHandler) OT.$.callAsync(completionHandler, null);
-  };
-
-  this.failed = function(reason) {
-    destroy();
-    if (completionHandler) OT.$.callAsync(completionHandler, new OT.Error(null, reason));
-  };
-
-  parent.on('exception', onException, this);
-  timeoutInterval = setTimeout(onTimeout.bind(this), REQUEST_TIMEOUT);
-};
+!(function(window) {
 
 
 /**
- * The Session object returned by the <code>TB.initSession()</code> method provides access to much of the OpenTok functionality.
+ * The Session object returned by the <code>OT.initSession()</code> method provides access to
+ * much of the OpenTok functionality.
  *
  * @class Session
  * @augments EventDispatcher
  *
- * @property {Capabilities} capabilities A {@link Capabilities} object that includes information about the capabilities of the client.
- * All properties of the <code>capabilities</code> object are undefined until you have connected to a session
- * and the Session object has dispatched the <code>sessionConnected</code> event.
- * @property {Connection} connection The {@link Connection} object for this session. The connection property is only available once the
- * Session object dispatches the sessionConnected event. The Session object asynchronously dispatches a sessionConnected event in response
- * to a successful call to the connect() method. See: <a href="Session#connect">connect</a> and {@link Connection}.
- * @property {String} sessionId The session ID for this session. You pass this value into the <code>TB.initSession()</code> method when you create
- * the Session object. (Note: a Session object is not connected to the OpenTok server until you
- * call the connect() method of the object and the object dispatches a connected event. See {@link TB.initSession} and {@link connect}).
- * 	For more information on sessions and session IDs, see
+ * @property {Capabilities} capabilities A {@link Capabilities} object that includes information
+ * about the capabilities of the client. All properties of the <code>capabilities</code> object
+ * are undefined until you have connected to a session and the Session object has dispatched the
+ * <code>sessionConnected</code> event.
+ * @property {Connection} connection The {@link Connection} object for this session. The
+ * connection property is only available once the Session object dispatches the sessionConnected
+ * event. The Session object asynchronously dispatches a sessionConnected event in response
+ * to a successful call to the connect() method. See: <a href="Session#connect">connect</a> and
+ * {@link Connection}.
+ * @property {String} sessionId The session ID for this session. You pass this value into the
+ * <code>OT.initSession()</code> method when you create the Session object. (Note: a Session
+ * object is not connected to the OpenTok server until you call the connect() method of the
+ * object and the object dispatches a connected event. See {@link OT.initSession} and
+ * {@link connect}).
+ *  For more information on sessions and session IDs, see
  * <a href="/opentok/tutorials/create-session/">Session creation</a>.
  */
-OT.Session = function(sessionId) {
-  // Check that the client meets the minimum requirements, if they don't the upgrade
-  // flow will be triggered.
-  if (!OT.checkSystemRequirements()) {
+  OT.Session = function(apiKey, sessionId) {
+    // Check that the client meets the minimum requirements, if they don't the upgrade
+    // flow will be triggered.
+    if (!OT.checkSystemRequirements()) {
       OT.upgradeSystemRequirements();
       return;
-  }
+    }
 
-  var _initialConnection = true,
-      _apiKey,
-      _token,
-      _sessionId = sessionId,
-      _socket,
-      _widgetId = OT.$.uuid(),
-      _analytics = new OT.Analytics(),
-      _connectionId,
-      _callbacks = {
-        forceDisconnect: {},
-        forceUnpublish: {}
-      };
+    if(sessionId == null) {
+      sessionId = apiKey;
+      apiKey = null;
+    }
+
+    var _initialConnection = true,
+        _apiKey = apiKey,
+        _token,
+        _sessionId = sessionId,
+        _socket,
+        _widgetId = OT.$.uuid(),
+        _connectionId,
+        _analytics = new OT.Analytics(),
+        sessionConnectFailed,
+        sessionDisconnectedHandler,
+        connectionCreatedHandler,
+        connectionDestroyedHandler,
+        streamCreatedHandler,
+        streamPropertyModifiedHandler,
+        streamDestroyedHandler,
+        archiveCreatedHandler,
+        archiveDestroyedHandler,
+        archiveUpdatedHandler,
+        reset,
+        disconnectComponents,
+        destroyPublishers,
+        destroySubscribers,
+        connectMessenger,
+        getSessionInfo,
+        onSessionInfoResponse,
+        permittedTo,
+        dispatchError;
 
 
-  OT.$.eventing(this);
-  var setState = OT.$.statable(this, ['disconnected', 'connecting', 'connected', 'disconnecting'], 'disconnected');
+    OT.$.eventing(this);
+    var setState = OT.$.statable(this, [
+      'disconnected', 'connecting', 'connected', 'disconnecting'
+    ], 'disconnected');
 
-  this.connections = new OT.Collection();
-  this.streams = new OT.Collection();
+    this.connections = new OT.Collection();
+    this.streams = new OT.Collection();
+    this.archives = new OT.Collection();
 
 
-	//--------------------------------------
-	//  MESSAGE HANDLERS
-	//--------------------------------------
+  //--------------------------------------
+  //  MESSAGE HANDLERS
+  //--------------------------------------
 
-	var
   // The duplication of this and sessionConnectionFailed will go away when
   // session and messenger are refactored
-  sessionConnectFailed = function(reason, code) {
-    setState('disconnected');
+    sessionConnectFailed = function(reason, code) {
+      setState('disconnected');
 
-    OT.error(reason);
+      OT.error(reason);
 
-    this.trigger('sessionConnectFailed', reason);
+      this.trigger('sessionConnectFailed',
+        new OT.Error(code || OT.ExceptionCodes.CONNECT_FAILED, reason));
 
-    TB.handleJsException(reason, code || OT.ExceptionCodes.CONNECT_FAILED, {
-      session: this
-    });
-  },
+      OT.handleJsException(reason, code || OT.ExceptionCodes.CONNECT_FAILED, {
+        session: this
+      });
+    };
 
-	sessionDisconnectedHandler = function(event) {
-    var reason = event.reason;
-    if(reason == "networkTimedout") {
-      reason = "networkDisconnected";
-      this.logEvent('Connect', 'TimeOutDisconnect', "reason", event.reason);
-    } else {
-      this.logEvent('Connect', 'Disconnected', "reason", event.reason);
-    }
+    sessionDisconnectedHandler = function(event) {
+      var reason = event.reason;
+      if(reason === 'networkTimedout') {
+        reason = 'networkDisconnected';
+        this.logEvent('Connect', 'TimeOutDisconnect', 'reason', event.reason);
+      } else {
+        this.logEvent('Connect', 'Disconnected', 'reason', event.reason);
+      }
 
-		var publicEvent = new OT.SessionDisconnectEvent('sessionDisconnected', reason);
+      var publicEvent = new OT.SessionDisconnectEvent('sessionDisconnected', reason);
 
-    reset.call(this);
-    disconnectComponents.call(this);
+      reset.call(this);
+      disconnectComponents.call(this, reason);
 
-		var defaultAction = function() {
-      if (!publicEvent.isDefaultPrevented()) destroyComponents.call(this, publicEvent.reason);
-		}.bind(this);
+      var defaultAction = function() {
+        // Publishers handle preventDefault'ing themselves
+        destroyPublishers.call(this, publicEvent.reason);
+        // Subscriers don't, destroy 'em if needed
+        if (!publicEvent.isDefaultPrevented()) destroySubscribers.call(this, publicEvent.reason);
+      }.bind(this);
 
-		this.dispatchEvent(publicEvent, defaultAction);
-	},
+      this.dispatchEvent(publicEvent, defaultAction);
+    };
 
-  connectionCreatedHandler = function(connection) {
-    // We don't broadcast events for the symphony connection
-    if (connection.id.match(/^symphony\./)) return;
+    connectionCreatedHandler = function(connection) {
+      // We don't broadcast events for the symphony connection
+      if (connection.id.match(/^symphony\./)) return;
 
-    this.dispatchEvent(new OT.ConnectionEvent(
+      this.dispatchEvent(new OT.ConnectionEvent(
         OT.Event.names.CONNECTION_CREATED,
-        [connection]
-    ));
-  },
+        connection
+      ));
+    };
 
-	connectionDestroyedHandler = function(connection, reason) {
-    // We don't broadcast events for the symphony connection
-    if (connection.id.match(/^symphony\./)) return;
+    connectionDestroyedHandler = function(connection, reason) {
+      // We don't broadcast events for the symphony connection
+      if (connection.id.match(/^symphony\./)) return;
 
-    // Don't delete the connection if it's ours. This only happens when
-    // we're about to receive a session disconnected and session disconnected
-    // will also clean up our connection.
-    if (connection.id === _socket.id) return;
+      // Don't delete the connection if it's ours. This only happens when
+      // we're about to receive a session disconnected and session disconnected
+      // will also clean up our connection.
+      if (connection.id === _socket.id) return;
 
-    // Handle success callbacks
-    if (_callbacks.forceDisconnect[connection.id]) {
-      var callback = _callbacks.forceDisconnect[connection.id];
-      delete _callbacks.forceDisconnect[connection.id];
+      this.dispatchEvent(
+        new OT.ConnectionEvent(
+          OT.Event.names.CONNECTION_DESTROYED,
+          connection,
+          reason
+        )
+      );
+    };
 
+    streamCreatedHandler = function(stream) {
+      if(stream.connection.id !== this.connection.id) {
+        this.dispatchEvent(new OT.StreamEvent(
+          OT.Event.names.STREAM_CREATED,
+          stream,
+          null,
+          false
+        ));
+      }
+    };
 
-      if (reason !== 'forceDisconnected') {
-        OT.warn("Expected a forceDisconnect for connection " + connection.id + ", but a " + reason + " was received instead.");
+    streamPropertyModifiedHandler = function(event) {
+      var stream = event.target,
+          propertyName = event.changedProperty,
+          newValue = event.newValue;
+
+      if (propertyName === 'orientation') {
+        propertyName = 'videoDimensions';
+        newValue = {width: newValue.width, height: newValue.height};
       }
 
-      callback.succeeded();
-    }
+      this.dispatchEvent(new OT.StreamPropertyChangedEvent(
+        OT.Event.names.STREAM_PROPERTY_CHANGED,
+        stream,
+        propertyName,
+        event.oldValue,
+        newValue
+      ));
+    };
 
-    this.dispatchEvent(
-      new OT.ConnectionEvent(
-        OT.Event.names.CONNECTION_DESTROYED,
-        [connection],
-        reason
-      )
-    );
-	},
+    streamDestroyedHandler = function(stream, reason) {
 
-  streamCreatedHandler = function(stream) {
-    this.dispatchEvent(new OT.StreamEvent(
-      OT.Event.names.STREAM_CREATED,
-      [stream]
-    ));
-  },
-
-  streamPropertyModifiedHandler = function(event) {
-    var stream = event.target,
-        propertyName = event.changedProperty,
-        newValue = event.newValue;
-
-    if (propertyName === 'orientation') {
-      propertyName = 'videoDimensions';
-      newValue = {width: newValue.width, height: newValue.height};
-    }
-
-    this.dispatchEvent(new OT.StreamPropertyChangedEvent(
-      OT.Event.names.STREAM_PROPERTY_CHANGED,
-      stream,
-      propertyName,
-      event.oldValue,
-      newValue
-    ));
-  },
-
-	streamDestroyedHandler = function(stream, reason) {
-    // Handle success callbacks
-    if (_callbacks.forceUnpublish[stream.id]) {
-      var callback = _callbacks.forceUnpublish[stream.id];
-      delete _callbacks.forceUnpublish[stream.id];
-
-      if (reason !== 'forceUnpublished') {
-        OT.warn("Expected a forceUnpublish for stream " + stream.id + ", but a " + reason + " destroyed was received instead.");
-      }
-
-      callback.succeeded();
-    }
-
-    var event = new OT.StreamEvent('streamDestroyed', [stream], reason);
-
-    var defaultAction = function() {
-      if (!event.isDefaultPrevented()) {
-        // If the stream is one of ours then we need to cleanup
-        // a publisher.
-        var publisher = OT.publishers.where({streamId: stream.id})[0];
-        if (publisher) {
-          publisher._.unpublishFromSession(this);
-          publisher.destroy();
-        }
-
-        // If we are subscribed to any of the streams we should unsubscribe
-        OT.subscribers.where({streamId: stream.id}).forEach(function(subscriber) {
-          if (subscriber.session.id === this.id) {
-            this.unsubscribe(subscriber);
-          }
-        }, this);
-      }
-		}.bind(this);
-
-		this.dispatchEvent(event, defaultAction);
-	},
-
-
-	// Put ourselves into a pristine state
-	reset = function() {
-    _apiKey = null;
-    _token = null;
-    setState('disconnected');
-
-    this.connections.destroy();
-    this.streams.destroy();
-	},
-
-  disconnectComponents = function() {
-    OT.publishers.where({session: this}).forEach(function(publisher) {
-      publisher.disconnect();
-    });
-
-    OT.subscribers.where({session: this}).forEach(function(subscriber) {
-      subscriber.disconnect();
-    });
-  },
-
-  destroyComponents = function(reason) {
-    OT.publishers.where({session: this}).forEach(function(publisher) {
-      publisher.destroy(reason);
-    });
-
-    OT.subscribers.where({session: this}).forEach(function(subscriber) {
-      subscriber.destroy(reason);
-    });
-  },
-
-	connectMessenger = function() {
-    TB.debug("OT.Session: connecting to Raptor");
-
-    _socket = new OT.Raptor.Socket(_widgetId, this.sessionInfo.messagingServer);
-    _socket.connect(_token, this.sessionInfo, function(error, sessionState) {
-      if (error) {
-        sessionConnectFailed.call(this, error.reason, error.code);
+      // if the stream is one of ours we delegate handling
+      // to the publisher itself.
+      if(stream.connection.id === this.connection.id) {
+        OT.publishers.where({ streamId: stream.id }).forEach(function(publisher) {
+          publisher._.unpublishFromSession(this, reason);
+        }.bind(this));
         return;
       }
 
-      OT.debug("OT.Session: Received session state from Raptor", sessionState);
+      var event = new OT.StreamEvent('streamDestroyed', stream, reason, true);
 
-      _connectionId = this.connection.id;
-      setState('connected');
+      var defaultAction = function() {
+        if (!event.isDefaultPrevented()) {
+          // If we are subscribed to any of the streams we should unsubscribe
+          OT.subscribers.where({streamId: stream.id}).forEach(function(subscriber) {
+            if (subscriber.session.id === this.id) {
+              if(subscriber.stream) {
+                subscriber.destroy('streamDestroyed');
+              }
+            }
+          }, this);
+        } else {
+          // @TODO Add a one time warning that this no longer cleans up the publisher
+        }
+      }.bind(this);
 
-      // Listen for our own connection's destroyed event so we know when we've been disconnected.
-      this.connection.on('destroyed', sessionDisconnectedHandler, this);
+      this.dispatchEvent(event, defaultAction);
+    };
 
-      // Listen for connection updates
-      this.connections.on({
-        add: connectionCreatedHandler,
-        remove: connectionDestroyedHandler
-      }, this);
+    archiveCreatedHandler = function(archive) {
+      this.dispatchEvent(new OT.ArchiveEvent('archiveStarted', archive));
+    };
 
-      // Listen for stream updates
-      this.streams.on({
-        add: streamCreatedHandler,
-        remove: streamDestroyedHandler,
-        update: streamPropertyModifiedHandler
-      }, this);
+    archiveDestroyedHandler = function(archive) {
+      this.dispatchEvent(new OT.ArchiveEvent('archiveDestroyed', archive));
+    };
 
-      this.dispatchEvent(new OT.SessionConnectEvent(
-        OT.Event.names.SESSION_CONNECTED,
-        sessionState.connections,
-        sessionState.streams,
-        sessionState.archives
-      ));
-    }.bind(this));
-	},
+    archiveUpdatedHandler = function(event) {
+      var archive = event.target,
+        propertyName = event.changedProperty,
+        newValue = event.newValue;
 
-  getSessionInfo = function() {
-    if (this.is('connecting')) {
-      OT.SessionInfo.get(
-        this,
-        onSessionInfoResponse.bind(this),
-        function(error) {
-          sessionConnectFailed.call(this, error.message + (error.code ? ' (' + error.code + ')' : ''));
-        }.bind(this)
-      );
-    }
-  },
+      if(propertyName === 'status' && newValue === 'stopped') {
+        this.dispatchEvent(new OT.ArchiveEvent('archiveStopped', archive));
+      } else {
+        this.dispatchEvent(new OT.ArhiveEvent('archiveUpdated', archive));
+      }
+    };
 
-  onSessionInfoResponse = function(sessionInfo) {
-    if (this.is('connecting')) {
-      this.sessionInfo = sessionInfo;
-      if (this.sessionInfo.partnerId && this.sessionInfo.partnerId != _apiKey) {
+    // Put ourselves into a pristine state
+    reset = function() {
+      _token = null;
+      setState('disconnected');
+
+      this.connections.destroy();
+      this.streams.destroy();
+      this.archives.destroy();
+    };
+
+    disconnectComponents = function(reason) {
+      OT.publishers.where({session: this}).forEach(function(publisher) {
+        publisher.disconnect(reason);
+      });
+
+      OT.subscribers.where({session: this}).forEach(function(subscriber) {
+        subscriber.disconnect();
+      });
+    };
+
+    destroyPublishers = function(reason) {
+      OT.publishers.where({session: this}).forEach(function(publisher) {
+        publisher._.streamDestroyed(reason);
+      });
+    };
+
+    destroySubscribers = function(reason) {
+      OT.subscribers.where({session: this}).forEach(function(subscriber) {
+        subscriber.destroy(reason);
+      });
+    };
+
+    connectMessenger = function() {
+      OT.debug('OT.Session: connecting to Raptor');
+
+      var socketUrl = OT.properties.messagingProtocol + '://' + this.sessionInfo.messagingServer +
+            ':' + OT.properties.messagingPort + '/rumorwebsocketsv2',
+          symphonyUrl = OT.properties.symphonyAddresss || 'symphony.' +
+            this.sessionInfo.messagingServer;
+
+      _socket = new OT.Raptor.Socket(_widgetId, socketUrl, symphonyUrl,
+        OT.SessionDispatcher(this));
+
+      var analyticsPayload = [
+        socketUrl, navigator.userAgent, OT.properties.version,
+        window.externalHost ? 'yes' : 'no'
+      ];
+
+      _socket.connect(_token, this.sessionInfo, function(error, sessionState) {
+        if (error) {
+          analyticsPayload.splice(0,0,error.message);
+          this.logEvent('Connect', 'Failure',
+            'reason|webSocketServerUrl|userAgent|sdkVersion|chromeFrame',
+            analyticsPayload.map(function(e) { return e.replace('|', '\\|'); }).join('|'));
+
+          sessionConnectFailed.call(this, error.message, error.code);
+          return;
+        }
+
+        OT.debug('OT.Session: Received session state from Raptor', sessionState);
+
+        setState('connected');
+
+        this.logEvent('Connect', 'Success',
+          'webSocketServerUrl|userAgent|sdkVersion|chromeFrame',
+          analyticsPayload.map(function(e) {
+            return e.replace('|', '\\|');
+          }).join('|'), {connectionId: this.connection.id});
+
+        // Listen for our own connection's destroyed event so we know when we've been disconnected.
+        this.connection.on('destroyed', sessionDisconnectedHandler, this);
+
+        // Listen for connection updates
+        this.connections.on({
+          add: connectionCreatedHandler,
+          remove: connectionDestroyedHandler
+        }, this);
+
+        // Listen for stream updates
+        this.streams.on({
+          add: streamCreatedHandler,
+          remove: streamDestroyedHandler,
+          update: streamPropertyModifiedHandler
+        }, this);
+
+        this.archives.on({
+          add: archiveCreatedHandler,
+          remove: archiveDestroyedHandler,
+          update: archiveUpdatedHandler
+        }, this);
+
+        this.dispatchEvent(
+          new OT.SessionConnectEvent(OT.Event.names.SESSION_CONNECTED), function() {
+            this.connections._triggerAddEvents(); // { id: this.connection.id }
+            this.streams._triggerAddEvents(); // { id: this.stream.id }
+            this.archives._triggerAddEvents();
+          }.bind(this)
+        );
+
+      }.bind(this));
+    };
+
+    getSessionInfo = function() {
+      if (this.is('connecting')) {
+        OT.SessionInfo.get(
+          this,
+          onSessionInfoResponse.bind(this),
+          function(error) {
+            sessionConnectFailed.call(this, error.message +
+              (error.code ? ' (' + error.code + ')' : ''), error.code);
+          }.bind(this)
+        );
+      }
+    };
+
+    onSessionInfoResponse = function(sessionInfo) {
+      if (this.is('connecting')) {
+        this.sessionInfo = sessionInfo;
+        if (this.sessionInfo.partnerId && this.sessionInfo.partnerId !== _apiKey) {
           _apiKey = this.sessionInfo.partnerId;
 
-          var reason = 'Authentication Error: The apiKey passed into the session.connect ' +
-            'method does not match the apiKey in the token or session you are trying to ' +
-            'connect to.';
+          var reason = 'Authentication Error: The API key does not match the token or session.';
 
           this.logEvent('Connect', 'Failure', 'reason', 'GetSessionInfo:' +
             OT.ExceptionCodes.AUTHENTICATION_ERROR + ':' + reason);
 
           sessionConnectFailed.call(this, reason, OT.ExceptionCodes.AUTHENTICATION_ERROR);
-      } else {
+        } else {
           connectMessenger.call(this);
+        }
       }
-    }
-  },
-
-  // Check whether we have permissions to perform the action.
-  permittedTo = function(action) {
-      return _socket && _socket.permittedTo(action);
-  };
-
-  this.logEvent = function(action, variation, payload_type, payload) {
-    var event = {
-      action: action,
-      variation: variation,
-      payload_type: payload_type,
-      payload: payload,
-      session_id: _sessionId,
-      partner_id: _apiKey,
-      widget_id: _widgetId,
-      widget_type: 'Controller'
     };
-    if (this.connection && this.connection.id) event.connection_id = this.connection.id;
-    else if (_connectionId) event.connection_id = _connectionId;
-    _analytics.logEvent(event);
-  };
+
+    // Check whether we have permissions to perform the action.
+    permittedTo = function(action) {
+      return this.capabilities.permittedTo(action);
+    }.bind(this);
+
+    dispatchError = function(code, message, completionHandler) {
+      OT.dispatchError(code, message, completionHandler, this);
+    }.bind(this);
+
+    this.logEvent = function(action, variation, payloadType, payload, options) {
+      /* jshint camelcase:false */
+      var event = {
+        action: action,
+        variation: variation,
+        payload_type: payloadType,
+        payload: payload,
+        session_id: _sessionId,
+        partner_id: _apiKey,
+        widget_id: _widgetId,
+        widget_type: 'Controller'
+      };
+      if (this.connection && this.connection.id) _connectionId = event.connection_id =
+        this.connection.id;
+      else if (_connectionId) event.connection_id = _connectionId;
+
+      if (options) event = OT.$.extend(options, event);
+      _analytics.logEvent(event);
+    };
 
  /**
- * Connects to an OpenTok session. Pass your API key as the <code>apiKey</code> parameter. You get an API key when you
- * <a href="https://dashboard.tokbox.com/users/sign_in">sign up</a> for an OpenTok account. Pass a token string as
- * the <code>token</code> parameter. You generate a token using the
- * <a href="/opentok/api/tools/documentation/api/server_side_libraries.html">OpenTok server-side libraries</a>
- * or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page. For more information, see
- * <a href="/opentok/tutorials/create-token/">Connection token creation</a>.
- *  <p>
- *  	Upon a successful connection, the Session object dispatches a <code>sessionConnected</code> event. Call the
- * <code>addEventListener()</code> method to set up an event listener to process this event before calling other methods of the Session object.
+ * Connects to an OpenTok session. Pass your API key as the <code>apiKey</code> parameter.
+ * You get an API key when you <a href="https://dashboard.tokbox.com/users/sign_in">sign up</a>
+ * for an OpenTok account. Pass a token string as the <code>token</code> parameter. You generate
+ * a token using the
+ * <a href="/opentok/api/tools/documentation/api/server_side_libraries.html">OpenTok server-side
+ * libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page. For
+ * more information, see <a href="/opentok/tutorials/create-token/">Connection token creation</a>.
+ * <p>
+ * Upon a successful connection, the Session object dispatches a <code>sessionConnected</code>
+ * event. Call the <code>on()</code> method to set up an event handler to process this event before
+ * calling other methods of the Session object.
  *  </p>
  *  <p>
- *  	The Session object dispatches a <code>connectionCreated</code> event when other clients create connections to the session.
+ *    The Session object dispatches a <code>connectionCreated</code> event when other clients
+ *    create connections to the session.
  *  </p>
  *  <p>
- *  	The TB object dispatches an <code>exception</code> event if the session ID,
+ *    The OT object dispatches an <code>exception</code> event if the session ID,
  *    API key, or token string are invalid. See <a href="ExceptionEvent.html">ExceptionEvent</a>
- *    and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+ *    and <a href="OT.html#on">OT.on()</a>.
  *  </p>
  *  <p>
- *  	The application throws an error if the system requirements are not met
- *    (see <a href="TB.html#checkSystemRequirements">TB.checkSystemRequirements()</a>).
+ *    The application throws an error if the system requirements are not met
+ *    (see <a href="OT.html#checkSystemRequirements">OT.checkSystemRequirements()</a>).
+ *    The application also throws an error if the session has peer-to-peer streaming enabled
+ *    and two clients are already connected to the session (see our
+ *    <a href="/opentok/libraries/server/">server-side libraries</a>).
  *  </p>
  *
+ * <p>
+ *  With the peer-to-peer option enabled for a session, the session supports two connections.
+ *  Without the peer-to-peer option enabled, the session supports up to four connections. On
+ *  clients that attempt to a session that already has the maximum number of connections, the
+ *  OT object dispatches an `exception` event (with the `code` property set to 1007). See
+ *  <a href="/opentok/tutorials/create-session/">Session Creation documentation</a>.
+ * </p>
+ *
+ *
  *  <h5>
  *  Example
  *  </h5>
  *  <p>
- *  The following code initializes a session and sets up an event listener for when the session connects:
+ *  The following code initializes a session and sets up an event listener for when the session
+ *  connects:
  *  </p>
  *  <pre>
  *  var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
@@ -14099,17 +16241,16 @@ OT.Session = function(sessionId) {
  *  var token = ""; // Replace with a generated token that has been assigned the moderator role.
  *                  // See https://dashboard.tokbox.com/projects
  *
- *  var session = TB.initSession(sessionID);
- *  session.addEventListener("sessionConnected", sessionConnectHandler);
- *  session.connect(apiKey, token);
- *
- *  function sessionConnectHandler(sessionConnectEvent) {
+ *  var session = OT.initSession(apiKey, sessionID);
+ *  session.on("sessionConnected", function(sessionConnectEvent) {
  *      //
- *  }
+ *  });
+ *  session.connect(token);
  *  </pre>
  *  <p>
  *  <p>
- *  	In this example, the <code>sessionConnectHandler()</code> function is passed an event object of type {@link SessionConnectEvent}.
+ *    In this example, the <code>sessionConnectHandler()</code> function is passed an event
+ *    object of type {@link SessionConnectEvent}.
  *  </p>
  *
  *  <h5>
@@ -14117,174 +16258,240 @@ OT.Session = function(sessionId) {
  *  </h5>
  *
  *  <p>
- *  	<code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151; Dispatched by the TB class
- *  	locally in the event of an error.
+ *    <code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151; Dispatched
+ *    by the OT class locally in the event of an error.
  *  </p>
  *  <p>
- *  	<code>connectionCreated</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
+ *    <code>connectionCreated</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
  *      Dispatched by the Session object on all clients connected to the session.
  *  </p>
  *  <p>
- *  	<code>sessionConnected</code> (<a href="SessionConnectEvent.html">SessionConnectEvent</a>) &#151;
- *      Dispatched locally by the Session object when the connection is established.
+ *    <code>sessionConnected</code> (<a href="SessionConnectEvent.html">SessionConnectEvent</a>)
+ *      &#151; Dispatched locally by the Session object when the connection is established.
  *  </p>
  *
-  * @param {String} apiKey The API key that TokBox provided you when you registered for the OpenTok API.
-  *
   * @param {String} token The session token. You generate a session token using our
   * <a href="/opentok/libraries/server/">server-side libraries</a> or the
   * <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page. For more information, see
   * <a href="/opentok/tutorials/create-token/">Connection token creation</a>.
   *
+  * @param {Function} completionHandler (Optional) A function to be called when the call to the
+  * <code>connect()</code> method succeeds or fails. This function takes one parameter &mdash;
+  * <code>error</code>. On success, the <code>completionHandler</code> function is not passed any
+  * arguments. On error, the function is passed an <code>error</code> object parameter. The
+  * <code>error</code> object has two properties: <code>code</code> (an integer) and
+  * <code>message</code> (a string), which identify the cause of the failure. The following
+  * code adds a <code>completionHandler</code> when calling the <code>connect()</code> method:
+  * <pre>
+  * session.connect(token, function (error) {
+  *   if (error) {
+  *       console.log(error.message);
+  *   } else {
+  *     console.log("Connected to session.");
+  *   }
+  * });
+  * </pre>
+  * <p>
+  * Note that upon connecting to the session, the Session object dispatches a
+  * <code>sessionConnected</code> event in addition to calling the <code>completionHandler</code>.
+  * The SessionConnectEvent object, which defines the <code>sessionConnected</code> event,
+  * includes <code>connections</code> and <code>streams</code> properties, which
+  * list the connections and streams in the session when you connect.
+  * </p>
+  *
+  * @see SessionConnectEvent
   * @method #connect
   * @memberOf Session
   */
-  this.connect = function(apiKey, token, completionHandler) {
-    if (this.is('connecting', 'connected')) {
-      OT.warn("OT.Session: Cannot connect, the session is already " + this.state);
-      return;
-    }
+    this.connect = function(token) {
 
-    reset.call(this);
-    setState('connecting');
-    _token = token;
+      if(apiKey == null && arguments.length > 1 &&
+        (typeof arguments[0] === 'string' || typeof arguments[0] === 'number') &&
+        typeof arguments[1] === 'string') {
+        _apiKey = token.toString();
+        token = arguments[1];
+      }
 
-    // Get a new widget ID when reconnecting.
-    if (_initialConnection) {
-      _initialConnection = false;
-    } else {
-      _widgetId = OT.$.uuid();
-    }
+      // The completion handler is always the last argument.
+      var completionHandler = arguments[arguments.length - 1];
 
-    _apiKey = apiKey.toString();
+      if (this.is('connecting', 'connected')) {
+        OT.warn('OT.Session: Cannot connect, the session is already ' + this.state);
+        return this;
+      }
 
-    // Ugly hack, make sure OT.APIKEY is set
-    if (OT.APIKEY.length === 0) {
+      reset.call(this);
+      setState('connecting');
+      _token = !OT.$.isFunction(token) && token;
+
+      // Get a new widget ID when reconnecting.
+      if (_initialConnection) {
+        _initialConnection = false;
+      } else {
+        _widgetId = OT.$.uuid();
+      }
+
+      if (completionHandler && OT.$.isFunction(completionHandler)) {
+        this.once('sessionConnected', completionHandler.bind(null, null));
+        this.once('sessionConnectFailed', completionHandler);
+      }
+
+      if(_apiKey == null || OT.$.isFunction(_apiKey)) {
+        setTimeout(sessionConnectFailed.bind(this,
+          'API Key is undefined. You must pass an API Key to initSession.',
+          OT.ExceptionCodes.AUTHENTICATION_ERROR));
+        return this;
+      }
+      
+      if (!_sessionId) {
+        setTimeout(sessionConnectFailed.bind(this,
+            'SessionID is undefined. You must pass a sessionID to initSession.',
+          OT.ExceptionCodes.INVALID_SESSION_ID));
+        return this;
+      }
+
+      _apiKey = _apiKey.toString();
+
+      // Ugly hack, make sure OT.APIKEY is set
+      if (OT.APIKEY.length === 0) {
         OT.APIKEY = _apiKey;
-    }
+      }
 
-    if (completionHandler && OT.$.isFunction(completionHandler)) {
-      this.once(OT.Event.names.SESSION_CONNECTED, completionHandler.bind(null, null));
-      this.once('sessionConnectFailed', completionHandler);
-    }
+      var analyticsPayload = [
+        navigator.userAgent, OT.properties.version,
+        window.externalHost ? 'yes' : 'no'
+      ];
+      this.logEvent( 'Connect', 'Attempt',
+        'userAgent|sdkVersion|chromeFrame',
+        analyticsPayload.map(function(e) { return e.replace('|', '\\|'); }).join('|')
+      );
 
-    var analyticsPayload = [
-      navigator.userAgent, OT.properties.version,
-      window.externalHost ? 'yes' : 'no'
-    ];
-    this.logEvent( 'Connect', 'Attempt',
-      'userAgent|sdkVersion|chromeFrame',
-      analyticsPayload.map(function(e) { return e.replace('|', '\\|'); }).join('|')
-    );
-
-    getSessionInfo.call(this);
-  };
+      getSessionInfo.call(this);
+      return this;
+    };
 
  /**
   * Disconnects from the OpenTok session.
   *
   * <p>
-  * Calling the <code>disconnect()</code> method ends your connection with the session. In the course of terminating your connection,
-  * it also ceases publishing any stream(s) you were publishing.
+  * Calling the <code>disconnect()</code> method ends your connection with the session. In the
+  * course of terminating your connection, it also ceases publishing any stream(s) you were
+  * publishing.
   * </p>
   * <p>
-  * Session objects on remote clients dispatch <code>streamDestroyed</code> events for any stream you were publishing.
-  * The Session object dispatches a <code>sessionDisconnected</code> event locally. The Session objects on remote clients dispatch
-  * <code>connectionDestroyed</code> events, letting other connections know you have left the session. The {@link SessionDisconnectEvent}
-  * and {@link StreamEvent} objects that define the <code>sessionDisconnect</code> and <code>connectionDestroyed</code> events each have
-  * a <code>reason</code> property. The <code>reason</code> property lets the developer determine whether the connection is being
-  * terminated voluntarily and whether any streams are being destroyed as a byproduct of the underlying connection's voluntary destruction.
+  * Session objects on remote clients dispatch <code>streamDestroyed</code> events for any
+  * stream you were publishing. The Session object dispatches a <code>sessionDisconnected</code>
+  * event locally. The Session objects on remote clients dispatch <code>connectionDestroyed</code>
+  * events, letting other connections know you have left the session. The
+  * {@link SessionDisconnectEvent} and {@link StreamEvent} objects that define the
+  * <code>sessionDisconnect</code> and <code>connectionDestroyed</code> events each have a
+  * <code>reason</code> property. The <code>reason</code> property lets the developer determine
+  * whether the connection is being terminated voluntarily and whether any streams are being
+  * destroyed as a byproduct of the underlying connection's voluntary destruction.
   * </p>
   * <p>
   * If the session is not currently connected, calling this method causes a warning to be logged.
-  * See <a "href=TB.html#setLogLevel">TB.setLogLevel()</a>.
+  * See <a "href=OT.html#setLogLevel">OT.setLogLevel()</a>.
   * </p>
   *
   * <p>
-  * <i>Note:</i> If you intend to reuse a Publisher object created using <code>TB.initPublisher()</code>
-  * to publish to different sessions sequentially, call either <code>Session.disconnect()</code> or
-  * <code>Session.unpublish()</code>. Do not call both. Then call the <code>preventDefault()</code> method
-  * of the <code>streamDestroyed</code> or <code>sessionDisconnected</code> event object to prevent the
-  * Publisher object from being removed from the page. Be sure to call <code>preventDefault()</code> only
-  * if the <code>connection.connectionId</code> property of the Stream object in the event matches the
-  * <code>connection.connectionId</code> property of your Session object (to ensure that you are preventing
-  * the default behavior for your published streams, not for other streams that you subscribe to).
+  * <i>Note:</i> If you intend to reuse a Publisher object created using
+  * <code>OT.initPublisher()</code> to publish to different sessions sequentially, call either
+  * <code>Session.disconnect()</code> or <code>Session.unpublish()</code>. Do not call both.
+  * Then call the <code>preventDefault()</code> method of the <code>streamDestroyed</code> or
+  * <code>sessionDisconnected</code> event object to prevent the Publisher object from being
+  * removed from the page. Be sure to call <code>preventDefault()</code> only if the
+  * <code>connection.connectionId</code> property of the Stream object in the event matches the
+  * <code>connection.connectionId</code> property of your Session object (to ensure that you are
+  * preventing the default behavior for your published streams, not for other streams that you
+  * subscribe to).
   * </p>
   *
   * <h5>
   * Events dispatched:
   * </h5>
   * <p>
-  * <code>sessionDisconnected</code> (<a href="SessionDisconnectEvent.html">SessionDisconnectEvent</a>)
+  * <code>sessionDisconnected</code>
+  * (<a href="SessionDisconnectEvent.html">SessionDisconnectEvent</a>)
   * &#151; Dispatched locally when the connection is disconnected.
   * </p>
   * <p>
   * <code>connectionDestroyed</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
-  * Dispatched on other connections, along with the <code>streamDestroyed</code> event (as warranted).
+  * Dispatched on other clients, along with the <code>streamDestroyed</code> event (as warranted).
   * </p>
   *
   * <p>
   * <code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
-  * Dispatched if streams are lost as a result of the session disconnecting.
+  * Dispatched on other clients if streams are lost as a result of the session disconnecting.
   * </p>
   *
   * @method #disconnect
   * @memberOf Session
   */
-  this.disconnect = function() {
-    if (_socket && _socket.isNot('disconnected')) {
-      setState('disconnecting');
-      _socket.disconnect();
-    }
-    else {
-      reset.call(this);
-    }
-  };
+    this.disconnect = function() {
+      if (_socket && _socket.isNot('disconnected')) {
+        setState('disconnecting');
+        _socket.disconnect();
+      }
+      else {
+        reset.call(this);
+      }
+    };
 
-  this.destroy = function(reason, quiet) {
-    this.streams.destroy();
-    this.connections.destroy();
-    this.disconnect();
-  };
+    this.destroy = function(/*reason, quiet*/) {
+      this.streams.destroy();
+      this.connections.destroy();
+      this.archives.destroy();
+      this.disconnect();
+    };
 
  /**
   * The <code>publish()</code> method starts publishing an audio-video stream to the session.
-  * The audio-video stream is captured from a local microphone and webcam. Upon successful publishing,
-  * the Session objects on all connected clients dispatch the <code>streamCreated</code> event.
+  * The audio-video stream is captured from a local microphone and webcam. Upon successful
+  * publishing, the Session objects on all connected clients dispatch the
+  * <code>streamCreated</code> event.
   * </p>
   *
   * <!--JS-ONLY-->
-  * <p>You pass a Publisher object as the one parameter of the method. You can initialize a Publisher object by calling the
-  * <a href="TB.html#initPublisher">TB.initPublisher()</a> method. Before calling <code>Session.publish()</code>.
+  * <p>You pass a Publisher object as the one parameter of the method. You can initialize a
+  * Publisher object by calling the <a href="OT.html#initPublisher">OT.initPublisher()</a>
+  * method. Before calling <code>Session.publish()</code>.
   * </p>
   *
-  * <p>This method takes an alternate form: <code>publish([targetElement:String, properties:Object]):Publisher</code> &#151;
-  * In this form, you do <i>not</i> pass a Publisher object into the function. Instead, you pass in a <code>targetElement</code>
-  * (the ID of the DOM element that the Publisher will replace) and a <code>properties</code> object that defines
-  * options for the Publisher (see <a href="TB.html#initPublisher">TB.initPublisher()</a>.) The method
-  * returns a new Publisher object, which starts sending an audio-video stream to the session.
-  * The remainder of this documentation describes the form that takes a single Publisher object as a parameter.
+  * <p>This method takes an alternate form: <code>publish([targetElement:String,
+  * properties:Object]):Publisher</code> &#151; In this form, you do <i>not</i> pass a Publisher
+  * object into the function. Instead, you pass in a <code>targetElement</code> (the ID of the
+  * DOM element that the Publisher will replace) and a <code>properties</code> object that
+  * defines options for the Publisher (see <a href="OT.html#initPublisher">OT.initPublisher()</a>.)
+  * The method returns a new Publisher object, which starts sending an audio-video stream to the
+  * session. The remainder of this documentation describes the form that takes a single Publisher
+  * object as a parameter.
   *
   * <p>
-  * 	A local display of the published stream is created on the web page by replacing
+  *   A local display of the published stream is created on the web page by replacing
   *         the specified element in the DOM with a streaming video display. The video stream
   *         is automatically mirrored horizontally so that users see themselves and movement
   *         in their stream in a natural way. If the width and height of the display do not match
-  *         the 4:3 aspect ratio of the video signal, the video stream is cropped to fit the display.
+  *         the 4:3 aspect ratio of the video signal, the video stream is cropped to fit the
+  *         display.
   * </p>
   *
   * <p>
-  * 	If calling this method creates a new Publisher object and the OpenTok library does not have access to
-  * 	the camera or microphone, the web page alerts the user to grant access to the camera and microphone.
+  *   If calling this method creates a new Publisher object and the OpenTok library does not
+  *   have access to the camera or microphone, the web page alerts the user to grant access
+  *   to the camera and microphone.
   * </p>
   *
   * <p>
-  * The TB object dispatches an <code>exception</code> event if the user's role does not
+  * The OT object dispatches an <code>exception</code> event if the user's role does not
   * include permissions required to publish. For example, if the user's role is set to subscriber,
-  * then they cannot publish. You define a user's role when you create the user token using the <code>generate_token()</code> method
-  * of our <a href="/opentok/libraries/server/">server-side libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
-  * You pass the token string as a parameter of the <code>connect()</code> method of the Session object.
-  * See <a href="ExceptionEvent.html">ExceptionEvent</a> and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+  * then they cannot publish. You define a user's role when you create the user token using the
+  * <code>generate_token()</code> method of the
+  * <a href="/opentok/api/tools/documentation/api/server_side_libraries.html">OpenTok server-side
+  * libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
+  * You pass the token string as a parameter of the <code>connect()</code> method of the Session
+  * object. See <a href="ExceptionEvent.html">ExceptionEvent</a> and
+  * <a href="OT.html#on">OT.on()</a>.
   * </p>
   *     <p>
   *     The application throws an error if the session is not connected.
@@ -14292,11 +16499,12 @@ OT.Session = function(sessionId) {
   *
   * <h5>Events dispatched:</h5>
   * <p>
-  * <code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151; Dispatched by the TB object. This
-  * can occur when user's role does not allow publishing (the <code>code</code> property of event object is set to 1500);
-  * it can also occur if the connection fails to connect (the <code>code</code> property of event object is set to 1013).
-  * WebRTC is a peer-to-peer protocol, and it is possible that connections will fail to connect. The most common cause
-  * for failure is a firewall that the protocol cannot traverse.</li>
+  * <code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151; Dispatched
+  * by the OT object. This can occur when user's role does not allow publishing (the
+  * <code>code</code> property of event object is set to 1500); it can also occur if the c
+  * onnection fails to connect (the <code>code</code> property of event object is set to 1013).
+  * WebRTC is a peer-to-peer protocol, and it is possible that connections will fail to connect.
+  * The most common cause for failure is a firewall that the protocol cannot traverse.</li>
   * </p>
   * <p>
   * <code>streamCreated</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
@@ -14307,135 +16515,180 @@ OT.Session = function(sessionId) {
   * <h5>Example</h5>
   *
   * <p>
-  * 	The following example publishes a video once the session connects:
+  *   The following example publishes a video once the session connects:
   * </p>
   * <pre>
-  * var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
   * var sessionId = ""; // Replace with your own session ID.
   *                     // See https://dashboard.tokbox.com/projects
   * var token = ""; // Replace with a generated token that has been assigned the moderator role.
   *                 // See https://dashboard.tokbox.com/projects
-  * var session = TB.initSession(sessionID);
-  * session.addEventListener("sessionConnected", sessionConnectHandler);
-  * session.connect(apiKey, token);
-  *
-  * function sessionConnectHandler(event) {
+  * var session = OT.initSession(apiKey, sessionID);
+  * session.on("sessionConnected", function (event) {
   *     var divProps = {width: 400, height:300, name:"Bob's stream"};
-  *     publisher = TB.initPublisher(apiKey, 'publisher', divProps);
-  *                       // This assumes that there is a DOM element with the ID 'publisher'.
+  *     // This assumes that there is a DOM element with the ID 'publisher':
+  *     publisher = OT.initPublisher('publisher', divProps);
   *     session.publish(publisher);
-  * }
+  * });
+  * session.connect(token);
   * </pre>
   *
-  * @param publisher A Publisher object, which you initialize by calling the <a href="TB.html#initPublisher">TB.initPublisher()</a>
-  * method.
+  * @param {Publisher} publisher A Publisher object, which you initialize by calling the
+  * <a href="OT.html#initPublisher">OT.initPublisher()</a> method.
+  *
+  * @param {Function} completionHandler (Optional) A function to be called when the call to the
+  * <code>publish()</code> method succeeds or fails. This function takes one parameter &mdash;
+  * <code>error</code>. On success, the <code>completionHandler</code> function is not passed any
+  * arguments. On error, the function is passed an <code>error</code> object parameter. The
+  * <code>error</code> object has two properties: <code>code</code> (an integer) and
+  * <code>message</code> (a string), which identify the cause of the failure. Calling
+  * <code>publish()</code> fails if the role assigned to your token is not "publisher" or
+  * "moderator"; in this case <code>error.code</code> is set to 1500. Calling
+  * <code>publish()</code> also fails the client fails to connect; in this case
+  * <code>error.code</code> is set to 1013. The following code adds a
+  * <code>completionHandler</code> when calling the <code>publish()</code> method:
+  * <pre>
+  * session.publish(publisher, null, function (error) {
+  *   if (error) {
+  *     console.log(error.message);
+  *   } else {
+  *     console.log("Publishing a stream.");
+  *   }
+  * });
+  * </pre>
   *
   * @returns The Publisher object for this stream.
   *
   * @method #publish
   * @memberOf Session
   */
-  this.publish = function(publisher, properties, completionHandler) {
-    var errorMsg;
+    this.publish = function(publisher, properties, completionHandler) {
+      if(typeof publisher === 'function') {
+        completionHandler = publisher;
+        publisher = undefined;
+      }
+      if(typeof properties === 'function') {
+        completionHandler = properties;
+        properties = undefined;
+      }
+      if (this.isNot('connected')) {
+        /*jshint camelcase:false*/
+        _analytics.logError(1010, 'OT.exception',
+          'We need to be connected before you can publish', null, {
+          action: 'publish',
+          variation: 'Failure',
+          payload_type: 'reason',
+          payload: 'We need to be connected before you can publish',
+          session_id: _sessionId,
+          partner_id: _apiKey,
+          widgetId: _widgetId,
+          widget_type: 'Controller'
+        });
 
-    if (this.isNot('connected')) {
-      _analytics.logError(1010, 'tb.exception', "We need to be connected before you can publish", null, {
-        action: 'publish',
-        variation: 'Failure',
-        payload_type: "reason",
-        payload: "We need to be connected before you can publish",
-        session_id: _sessionId,
-        partner_id: _apiKey,
-        widgetId: _widgetId,
-        widget_type: 'Controller'
-      });
+        if (completionHandler && OT.$.isFunction(completionHandler)) {
+          dispatchError(OT.ExceptionCodes.NOT_CONNECTED,
+            'We need to be connected before you can publish', completionHandler);
+        }
 
-      if (completionHandler && OT.$.isFunction(completionHandler)) {
-        errorMsg = "We need to be connected before you can publish";
-        OT.$.callAsync(completionHandler, new OT.Error(OT.ExceptionCodes.NOT_CONNECTED, errorMsg));
+        return null;
       }
 
-      return null;
-    }
-
-    if (!permittedTo("publish")) {
-      this.logEvent('publish', 'Failure', 'reason', 'This token does not allow publishing. The role must be at least `publisher` to enable this functionality');
-
-      TB.handleJsException("This token does not allow publishing. The role must be at least `publisher` to enable this functionality", OT.ExceptionCodes.UNABLE_TO_PUBLISH, {
-        session: this
-      });
-      return null;
-    }
-
-    // If the user has passed in an ID of a element then we create a new publisher.
-    if (!publisher || typeof(publisher)==='string' || publisher.nodeType == Node.ELEMENT_NODE){
-      // Initiate a new Publisher with the new session credentials
-     publisher = OT.initPublisher(this.apiKey, publisher, properties);
-    }
-    else if (publisher instanceof OT.Publisher){
-
-      // If the publisher already has a session attached to it we can
-      if( "session" in publisher && publisher.session && "sessionId" in publisher.session ){
-        // send a warning message that we can't publish again.
-        if( publisher.session.sessionId === this.sessionId){
-          OT.warn("Cannot publish " + publisher.guid + " again to " + this.sessionId + ". Please call session.unpublish(publisher) first.");
-        }
-        else {
-          OT.warn("Cannot publish " + publisher.guid + " publisher already attached to " + publisher.session.sessionId+ ". Please call session.unpublish(publisher) first.");
-        }
+      if (!permittedTo('publish')) {
+        this.logEvent('publish', 'Failure', 'reason',
+          'This token does not allow publishing. The role must be at least `publisher` ' +
+          'to enable this functionality');
+        dispatchError(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+          'This token does not allow publishing. The role must be at least `publisher` ' +
+          'to enable this functionality', completionHandler);
+        return null;
       }
-    }
-    else {
-      errorMsg = "Session.publish :: First parameter passed in is neither a string nor an instance of the Publisher";
-      OT.error(errorMsg);
-      throw new Error(errorMsg);
-    }
 
-    if (completionHandler && OT.$.isFunction(completionHandler)) publisher.once('publishComplete', completionHandler);
+      // If the user has passed in an ID of a element then we create a new publisher.
+      if (!publisher || typeof(publisher)==='string' || publisher.nodeType === Node.ELEMENT_NODE) {
+        // Initiate a new Publisher with the new session credentials
+        publisher = OT.initPublisher(publisher, properties);
 
-    // Add publisher reference to the session
-    publisher._.publishToSession(this);
+      } else if (publisher instanceof OT.Publisher){
 
-    // return the embed publisher
-    return publisher;
-  };
+        // If the publisher already has a session attached to it we can
+        if ('session' in publisher && publisher.session && 'sessionId' in publisher.session) {
+          // send a warning message that we can't publish again.
+          if( publisher.session.sessionId === this.sessionId){
+            OT.warn('Cannot publish ' + publisher.guid + ' again to ' +
+              this.sessionId + '. Please call session.unpublish(publisher) first.');
+          } else {
+            OT.warn('Cannot publish ' + publisher.guid + ' publisher already attached to ' +
+              publisher.session.sessionId+ '. Please call session.unpublish(publisher) first.');
+          }
+        }
+
+      } else {
+        dispatchError(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+          'Session.publish :: First parameter passed in is neither a ' +
+          'string nor an instance of the Publisher',
+          completionHandler);
+        return;
+      }
+
+      publisher.once('publishComplete', function(err) {
+        if (err) {
+          dispatchError(OT.ExceptionCodes.UNABLE_TO_PUBLISH,
+            'Session.publish :: ' + err.message,
+            completionHandler);
+          return;
+        }
+
+        if (completionHandler && OT.$.isFunction(completionHandler)) {
+          completionHandler.apply(null, arguments);
+        }
+      });
+
+      // Add publisher reference to the session
+      publisher._.publishToSession(this);
+
+      // return the embed publisher
+      return publisher;
+    };
 
  /**
   * Ceases publishing the specified publisher's audio-video stream
-  * to the session. By default, the local representation of the audio-video stream is removed from the
-  * web page.< Upon successful termination, the Session object on every connected
-  * web page dispatches
+  * to the session. By default, the local representation of the audio-video stream is
+  * removed from the web page. Upon successful termination, the Session object on every
+  * connected web page dispatches
   * a <code>streamDestroyed</code> event.
   * </p>
   *
   * <p>
   * To prevent the Publisher from being removed from the DOM, add an event listener for the
-  * <code>streamDestroyed</code> event and call the <code>preventDefault()</code> method of the event object.
+  * <code>streamDestroyed</code> event dispatched by the Publisher object and call the
+  * <code>preventDefault()</code> method of the event object.
   * </p>
   *
   * <p>
-  * <i>Note:</i> If you intend to reuse a Publisher object created using <code>TB.initPublisher()</code>
-  * to publish to different sessions sequentially, call either <code>Session.disconnect()</code> or
-  * <code>Session.unpublish()</code>. Do not call both. Then call the <code>preventDefault()</code> method
-  * of the <code>streamDestroyed</code> or <code>sessionDisconnected</code> event object to prevent the
-  * Publisher object from being removed from the page. Be sure to call <code>preventDefault()</code> only
-  * if the <code>connection.connectionId</code> property of the Stream object in the event matches the
-  * <code>connection.connectionId</code> property of your Session object (to ensure that you are preventing
-  * the default behavior for your published streams, not for other streams that you subscribe to).
+  * <i>Note:</i> If you intend to reuse a Publisher object created using
+  * <code>OT.initPublisher()</code> to publish to different sessions sequentially, call
+  * either <code>Session.disconnect()</code> or <code>Session.unpublish()</code>. Do not call
+  * both. Then call the <code>preventDefault()</code> method of the <code>streamDestroyed</code>
+  * or <code>sessionDisconnected</code> event object to prevent the Publisher object from being
+  * removed from the page. Be sure to call <code>preventDefault()</code> only if the
+  * <code>connection.connectionId</code> property of the Stream object in the event matches the
+  * <code>connection.connectionId</code> property of your Session object (to ensure that you are
+  * preventing the default behavior for your published streams, not for other streams that you
+  * subscribe to).
   * </p>
   *
   * <h5>Events dispatched:</h5>
   *
   * <p>
   * <code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
-  * The stream associated with the Publisher has been destroyed. Dispatched on
-  * the Publisher's browser and on the browser for all connections subscribing
-  * to the publisher's stream.
-  *                </p>
+  * The stream associated with the Publisher has been destroyed. Dispatched on by the
+  * Publisher on on the Publisher's browser. Dispatched by the Session object on
+  * all other connections subscribing to the publisher's stream.
+  * </p>
   *
   * <h5>Example</h5>
   *
-  * The following example publishes a stream to a session and adds a Disconnect link to the web page. Clicking this link causes the stream to stop being published.
+  * The following example publishes a stream to a session and adds a Disconnect link to the
+  * web page. Clicking this link causes the stream to stop being published.
   *
   * <pre>
   * &lt;script&gt;
@@ -14443,17 +16696,16 @@ OT.Session = function(sessionId) {
   *     var sessionID = ""; // Replace with your own session ID.
   *                      // See https://dashboard.tokbox.com/projects
   *     var token = "Replace with the TokBox token string provided to you."
-  *     var session = TB.initSession(sessionID);
-  *     session.addEventListener("sessionConnected", sessionConnectHandler);
-  *     session.connect(apiKey, token);
+  *     var session = OT.initSession(apiKey, sessionID);
+  *     session.on("sessionConnected", function sessionConnectHandler(event) {
+  *         // This assumes that there is a DOM element with the ID 'publisher':
+  *         publisher = OT.initPublisher('publisher');
+  *         session.publish(publisher);
+  *     });
+  *     session.connect(token);
   *     var publisher;
   *
-  *     function sessionConnectHandler(event) {
-  *         publisher = TB.initPublisher(apiKey, 'publisher');
-  *                         // This assumes that there is a DOM element with the ID 'publisher'.
-  *         session.publish(publisher);
-  *     }
-  *     function unpublsh() {
+  *     function unpublish() {
   *         session.unpublish(publisher);
   *     }
   * &lt;/script&gt;
@@ -14478,27 +16730,30 @@ OT.Session = function(sessionId) {
   * @method #unpublish
   * @memberOf Session
   */
-  this.unpublish = function(publisher) {
-    if (!publisher) {
-      OT.error('OT.Session.unpublish: publisher parameter missing.');
-      return;
-    }
+    this.unpublish = function(publisher) {
+      if (!publisher) {
+        OT.error('OT.Session.unpublish: publisher parameter missing.');
+        return;
+      }
 
-    // Unpublish the localMedia publisher
-    publisher._.unpublishFromSession(this);
-  };
+      // Unpublish the localMedia publisher
+      publisher._.unpublishFromSession(this, 'unpublished');
+    };
 
 
  /**
   * Subscribes to a stream that is available to the session. You can get an array of
   * available streams from the <code>streams</code> property of the <code>sessionConnected</code>
-  * and <code>streamCreated</code> events (see <a href="SessionConnectEvent.html">SessionConnectEvent</a> and
+  * and <code>streamCreated</code> events (see
+  * <a href="SessionConnectEvent.html">SessionConnectEvent</a> and
   * <a href="StreamEvent.html">StreamEvent</a>).
   * </p>
   * <p>
-  * The subscribed stream is displayed on the local web page by replacing the specified element in the DOM with a streaming video display.
-  * If the width and height of the display do not match the 4:3 aspect ratio of the video signal, the video stream is cropped to fit
-  * the display. If the stream lacks a video component, a blank screen with an audio indicator is displayed in place of the video stream.
+  * The subscribed stream is displayed on the local web page by replacing the specified element
+  * in the DOM with a streaming video display. If the width and height of the display do not
+  * match the 4:3 aspect ratio of the video signal, the video stream is cropped to fit
+  * the display. If the stream lacks a video component, a blank screen with an audio indicator
+  * is displayed in place of the video stream.
   * </p>
   *
   * <p>
@@ -14508,59 +16763,37 @@ OT.Session = function(sessionId) {
   *
   * <h5>Example</h5>
   *
-  * The following code subscribes to available streams at the time that a session is connected
+  * The following code subscribes to other clients streams:
   *
   * <pre>
   * var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
   * var sessionID = ""; // Replace with your own session ID.
   *                     // See https://dashboard.tokbox.com/projects
   *
-  * var session = TB.initSession(sessionID);
-  * session.addEventListener("sessionConnected", sessionConnectHandler);
-  * session.connect(apiKey, token);
-  *
-  * function sessionConnectHandler(event) {
-  *     for (var i = 0; i &lt; event.streams.length; i++) {
-  *         var stream = event.streams[i];
-  *         displayStream(stream);
-  *     }
-  * }
-  *
-  * function displayStream(stream) {
-  *     var div = document.createElement('div');
-  *     div.setAttribute('id', 'stream' + stream.streamId);
-  *     var streamsContainer = document.getElementById('streamsContainer');
-  *     streamsContainer.appendChild(div);
-  *     subscriber = session.subscribe(stream, 'stream' + stream.streamId);
-  * }
-  * </pre>
-  * <p>
-  * You can also add an event listener for the <code>streamCreated</code> event. The Session object dispatches this event when a new stream is created.
-  * </p>
-  * <pre>
-  * session.addEventListener("streamCreated", streamCreatedHandler);
-  *
-  * function streamCreatedHandler(event) {
-  *     for (var i = 0; i &lt; event.streams.length; i++) {
-  *         var stream = event.streams[i];
-  *         displayStream(stream);
-  *     }
-  * }
+  * var session = OT.initSession(apiKey, sessionID);
+  * session.on("streamCreated", function(event) {
+  *   subscriber = session.subscribe(streamContainer);
+  * });
+  * session.connect(token);
   * </pre>
   *
-  * @param {Stream} stream The Stream object representing the stream to which we are trying to subscribe.
+  * @param {Stream} stream The Stream object representing the stream to which we are trying to
+  * subscribe.
   *
-  * @param {String} targetElement The ID of the existing DOM element
-  * that the Subscriber replaces. If you do not specify a <code>targetElement</code>, the application
-  * appends a new DOM element to the HTML <code>body</code>.
+  * @param {Object} targetElement (Optional) The DOM element or the <code>id</code> attribute of
+  * the existing DOM element used to determine the location of the Subscriber video in the HTML
+  * DOM. See the <code>insertMode</code> property of the <code>properties</code> parameter. If
+  * you do not specify a <code>targetElement</code>, the application appends a new DOM element
+  * to the HTML <code>body</code>.
   *
   * @param {Object} properties This is an object that contains the following properties:
   *    <ul>
-  *       <li><code>audioVolume</code> (Number) &#151; The desired audio volume, between 0 and 100, when the Subscriber
-  *       is first opened (default: 50). After you subscribe to the stream, you can adjust the volume by calling
-  *       the <a href="Subscriber.html#setAudioVolume"><code>setAudioVolume()</code> method</a> of the Subscriber
-  *       object. This volume setting affects local playback only; it does not affect the stream's volume on other
-  *       clients.</li>
+  *       <li><code>audioVolume</code> (Number) &#151; The desired audio volume, between 0 and
+  *       100, when the Subscriber is first opened (default: 50). After you subscribe to the
+  *       stream, you can adjust the volume by calling the
+  *       <a href="Subscriber.html#setAudioVolume"><code>setAudioVolume()</code> method</a> of the
+  *       Subscriber object. This volume setting affects local playback only; it does not affect
+  *       the stream's volume on other clients.</li>
   *
   *       <li><code>height</code> (Number) &#151; The desired height, in pixels, of the
   *        displayed Subscriber video stream (default: 198). <i>Note:</i> Use the
@@ -14568,10 +16801,53 @@ OT.Session = function(sessionId) {
   *       of the Subscriber video; do not set the height and width of the DOM element
   *       (using CSS).</li>
   *
-  *       <li><code>style.nameDisplayMode</code> (String) &#151; This property determines whether to display the
-  *       stream name. Possible values are: <code>"auto"</code> (the name is displayed when the stream is first
-  *       displayed and when the user mouses over the display), <code>"off"</code> (the name is not displayed),
-  *       and <code>"on"</code> (the name is displayed).</li>
+  *       <li>
+  *         <code>insertMode</code> (String) &#151; Specifies how the Subscriber object will
+  *         be inserted in the HTML DOM. See the <code>targetElement</code> parameter. This
+  *         string can have the following values:
+  *         <ul>
+  *           <li><code>"replace"</code> &#151; The Subscriber object replaces contents of the
+  *             targetElement. This is the default.</li>
+  *           <li><code>"after"</code> &#151; The Subscriber object is a new element inserted
+  *             after the targetElement in the HTML DOM. (Both the Subscriber and targetElement
+  *             have the same parent element.)</li>
+  *           <li><code>"before"</code> &#151; The Subscriber object is a new element inserted
+  *             before the targetElement in the HTML DOM. (Both the Subsciber and targetElement
+  *             have the same parent element.)</li>
+  *           <li><code>"append"</code> &#151; The Subscriber object is a new element added as a
+  *             child of the targetElement. If there are other child elements, the Subscriber is
+  *             appended as the last child element of the targetElement.</li>
+  *         </ul>
+  *       </li>
+  *
+  *   <li>
+  *   <code>style</code> (Object) &#151; An object containing properties that define the initial
+  *   appearance of user interface controls of the Subscriber. The <code>style</code> object
+  *   includes the following properties:
+  *     <ul>
+  *       <li><code>backgroundImageURI</code> (String) &mdash; A URI for an image to display as
+  *       the background image when a video is not displayed. (A video may not be displayed if
+  *       you call <code>subscribeToVideo(false)</code> on the Subscriber object). You can pass an
+  *       http or https URI to a PNG, JPEG, or non-animated GIF file location. You can also use the
+  *       <code>data</code> URI scheme (instead of http or https) and pass in base-64-encrypted
+  *       PNG data, such as that obtained from the
+  *       <a href="Subscriber.html#getImgData">Subscriber.getImgData()</a> method. For example,
+  *       you could set the property to <code>"data:VBORw0KGgoAA..."</code>, where the portion of
+  *       the string after <code>"data:"</code> is the result of a call to
+  *       <code>Subscriber.getImgData()</code>. If the URL or the image data is invalid, the
+  *       property is ignored (the attempt to set the image fails silently).</li>
+  *
+  *       <li><code>buttonDisplayMode</code> (String) &mdash; How to display the speaker controls
+  *       Possible values are: <code>"auto"</code> (controls are displayed when the stream is first
+  *       displayed and when the user mouses over the display), <code>"off"</code> (controls are not
+  *       displayed), and <code>"on"</code> (controls are always displayed).</li>
+  *
+  *       <li><code>nameDisplayMode</code> (String) &#151; Whether to display the stream name.
+  *       Possible values are: <code>"auto"</code> (the name is displayed when the stream is first
+  *       displayed and when the user mouses over the display), <code>"off"</code> (the name is not
+  *       displayed), and <code>"on"</code> (the name is always displayed).</li>
+  *   </ul>
+  *   </li>
   *
   *       <li><code>subscribeToAudio</code> (Boolean) &#151; Whether to initially subscribe to audio
   *       (if available) for the stream (default: <code>true</code>).</li>
@@ -14587,50 +16863,93 @@ OT.Session = function(sessionId) {
   *
   *    </ul>
   *
-  * @signature subscribe(stream, targetElement, properties)
-  * @returns {Subscriber} The Subscriber object for this stream. Stream control functions are exposed through the Subscriber object.
+  * @param {Function} completionHandler (Optional) A function to be called when the call to the
+  * <code>subscribe()</code> method succeeds or fails. This function takes one parameter &mdash;
+  * <code>error</code>. On success, the <code>completionHandler</code> function is not passed any
+  * arguments. On error, the function is passed an <code>error</code> object, defined by the
+  * <a href="Error.html">Error</a> class, has two properties: <code>code</code> (an integer) and
+  * <code>message</code> (a string), which identify the cause of the failure. The following
+  * code adds a <code>completionHandler</code> when calling the <code>subscribe()</code> method:
+  * <pre>
+  * session.subscribe(stream, "subscriber", null, function (error) {
+  *   if (error) {
+  *     console.log(error.message);
+  *   } else {
+  *     console.log("Subscribed to stream: " + stream.id);
+  *   }
+  * });
+  * </pre>
+  *
+  * @signature subscribe(stream, targetElement, properties, completionHandler)
+  * @returns {Subscriber} The Subscriber object for this stream. Stream control functions
+  * are exposed through the Subscriber object.
   * @method #subscribe
   * @memberOf Session
   */
-  this.subscribe = function(stream, targetElement, properties, completionHandler) {
-    var errorMsg;
+    this.subscribe = function(stream, targetElement, properties, completionHandler) {
 
-    if (!this.connection || !this.connection.connectionId) {
-      errorMsg = "Session.subscribe :: Connection required to subscribe";
-      OT.error(errorMsg);
-      throw new Error(errorMsg);
-    }
+      if (!this.connection || !this.connection.connectionId) {
+        dispatchError(OT.ExceptionCodes.UNABLE_TO_SUBSCRIBE,
+                      'Session.subscribe :: Connection required to subscribe',
+                      completionHandler);
+        return;
+      }
 
-    if (!stream) {
-      errorMsg = "Session.subscribe :: stream cannot be null";
-      OT.error(errorMsg);
-      throw new Error(errorMsg);
-    }
+      if (!stream) {
+        dispatchError(OT.ExceptionCodes.UNABLE_TO_SUBSCRIBE,
+                      'Session.subscribe :: stream cannot be null',
+                      completionHandler);
+        return;
+      }
 
-    if (!stream.hasOwnProperty("streamId")) {
-      errorMsg = "Session.subscribe :: invalid stream object";
-      OT.error(errorMsg);
-      throw new Error(errorMsg);
-    }
+      if (!stream.hasOwnProperty('streamId')) {
+        dispatchError(OT.ExceptionCodes.UNABLE_TO_SUBSCRIBE,
+                      'Session.subscribe :: invalid stream object',
+                      completionHandler);
+        return;
+      }
 
-    var subscriber = new OT.Subscriber(targetElement, OT.$.extend(properties || {}, {
+      if(typeof targetElement === 'function') {
+        completionHandler = targetElement;
+        targetElement = undefined;
+      }
+
+      if(typeof properties === 'function') {
+        completionHandler = properties;
+        properties = undefined;
+      }
+
+      var subscriber = new OT.Subscriber(targetElement, OT.$.extend(properties || {}, {
         session: this
-    }));
+      }));
 
-    if (completionHandler && OT.$.isFunction(completionHandler)) subscriber.once('subscribeComplete', completionHandler);
+      subscriber.once('subscribeComplete', function(err) {
+        if (err) {
+          dispatchError(OT.ExceptionCodes.UNABLE_TO_SUBSCRIBE,
+                'Session.subscribe :: ' + err.message,
+                completionHandler);
 
-    OT.subscribers.add(subscriber);
-    subscriber.subscribe(stream);
+          return;
+        }
 
-    return subscriber;
-  };
+        if (completionHandler && OT.$.isFunction(completionHandler)) {
+          completionHandler.apply(null, arguments);
+        }
+      });
+
+      OT.subscribers.add(subscriber);
+      subscriber.subscribe(stream);
+
+      return subscriber;
+    };
 
  /**
-  * Stops subscribing to a stream in the session. the display of the audio-video stream is removed from the local web page.
+  * Stops subscribing to a stream in the session. the display of the audio-video stream is
+  * removed from the local web page.
   *
   * <h5>Example</h5>
   * <p>
-  * The following code subscribes to available streams at the time that a session is connected. For each stream, the code also
+  * The following code subscribes to other clients' streams. For each stream, the code also
   * adds an Unsubscribe link.
   * </p>
   * <pre>
@@ -14639,27 +16958,20 @@ OT.Session = function(sessionId) {
   *                     // See https://dashboard.tokbox.com/projects
   * var streams = [];
   *
-  * var session = TB.initSession(sessionID);
-  * session.addEventListener("sessionConnected", sessionConnectHandler);
-  * session.connect(apiKey, token);
-  *
-  * function sessionConnectHandler(event) {
-  *     for (var i = 0; i &lt; event.streams.length; i++) {
-  *         var stream = event.streams[i];
-  *         displayStream(stream);
-  *     }
-  * }
+  * var session = OT.initSession(apiKey, sessionID);
+  * session.on("streamCreated", function(event) {
+  *     var stream = event.stream;
+  *     displayStream(stream);
+  * });
+  * session.connect(token);
   *
   * function displayStream(stream) {
   *     var div = document.createElement('div');
   *     div.setAttribute('id', 'stream' + stream.streamId);
   *
-  *
-  *
-  *     var subscriber = session.subscribe(stream, 'stream' + stream.streamId);
+  *     var subscriber = session.subscribe(stream, div);
   *     subscribers.push(subscriber);
   *
-  *
   *     var aLink = document.createElement('a');
   *     aLink.setAttribute('href', 'javascript: unsubscribe("' + subscriber.id + '")');
   *     aLink.innerHTML = "Unsubscribe";
@@ -14689,24 +17001,24 @@ OT.Session = function(sessionId) {
   * @method #unsubscribe
   * @memberOf Session
   */
-  this.unsubscribe = function(subscriber) {
-    if (!subscriber) {
-      var errorMsg = "OT.Session.unsubscribe: subscriber cannot be null";
-      OT.error(errorMsg);
-      throw new Error(errorMsg);
-    }
+    this.unsubscribe = function(subscriber) {
+      if (!subscriber) {
+        var errorMsg = 'OT.Session.unsubscribe: subscriber cannot be null';
+        OT.error(errorMsg);
+        throw new Error(errorMsg);
+      }
 
-    if (!subscriber.stream) {
-        OT.warn("OT.Session.unsubscribe:: tried to unsubscribe a subscriber that had no stream");
+      if (!subscriber.stream) {
+        OT.warn('OT.Session.unsubscribe:: tried to unsubscribe a subscriber that had no stream');
         return false;
-    }
+      }
 
-    OT.debug("OT.Session.unsubscribe: subscriber " + subscriber.id);
+      OT.debug('OT.Session.unsubscribe: subscriber ' + subscriber.id);
 
-    subscriber.destroy();
+      subscriber.destroy();
 
-    return true;
-  };
+      return true;
+    };
 
  /**
   * Returns an array of local Subscriber objects for a given stream.
@@ -14721,16 +17033,17 @@ OT.Session = function(sessionId) {
   * @method #getSubscribersForStream
   * @memberOf Session
   */
-  this.getSubscribersForStream = function(stream) {
-    return OT.subscribers.where({streamId: stream.id});
-  };
+    this.getSubscribersForStream = function(stream) {
+      return OT.subscribers.where({streamId: stream.id});
+    };
 
  /**
   * Returns the local Publisher object for a given stream.
   *
   * @param {Stream} stream The stream for which you want to find the Publisher.
   *
-  * @returns {Publisher} A Publisher object for the specified stream. Returns <code>null</code> if there is no local Publisher object
+  * @returns {Publisher} A Publisher object for the specified stream. Returns
+  * <code>null</code> if there is no local Publisher object
   * for the specified stream.
   *
   * @see <a href="#forceUnpublish">forceUnpublish()</a>
@@ -14740,93 +17053,111 @@ OT.Session = function(sessionId) {
   * @method #getPublisherForStream
   * @memberOf Session
   */
-  this.getPublisherForStream = function(stream) {
-    var streamId;
+    this.getPublisherForStream = function(stream) {
+      var streamId,
+          errorMsg;
 
-    if (typeof(stream) == "string") {
-      streamId = stream;
-    } else if (typeof(stream) == "object" && stream && stream.hasOwnProperty("id")) {
-      streamId = stream.id;
-    } else {
-      errorMsg = "Session.getPublisherForStream :: Invalid stream type";
-      OT.error(errorMsg);
-      throw new Error(errorMsg);
-    }
-
-    return OT.publishers.where({streamId: streamId})[0];
-  };
-
-
-  // Private Session API: for internal OT use only
-  this._ = {
-    jsepSubscribe: function(stream, subscribeToVideo, subscribeToAudio) {
-      return _socket.jsepSubscribe(stream.connection.id, stream.id, subscribeToVideo, subscribeToAudio);
-    }.bind(this),
-
-    jsepUnsubscribe: function(stream) {
-      return _socket.jsepUnsubscribe(stream.connection.id, stream.id);
-    }.bind(this),
-
-    jsepCandidate: function(toConnectionId, stream, candidate) {
-      return _socket.jsepCandidate(toConnectionId, stream.id, candidate);
-    }.bind(this),
-
-    jsepOffer: function(toConnectionId, stream, offerSDP) {
-      return _socket.jsepOffer(toConnectionId, stream.id, offerSDP);
-    }.bind(this),
-
-    jsepAnswer: function(toConnectionId, stream, answerSDP) {
-      return _socket.jsepAnswer(toConnectionId, stream.id, answerSDP);
-    }.bind(this),
-
-    // session.on("signal", function(SignalEvent))
-    // session.on("signal:{type}", function(SignalEvent))
-    dispatchSignal: function(fromConnection, type, data) {
-      var event = new OT.SignalEvent(type, data, fromConnection);
-      event.target = this;
-
-      // signal a "signal" event
-      // NOTE: trigger doesn't support defaultAction, and therefore preventDefault.
-      this.trigger(OT.Event.names.SIGNAL, event);
-
-      // signal an "signal:{type}" event" if there was a custom type
-      if (type) this.dispatchEvent(event);
-    }.bind(this),
-
-    modifySubscriber: function(subscriber, key, value) {
-      return _socket.modifySubscriber(subscriber, key, value);
-    }.bind(this),
-
-    createStream: function(publisherId, name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo) {
-      _socket.createStream(publisherId, name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo);
-    }.bind(this),
-
-    modifyStream: function(streamId, key, value) {
-      if (!streamId || !key || value === void 0) {
-        OT.error('OT.Session.modifyStream: must provide streamId, key and value to modify a stream property.');
-        return;
+      if (typeof stream === 'string') {
+        streamId = stream;
+      } else if (typeof stream === 'object' && stream && stream.hasOwnProperty('id')) {
+        streamId = stream.id;
+      } else {
+        errorMsg = 'Session.getPublisherForStream :: Invalid stream type';
+        OT.error(errorMsg);
+        throw new Error(errorMsg);
       }
 
-      _socket.updateStream(streamId, key, value);
-    }.bind(this),
+      return OT.publishers.where({streamId: streamId})[0];
+    };
 
-    destroyStream: function(streamId) {
-      _socket.destroyStream(streamId);
-    }.bind(this)
-  };
+
+    // Private Session API: for internal OT use only
+    this._ = {
+      jsepCandidateP2p: function(streamId, subscriberId, candidate) {
+        return _socket.jsepCandidateP2p(streamId, subscriberId, candidate);
+      }.bind(this),
+
+      jsepCandidate: function(streamId, candidate) {
+        return _socket.jsepCandidate(streamId, candidate);
+      }.bind(this),
+
+      jsepOffer: function(streamId, offerSdp) {
+        return _socket.jsepOffer(streamId, offerSdp);
+      }.bind(this),
+
+      jsepOfferP2p: function(streamId, subscriberId, offerSdp) {
+        return _socket.jsepOfferP2p(streamId, subscriberId, offerSdp);
+      }.bind(this),
+
+      jsepAnswer: function(streamId, answerSdp) {
+        return _socket.jsepAnswer(streamId, answerSdp);
+      }.bind(this),
+
+      jsepAnswerP2p: function(streamId, subscriberId, answerSdp) {
+        return _socket.jsepAnswerP2p(streamId, subscriberId, answerSdp);
+      }.bind(this),
+
+      // session.on("signal", function(SignalEvent))
+      // session.on("signal:{type}", function(SignalEvent))
+      dispatchSignal: function(fromConnection, type, data) {
+        var event = new OT.SignalEvent(type, data, fromConnection);
+        event.target = this;
+
+        // signal a "signal" event
+        // NOTE: trigger doesn't support defaultAction, and therefore preventDefault.
+        this.trigger(OT.Event.names.SIGNAL, event);
+
+        // signal an "signal:{type}" event" if there was a custom type
+        if (type) this.dispatchEvent(event);
+      }.bind(this),
+
+      subscriberCreate: function(stream, subscriber, channelsToSubscribeTo, completion) {
+        return _socket.subscriberCreate(stream.id, subscriber.widgetId,
+          channelsToSubscribeTo, completion);
+      }.bind(this),
+
+      subscriberDestroy: function(stream, subscriber) {
+        return _socket.subscriberDestroy(stream.id, subscriber.widgetId);
+      }.bind(this),
+
+      subscriberUpdate: function(stream, subscriber, attributes) {
+        return _socket.subscriberUpdate(stream.id, subscriber.widgetId, attributes);
+      }.bind(this),
+
+      subscriberChannelUpdate: function(stream, subscriber, channel, attributes) {
+        return _socket.subscriberChannelUpdate(stream.id, subscriber.widgetId, channel.id,
+          attributes);
+      }.bind(this),
+
+      streamCreate: function(name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo,
+        frameRate, completion) {
+        _socket.streamCreate(name, orientation, encodedWidth, encodedHeight, hasAudio, hasVideo,
+          frameRate, OT.Config.get('bitrates', 'min', OT.APIKEY),
+          OT.Config.get('bitrates', 'max', OT.APIKEY), completion);
+      }.bind(this),
+
+      streamDestroy: function(streamId) {
+        _socket.streamDestroy(streamId);
+      }.bind(this),
+
+      streamChannelUpdate: function(stream, channel, attributes) {
+        _socket.streamChannelUpdate(stream.id, channel.id, attributes);
+      }.bind(this)
+    };
 
 
  /**
-  * Sends a signal to each client or specified clients in the session. Specify a <code>connections</code> property
-  * of the <code>signal</code> parameter to limit the recipients of the signal; otherwise the signal is sent to
-  * each client connected to the session.
+  * Sends a signal to each client or specified clients in the session. Specify a
+  * <code>connections</code> property of the <code>signal</code> parameter to limit the
+  * recipients of the signal; otherwise the signal is sent to each client connected to
+  * the session.
   * <p>
-  * The following example sends a signal of type "foo" with a specified data payload to all clients connected to
-  * the session:
+  * The following example sends a signal of type "foo" with a specified data payload to all
+  * clients connected to the session:
   * <pre>
   * session.signal({
   *     type: "foo",
-  *     data: {messageString:"hello", scores:[7, 14, 23]},
+  *     data: "hello"
   *   },
   *   function(error) {
   *     if (error) {
@@ -14838,17 +17169,18 @@ OT.Session = function(sessionId) {
   * );
   * </pre>
   * <p>
-  * Calling this method without limiting the set of recipient clients will result in multiple signals sent (one to
-  * each client in the session). For information on charges for signaling, see the <a href="http://tokbox.com/pricing">OpenTok
+  * Calling this method without limiting the set of recipient clients will result in
+  * multiple signals sent (one to each client in the session). For information on charges
+  * for signaling, see the <a href="http://tokbox.com/pricing">OpenTok
   * pricing</a> page.
   * <p>
-  * The following example sends a signal of type "foo" with a specified data payload to two specific clients
-  * connected to the session:
+  * The following example sends a signal of type "foo" with a specified data payload to two
+  * specific clients connected to the session:
   * <pre>
   * session.signal({
   *     type: "foo",
   *     to: [connection1, connection2]; // connection1 and 2 are Connection objects
-  *     data: {messageString:"hello"}
+  *     data: "hello"
   *   },
   *   function(error) {
   *     if (error) {
@@ -14860,51 +17192,50 @@ OT.Session = function(sessionId) {
   * );
   * </pre>
   * <p>
-  * Each of the properties of the object you pass into the <code>signal()</code> method is optional.
-  * <p>
-  * Add an event handler for the <code>signal</code> event to listen for all signals sent in the session.
-  * Add an event handler for the <code>signal:type</code> event to listen for signals of a specified type
-  * only (replace <code>type</code>, in <code>signal:type</code>, with the type of signal to listen for). The
-  * Session object dispatches these events. (See <a href="#events">events</a>.)
-  * <p>
-  * Each property is optional. If you set none of the properties, you will send a signal with no data or type to
-  * each client connected to the session.</p>
+  * Add an event handler for the <code>signal</code> event to listen for all signals sent in
+  * the session. Add an event handler for the <code>signal:type</code> event to listen for
+  * signals of a specified type only (replace <code>type</code>, in <code>signal:type</code>,
+  * with the type of signal to listen for). The Session object dispatches these events. (See
+  * <a href="#events">events</a>.)
   *
   * @param {Object} signal An object that contains the following properties defining the signal:
   * <ul>
-  *   <li><code>to</code> &mdash; (Array) An array of <a href="Connection.html">Connection</a> objects, corresponding
-  *      to clients that the message is to be sent to. If you do not specify this property, the signal is sent to all
-  *      clients connected to the session.</li>
-  *   <li><code>data</code> &mdash; (Object) The data to send. Valid types for data are a JSON-parsable object,
-  *     a JSON-parsable array, a string, a number, a Boolean value, or <code>null</code>. Numbers cannot be NaN or Infinity.
-  *     The limit to the size of data is 8kB.</li>
-  *   <li><code>type</code> &mdash; (String) The type of the signal. You can use the type to filter signals when setting an
-  *     event handler for the <code>signal:type</code> event (where you replace <code>type</code> with the type string).
-  *     The maximum length of the <code>type</code> string is 128 characters, and it must contain only letters (A-Z and a-z),
+  *   <li><code>to</code> &mdash; (Array) An array of <a href="Connection.html">Connection</a>
+  *      objects, corresponding to clients that the message is to be sent to. If you do not
+  *      specify this property, the signal is sent to all clients connected to the session.</li>
+  *   <li><code>data</code> &mdash; (Signal) The data to send. The limit to the size of data
+  *     string is 8kB.</li>
+  *   <li><code>type</code> &mdash; (String) The type of the signal. You can use the type to
+  *     filter signals when setting an event handler for the <code>signal:type</code> event
+  *     (where you replace <code>type</code> with the type string). The maximum length of the
+  *     <code>type</code> string is 128 characters, and it must contain only letters (A-Z and a-z),
   *     numbers (0-9), '-', '_', and '~'.</li>
   *   </li>
   * </ul>
   *
-  * <p>Each property is optional. If you set none of the properties, you will send a signal with no data or type to
-  * each client connected to the session.</p>
+  * <p>Each property is optional. If you set none of the properties, you will send a signal
+  * with no data or type to each client connected to the session.</p>
   *
-  * @param {Function} completionHandler A function that is called when sending the signal succeeds or fails. This
-  * function takes one parameter, <code>error</code>, which is set to <code>null</code> if sending the signal succeeds;
-  * otherwise the <code>error</code> object has the following properties:
+  * @param {Function} completionHandler A function that is called when sending the signal
+  * succeeds or fails. This function takes one parameter &mdash; <code>error</code>.
+  * On success, the <code>completionHandler</code> function is not passed any
+  * arguments. On error, the function is passed an <code>error</code> object, defined by the
+  * <a href="Error.html">Error</a> class. The <code>error</code> object has the following
+  * properties:
   *
   * <ul>
   *   <li><code>code</code> &mdash; (Number) An error code, which can be one of the following:
   *     <table style="width:100%">
   *         <tr>
-  *           <td>400</td> <td>One of the signal properties &mdash; data, type, or to &mdash; is invalid.
-  *                         Or the data cannot be parsed as JSON.</td>
+  *           <td>400</td> <td>One of the signal properties &mdash; data, type, or to &mdash;
+  *                         is invalid. Or the data cannot be parsed as JSON.</td>
   *         </tr>
   *         <tr>
   *           <td>404</td> <td>The to connection does not exist.</td>
   *         </tr>
   *         <tr>
-  *           <td>413</td> <td>The type string exceeds the maximum length (128 characters),
-  *                        or the data property exceeds the maximum size (8kB).</td>
+  *           <td>413</td> <td>The type string exceeds the maximum length (128 bytes),
+  *                        or the data string exceeds the maximum size (8 kB).</td>
   *         </tr>
   *         <tr>
   *           <td>500</td> <td>The WebSocket connection is down.</td>
@@ -14912,109 +17243,147 @@ OT.Session = function(sessionId) {
   *      </table>
   *   </li>
   *   <li><code>reason</code> &mdash; (String) A description of the error.</li>
-  *   <li><code>signal</code> &mdash; (Object) An object with properties corresponding to the values passed
-  *     into the <code>signal()</code> method &mdash; <code>data</code>, <code>to</code>, and <code>type</code>.
+  *   <li><code>signal</code> &mdash; (Object) An object with properties corresponding to the
+  *     values passed into the <code>signal()</code> method &mdash; <code>data</code>,
+  *     <code>to</code>, and <code>type</code>.
   *   </li>
   * </ul>
   *
-  * <p>Note that the <code>completionHandler</code> success result (<code>error == null</code>) indicates that the
-  * options passed into the <code>Session.signal()</code> method are valid and the signal was sent. It does
-  * <i>not</i> indicate that the signal was successfully received by any of the intended recipients.
+  * <p>Note that the <code>completionHandler</code> success result (<code>error == null</code>)
+  * indicates that the options passed into the <code>Session.signal()</code> method are valid
+  * and the signal was sent. It does <i>not</i> indicate that the signal was sucessfully
+  * received by any of the intended recipients.
   *
   * @method #signal
   * @memberOf Session
   * @see <a href="#event:signal">signal</a> and <a href="#event:signal:type">signal:type</a> events
   */
-  this.signal = function(options, completion) {
-    _socket.signal(options, completion);
-  };
+    this.signal = function(options, completion) {
+      var _options = options,
+          _completion = completion;
+
+      if (OT.$.isFunction(_options)) {
+        _completion = _options;
+        _options = null;
+      }
+
+      _socket.signal(_options, _completion);
+      if (options && options.data && (typeof(options.data) !== 'string')) {
+        OT.warn('Signaling of anything other than Strings is deprecated. ' +
+                'Please update the data property to be a string.');
+      }
+      this.logEvent('signal', 'send', 'type',
+        (options && options.data) ? typeof(options.data) : 'null');
+    };
 
  /**
-  * 	Forces a remote connection to leave the session.
+  *   Forces a remote connection to leave the session.
   *
   * <p>
-  * 	The <code>forceDisconnect()</code> method is normally used as a moderation tool
+  *   The <code>forceDisconnect()</code> method is normally used as a moderation tool
   *        to remove users from an ongoing session.
   * </p>
   * <p>
-  * 	When a connection is terminated using the <code>forceDisconnect()</code>,
+  *   When a connection is terminated using the <code>forceDisconnect()</code>,
   *        <code>sessionDisconnected</code>, <code>connectionDestroyed</code> and
   *        <code>streamDestroyed</code> events are dispatched in the same way as they
-  *        would be if the connection had terminated itself using the <code>disconnect()</code> method. However,
-  *        the <code>reason</code> property of a {@link ConnectionEvent} or {@link StreamEvent} object specifies
-  *        <code>"forceDisconnected"</code> as the reason for the destruction of the connection and stream(s).
+  *        would be if the connection had terminated itself using the <code>disconnect()</code>
+  *        method. However, the <code>reason</code> property of a {@link ConnectionEvent} or
+  *        {@link StreamEvent} object specifies <code>"forceDisconnected"</code> as the reason
+  *        for the destruction of the connection and stream(s).
   * </p>
   * <p>
-  * 	While you can use the <code>forceDisconnect()</code> method to terminate your own connection,
+  *   While you can use the <code>forceDisconnect()</code> method to terminate your own connection,
   *        calling the <code>disconnect()</code> method is simpler.
   * </p>
   * <p>
-  * 	The TB object dispatches an <code>exception</code> event if the user's role
-  * 	does not include permissions required to force other users to disconnect.
-  *        You define a user's role when you create the user token using the <code>generate_token()</code>
-  *        method using our <a href="/opentok/libraries/server/">server-side libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
-  * 	See <a href="ExceptionEvent.html">ExceptionEvent</a> and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+  *   The OT object dispatches an <code>exception</code> event if the user's role
+  *   does not include permissions required to force other users to disconnect.
+  *   You define a user's role when you create the user token using the
+  *   <code>generate_token()</code> method using
+  *   <a href="/opentok/api/tools/documentation/api/server_side_libraries.html">OpenTok
+  *   server-side libraries</a> or the
+  *   <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page.
+  *   See <a href="ExceptionEvent.html">ExceptionEvent</a> and <a href="OT.html#on">OT.on()</a>.
   * </p>
   * <p>
-  * 	The application throws an error if the session is not connected.
+  *   The application throws an error if the session is not connected.
   * </p>
   *
   * <h5>Events dispatched:</h5>
   *
   * <p>
-  * 	<code>connectionDestroyed</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
+  *   <code>connectionDestroyed</code> (<a href="ConnectionEvent.html">ConnectionEvent</a>) &#151;
   *     On clients other than which had the connection terminated.
   * </p>
   * <p>
-  * 	<code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151;
-  *     The user's role does not allow forcing other user's to disconnect (<code>event.code = 1530</code>),
-  * 	or the specified stream is not publishing to the session (<code>event.code = 1535</code>).
+  *   <code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151;
+  *     The user's role does not allow forcing other user's to disconnect (<code>event.code =
+  *     1530</code>),
+  *   or the specified stream is not publishing to the session (<code>event.code = 1535</code>).
   * </p>
   * <p>
-  * 	<code>sessionDisconnected</code> (<a href="SessionDisconnectEvent.html">SessionDisconnectEvent</a>) &#151;
+  *   <code>sessionDisconnected</code>
+  *   (<a href="SessionDisconnectEvent.html">SessionDisconnectEvent</a>) &#151;
   *     On the client which has the connection terminated.
   * </p>
   * <p>
-  * 	<code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
+  *   <code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
   *     If streams are stopped as a result of the connection ending.
   * </p>
   *
   * @param {Connection} connection The connection to be disconnected from the session.
-  * This value can either be a <a href="Connection.html">Connection</a> object or a connection ID (which can be
-  * obtained from the <code>connectionId</code> property of the Connection object).
+  * This value can either be a <a href="Connection.html">Connection</a> object or a connection
+  * ID (which can be obtained from the <code>connectionId</code> property of the Connection object).
+  *
+  * @param {Function} completionHandler (Optional) A function to be called when the call to the
+  * <code>forceDiscononnect()</code> method succeeds or fails. This function takes one parameter
+  * &mdash; <code>error</code>. On success, the <code>completionHandler</code> function is
+  * not passed any arguments. On error, the function is passed an <code>error</code> object
+  * parameter. The <code>error</code> object, defined by the <a href="Error.html">Error</a>
+  * class, has two properties: <code>code</code> (an integer)
+  * and <code>message</code> (a string), which identify the cause of the failure.
+  * Calling <code>forceDisconnect()</code> fails if the role assigned to your
+  * token is not "moderator"; in this case <code>error.code</code> is set to 1520. The following
+  * code adds a <code>completionHandler</code> when calling the <code>forceDisconnect()</code>
+  * method:
+  * <pre>
+  * session.forceDisconnect(connection, function (error) {
+  *   if (error) {
+  *       console.log(error);
+  *     } else {
+  *       console.log("Connection forced to disconnect: " + connection.id);
+  *     }
+  *   });
+  * </pre>
   *
   * @method #forceDisconnect
   * @memberOf Session
   */
 
-  this.forceDisconnect = function(connectionOrConnectionId, completionHandler) {
-    var notPermittedErrorMsg = "This token does not allow forceDisconnect. The role must be at least `moderator` to enable this functionality";
+    this.forceDisconnect = function(connectionOrConnectionId, completionHandler) {
+      var notPermittedErrorMsg = 'This token does not allow forceDisconnect. ' +
+        'The role must be at least `moderator` to enable this functionality';
 
-    if (permittedTo("forceDisconnect")) {
-      var connectionId = typeof(connectionOrConnectionId) === 'string' ? connectionOrConnectionId : connectionOrConnectionId.id;
+      if (permittedTo('forceDisconnect')) {
+        var connectionId = typeof connectionOrConnectionId === 'string' ?
+          connectionOrConnectionId : connectionOrConnectionId.id;
 
-      if (completionHandler) {
-        var work = new RemoteWork(this, completionHandler, {
-          timeoutMessage: "Timed out while waiting for connection " + connectionId + " to be force Disconnected."
+        _socket.forceDisconnect(connectionId, function(err) {
+          if (err) {
+            dispatchError(OT.ExceptionCodes.UNABLE_TO_FORCE_DISCONNECT,
+              notPermittedErrorMsg, completionHandler);
+
+          } else if (completionHandler && OT.$.isFunction(completionHandler)) {
+            completionHandler.apply(null, arguments);
+          }
         });
-
-        work.failsOnExceptionCodes({
-          1520: notPermittedErrorMsg
-        });
-
-        _callbacks.forceDisconnect[connectionId] = work;
+      } else {
+        // if this throws an error the handleJsException won't occur
+        dispatchError(OT.ExceptionCodes.UNABLE_TO_FORCE_DISCONNECT,
+          notPermittedErrorMsg, completionHandler);
       }
-
-      _socket.forceDisconnect(connectionId);
-    } else {
-      // if this throws an error the handleJsException won't occur
-      if (completionHandler) OT.$.callAsync(completionHandler, new OT.Error(null, notPermittedErrorMsg));
-
-      TB.handleJsException(notPermittedErrorMsg, OT.ExceptionCodes.UNABLE_TO_FORCE_DISCONNECT, {
-        session: this
-      });
-    }
-  };
+    };
 
  /**
   * Forces the publisher of the specified stream to stop publishing the stream.
@@ -15026,128 +17395,175 @@ OT.Session = function(sessionId) {
   * set to <code>"forceUnpublished"</code>.
   * </p>
   * <p>
-  * The TB object dispatches an <code>exception</code> event if the user's role
+  * The OT object dispatches an <code>exception</code> event if the user's role
   * does not include permissions required to force other users to unpublish.
   * You define a user's role when you create the user token using the <code>generate_token()</code>
-  * method using our <a href="/opentok/libraries/server/">server-side libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a> page page.
-  * You pass the token string as a parameter of the <code>connect()</code> method of the Session object.
-  * See <a href="ExceptionEvent.html">ExceptionEvent</a> and <a href="TB.html#addEventListener">TB.addEventListener()</a>.
+  * method using the
+  * <a href="/opentok/api/tools/documentation/api/server_side_libraries.html">OpenTok
+  * server-side libraries</a> or the <a href="https://dashboard.tokbox.com/projects">Dashboard</a>
+  * page.
+  * You pass the token string as a parameter of the <code>connect()</code> method of the Session
+  * object. See <a href="ExceptionEvent.html">ExceptionEvent</a> and
+  * <a href="OT.html#on">OT.on()</a>.
   * </p>
   *
   * <h5>Events dispatched:</h5>
   *
   * <p>
-  * 	<code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151;
+  *   <code>exception</code> (<a href="ExceptionEvent.html">ExceptionEvent</a>) &#151;
   *     The user's role does not allow forcing other users to unpublish.
   * </p>
   * <p>
-  * 	<code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
+  *   <code>streamDestroyed</code> (<a href="StreamEvent.html">StreamEvent</a>) &#151;
   *     The stream has been unpublished. The Session object dispatches this on all clients
   *     subscribed to the stream, as well as on the publisher's client.
   * </p>
   *
   * @param {Stream} stream The stream to be unpublished.
   *
+  * @param {Function} completionHandler (Optional) A function to be called when the call to the
+  * <code>forceUnpublish()</code> method succeeds or fails. This function takes one parameter
+  * &mdash; <code>error</code>. On success, the <code>completionHandler</code> function is
+  * not passed any arguments. On error, the function is passed an <code>error</code> object
+  * parameter. The <code>error</code> object, defined by the <a href="Error.html">Error</a>
+  * class, has two properties: <code>code</code> (an integer)
+  * and <code>message</code> (a string), which identify the cause of the failure. Calling
+  * <code>forceUnpublish()</code> fails if the role assigned to your token is not "moderator";
+  * in this case <code>error.code</code> is set to 1530. The following code adds a
+  * <code>completionHandler</code> when calling the <code>forceUnpublish()</code> method:
+  * <pre>
+  * session.forceUnpublish(stream, function (error) {
+  *   if (error) {
+  *       console.log(error);
+  *     } else {
+  *       console.log("Connection forced to disconnect: " + connection.id);
+  *     }
+  *   });
+  * </pre>
+  *
   * @method #forceUnpublish
   * @memberOf Session
   */
-  this.forceUnpublish = function(streamOrStreamId, completionHandler) {
-    var notPermittedErrorMsg = "This token does not allow forceUnpublish. The role must be at least `moderator` to enable this functionality";
+    this.forceUnpublish = function(streamOrStreamId, completionHandler) {
+      var notPermittedErrorMsg = 'This token does not allow forceUnpublish. ' +
+        'The role must be at least `moderator` to enable this functionality';
 
-    if (permittedTo("forceUnpublish")) {
-      var stream = typeof(streamOrStreamId) === 'string' ? this.streams.get(streamOrStreamId) : streamOrStreamId;
+      if (permittedTo('forceUnpublish')) {
+        var stream = typeof streamOrStreamId === 'string' ?
+          this.streams.get(streamOrStreamId) : streamOrStreamId;
 
-      if (completionHandler) {
-        var work = new RemoteWork(this, completionHandler, {
-          timeoutMessage: "Timed out while waiting for stream " + stream.id + " to be force unpublished."
+        _socket.forceUnpublish(stream.id, function(err) {
+          if (err) {
+            dispatchError(OT.ExceptionCodes.UNABLE_TO_FORCE_UNPUBLISH,
+              notPermittedErrorMsg, completionHandler);
+          } else if (completionHandler && OT.$.isFunction(completionHandler)) {
+            completionHandler.apply(null, arguments);
+          }
         });
-
-        work.failsOnExceptionCodes({
-          1530: notPermittedErrorMsg
-        });
-
-        _callbacks.forceUnpublish[stream.id] = work;
+      } else {
+        // if this throws an error the handleJsException won't occur
+        dispatchError(OT.ExceptionCodes.UNABLE_TO_FORCE_UNPUBLISH,
+          notPermittedErrorMsg, completionHandler);
       }
+    };
 
-      _socket.forceUnpublish(stream.id);
-    } else {
-      // if this throws an error the handleJsException won't occur
-      if (completionHandler) OT.$.callAsync(completionHandler, new OT.Error(null, notPermittedErrorMsg));
+    this.getStateManager = function() {
+      OT.warn('Fixme: Have not implemented session.getStateManager');
+    };
 
-      TB.handleJsException(notPermittedErrorMsg, OT.ExceptionCodes.UNABLE_TO_FORCE_UNPUBLISH, {
-        session: this
-      });
-    }
-  };
+    OT.$.defineGetters(this, {
+      apiKey: function() { return _apiKey; },
+      token: function() { return _token; },
+      connected: function() { return this.is('connected'); },
+      connection: function() {
+        return _socket && _socket.id ? this.connections.get(_socket.id) : null;
+      },
+      sessionId: function() { return _sessionId; },
+      id: function() { return _sessionId; },
+      capabilities: function() {
+        var connection =  this.connection;
+        return connection ? connection.permissions : new OT.Capabilities([]);
+      }.bind(this)
+    }, true);
 
-  this.getStateManager = function() {
-      OT.warn("Fixme: Have not implemented session.getStateManager");
-  };
 
-  OT.$.defineGetters(this, {
-    apiKey: function() { return _apiKey; },
-    token: function() { return _token; },
-    connected: function() { return this.is('connected'); },
-    connection: function() { return _socket && _socket.id ? this.connections.get(_socket.id) : null; },
-    capabilities: function() { return _socket ? _socket.capabilities : new OT.Capabilities([]); },
-    sessionId: function() { return _sessionId; },
-    id: function() { return _sessionId; }
-  }, true);
+  /**
+   * A new client, other than your own, has connected to the session.
+   * @name connectionCreated
+   * @event
+   * @memberof Session
+   * @see ConnectionEvent
+   * @see <a href="OT.html#initSession">OT.initSession()</a>
+   */
 
+  /**
+   * A client, other than your own, has disconnected from the session.
+   * @name connectionDestroyed
+   * @event
+   * @memberof Session
+   * @see ConnectionEvent
+   */
+
+  /**
+   * The page has connected to an OpenTok session. This event is dispatched asynchronously
+   * in response to a successful call to the <code>connect()</code> method of a Session
+   * object. Before calling the <code>connect()</code> method, initialize the session by
+   * calling the <code>OT.initSession()</code> method. For a code example and more details,
+   * see <a href="#connect">Session.connect()</a>.
+   * @name sessionConnected
+   * @event
+   * @memberof Session
+   * @see SessionConnectEvent
+   * @see <a href="#connect">Session.connect()</a>
+   * @see <a href="OT.html#initSession">OT.initSession()</a>
+   */
+
+  /**
+   * The client has disconnected from the session. This event may be dispatched asynchronously
+   * in response to a successful call to the <code>disconnect()</code> method of the Session object.
+   * The event may also be disptached if a session connection is lost inadvertantly, as in the case
+   * of a lost network connection.
+   * <p>
+   * The default behavior is that all Subscriber objects are unsubscribed and removed from the
+   * HTML DOM. Each Subscriber object dispatches a <code>destroyed</code> event when the element is
+   * removed from the HTML DOM. If you call the <code>preventDefault()</code> method in the event
+   * listener for the <code>sessionDisconnect</code> event, the default behavior is prevented, and
+   * you can, optionally, clean up Subscriber objects using your own code.
+*
+   * @name sessionDisconnected
+   * @event
+   * @memberof Session
+   * @see <a href="#disconnect">Session.disconnect()</a>
+   * @see <a href="#disconnect">Session.forceDisconnect()</a>
+   * @see SessionDisconnectEvent
+   */
+
+  /**
+   * A new stream, published by another client, has been created on this session. For streams
+   * published by your own client, the Publisher object dispatches a <code>streamCreated</code>
+   * event. For a code example and more details, see {@link StreamEvent}.
+   * @name streamCreated
+   * @event
+   * @memberof Session
+   * @see StreamEvent
+   * @see <a href="Session.html#publish">Session.publish()</a>
+   */
 
 	/**
-	 * A new connection to this session has been created.
-	 * @name connectionCreated
-	 * @event
-	 * @memberof Session
-	 * @see ConnectionEvent
-	 * @see <a href="TB.html#initSession">TB.initSession()</a>
-	 */
-
-	/**
-	 * A connection to this session has ended.
-	 * @name connectionDestroyed
-	 * @event
-	 * @memberof Session
-	 * @see ConnectionEvent
-	 */
-
-	/**
-	 * The page has connected to an OpenTok session. This event is dispatched asynchronously in response to
-	 * a successful call to the <code>connect()</code> method of a Session object. Before calling the <code>connect()</code>
-	 * method, initialize the session by calling the <code>TB.initSession()</code> method. For a code example and more details,
-	 * see <a href="#connect">Session.connect()</a>.
-	 * @name sessionConnected
-	 * @event
-	 * @memberof Session
-	 * @see SessionConnectEvent
-	 * @see <a href="#connect">Session.connect()</a>
-	 * @see <a href="TB.html#initSession">TB.initSession()</a>
-	 */
-
-	/**
-	 * The session has disconnected. This event may be dispatched asynchronously in response to a successful call to the
-	 * <code>disconnect()</code> method of the Session object. The event may also be disptached if a session connection is lost
-	 * inadvertantly, as in the case of a lost network connection.
-	 * @name sessionDisconnected
-	 * @event
-	 * @memberof Session
-	 * @see <a href="#disconnect">Session.disconnect()</a>
-	 * @see <a href="#disconnect">Session.forceDisconnect()</a>
-	 * @see SessionDisconnectEvent
-	 */
-
-	/**
-	 * A new stream has been created on this session. For a code example and more details, see {@link StreamEvent}.
-	 * @name streamCreated
-	 * @event
-	 * @memberof Session
-	 * @see StreamEvent
-	 * @see <a href="Session.html#publish">Session.publish()</a>
-	 */
-
-	/**
-	 * A stream has closed on this connection. For a code example and more details, see {@link StreamEvent}.
+	 * A stream from another client has stopped publishing to the session.
+	 * <p>
+	 * The default behavior is that all Subscriber objects that are subscribed to the stream are
+	 * unsubscribed and removed from the HTML DOM. Each Subscriber object dispatches a
+	 * <code>destroyed</code> event when the element is removed from the HTML DOM. If you call the
+	 * <code>preventDefault()</code> method in the event listener for the
+	 * <code>streamDestroyed</code> event, the default behavior is prevented and you can clean up
+	 * Subscriber objects using your own code. See
+	 * <a href="Session.html#getSubscribersForStream">Session.getSubscribersForStream()</a>.
+	 * <p>
+	 * For streams published by your own client, the Publisher object dispatches a
+	 * <code>streamDestroyed</code> event.
+	 * <p>
+	 * For a code example and more details, see {@link StreamEvent}.
 	 * @name streamDestroyed
 	 * @event
 	 * @memberof Session
@@ -15155,8 +17571,10 @@ OT.Session = function(sessionId) {
 	 */
 
 	/**
-	 * A stream has started or stopped publishing audio or video (see <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a> and
-	 * <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a>); or the <code>videoDimensions</code> property of the Stream
+	 * A stream has started or stopped publishing audio or video (see
+	 * <a href="Publisher.html#publishAudio">Publisher.publishAudio()</a> and
+	 * <a href="Publisher.html#publishVideo">Publisher.publishVideo()</a>); or the
+	 * <code>videoDimensions</code> property of the Stream
 	 * object has changed (see <a href="Stream.html#"videoDimensions>Stream.videoDimensions</a>).
 	 * @name streamPropertyChanged
 	 * @event
@@ -15170,24 +17588,29 @@ OT.Session = function(sessionId) {
 	 */
 
 	/**
-	 * A signal was received from the session. The <a href="SignalEvent.html">SignalEvent</a> class defines this event object.
-	 * It includes the following properties:
+	 * A signal was received from the session. The <a href="SignalEvent.html">SignalEvent</a>
+	 * class defines this event object. It includes the following properties:
 	 * <ul>
-	 *   <li><code>data</code> &mdash; (Object) The data payload sent with the signal (if there is one).</li>
-	 *   <li><code>from</code> &mdash; (<a href="Connection.html">Connection</a>) The Connection corresponding to the
-	 *   client that sent with the signal.</li>
-	 *   <li><code>type</code> &mdash; (String) The type assigned to the signal (if there is one).</li>
+	 *   <li><code>data</code> &mdash; (String) The data string sent with the signal (if there
+	 *       is one).</li>
+	 *   <li><code>from</code> &mdash; (<a href="Connection.html">Connection</a>) The Connection
+	 *       corresponding to the client that sent with the signal.</li>
+	 *   <li><code>type</code> &mdash; (String) The type assigned to the signal (if there is
+	 *       one).</li>
 	 * </ul>
 	 * <p>
-	 * You can register to receive all signals sent in the session, by adding an event handler for the <code>signal</code>
-	 * event. For example, the following code adds an event handler to process all signals sent in the session:
+	 * You can register to receive all signals sent in the session, by adding an event handler
+	 * for the <code>signal</code> event. For example, the following code adds an event handler
+	 * to process all signals sent in the session:
 	 * <pre>
-	 * session.addEventListener("signal", function(event) {
-	 *   console.log("Signal sent from connection " + event.from.id);
+	 * session.on("signal", function(event) {
+	 *   console.log("Signal sent from connection: " + event.from.id);
+	 *   console.log("Signal data: " + event.data);
 	 * });
 	 * </pre>
-	 * <p>You can register for signals of a specfied type by adding an event handler for the <code>signal:type</code>
-	 * event (replacing <code>type</code> with the actual type string to filter on).
+	 * <p>You can register for signals of a specfied type by adding an event handler for the
+	 * <code>signal:type</code> event (replacing <code>type</code> with the actual type string
+	 * to filter on).
 	 *
 	 * @name signal
 	 * @event
@@ -15198,27 +17621,30 @@ OT.Session = function(sessionId) {
 	 */
 
 	/**
-	 * A signal of the specified type was received from the session. The <a href="SignalEvent.html">SignalEvent</a> class
-	 * defines this event object.
+	 * A signal of the specified type was received from the session. The
+	 * <a href="SignalEvent.html">SignalEvent</a> class defines this event object.
 	 * It includes the following properties:
 	 * <ul>
-	 *   <li><code>data</code> &mdash; (Object) The data payload sent with the signal.</li>
-	 *   <li><code>from</code> &mdash; (<a href="Connection.html">Connection</a>) The Connection corresponding to the
-	 *   client that sent with the signal.</li>
-	 *   <li><code>type</code> &mdash; (String) The type assigned to the signal (if there is one).</li>
+	 *   <li><code>data</code> &mdash; (String) The data string sent with the signal.</li>
+	 *   <li><code>from</code> &mdash; (<a href="Connection.html">Connection</a>) The Connection
+	 *   corresponding to the client that sent with the signal.</li>
+	 *   <li><code>type</code> &mdash; (String) The type assigned to the signal (if there is one).
+	 *   </li>
 	 * </ul>
 	 * <p>
-	 * You can register for signals of a specfied type by adding an event handler for the <code>signal:type</code>
-	 * event (replacing <code>type</code> with the actual type string to filter on). For example, the following code adds
-	 * an event handler for signals of type "foo":
+	 * You can register for signals of a specfied type by adding an event handler for the
+	 * <code>signal:type</code> event (replacing <code>type</code> with the actual type string
+	 * to filter on). For example, the following code adds an event handler for signals of
+	 * type "foo":
 	 * <pre>
-	 * session.addEventListener("signal:foo", function(event) {
+	 * session.on("signal:foo", function(event) {
 	 *   console.log("foo signal sent from connection " + event.from.id);
+	 *   console.log("Signal data: " + event.data);
 	 * });
 	 * </pre>
 	 * <p>
-	 * You can register to receive <i>all</i> signals sent in the session, by adding an event handler for the
-	 * <code>signal</code> event.
+	 * You can register to receive <i>all</i> signals sent in the session, by adding an event
+	 * handler for the <code>signal</code> event.
 	 *
 	 * @name signal:type
 	 * @event
@@ -15227,12 +17653,10 @@ OT.Session = function(sessionId) {
 	 * @see SignalEvent
 	 * @see <a href="#event:signal">signal</a> event
 	 */
-
-
-};
+  };
 
 })(window);
-(function(window) {
+!(function() {
   var style = document.createElement('link');
   style.type = 'text/css';
   style.media = 'screen';
@@ -15241,7 +17665,8 @@ OT.Session = function(sessionId) {
   var head = document.head || document.getElementsByTagName('head')[0];
   head.appendChild(style);
 })(window);
-(function(window){
+!(function(){
+/*global define*/
 
 // Register as a named AMD module, since TokBox could be concatenated with other
 // files that may use define, but not via a proper concatenation script that
@@ -15249,8 +17674,8 @@ OT.Session = function(sessionId) {
 // way to register. Uppercase TB is used because AMD module names are
 // derived from file names, and OpenTok is normally delivered in an uppercase
 // file name.
-if ( typeof define === "function" && define.amd ) {
-  define( "TB", [], function () { return TB; } );
-}
+  if (typeof define === 'function' && define.amd) {
+    define( 'TB', [], function () { return TB; } );
+  }
 
 })(window);
diff --git a/browser/components/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
index bf31eebd5ec8..8511150e817f 100644
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -51,7 +51,7 @@
     </div>
 
     <!-- libs -->
-    <script src="http://static.opentok.com/webrtc/v2.0/js/TB.min.js"></script>
+    <script src="https://static.opentok.com/webrtc/v2.2/js/opentok.min.js"></script>
     <script type="text/javascript" src="shared/libs/webl10n-20130617.js"></script>
     <script type="text/javascript" src="shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="shared/libs/lodash-2.4.1.js"></script>
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index d1bc6795371c..f42797877d83 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -5,7 +5,7 @@
 /* global loop:true */
 
 var loop = loop || {};
-loop.webapp = (function($, TB, webl10n) {
+loop.webapp = (function($, OT, webl10n) {
   "use strict";
 
   /**
@@ -202,7 +202,7 @@ loop.webapp = (function($, TB, webl10n) {
         }
       }
       this.loadView(new sharedViews.ConversationView({
-        sdk: TB,
+        sdk: OT,
         model: this._conversation
       }));
     }
@@ -227,4 +227,4 @@ loop.webapp = (function($, TB, webl10n) {
     init: init,
     WebappRouter: WebappRouter
   };
-})(jQuery, window.TB, document.webL10n);
+})(jQuery, window.OT, document.webL10n);

From 0bfbde3fe12eaf184c8232d624e4d511a77c17db Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 048/117] Bug 994391 - Removed obsolete readme.html file.
 r=Standard8

--HG--
extra : transplant_source : %C6%7D%08%0A%8C%16%A2%25_%28.%E2%A6%11N%83%FF%D2%AD%E2
---
 readme.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 readme.html

diff --git a/readme.html b/readme.html
deleted file mode 100644
index e69de29bb2d1..000000000000

From 7fae1e6c4c1de1cbf173ad669cdf5f6d7b76a34f Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 049/117] Bug 972019: Terminate a call. r=Standard8

--HG--
extra : transplant_source : %ADE%A7%A4%A5%F2v%114%95%10%21%C6Trg%CA%86y%19
---
 .../loop/content/shared/css/common.css        |   9 +-
 .../loop/content/shared/css/readme.html       |  10 +-
 .../loop/content/shared/js/views.js           |  97 ++++++++++++-
 .../loop/standalone/content/index.html        |   3 +-
 .../loop/standalone/content/js/webapp.js      |  46 ++++--
 .../loop/standalone/content/l10n/data.ini     |   6 +-
 .../components/loop/test/shared/index.html    |   2 +-
 .../components/loop/test/shared/views_test.js | 131 +++++++++++++++---
 .../loop/test/standalone/index.html           |   2 +-
 .../loop/test/standalone/webapp_test.js       |  83 ++++++++---
 10 files changed, 321 insertions(+), 68 deletions(-)

diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index 511d1d9f7418..83943669802c 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -108,10 +108,15 @@ img {
   border: 1px solid #f77;
 }
 
+.alert.alert-warning {
+  background: #fcf8e3;
+  border: 1px solid #fbeed5;
+}
+
 .alert .close {
   position: relative;
-  top: 0;
-  right: -.8em;
+  top: -.2em;
+  right: -1em;
 }
 
 /* Misc */
diff --git a/browser/components/loop/content/shared/css/readme.html b/browser/components/loop/content/shared/css/readme.html
index 0a714552c79d..70cbd2c70cb2 100644
--- a/browser/components/loop/content/shared/css/readme.html
+++ b/browser/components/loop/content/shared/css/readme.html
@@ -157,17 +157,21 @@
   <h2>Alerts</h2>
 
   <div class="alert alert-error">
-    <button class="close"
-            onclick="var el=this.parentNode;el.classList.add('fade-out');setTimeout(el.remove.bind(el), 500);"></button>
+    <button class="close"></button>
     <p class="message">Oops! Something went really wrong.</p>
   </div>
 
+  <div class="alert alert-warning">
+    <button class="close"></button>
+    <p class="message">Oops! This is a warning.</p>
+  </div>
+
   <script>
   window.onload = function() {
     [].forEach.call(document.querySelectorAll("video"), function(video) {
       video.setAttribute("src", "http://v2v.cc/~j/theora_testsuite/320x240.ogg");
     });
-  }
+  };
   </script>
 </body>
 </html>
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index cb198ebde250..d898a39e30de 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -46,6 +46,10 @@ loop.shared.views = (function(OT) {
     // @see https://bugzilla.mozilla.org/show_bug.cgi?id=991122
     videoStyles: { width: "100%", height: "auto" },
 
+    events: {
+      'click .btn.stop': 'hangup'
+    },
+
     /**
      * Establishes webrtc communication using OT sdk.
      */
@@ -67,24 +71,84 @@ loop.shared.views = (function(OT) {
 
       this.listenTo(this.session, "sessionConnected", this._sessionConnected);
       this.listenTo(this.session, "streamCreated", this._streamCreated);
-      this.listenTo(this.session, "connectionDestroyed", this._sessionEnded);
+      this.listenTo(this.session, "connectionDestroyed",
+                                  this._connectionDestroyed);
+      this.listenTo(this.session, "sessionDisconnected",
+                                  this._sessionDisconnected);
+      this.listenTo(this.session, "networkDisconnected",
+                                  this._networkDisconnected);
     },
 
+    hangup: function(event) {
+      event.preventDefault();
+      this.session.disconnect();
+    },
+
+    /**
+     * Session is created.
+     * http://tokbox.com/opentok/libraries/client/js/reference/SessionConnectEvent.html
+     *
+     * @param  {SessionConnectEvent} event
+     */
     _sessionConnected: function(event) {
       this.session.publish(this.publisher);
-      this._subscribeToStreams(event.streams);
     },
 
+    /**
+     * New created streams are available.
+     * http://tokbox.com/opentok/libraries/client/js/reference/StreamEvent.html
+     *
+     * @param  {StreamEvent} event
+     */
     _streamCreated: function(event) {
       this._subscribeToStreams(event.streams);
     },
 
-    _sessionEnded: function(event) {
-      // XXX: better end user notification
-      alert("Your session has ended. Reason: " + event.reason);
+    /**
+     * Local user hung up.
+     * http://tokbox.com/opentok/libraries/client/js/reference/SessionDisconnectEvent.html
+     *
+     * @param  {SessionDisconnectEvent} event
+     */
+    _sessionDisconnected: function(event) {
       this.model.trigger("session:ended");
+      this.session.unpublish(this.publisher);
     },
 
+    /**
+     * Peer hung up. Disconnects local session.
+     * http://tokbox.com/opentok/libraries/client/js/reference/ConnectionEvent.html
+     *
+     * @param  {ConnectionEvent} event
+     */
+    _connectionDestroyed: function(event) {
+      this.model.trigger("session:peer-hungup", {
+        connectionId: event.connection.connectionId
+      });
+      this.session.unpublish(this.publisher);
+      this.session.disconnect();
+    },
+
+    /**
+     * Network was disconnected.
+     * http://tokbox.com/opentok/libraries/client/js/reference/ConnectionEvent.html
+     *
+     * @param {ConnectionEvent} event
+     */
+    _networkDisconnected: function(event) {
+      this.model.trigger("session:network-disconnected");
+      this.session.unpublish(this.publisher);
+      this.session.disconnect();
+    },
+
+    /**
+     * Subscribes and attaches each available stream to a DOM element.
+     *
+     * XXX: for now we only support a single remote stream, hence a singe DOM
+     *      element.
+     *
+     * @param  {Array} streams A list of media streams.
+     */
     _subscribeToStreams: function(streams) {
       streams.forEach(function(stream) {
         if (stream.connection.connectionId !==
@@ -162,6 +226,29 @@ loop.shared.views = (function(OT) {
       this.collection.add(notification);
     },
 
+    /**
+     * Adds a warning notification to the stack and renders it.
+     *
+     * @return {String} message
+     */
+    warn: function(message) {
+      this.notify({level: "warning", message: message});
+    },
+
+    /**
+     * Adds an error notification to the stack and renders it.
+     *
+     * @return {String} message
+     */
+    error: function(message) {
+      this.notify({level: "error", message: message});
+    },
+
+    /**
+     * Renders this view.
+     *
+     * @return {loop.shared.views.NotificationListView}
+     */
     render: function() {
       this.$el.html(this.collection.map(function(notification) {
         return new NotificationView({
diff --git a/browser/components/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
index 8511150e817f..d81feed6bf0e 100644
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -33,8 +33,7 @@
 
     <div id="conversation" class="conversation hide">
       <nav class="controls">
-        <button class="btn" data-l10n-id="start">Start</button>
-        <button class="btn" data-l10n-id="stop">Stop</button>
+        <button class="btn stop" data-l10n-id="stop"></button>
       </nav>
       <div class="media nested">
         <!-- both these wrappers are required by the SDK; this is fragile and
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index f42797877d83..e10ed499221a 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -80,10 +80,7 @@ loop.webapp = (function($, OT, webl10n) {
 
     _onSessionError: function(error) {
       console.error(error);
-      this.notifier.notify({
-        message: __("unable_retrieve_call_info"),
-        level: "error"
-      });
+      this.notifier.error(__("unable_retrieve_call_info"));
     },
 
     /**
@@ -143,12 +140,24 @@ loop.webapp = (function($, OT, webl10n) {
       this._notifier = options.notifier;
 
       this.listenTo(this._conversation, "session:ready", this._onSessionReady);
-      this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
+      this.listenTo(this._conversation, "session:ended", this._endCall);
+      this.listenTo(this._conversation, "session:peer-hungup",
+                                        this._onPeerHungup);
+      this.listenTo(this._conversation, "session:network-disconnected",
+                                        this._onNetworkDisconnected);
 
       // Load default view
       this.loadView(new HomeView());
     },
 
+    _endCall: function() {
+      var route = "home";
+      if (this._conversation.get("loopToken")) {
+        route = "call/" + this._conversation.get("loopToken");
+      }
+      this.navigate(route, {trigger: true});
+    },
+
     /**
      * Navigates to conversation when the call session is ready.
      */
@@ -157,10 +166,26 @@ loop.webapp = (function($, OT, webl10n) {
     },
 
     /**
-     * Navigates back to initiate when the call session has ended.
+     * Peer hung up. Navigates back to call initiation so the user can start
+     * calling again.
+     *
+     * Event properties:
+     * - {String} connectionId: OT session id
+     *
+     * @param {Object} event
      */
-    _onSessionEnded: function() {
-      this.navigate("call/" + this._conversation.get("token"), {trigger: true});
+    _onPeerHungup: function(event) {
+      this._notifier.warn(__("peer_ended_conversation"));
+      this._endCall();
+    },
+
+    /**
+     * Network disconnected. Navigates back to call initiation so the user can
+     * start calling again.
+     */
+    _onNetworkDisconnected: function() {
+      this._notifier.warn(__("network_disconnected"));
+      this._endCall();
     },
 
     /**
@@ -194,10 +219,7 @@ loop.webapp = (function($, OT, webl10n) {
         if (loopToken) {
           return this.navigate("call/" + loopToken, {trigger: true});
         } else {
-          this._notifier.notify({
-            message: __("Missing conversation information"),
-            level: "error"
-          });
+          this._notifier.error(__("Missing conversation information"));
           return this.navigate("home", {trigger: true});
         }
       }
diff --git a/browser/components/loop/standalone/content/l10n/data.ini b/browser/components/loop/standalone/content/l10n/data.ini
index 81449b841e7f..0c98111e76ce 100644
--- a/browser/components/loop/standalone/content/l10n/data.ini
+++ b/browser/components/loop/standalone/content/l10n/data.ini
@@ -1,15 +1,17 @@
 [en]
 missing_conversation_info=Missing conversation information.
+network_disconnected=The network connection terminated abruptly.
+peer_ended_conversation=Your peer ended the conversation.
 unable_retrieve_call_info=Unable to retrieve conversation information.
-start=Start
 stop=Stop
 start_call=Start the call
 welcome=Welcome to the Loop web client.
 
 [fr]
 missing_conversation_info=Informations de communication manquantes.
+network_disconnected=La connexion réseau semble avoir été interrompue.
+peer_ended_conversation=Votre correspondant a mis fin à la communication.
 unable_retrieve_call_info=Impossible de récupérer les informations liées à cet appel.
-start=Démarrer
 stop=Arrêter
 start_call=Démarrer l'appel
 welcome=Bienvenue sur Loop.
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index 14d1c708bae1..1c68b98b8e32 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -11,7 +11,7 @@
 </head>
 <body>
   <div id="mocha">
-    <p><a href=".">Index</a></p>
+    <p><a href="../">Index</a></p>
   </div>
   <div id="messages"></div>
   <div id="fixtures"></div>
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index 83bda6c92278..4c7c795fe3ca 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -28,7 +28,9 @@ describe("loop.shared.views", function() {
 
     beforeEach(function() {
       fakeSession = _.extend({
-        connect: sandbox.spy()
+        connect: sandbox.spy(),
+        disconnect: sandbox.spy(),
+        unpublish: sandbox.spy()
       }, Backbone.Events);
       fakeSDK = {
         initPublisher: sandbox.spy(),
@@ -36,38 +38,105 @@ describe("loop.shared.views", function() {
       };
     });
 
-    describe("initialize", function() {
+    describe("#initialize", function() {
       it("should require an sdk object", function() {
         expect(function() {
           new sharedViews.ConversationView();
         }).to.Throw(Error, /sdk/);
       });
 
-      it("should initiate a session", function() {
-        new sharedViews.ConversationView({
-          sdk: fakeSDK,
-          model: new sharedModels.ConversationModel()
-        });
+      describe("constructed", function() {
+        var model, view;
 
-        sinon.assert.calledOnce(fakeSession.connect);
-      });
-
-      it("should trigger a session:ended model event when connectionDestroyed" +
-         " event is received/", function(done) {
-          // XXX remove when we implement proper notifications
-          sandbox.stub(window, "alert");
-          var model = new sharedModels.ConversationModel();
-          new sharedViews.ConversationView({
+        beforeEach(function() {
+          model = new sharedModels.ConversationModel();
+          view = new sharedViews.ConversationView({
             sdk: fakeSDK,
             model: model
           });
+        });
 
-          model.once("session:ended", function() {
-            done();
+        it("should initiate a session", function() {
+          sinon.assert.calledOnce(fakeSession.connect);
+        });
+
+        describe("sessionDisconnected event received", function() {
+          it("should trigger a session:ended event", function(done) {
+            model.once("session:ended", function() {
+              done();
+            });
+
+            fakeSession.trigger("sessionDisconnected", {reason: "ko"});
           });
 
-          fakeSession.trigger("connectionDestroyed", {reason: "ko"});
+          it("should unpublish current stream publisher", function() {
+            fakeSession.trigger("sessionDisconnected", {reason: "ko"});
+
+            sinon.assert.calledOnce(fakeSession.unpublish);
+          });
         });
+
+        describe("connectionDestroyed event received", function() {
+          var fakeEvent = {reason: "ko", connection: {connectionId: 42}};
+
+          it("should trigger a session:peer-hungup model event",
+            function(done) {
+              model.once("session:peer-hungup", function(event) {
+                expect(event.connectionId).eql(42);
+                done();
+              });
+
+              fakeSession.trigger("connectionDestroyed", fakeEvent);
+            });
+
+          it("should disconnect the session", function() {
+            fakeSession.trigger("connectionDestroyed", fakeEvent);
+
+            sinon.assert.calledOnce(fakeSession.unpublish);
+          });
+
+          it("should unpublish current stream publisher", function() {
+            fakeSession.trigger("connectionDestroyed", fakeEvent);
+
+            sinon.assert.calledOnce(fakeSession.unpublish);
+          });
+        });
+
+        describe("networkDisconnected event received", function() {
+          it("should trigger a session:network-disconnected event",
+            function(done) {
+              model.once("session:network-disconnected", function() {
+                done();
+              });
+
+              fakeSession.trigger("networkDisconnected");
+            });
+
+          it("should disconnect the session", function() {
+            fakeSession.trigger("networkDisconnected", {reason: "ko"});
+
+            sinon.assert.calledOnce(fakeSession.unpublish);
+          });
+
+          it("should unpublish current stream publisher", function() {
+            fakeSession.trigger("networkDisconnected", {reason: "ko"});
+
+            sinon.assert.calledOnce(fakeSession.unpublish);
+          });
+        });
+      });
+    });
+
+    describe("#hangup", function() {
+      it("should disconnect the session", function() {
+        var model = new sharedModels.ConversationModel();
+        var view = new sharedViews.ConversationView({
+          sdk: fakeSDK,
+          model: model
+        });
+        view.hangup({preventDefault: function() {}});
+        sinon.assert.calledOnce(fakeSession.disconnect);
+      });
     });
   });
 
@@ -168,6 +237,30 @@ describe("loop.shared.views", function() {
       });
     });
 
+    describe("#warn", function() {
+      it("should add a warning notification to the stack", function() {
+        var view = new sharedViews.NotificationListView({collection: coll});
+
+        view.warn("watch out");
+
+        expect(coll).to.have.length.of(1);
+        expect(coll.at(0).get("level")).eql("warning");
+        expect(coll.at(0).get("message")).eql("watch out");
+      });
+    });
+
+    describe("#error", function() {
+      it("should add an error notification to the stack", function() {
+        var view = new sharedViews.NotificationListView({collection: coll});
+
+        view.error("wrong");
+
+        expect(coll).to.have.length.of(1);
+        expect(coll.at(0).get("level")).eql("error");
+        expect(coll.at(0).get("message")).eql("wrong");
+      });
+    });
+
     describe("Collection events", function() {
       var view;
 
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
index ad85824d1933..f84b04324d86 100644
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -11,7 +11,7 @@
 </head>
 <body>
   <div id="mocha">
-    <p><a href=".">Index</a></p>
+    <p><a href="../">Index</a></p>
     <p><a href="../shared/">Shared Tests</a></p>
  </div>
   <div id="messages"></div>
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 6e7f0d110c63..10d1dce89955 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -10,10 +10,16 @@ describe("loop.webapp", function() {
   "use strict";
 
   var sharedModels = loop.shared.models,
-      sandbox;
+      sandbox,
+      notifier;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
+    notifier = {
+      notify: sandbox.spy(),
+      warn: sandbox.spy(),
+      error: sandbox.spy()
+    };
   });
 
   afterEach(function() {
@@ -21,16 +27,10 @@ describe("loop.webapp", function() {
   });
 
   describe("WebappRouter", function() {
-    var conversation, notifier, fakeSessionData;
+    var conversation;
 
     beforeEach(function() {
-      notifier = {notify: sandbox.spy()};
       conversation = new sharedModels.ConversationModel();
-      fakeSessionData = {
-        sessionId:    "sessionId",
-        sessionToken: "sessionToken",
-        apiKey:       "apiKey"
-      };
     });
 
     describe("#constructor", function() {
@@ -131,19 +131,63 @@ describe("loop.webapp", function() {
     });
 
     describe("Events", function() {
+      var router, fakeSessionData;
+
+      beforeEach(function() {
+        fakeSessionData = {
+          sessionId:    "sessionId",
+          sessionToken: "sessionToken",
+          apiKey:       "apiKey"
+        };
+        sandbox.stub(loop.webapp.WebappRouter.prototype, "navigate");
+        conversation.set("loopToken", "fakeToken");
+        router = new loop.webapp.WebappRouter({
+          conversation: conversation,
+          notifier: notifier
+        });
+      });
+
       it("should navigate to call/ongoing once the call session is ready",
         function() {
-          sandbox.stub(loop.webapp.WebappRouter.prototype, "navigate");
-          var router = new loop.webapp.WebappRouter({
-            conversation: conversation,
-            notifier: notifier
-          });
-
-          conversation.setReady(fakeSessionData);
+          conversation.trigger("session:ready");
 
           sinon.assert.calledOnce(router.navigate);
           sinon.assert.calledWith(router.navigate, "call/ongoing");
         });
+
+      it("should navigate to call/{token} when conversation ended", function() {
+        conversation.trigger("session:ended");
+
+        sinon.assert.calledOnce(router.navigate);
+        sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
+      });
+
+      it("should warn the user when peer hangs up", function() {
+        conversation.trigger("session:peer-hungup");
+
+        sinon.assert.calledOnce(notifier.warn);
+      });
+
+      it("should navigate to call/{token} when peer hangs up", function() {
+        conversation.trigger("session:peer-hungup");
+
+        sinon.assert.calledOnce(router.navigate);
+        sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
+      });
+
+      it("should warn the user when network disconnects", function() {
+        conversation.trigger("session:network-disconnected");
+
+        sinon.assert.calledOnce(notifier.warn);
+      });
+
+      it("should navigate to call/{token} when network disconnects",
+        function() {
+          conversation.trigger("session:network-disconnected");
+
+          sinon.assert.calledOnce(router.navigate);
+          sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
+        });
     });
   });
 
@@ -163,10 +207,9 @@ describe("loop.webapp", function() {
     });
 
     describe("#initiate", function() {
-      var notifier, conversation, initiate, view, fakeSubmitEvent;
+      var conversation, initiate, view, fakeSubmitEvent;
 
       beforeEach(function() {
-        notifier = {notify: sandbox.spy()};
         conversation = new sharedModels.ConversationModel();
         view = new loop.webapp.ConversationFormView({
           model: conversation,
@@ -200,10 +243,9 @@ describe("loop.webapp", function() {
     });
 
     describe("Events", function() {
-      var notifier, conversation, view;
+      var conversation, view;
 
       beforeEach(function() {
-        notifier = {notify: sandbox.spy()};
         conversation = new sharedModels.ConversationModel({
           loopToken: "fake"
         });
@@ -217,11 +259,10 @@ describe("loop.webapp", function() {
          " received", function() {
         conversation.trigger("session:error", "tech error");
 
-        sinon.assert.calledOnce(notifier.notify);
         // XXX We should test for the actual message content, but webl10n gets
         //     in the way as translated messages are all empty because matching
         //     DOM elements are missing.
-        sinon.assert.calledWithMatch(notifier.notify, {level: "error"});
+        sinon.assert.calledOnce(notifier.error);
       });
     });
   });

From 83c30ff2f63bfeb362d411b50352e3722fd313dd Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 050/117] Bug 976127 - Get marionette to drive shared and
 desktop-local unit tests, r=Standard8

---
 browser/components/loop/standalone/.gitignore |  1 +
 .../loop/test/shared/frontend_tester.py       | 94 +++++++++++++++++++
 .../components/loop/test/shared/index.html    |  3 +-
 .../loop/test/shared/test_shared_all.py       | 16 ++++
 4 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 browser/components/loop/test/shared/frontend_tester.py
 create mode 100644 browser/components/loop/test/shared/test_shared_all.py

diff --git a/browser/components/loop/standalone/.gitignore b/browser/components/loop/standalone/.gitignore
index 3c3629e647f5..01136b1b056f 100644
--- a/browser/components/loop/standalone/.gitignore
+++ b/browser/components/loop/standalone/.gitignore
@@ -1 +1,2 @@
 node_modules
+*.pyc
diff --git a/browser/components/loop/test/shared/frontend_tester.py b/browser/components/loop/test/shared/frontend_tester.py
new file mode 100644
index 000000000000..6f2c48e22761
--- /dev/null
+++ b/browser/components/loop/test/shared/frontend_tester.py
@@ -0,0 +1,94 @@
+from marionette_test import MarionetteTestCase
+import threading
+import SimpleHTTPServer
+import SocketServer
+import BaseHTTPServer
+import urlparse
+
+PORT = 2222
+DEBUG = False
+
+
+# XXX Once we're on a branch with bug 993478 landed, we may want to get
+# rid of this HTTP server and just use the built-in one from Marionette,
+# since there will less code to maintain, and it will be faster.  We'll
+# need to consider whether this code wants to be shared with WebDriver tests
+# for other browsers, though.
+#
+class ThreadingSimpleServer(SocketServer.ThreadingMixIn,
+                            BaseHTTPServer.HTTPServer):
+    pass
+
+
+class QuietHttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+    def log_message(self, format, *args, **kwargs):
+        pass
+
+
+class BaseTestFrontendUnits(MarionetteTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(BaseTestFrontendUnits, cls).setUpClass()
+
+        if DEBUG:
+            handler = SimpleHTTPServer.SimpleHTTPRequestHandler
+        else:
+            handler = QuietHttpRequestHandler
+
+        cls.server = ThreadingSimpleServer(('', PORT), handler)
+
+        cls.server_thread = threading.Thread(target=cls.server.serve_forever)
+        cls.server_thread.daemon = False
+        cls.server_thread.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.server.shutdown()
+        cls.server_thread.join()
+
+        # make sure everything gets GCed so it doesn't interfere with the next
+        # test class.  Even though this is class-static, each subclass gets
+        # its own instance of this stuff.
+        cls.server_thread = None
+        cls.server = None
+
+    def setUp(self):
+        super(BaseTestFrontendUnits, self).setUp()
+
+    def set_server_prefix(self, srcdir_path=None):
+        self.server_prefix = urlparse.urljoin("http://localhost:" + str(PORT),
+                                              srcdir_path)
+
+    def check_page(self, page):
+
+        self.marionette.navigate(urlparse.urljoin(self.server_prefix, page))
+        self.marionette.find_element("id", 'complete')
+
+        fail_node = self.marionette.find_element("css selector",
+                                                 '.failures > em')
+        if fail_node.text == "0":
+            return
+
+        # This may want to be in a more general place triggerable by an env
+        # var some day if it ends up being something we need often:
+        #
+        # If you have browser-based unit tests which work when loaded manually
+        # but not from marionette, uncomment the two lines below to break
+        # on failing tests, so that the browsers won't be torn down, and you
+        # can use the browser debugging facilities to see what's going on.
+        #from ipdb import set_trace
+        #set_trace()
+
+        raise AssertionError(self.get_failure_details())
+
+    def get_failure_details(self):
+        fail_nodes = self.marionette.find_elements("css selector",
+                                                   '.test.fail')
+        details = ["%d failure(s) encountered:" % len(fail_nodes)]
+        for node in fail_nodes:
+            details.append(
+                node.find_element("tag name", 'h2').text.split("\n")[0])
+            details.append(
+                node.find_element("css selector", '.error').text)
+        return "\n".join(details)
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index 1c68b98b8e32..c1b4c0d46c73 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -27,6 +27,7 @@
   <script src="vendor/chai-1.9.0.js"></script>
   <script src="vendor/sinon-1.9.0.js"></script>
   <script>
+    /*global chai, mocha */
     chai.Assertion.includeStack = true;
     mocha.setup('bdd');
   </script>
@@ -44,7 +45,7 @@
   <script src="router_test.js"></script>
   <script>
     mocha.run(function () {
-      $("#mocha").append("<p>Complete.</p>");
+      $("#mocha").append("<p id='complete'>Complete.</p>");
     });
   </script>
 </body>
diff --git a/browser/components/loop/test/shared/test_shared_all.py b/browser/components/loop/test/shared/test_shared_all.py
new file mode 100644
index 000000000000..771b8cb40d66
--- /dev/null
+++ b/browser/components/loop/test/shared/test_shared_all.py
@@ -0,0 +1,16 @@
+# need to get this dir in the path so that we make the import work
+import os
+import sys
+sys.path.append(os.path.dirname(__file__))
+
+from frontend_tester import BaseTestFrontendUnits
+
+
+class TestSharedUnits(BaseTestFrontendUnits):
+
+    def setUp(self):
+        super(TestSharedUnits, self).setUp()
+        self.set_server_prefix("browser/components/loop/test/shared/")
+
+    def test_units(self):
+        self.check_page("index.html")

From 671c706913dcce9b49f2cf153c5fce1f9ad69340 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 051/117] Bug 995194 Don't unpublish when receiving
 sessionDisconnected, as we've implicitly unpublished already, r=dmose

---
 browser/components/loop/content/shared/js/views.js | 1 -
 browser/components/loop/test/shared/views_test.js  | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index d898a39e30de..3d61b2484fb7 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -112,7 +112,6 @@ loop.shared.views = (function(OT) {
      */
     _sessionDisconnected: function(event) {
       this.model.trigger("session:ended");
-      this.session.unpublish(this.publisher);
     },
 
     /**
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index 4c7c795fe3ca..581a5927a355 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -68,12 +68,6 @@ describe("loop.shared.views", function() {
 
             fakeSession.trigger("sessionDisconnected", {reason: "ko"});
           });
-
-          it("should unpublish current stream publisher", function() {
-            fakeSession.trigger("sessionDisconnected", {reason: "ko"});
-
-            sinon.assert.calledOnce(fakeSession.unpublish);
-          });
         });
 
         describe("connectionDestroyed event received", function() {

From 10938a5fde8f9b6df672005a65d577433af322b6 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 052/117] Bug 972019 - Shared conversation router logic.
 r=dmose

---
 .../loop/content/shared/css/conversation.css  |   5 +
 .../loop/content/shared/js/router.js          | 106 +++++++++++++++++-
 .../loop/standalone/content/js/webapp.js      |  90 +++------------
 .../loop/standalone/content/l10n/data.ini     |   2 +
 .../loop/test/shared/router_test.js           |  88 +++++++++++++++
 .../loop/test/standalone/webapp_test.js       |  39 -------
 6 files changed, 213 insertions(+), 117 deletions(-)

diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
index ad3e199425b4..c7f00617f0ef 100644
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -50,3 +50,8 @@
 .conversation .OT_video-container {
   position: inherit;
 }
+
+/* Call ended view */
+.call-ended p {
+  text-align: center;
+}
diff --git a/browser/components/loop/content/shared/js/router.js b/browser/components/loop/content/shared/js/router.js
index 87712033f75b..64648687c312 100644
--- a/browser/components/loop/content/shared/js/router.js
+++ b/browser/components/loop/content/shared/js/router.js
@@ -6,9 +6,11 @@
 
 var loop = loop || {};
 loop.shared = loop.shared || {};
-loop.shared.router = (function() {
+loop.shared.router = (function(l10n) {
   "use strict";
 
+  var __ = l10n.get;
+
   /**
    * Base Router. Allows defining a main active view and ease toggling it when
    * the active route changes.
@@ -31,7 +33,105 @@ loop.shared.router = (function() {
     }
   });
 
+  /**
+   * Base conversation router, implementing common behaviors when handling
+   * a conversation.
+   */
+  var BaseConversationRouter = BaseRouter.extend({
+    /**
+     * Current conversation.
+     * @type {loop.shared.models.ConversationModel}
+     */
+    _conversation: undefined,
+
+    /**
+     * Notifications dispatcher.
+     * @type {loop.shared.views.NotificationListView}
+     */
+    _notifier: undefined,
+
+    /**
+     * Constructor. Defining it as `constructor` allows implementing an
+     * `initialize` method in child classes without needing calling this parent
+     * one. See http://backbonejs.org/#Model-constructor (same for Router)
+     *
+     * Required options:
+     * - {loop.shared.model.ConversationModel}    model    Conversation model.
+     * - {loop.shared.views.NotificationListView} notifier Notifier component.
+     *
+     * @param {Object} options Options object.
+     */
+    constructor: function(options) {
+      options = options || {};
+      if (!options.conversation) {
+        throw new Error("missing required conversation");
+      }
+      this._conversation = options.conversation;
+
+      if (!options.notifier) {
+        throw new Error("missing required notifier");
+      }
+      this._notifier = options.notifier;
+
+      this.listenTo(this._conversation, "session:ready", this._onSessionReady);
+      this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
+      this.listenTo(this._conversation, "session:peer-hungup",
+                                        this._onPeerHungup);
+      this.listenTo(this._conversation, "session:network-disconnected",
+                                        this._onNetworkDisconnected);
+
+      BaseRouter.apply(this, arguments);
+    },
+
+    /**
+     * Starts the call. This method should be overriden.
+     */
+    startCall: function() {},
+
+    /**
+     * Ends the call. This method should be overriden.
+     */
+    endCall: function() {},
+
+    /**
+     * Session is ready.
+     */
+    _onSessionReady: function() {
+      this.startCall();
+    },
+
+    /**
+     * Session has ended. Notifies the user and ends the call.
+     */
+    _onSessionEnded: function() {
+      this._notifier.warn(__("call_has_ended"));
+      this.endCall();
+    },
+
+    /**
+     * Peer hung up. Notifies the user and ends the call.
+     *
+     * Event properties:
+     * - {String} connectionId: OT session id
+     *
+     * @param {Object} event
+     */
+    _onPeerHungup: function() {
+      this._notifier.warn(__("peer_ended_conversation"));
+      this.endCall();
+    },
+
+    /**
+     * Network disconnected. Notifies the user and ends the call.
+     */
+    _onNetworkDisconnected: function() {
+      this._notifier.warn(__("network_disconnected"));
+      this.endCall();
+    }
+  });
+
   return {
-    BaseRouter: BaseRouter
+    BaseRouter: BaseRouter,
+    BaseConversationRouter: BaseConversationRouter
   };
-})();
+})(document.webL10n || document.mozL10n);
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index e10ed499221a..6611293d2a82 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -29,12 +29,6 @@ loop.webapp = (function($, OT, webl10n) {
    */
   var router;
 
-  /**
-   * Current conversation model instance.
-   * @type {loop.shared.models.ConversationModel}
-   */
-  var conversation;
-
   /**
    * Homepage view.
    */
@@ -103,54 +97,31 @@ loop.webapp = (function($, OT, webl10n) {
   });
 
   /**
-   * Webapp Router. Allows defining a main active view and easily toggling it
-   * when the active route changes.
-   *
-   * @link http://mikeygee.com/blog/backbone.html
+   * Webapp Router.
    */
-  var WebappRouter = loop.shared.router.BaseRouter.extend({
-    /**
-     * Current conversation.
-     * @type {loop.shared.models.ConversationModel}
-     */
-    _conversation: undefined,
-
-    /**
-     * Notifications dispatcher.
-     * @type {loop.shared.views.NotificationListView}
-     */
-    _notifier: undefined,
-
+  var WebappRouter = loop.shared.router.BaseConversationRouter.extend({
     routes: {
       "": "home",
       "call/ongoing": "conversation",
       "call/:token": "initiate"
     },
 
-    initialize: function(options) {
-      options = options || {};
-      if (!options.conversation) {
-        throw new Error("missing required conversation");
-      }
-      this._conversation = options.conversation;
-
-      if (!options.notifier) {
-        throw new Error("missing required notifier");
-      }
-      this._notifier = options.notifier;
-
-      this.listenTo(this._conversation, "session:ready", this._onSessionReady);
-      this.listenTo(this._conversation, "session:ended", this._endCall);
-      this.listenTo(this._conversation, "session:peer-hungup",
-                                        this._onPeerHungup);
-      this.listenTo(this._conversation, "session:network-disconnected",
-                                        this._onNetworkDisconnected);
-
+    initialize: function() {
       // Load default view
       this.loadView(new HomeView());
     },
 
-    _endCall: function() {
+    /**
+     * @override {loop.shared.router.BaseConversationRouter.startCall}
+     */
+    startCall: function() {
+      this.navigate("call/ongoing", {trigger: true});
+    },
+
+    /**
+     * @override {loop.shared.router.BaseConversationRouter.endCall}
+     */
+    endCall: function() {
       var route = "home";
       if (this._conversation.get("loopToken")) {
         route = "call/" + this._conversation.get("loopToken");
@@ -158,36 +129,6 @@ loop.webapp = (function($, OT, webl10n) {
       this.navigate(route, {trigger: true});
     },
 
-    /**
-     * Navigates to conversation when the call session is ready.
-     */
-    _onSessionReady: function() {
-      this.navigate("call/ongoing", {trigger: true});
-    },
-
-    /**
-     * Peer hung up. Navigates back to call initiation so the user can start
-     * calling again.
-     *
-     * Event properties:
-     * - {String} connectionId: OT session id
-     *
-     * @param {Object} event
-     */
-    _onPeerHungup: function(event) {
-      this._notifier.warn(__("peer_ended_conversation"));
-      this._endCall();
-    },
-
-    /**
-     * Network disconnected. Navigates back to call initiation so the user can
-     * start calling again.
-     */
-    _onNetworkDisconnected: function() {
-      this._notifier.warn(__("network_disconnected"));
-      this._endCall();
-    },
-
     /**
      * Default entry point.
      */
@@ -234,9 +175,8 @@ loop.webapp = (function($, OT, webl10n) {
    * App initialization.
    */
   function init() {
-    conversation = new sharedModels.ConversationModel();
     router = new WebappRouter({
-      conversation: conversation,
+      conversation: new sharedModels.ConversationModel(),
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
diff --git a/browser/components/loop/standalone/content/l10n/data.ini b/browser/components/loop/standalone/content/l10n/data.ini
index 0c98111e76ce..0e0883fb8e8c 100644
--- a/browser/components/loop/standalone/content/l10n/data.ini
+++ b/browser/components/loop/standalone/content/l10n/data.ini
@@ -1,4 +1,5 @@
 [en]
+call_has_ended=Your call has ended.
 missing_conversation_info=Missing conversation information.
 network_disconnected=The network connection terminated abruptly.
 peer_ended_conversation=Your peer ended the conversation.
@@ -8,6 +9,7 @@ start_call=Start the call
 welcome=Welcome to the Loop web client.
 
 [fr]
+call_has_ended=L'appel est terminé.
 missing_conversation_info=Informations de communication manquantes.
 network_disconnected=La connexion réseau semble avoir été interrompue.
 peer_ended_conversation=Votre correspondant a mis fin à la communication.
diff --git a/browser/components/loop/test/shared/router_test.js b/browser/components/loop/test/shared/router_test.js
index 8f1dbbc83813..2a37a251d732 100644
--- a/browser/components/loop/test/shared/router_test.js
+++ b/browser/components/loop/test/shared/router_test.js
@@ -35,6 +35,94 @@ describe("loop.shared.router", function() {
 
         expect(router.activeView).eql(view);
       });
+
+      // XXX hard to test as hell… functional?
+      it("should load the passed view");
+    });
+  });
+
+  describe("BaseConversationRouter", function() {
+    var conversation, notifier, TestRouter;
+
+    beforeEach(function() {
+      TestRouter = loop.shared.router.BaseConversationRouter.extend({
+        startCall: sandbox.spy(),
+        endCall: sandbox.spy()
+      });
+      conversation = new loop.shared.models.ConversationModel({
+        loopToken: "fakeToken"
+      });
+      notifier = {
+        notify: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy()
+      };
+    });
+
+    describe("#constructor", function() {
+      it("should require a ConversationModel instance", function() {
+        expect(function() {
+          new TestRouter();
+        }).to.Throw(Error, /missing required conversation/);
+      });
+
+      it("should require a notifier", function() {
+        expect(function() {
+          new TestRouter({conversation: {}});
+        }).to.Throw(Error, /missing required notifier/);
+      });
+    });
+
+    describe("Events", function() {
+      var router, fakeSessionData;
+
+      beforeEach(function() {
+        fakeSessionData = {
+          sessionId:    "sessionId",
+          sessionToken: "sessionToken",
+          apiKey:       "apiKey"
+        };
+        router = new TestRouter({
+          conversation: conversation,
+          notifier: notifier
+        });
+      });
+
+      it("should call startCall() once the call session is ready", function() {
+        conversation.trigger("session:ready");
+
+        sinon.assert.calledOnce(router.startCall);
+      });
+
+      it("should call endCall() when conversation ended", function() {
+        conversation.trigger("session:ended");
+
+        sinon.assert.calledOnce(router.endCall);
+      });
+
+      it("should warn the user when peer hangs up", function() {
+        conversation.trigger("session:peer-hungup");
+
+        sinon.assert.calledOnce(notifier.warn);
+      });
+
+      it("should call endCall() when peer hangs up", function() {
+        conversation.trigger("session:peer-hungup");
+
+        sinon.assert.calledOnce(router.endCall);
+      });
+
+      it("should warn the user when network disconnects", function() {
+        conversation.trigger("session:network-disconnected");
+
+        sinon.assert.calledOnce(notifier.warn);
+      });
+
+      it("should call endCall() when network disconnects", function() {
+        conversation.trigger("session:network-disconnected");
+
+        sinon.assert.calledOnce(router.endCall);
+      });
     });
   });
 });
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 10d1dce89955..216eb2b26fc3 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -33,33 +33,6 @@ describe("loop.webapp", function() {
       conversation = new sharedModels.ConversationModel();
     });
 
-    describe("#constructor", function() {
-      it("should require a ConversationModel instance", function() {
-        expect(function() {
-          new loop.webapp.WebappRouter();
-        }).to.Throw(Error, /missing required conversation/);
-      });
-
-      it("should require a notifier", function() {
-        expect(function() {
-          new loop.webapp.WebappRouter({conversation: {}});
-        }).to.Throw(Error, /missing required notifier/);
-      });
-    });
-
-    describe("constructed", function() {
-      var router;
-
-      beforeEach(function() {
-        router = new loop.webapp.WebappRouter({conversation: conversation});
-      });
-
-      describe("#loadView", function() {
-        // XXX hard to test as hell… functional?
-        it("should load the passed view");
-      });
-    });
-
     describe("Routes", function() {
       var router;
 
@@ -162,12 +135,6 @@ describe("loop.webapp", function() {
         sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
       });
 
-      it("should warn the user when peer hangs up", function() {
-        conversation.trigger("session:peer-hungup");
-
-        sinon.assert.calledOnce(notifier.warn);
-      });
-
       it("should navigate to call/{token} when peer hangs up", function() {
         conversation.trigger("session:peer-hungup");
 
@@ -175,12 +142,6 @@ describe("loop.webapp", function() {
         sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
       });
 
-      it("should warn the user when network disconnects", function() {
-        conversation.trigger("session:network-disconnected");
-
-        sinon.assert.calledOnce(notifier.warn);
-      });
-
       it("should navigate to call/{token} when network disconnects",
         function() {
           conversation.trigger("session:network-disconnected");

From 7d663f33a9826c0c2ba19e6348f10aedc4139473 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 053/117] Bug 996526 - Backbone views to carry their own
 templates. r=dmose

---
 .../loop/content/shared/js/router.js          | 12 ++-
 .../loop/content/shared/js/views.js           | 92 ++++++++++++++++---
 .../loop/standalone/content/index.html        | 30 +-----
 .../loop/standalone/content/js/webapp.js      | 17 +++-
 .../loop/test/shared/router_test.js           | 29 ++++--
 .../components/loop/test/shared/views_test.js | 17 ++++
 .../loop/test/standalone/webapp_test.js       | 37 ++++----
 7 files changed, 168 insertions(+), 66 deletions(-)

diff --git a/browser/components/loop/content/shared/js/router.js b/browser/components/loop/content/shared/js/router.js
index 64648687c312..87e8c495cc88 100644
--- a/browser/components/loop/content/shared/js/router.js
+++ b/browser/components/loop/content/shared/js/router.js
@@ -27,9 +27,19 @@ loop.shared.router = (function(l10n) {
      */
     loadView : function(view) {
       if (this.activeView) {
-        this.activeView.hide();
+        this.activeView.remove();
       }
       this.activeView = view.render().show();
+      this.updateView(this.activeView.$el);
+    },
+
+    /**
+     * Updates main div element with provided contents.
+     *
+     * @param  {jQuery} $el Element.
+     */
+    updateView: function($el) {
+      $("#main").html($el);
     }
   });
 
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 3d61b2484fb7..e567f4086ba3 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -6,15 +6,44 @@
 
 var loop = loop || {};
 loop.shared = loop.shared || {};
-loop.shared.views = (function(OT) {
+loop.shared.views = (function(_, OT, l10n) {
   "use strict";
 
   var sharedModels = loop.shared.models;
 
   /**
-   * Base Backbone view.
+   * L10n view. Translates resulting view DOM fragment once rendered.
    */
-  var BaseView = Backbone.View.extend({
+  var L10nView = (function() {
+    var L10nViewImpl = Backbone.View.extend(),
+        extend       = L10nViewImpl.extend;
+
+    // Patches View extend() method so we can hook and patch any declared render
+    // method.
+    L10nViewImpl.extend = function() {
+      var ExtendedView = extend.apply(this, arguments),
+          render       = ExtendedView.prototype.render;
+
+      // Wraps original render() method to translate contents once they're
+      // rendered.
+      ExtendedView.prototype.render = function() {
+        if (render) {
+          render.apply(this, arguments);
+          l10n.translate(this.el);
+        }
+        return this;
+      };
+
+      return ExtendedView;
+    };
+
+    return L10nViewImpl;
+  })();
+
+  /**
+   * Base view.
+   */
+  var BaseView = L10nView.extend({
     /**
      * Hides view element.
      *
@@ -33,6 +62,21 @@ loop.shared.views = (function(OT) {
     show: function() {
       this.$el.show();
       return this;
+    },
+
+    /**
+     * Base render implementation: renders an attached template if available.
+     *
+     * Note: You need to override this if you want to do fancier stuff, eg.
+     *       rendering the template using model data.
+     *
+     * @return {BaseView}
+     */
+    render: function() {
+      if (this.template) {
+        this.$el.html(this.template());
+      }
+      return this;
     }
   });
 
@@ -40,7 +84,21 @@ loop.shared.views = (function(OT) {
    * Conversation view.
    */
   var ConversationView = BaseView.extend({
-    el: "#conversation",
+    className: "conversation",
+
+    template: _.template([
+      '<nav class="controls">',
+      '  <button class="btn stop" data-l10n-id="stop"></button>',
+      '</nav>',
+      '<div class="media nested">',
+      // Both these wrappers are required by the SDK; this is fragile and
+      // will break if a future version of the SDK updates this generated DOM,
+      // especially as the SDK seems to actually move wrapped contents into
+      // their own generated stuff.
+      '  <div class="remote"><div class="incoming"></div></div>',
+      '  <div class="local"><div class="outgoing"></div></div>',
+      '</div>'
+    ].join("")),
 
     // height set to "auto" to fix video layout on Google Chrome
     // @see https://bugzilla.mozilla.org/show_bug.cgi?id=991122
@@ -59,13 +117,11 @@ loop.shared.views = (function(OT) {
         throw new Error("missing required sdk");
       }
       this.sdk = options.sdk;
+
       // XXX: this feels like to be moved to the ConversationModel, but as it's
       // tighly coupled with the DOM (element ids to receive streams), we'd need
       // an abstraction we probably don't want yet.
-      this.session   = this.sdk.initSession(this.model.get("sessionId"));
-      this.publisher = this.sdk.initPublisher(this.model.get("apiKey"),
-                                              "outgoing", this.videoStyles);
-
+      this.session = this.sdk.initSession(this.model.get("sessionId"));
       this.session.connect(this.model.get("apiKey"),
                            this.model.get("sessionToken"));
 
@@ -91,6 +147,8 @@ loop.shared.views = (function(OT) {
      * @param  {SessionConnectEvent} event
      */
     _sessionConnected: function(event) {
+      this.publisher = this.sdk.initPublisher(this.$(".outgoing").get(0),
+                                              this.videoStyles);
       this.session.publish(this.publisher);
     },
 
@@ -149,19 +207,30 @@ loop.shared.views = (function(OT) {
      * @param  {Array} streams A list of media streams.
      */
     _subscribeToStreams: function(streams) {
+      var incomingContainer = this.$(".incoming").get(0);
       streams.forEach(function(stream) {
         if (stream.connection.connectionId !==
             this.session.connection.connectionId) {
-          this.session.subscribe(stream, "incoming", this.videoStyles);
+          this.session.subscribe(stream, incomingContainer, this.videoStyles);
         }
       }.bind(this));
+    },
+
+    /**
+     * Renders this view.
+     *
+     * @return {ConversationView}
+     */
+    render: function() {
+      this.$el.html(this.template(this.model.toJSON()));
+      return this;
     }
   });
 
   /**
    * Notification view.
    */
-  var NotificationView = Backbone.View.extend({
+  var NotificationView = BaseView.extend({
     template: _.template([
       '<div class="alert alert-<%- level %>">',
       '  <button class="close"></button>',
@@ -260,9 +329,10 @@ loop.shared.views = (function(OT) {
   });
 
   return {
+    L10nView: L10nView,
     BaseView: BaseView,
     ConversationView: ConversationView,
     NotificationListView: NotificationListView,
     NotificationView: NotificationView
   };
-})(window.OT);
+})(_, window.OT, document.webL10n || document.mozL10n);
diff --git a/browser/components/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
index d81feed6bf0e..9c13bb3d0ae3 100644
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -19,35 +19,7 @@
 
     <div id="messages"></div>
 
-    <div id="home">
-      <p data-l10n-id="welcome">Welcome to the Loop web client.</p>
-    </div>
-
-    <!-- The autocomplete attribute is set to "off" to prevent keeping the state
-         of the disabled button across reloads  -->
-    <form id="conversation-form" autocomplete="off" class="hide">
-      <p>
-        <button class="btn btn-success" data-l10n-id="start_call">Start call</button>
-      </p>
-    </form>
-
-    <div id="conversation" class="conversation hide">
-      <nav class="controls">
-        <button class="btn stop" data-l10n-id="stop"></button>
-      </nav>
-      <div class="media nested">
-        <!-- both these wrappers are required by the SDK; this is fragile and
-             will break if a future version of SDK updates this generated DOM,
-             especially as the SDK seems to actually move wrapped contents into
-             their own generated stuff -->
-        <div class="remote">
-          <div id="incoming"></div>
-        </div>
-        <div class="local">
-          <div id="outgoing"></div>
-        </div>
-      </div>
-    </div>
+    <div id="main"></div>
 
     <!-- libs -->
     <script src="https://static.opentok.com/webrtc/v2.2/js/opentok.min.js"></script>
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 6611293d2a82..7f35bd86d948 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -33,7 +33,7 @@ loop.webapp = (function($, OT, webl10n) {
    * Homepage view.
    */
   var HomeView = sharedViews.BaseView.extend({
-    el: "#home"
+    template: _.template('<p data-l10n-id="welcome"></p>')
   });
 
   /**
@@ -41,7 +41,13 @@ loop.webapp = (function($, OT, webl10n) {
    * as a `model` property.
    */
   var ConversationFormView = sharedViews.BaseView.extend({
-    el: "#conversation-form",
+    template: _.template([
+      '<form>',
+      '  <p>',
+      '    <button class="btn btn-success" data-l10n-id="start_call"></button>',
+      '  </p>',
+      '</form>'
+    ].join("")),
 
     events: {
       "submit": "initiate"
@@ -86,6 +92,11 @@ loop.webapp = (function($, OT, webl10n) {
       this.$("button").attr("disabled", "disabled");
     },
 
+    /**
+     * Initiates the call.
+     *
+     * @param {SubmitEvent} event
+     */
     initiate: function(event) {
       event.preventDefault();
       this.model.initiate({
@@ -160,7 +171,7 @@ loop.webapp = (function($, OT, webl10n) {
         if (loopToken) {
           return this.navigate("call/" + loopToken, {trigger: true});
         } else {
-          this._notifier.error(__("Missing conversation information"));
+          this._notifier.error(__("missing_conversation_info"));
           return this.navigate("home", {trigger: true});
         }
       }
diff --git a/browser/components/loop/test/shared/router_test.js b/browser/components/loop/test/shared/router_test.js
index 2a37a251d732..2795a405d4e8 100644
--- a/browser/components/loop/test/shared/router_test.js
+++ b/browser/components/loop/test/shared/router_test.js
@@ -20,24 +20,41 @@ describe("loop.shared.router", function() {
   });
 
   describe("BaseRouter", function() {
-    var router;
+    var router, view;
 
     beforeEach(function() {
       router = new loop.shared.router.BaseRouter();
+      $("#fixtures").html('<div id="main"></div>');
+      var TestView = loop.shared.views.BaseView.extend({
+        template: _.template("<p>plop</p>")
+      });
+      view = new TestView();
+    });
+
+    afterEach(function() {
+      $("#fixtures").empty();
     });
 
     describe("#loadView", function() {
       it("should set the active view", function() {
-        var TestView = loop.shared.views.BaseView.extend({});
-        var view = new TestView();
-
         router.loadView(view);
 
         expect(router.activeView).eql(view);
       });
 
-      // XXX hard to test as hell… functional?
-      it("should load the passed view");
+      it("should load and render the passed view", function() {
+        router.loadView(view);
+
+        expect($("#main p").text()).eql("plop");
+      });
+    });
+
+    describe("#updateView", function() {
+      it("should update the main element with provided contents", function() {
+        router.updateView($("<p>plip</p>"));
+
+        expect($("#main p").text()).eql("plip");
+      });
     });
   });
 
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index 581a5927a355..717745307715 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -5,6 +5,7 @@
 /* global loop, sinon */
 
 var expect = chai.expect;
+var l10n = document.webL10n || document.mozL10n;
 
 describe("loop.shared.views", function() {
   "use strict";
@@ -23,6 +24,22 @@ describe("loop.shared.views", function() {
     sandbox.restore();
   });
 
+  describe("L10nView", function() {
+    beforeEach(function() {
+      sandbox.stub(l10n, "translate");
+    });
+
+    it("should translate generated contents on render()", function() {
+      var TestView = loop.shared.views.L10nView.extend();
+
+      var view = new TestView();
+      view.render();
+
+      sinon.assert.calledOnce(l10n.translate);
+      sinon.assert.calledWithExactly(l10n.translate, view.el);
+    });
+  });
+
   describe("ConversationView", function() {
     var fakeSDK, fakeSession;
 
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 216eb2b26fc3..1a9df158c5d0 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -10,6 +10,7 @@ describe("loop.webapp", function() {
   "use strict";
 
   var sharedModels = loop.shared.models,
+      sharedViews = loop.shared.views,
       sandbox,
       notifier;
 
@@ -49,36 +50,40 @@ describe("loop.webapp", function() {
           router.home();
 
           sinon.assert.calledOnce(router.loadView);
-          sinon.assert.calledWithMatch(router.loadView,
-                                       {$el: {selector: "#home"}});
+          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
+            return obj instanceof loop.webapp.HomeView;
+          }));
         });
       });
 
       describe("#initiate", function() {
-        it("should load the ConversationFormView and set the token",
-          function() {
-            router.initiate("fakeToken");
+        it("should set the token to the conversation model", function() {
+          router.initiate("fakeToken");
 
-            sinon.assert.calledOnce(router.loadView);
-            sinon.assert.calledWithMatch(router.loadView, {
-              $el: {selector: "#conversation-form"},
-              model: {attributes: {loopToken: "fakeToken"}}
-            });
-          });
+          expect(conversation.get("loopToken")).eql("fakeToken");
+        });
+
+        it("should load the ConversationFormView", function() {
+          router.initiate("fakeToken");
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
+            return obj instanceof loop.webapp.ConversationFormView;
+          }));
+        });
       });
 
       describe("#conversation", function() {
         it("should load the ConversationView if session is set", function() {
-          sandbox.stub(loop.shared.views.ConversationView.prototype,
-            "initialize");
+          sandbox.stub(sharedViews.ConversationView.prototype, "initialize");
           conversation.set("sessionId", "fakeSessionId");
 
           router.conversation();
 
           sinon.assert.calledOnce(router.loadView);
-          sinon.assert.calledWithMatch(router.loadView, {
-            $el: {selector: "#conversation"}
-          });
+          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
+            return obj instanceof sharedViews.ConversationView;
+          }));
         });
 
         it("should redirect to #call/{token} if session isn't ready",

From b3e78f805305c58912628c5e2f5b7cdd5b0a4dc1 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 054/117] Bug 991128 - make reloading a live call do something
 reasonable, r=dmose

---
 .../loop/standalone/content/js/webapp.js      | 26 +++---
 .../loop/test/standalone/webapp_test.js       | 89 ++++++++++++-------
 2 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 7f35bd86d948..30187e61187e 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -112,9 +112,9 @@ loop.webapp = (function($, OT, webl10n) {
    */
   var WebappRouter = loop.shared.router.BaseConversationRouter.extend({
     routes: {
-      "": "home",
-      "call/ongoing": "conversation",
-      "call/:token": "initiate"
+      "":                    "home",
+      "call/ongoing/:token": "conversation",
+      "call/:token":         "initiate"
     },
 
     initialize: function() {
@@ -126,7 +126,14 @@ loop.webapp = (function($, OT, webl10n) {
      * @override {loop.shared.router.BaseConversationRouter.startCall}
      */
     startCall: function() {
-      this.navigate("call/ongoing", {trigger: true});
+      var route;
+      if (this._conversation.get("loopToken")) {
+        route = "call/ongoing/" + this._conversation.get("loopToken");
+      } else {
+        route = "home";
+        this._notifier.error(__("missing_conversation_info"));
+      }
+      this.navigate(route, {trigger: true});
     },
 
     /**
@@ -165,15 +172,10 @@ loop.webapp = (function($, OT, webl10n) {
      * Loads conversation establishment view.
      *
      */
-    conversation: function() {
+    conversation: function(loopToken) {
       if (!this._conversation.isSessionReady()) {
-        var loopToken = this._conversation.get("loopToken");
-        if (loopToken) {
-          return this.navigate("call/" + loopToken, {trigger: true});
-        } else {
-          this._notifier.error(__("missing_conversation_info"));
-          return this.navigate("home", {trigger: true});
-        }
+        // User has loaded this url directly, need to actually setup the call
+        return this.navigate("call/" + loopToken, {trigger: true});
       }
       this.loadView(new sharedViews.ConversationView({
         sdk: OT,
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 1a9df158c5d0..36ff56ad8895 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -28,23 +28,63 @@ describe("loop.webapp", function() {
   });
 
   describe("WebappRouter", function() {
-    var conversation;
+    var router, conversation;
 
     beforeEach(function() {
       conversation = new sharedModels.ConversationModel();
+      router = new loop.webapp.WebappRouter({
+        conversation: conversation,
+        notifier: notifier
+      });
+      sandbox.stub(router, "loadView");
+      sandbox.stub(router, "navigate");
+    });
+
+    describe("#startCall", function() {
+      it("should navigate back home if session token is missing", function() {
+        router.startCall();
+
+        sinon.assert.calledOnce(router.navigate);
+        sinon.assert.calledWithMatch(router.navigate, "home");
+      });
+
+      it("should notify the user if session token is missing", function() {
+        router.startCall();
+
+        sinon.assert.calledOnce(notifier.error);
+        // XXX test for message contents (needs stubbing L10n)
+      });
+
+      it("should navigate to call/ongoing/:token if session token is available",
+        function() {
+          conversation.set("loopToken", "fake");
+
+          router.startCall();
+
+          sinon.assert.calledOnce(router.navigate);
+          sinon.assert.calledWithMatch(router.navigate, "call/ongoing/fake");
+        });
+    });
+
+    describe("#endCall", function() {
+      it("should navigate to home if session token is unset", function() {
+        router.endCall();
+
+        sinon.assert.calledOnce(router.navigate);
+        sinon.assert.calledWithMatch(router.navigate, "home");
+      });
+
+      it("should navigate to call/:token if session token is set", function() {
+        conversation.set("loopToken", "fake");
+
+        router.endCall();
+
+        sinon.assert.calledOnce(router.navigate);
+        sinon.assert.calledWithMatch(router.navigate, "call/fake");
+      });
     });
 
     describe("Routes", function() {
-      var router;
-
-      beforeEach(function() {
-        router = new loop.webapp.WebappRouter({
-          conversation: conversation,
-          notifier: notifier
-        });
-        sandbox.stub(router, "loadView");
-      });
-
       describe("#home", function() {
         it("should load the HomeView", function() {
           router.home();
@@ -86,30 +126,18 @@ describe("loop.webapp", function() {
           }));
         });
 
-        it("should redirect to #call/{token} if session isn't ready",
+        it("should navigate to #call/{token} if session isn't ready",
           function() {
-            conversation.set("loopToken", "fakeToken");
-            sandbox.stub(router, "navigate");
-
-            router.conversation();
+            router.conversation("fakeToken");
 
             sinon.assert.calledOnce(router.navigate);
             sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
           });
-
-        it("should redirect to #home if no call token is set", function() {
-          sandbox.stub(router, "navigate");
-
-          router.conversation();
-
-          sinon.assert.calledOnce(router.navigate);
-          sinon.assert.calledWithMatch(router.navigate, "home");
-        });
       });
     });
 
     describe("Events", function() {
-      var router, fakeSessionData;
+      var fakeSessionData;
 
       beforeEach(function() {
         fakeSessionData = {
@@ -117,20 +145,15 @@ describe("loop.webapp", function() {
           sessionToken: "sessionToken",
           apiKey:       "apiKey"
         };
-        sandbox.stub(loop.webapp.WebappRouter.prototype, "navigate");
         conversation.set("loopToken", "fakeToken");
-        router = new loop.webapp.WebappRouter({
-          conversation: conversation,
-          notifier: notifier
-        });
       });
 
-      it("should navigate to call/ongoing once the call session is ready",
+      it("should navigate to call/ongoing/:token once call session is ready",
         function() {
           conversation.trigger("session:ready");
 
           sinon.assert.calledOnce(router.navigate);
-          sinon.assert.calledWith(router.navigate, "call/ongoing");
+          sinon.assert.calledWith(router.navigate, "call/ongoing/fakeToken");
         });
 
       it("should navigate to call/{token} when conversation ended", function() {

From 900c60964590392b93d302f88ac6639bed1085cd Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 055/117] Bug 991118 - Going back should terminate call
 session, r=dmose

---
 .../loop/content/shared/js/models.js          | 115 ++++++-
 .../loop/content/shared/js/views.js           | 156 ++++-----
 .../loop/standalone/content/js/webapp.js      |  27 +-
 .../loop/test/shared/models_test.js           | 299 ++++++++++++------
 .../loop/test/shared/router_test.js           |   2 +-
 .../components/loop/test/shared/views_test.js | 185 ++++++-----
 .../loop/test/standalone/webapp_test.js       |  39 ++-
 7 files changed, 526 insertions(+), 297 deletions(-)

diff --git a/browser/components/loop/content/shared/js/models.js b/browser/components/loop/content/shared/js/models.js
index 6ba5cb8254ad..2beabb70369a 100644
--- a/browser/components/loop/content/shared/js/models.js
+++ b/browser/components/loop/content/shared/js/models.js
@@ -14,6 +14,7 @@ loop.shared.models = (function() {
    */
   var ConversationModel = Backbone.Model.extend({
     defaults: {
+      ongoing:      false,     // Ongoing call flag
       callerId:     undefined, // Loop caller id
       loopToken:    undefined, // Loop conversation token
       loopVersion:  undefined, // Loop version for /calls/ information. This
@@ -25,6 +26,35 @@ loop.shared.models = (function() {
       apiKey:       undefined  // OT api key
     },
 
+    /**
+     * SDK object.
+     * @type {OT}
+     */
+    sdk: undefined,
+
+    /**
+     * SDK session object.
+     * @type {XXX}
+     */
+    session: undefined,
+
+    /**
+     * Constructor.
+     *
+     * Required options:
+     * - {OT} sdk: SDK object.
+     *
+     * @param  {Object} attributes Attributes object.
+     * @param  {Object} options    Options object.
+     */
+    initialize: function(attributes, options) {
+      options = options || {};
+      if (!options.sdk) {
+        throw new Error("missing required sdk");
+      }
+      this.sdk = options.sdk;
+    },
+
     /**
      * Initiates a conversation, requesting call session information to the Loop
      * server and updates appropriately the current model attributes with the
@@ -104,7 +134,90 @@ loop.shared.models = (function() {
         apiKey:       sessionData.apiKey
       }).trigger("session:ready", this);
       return this;
-    }
+    },
+
+    /**
+     * Starts a SDK session and subscribe to call events.
+     */
+    startSession: function() {
+      if (!this.isSessionReady()) {
+        throw new Error("Can't start session as it's not ready");
+      }
+      this.session = this.sdk.initSession(this.get("sessionId"));
+      this.session.connect(this.get("apiKey"), this.get("sessionToken"));
+      this.listenTo(this.session, "sessionConnected", this._sessionConnected);
+      this.listenTo(this.session, "streamCreated", this._streamCreated);
+      this.listenTo(this.session, "connectionDestroyed",
+                                  this._connectionDestroyed);
+      this.listenTo(this.session, "sessionDisconnected",
+                                  this._sessionDisconnected);
+      this.listenTo(this.session, "networkDisconnected",
+                                  this._networkDisconnected);
+    },
+
+    /**
+     * Ends current session.
+     */
+    endSession: function() {
+      this.session.disconnect();
+      this.set("ongoing", false);
+    },
+
+    /**
+     * Session is created.
+     * http://tokbox.com/opentok/libraries/client/js/reference/SessionConnectEvent.html
+     *
+     * @param  {SessionConnectEvent} event
+     */
+    _sessionConnected: function(event) {
+      this.trigger("session:connected", event);
+      this.set("ongoing", true);
+    },
+
+    /**
+     * New created streams are available.
+     * http://tokbox.com/opentok/libraries/client/js/reference/StreamEvent.html
+     *
+     * @param  {StreamEvent} event
+     */
+    _streamCreated: function(event) {
+      this.trigger("session:stream-created", event);
+    },
+
+    /**
+     * Local user hung up.
+     * http://tokbox.com/opentok/libraries/client/js/reference/SessionDisconnectEvent.html
+     *
+     * @param  {SessionDisconnectEvent} event
+     */
+    _sessionDisconnected: function(event) {
+      this.trigger("session:ended");
+      this.endSession();
+    },
+
+    /**
+     * Peer hung up. Disconnects local session.
+     * http://tokbox.com/opentok/libraries/client/js/reference/ConnectionEvent.html
+     *
+     * @param  {ConnectionEvent} event
+     */
+    _connectionDestroyed: function(event) {
+      this.trigger("session:peer-hungup", {
+        connectionId: event.connection.connectionId
+      });
+      this.endSession();
+    },
+
+    /**
+     * Network was disconnected.
+     * http://tokbox.com/opentok/libraries/client/js/reference/ConnectionEvent.html
+     *
+     * @param {ConnectionEvent} event
+     */
+    _networkDisconnected: function(event) {
+      this.trigger("session:network-disconnected");
+      this.endSession();
+    },
   });
 
   /**
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index e567f4086ba3..1a0be28feeaf 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -15,20 +15,28 @@ loop.shared.views = (function(_, OT, l10n) {
    * L10n view. Translates resulting view DOM fragment once rendered.
    */
   var L10nView = (function() {
-    var L10nViewImpl = Backbone.View.extend(),
-        extend       = L10nViewImpl.extend;
+    var L10nViewImpl   = Backbone.View.extend(), // Original View constructor
+        originalExtend = L10nViewImpl.extend;    // Original static extend fn
 
-    // Patches View extend() method so we can hook and patch any declared render
-    // method.
+    /**
+     * Patches View extend() method so we can hook and patch any declared render
+     * method.
+     *
+     * @return {Backbone.View} Extended view with patched render() method.
+     */
     L10nViewImpl.extend = function() {
-      var ExtendedView = extend.apply(this, arguments),
-          render       = ExtendedView.prototype.render;
+      var ExtendedView   = originalExtend.apply(this, arguments),
+          originalRender = ExtendedView.prototype.render;
 
-      // Wraps original render() method to translate contents once they're
-      // rendered.
+      /**
+       * Wraps original render() method to translate contents once they're
+       * rendered.
+       *
+       * @return {Backbone.View} Extended view instance.
+       */
       ExtendedView.prototype.render = function() {
-        if (render) {
-          render.apply(this, arguments);
+        if (originalRender) {
+          originalRender.apply(this, arguments);
           l10n.translate(this.el);
         }
         return this;
@@ -118,104 +126,66 @@ loop.shared.views = (function(_, OT, l10n) {
       }
       this.sdk = options.sdk;
 
-      // XXX: this feels like to be moved to the ConversationModel, but as it's
-      // tighly coupled with the DOM (element ids to receive streams), we'd need
-      // an abstraction we probably don't want yet.
-      this.session = this.sdk.initSession(this.model.get("sessionId"));
-      this.session.connect(this.model.get("apiKey"),
-                           this.model.get("sessionToken"));
+      this.model.startSession();
 
-      this.listenTo(this.session, "sessionConnected", this._sessionConnected);
-      this.listenTo(this.session, "streamCreated", this._streamCreated);
-      this.listenTo(this.session, "connectionDestroyed",
-                                  this._connectionDestroyed);
-      this.listenTo(this.session, "sessionDisconnected",
-                                  this._sessionDisconnected);
-      this.listenTo(this.session, "networkDisconnected",
-                                  this._networkDisconnected);
-    },
-
-    hangup: function(event) {
-      event.preventDefault();
-      this.session.disconnect();
+      this.listenTo(this.model, "session:connected", this.publish);
+      this.listenTo(this.model, "session:stream-created", this._streamCreated);
+      this.listenTo(this.model, ["session:peer-hungup",
+                                 "session:network-disconnected",
+                                 "session:ended"].join(" "), this.unpublish);
     },
 
     /**
-     * Session is created.
-     * http://tokbox.com/opentok/libraries/client/js/reference/SessionConnectEvent.html
+     * Subscribes and attaches each created stream to a DOM element.
+     *
+     * XXX: for now we only support a single remote stream, hence a singe DOM
+     *      element.
      *
-     * @param  {SessionConnectEvent} event
-     */
-    _sessionConnected: function(event) {
-      this.publisher = this.sdk.initPublisher(this.$(".outgoing").get(0),
-                                              this.videoStyles);
-      this.session.publish(this.publisher);
-    },
-
-    /**
-     * New created streams are available.
      * http://tokbox.com/opentok/libraries/client/js/reference/StreamEvent.html
      *
      * @param  {StreamEvent} event
      */
     _streamCreated: function(event) {
-      this._subscribeToStreams(event.streams);
-    },
-
-    /**
-     * Local user hung up.
-     * http://tokbox.com/opentok/libraries/client/js/reference/SessionDisconnectEvent.html
-     *
-     * @param  {SessionDisconnectEvent} event
-     */
-    _sessionDisconnected: function(event) {
-      this.model.trigger("session:ended");
-    },
-
-    /**
-     * Peer hung up. Disconnects local session.
-     * http://tokbox.com/opentok/libraries/client/js/reference/ConnectionEvent.html
-     *
-     * @param  {ConnectionEvent} event
-     */
-    _connectionDestroyed: function(event) {
-      this.model.trigger("session:peer-hungup", {
-        connectionId: event.connection.connectionId
-      });
-      this.session.unpublish(this.publisher);
-      this.session.disconnect();
-    },
-
-    /**
-     * Network was disconnected.
-     * http://tokbox.com/opentok/libraries/client/js/reference/ConnectionEvent.html
-     *
-     * @param {ConnectionEvent} event
-     */
-    _networkDisconnected: function(event) {
-      this.model.trigger("session:network-disconnected");
-      this.session.unpublish(this.publisher);
-      this.session.disconnect();
-    },
-
-    /**
-     * Subscribes and attaches each available stream to a DOM element.
-     *
-     * XXX: for now we only support a single remote stream, hence a singe DOM
-     *      element.
-     *
-     * @param  {Array} streams A list of media streams.
-     */
-    _subscribeToStreams: function(streams) {
-      var incomingContainer = this.$(".incoming").get(0);
-      streams.forEach(function(stream) {
+      var incoming = this.$(".incoming").get(0);
+      event.streams.forEach(function(stream) {
         if (stream.connection.connectionId !==
-            this.session.connection.connectionId) {
-          this.session.subscribe(stream, incomingContainer, this.videoStyles);
+            this.model.session.connection.connectionId) {
+          this.model.session.subscribe(stream, incoming, this.videoStyles);
         }
       }.bind(this));
     },
 
+    /**
+     * Hangs up current conversation.
+     *
+     * @param  {MouseEvent} event
+     */
+    hangup: function(event) {
+      event.preventDefault();
+      this.unpublish();
+      this.model.endSession();
+    },
+
+    /**
+     * Publishes remote streams available once a session is connected.
+     *
+     * http://tokbox.com/opentok/libraries/client/js/reference/SessionConnectEvent.html
+     *
+     * @param  {SessionConnectEvent} event
+     */
+    publish: function(event) {
+      var outgoing = this.$(".outgoing").get(0);
+      this.publisher = this.sdk.initPublisher(outgoing, this.videoStyles);
+      this.model.session.publish(this.publisher);
+    },
+
+    /**
+     * Unpublishes local stream.
+     */
+    unpublish: function() {
+      this.model.session.unpublish(this.publisher);
+    },
+
     /**
      * Renders this view.
      *
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 30187e61187e..45e8b6d33daa 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -113,7 +113,7 @@ loop.webapp = (function($, OT, webl10n) {
   var WebappRouter = loop.shared.router.BaseConversationRouter.extend({
     routes: {
       "":                    "home",
-      "call/ongoing/:token": "conversation",
+      "call/ongoing/:token": "loadConversation",
       "call/:token":         "initiate"
     },
 
@@ -126,14 +126,14 @@ loop.webapp = (function($, OT, webl10n) {
      * @override {loop.shared.router.BaseConversationRouter.startCall}
      */
     startCall: function() {
-      var route;
-      if (this._conversation.get("loopToken")) {
-        route = "call/ongoing/" + this._conversation.get("loopToken");
-      } else {
-        route = "home";
+      if (!this._conversation.get("loopToken")) {
         this._notifier.error(__("missing_conversation_info"));
+        this.navigate("home", {trigger: true});
+      } else {
+        this.navigate("call/ongoing/" + this._conversation.get("loopToken"), {
+          trigger: true
+        });
       }
-      this.navigate(route, {trigger: true});
     },
 
     /**
@@ -156,11 +156,16 @@ loop.webapp = (function($, OT, webl10n) {
 
     /**
      * Loads conversation launcher view, setting the received conversation token
-     * to the current conversation model.
+     * to the current conversation model. If a session is currently established,
+     * terminates it first.
      *
      * @param  {String} loopToken Loop conversation token.
      */
     initiate: function(loopToken) {
+      // Check if a session is ongoing; if so, terminate it
+      if (this._conversation.get("ongoing")) {
+        this._conversation.endSession();
+      }
       this._conversation.set("loopToken", loopToken);
       this.loadView(new ConversationFormView({
         model: this._conversation,
@@ -172,9 +177,9 @@ loop.webapp = (function($, OT, webl10n) {
      * Loads conversation establishment view.
      *
      */
-    conversation: function(loopToken) {
+    loadConversation: function(loopToken) {
       if (!this._conversation.isSessionReady()) {
-        // User has loaded this url directly, need to actually setup the call
+        // User has loaded this url directly, actually setup the call.
         return this.navigate("call/" + loopToken, {trigger: true});
       }
       this.loadView(new sharedViews.ConversationView({
@@ -189,7 +194,7 @@ loop.webapp = (function($, OT, webl10n) {
    */
   function init() {
     router = new WebappRouter({
-      conversation: new sharedModels.ConversationModel(),
+      conversation: new sharedModels.ConversationModel({}, {sdk: OT}),
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
diff --git a/browser/components/loop/test/shared/models_test.js b/browser/components/loop/test/shared/models_test.js
index 9181ee51b70f..80efa8b33f77 100644
--- a/browser/components/loop/test/shared/models_test.js
+++ b/browser/components/loop/test/shared/models_test.js
@@ -10,7 +10,7 @@ describe("loop.shared.models", function() {
   "use strict";
 
   var sharedModels = loop.shared.models,
-      sandbox, fakeXHR, requests = [];
+      sandbox, fakeXHR, requests = [], fakeSDK, fakeSession, fakeSessionData;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -20,6 +20,20 @@ describe("loop.shared.models", function() {
     fakeXHR.xhr.onCreate = function(xhr) {
       requests.push(xhr);
     };
+    fakeSessionData = {
+      sessionId:    "sessionId",
+      sessionToken: "sessionToken",
+      apiKey:       "apiKey"
+    };
+    fakeSession = _.extend({
+      connect: sandbox.spy(),
+      disconnect: sandbox.spy(),
+      unpublish: sandbox.spy()
+    }, Backbone.Events);
+    fakeSDK = {
+      initPublisher: sandbox.spy(),
+      initSession: sandbox.stub().returns(fakeSession)
+    };
   });
 
   afterEach(function() {
@@ -27,122 +41,221 @@ describe("loop.shared.models", function() {
   });
 
   describe("ConversationModel", function() {
-    var conversation, reqCallInfoStub, reqCallsInfoStub,
-      fakeSessionData, fakeBaseServerUrl;
-
-    beforeEach(function() {
-      conversation = new sharedModels.ConversationModel();
-      conversation.set("loopToken", "fakeToken");
-      fakeSessionData = {
-        sessionId:    "sessionId",
-        sessionToken: "sessionToken",
-        apiKey:       "apiKey"
-      };
-      fakeBaseServerUrl = "http://fakeBaseServerUrl";
-      reqCallInfoStub = sandbox.stub(loop.shared.Client.prototype,
-        "requestCallInfo");
-      reqCallsInfoStub = sandbox.stub(loop.shared.Client.prototype,
-        "requestCallsInfo");
+    describe("#initialize", function() {
+      it("should require a sdk option", function() {
+        expect(function() {
+          new sharedModels.ConversationModel();
+        }).to.Throw(Error, /missing required sdk/);
+      });
     });
 
-    describe("#initiate", function() {
-      it("call requestCallInfo on the client for outgoing calls",
-        function() {
-          conversation.initiate({
+    describe("constructed", function() {
+      var conversation, reqCallInfoStub, reqCallsInfoStub, fakeBaseServerUrl;
+
+      beforeEach(function() {
+        conversation = new sharedModels.ConversationModel({}, {sdk: fakeSDK});
+        conversation.set("loopToken", "fakeToken");
+        fakeBaseServerUrl = "http://fakeBaseServerUrl";
+        reqCallInfoStub = sandbox.stub(loop.shared.Client.prototype,
+          "requestCallInfo");
+        reqCallsInfoStub = sandbox.stub(loop.shared.Client.prototype,
+          "requestCallsInfo");
+      });
+
+      describe("#initiate", function() {
+        it("call requestCallInfo on the client for outgoing calls",
+          function() {
+            conversation.initiate({
+              baseServerUrl: fakeBaseServerUrl,
+              outgoing: true
+            });
+
+            sinon.assert.calledOnce(reqCallInfoStub);
+            sinon.assert.calledWith(reqCallInfoStub, "fakeToken");
+          });
+
+        it("should not call requestCallsInfo on the client for outgoing calls",
+          function() {
+            conversation.initiate({
+              baseServerUrl: fakeBaseServerUrl,
+              outgoing: true
+            });
+
+            sinon.assert.notCalled(reqCallsInfoStub);
+          });
+
+        it("call requestCallsInfo on the client for incoming calls",
+          function() {
+            conversation.initiate({
+              baseServerUrl: fakeBaseServerUrl,
+              outgoing: false
+            });
+
+            sinon.assert.calledOnce(reqCallsInfoStub);
+            sinon.assert.calledWith(reqCallsInfoStub);
+          });
+
+        it("should not call requestCallInfo on the client for incoming calls",
+          function() {
+            conversation.initiate({
+              baseServerUrl: fakeBaseServerUrl,
+              outgoing: false
+            });
+
+            sinon.assert.notCalled(reqCallInfoStub);
+          });
+
+        it("should update conversation session information from server data",
+          function() {
+            sandbox.stub(conversation, "setReady");
+            reqCallInfoStub.callsArgWith(1, null, fakeSessionData);
+
+            conversation.initiate({
+              baseServerUrl: fakeBaseServerUrl,
+              outgoing: true
+            });
+
+            sinon.assert.calledOnce(conversation.setReady);
+            sinon.assert.calledWith(conversation.setReady, fakeSessionData);
+          });
+
+        it("should trigger session:ready without fetching session data over " +
+           "HTTP when already set", function(done) {
+            conversation.set(fakeSessionData);
+
+            conversation.on("session:ready", function() {
+              sinon.assert.notCalled(reqCallInfoStub);
+              done();
+            }).initiate({
+              baseServerUrl: fakeBaseServerUrl,
+              outgoing: true
+            });
+
+          });
+
+        it("should trigger a `session:error` on failure", function(done) {
+          reqCallInfoStub.callsArgWith(1,
+            new Error("failed: HTTP 400 Bad Request; fake"));
+
+          conversation.on("session:error", function(err) {
+            expect(err.message).to.match(/failed: HTTP 400 Bad Request; fake/);
+            done();
+          }).initiate({
             baseServerUrl: fakeBaseServerUrl,
             outgoing: true
           });
-
-          sinon.assert.calledOnce(reqCallInfoStub);
-          sinon.assert.calledWith(reqCallInfoStub, "fakeToken");
         });
+      });
 
-      it("should not call requestCallsInfo on the client for outgoing calls",
-        function() {
-          conversation.initiate({
-            baseServerUrl: fakeBaseServerUrl,
-            outgoing: true
-          });
-
-          sinon.assert.notCalled(reqCallsInfoStub);
-        });
-
-      it("call requestCallsInfo on the client for incoming calls",
-        function() {
-          conversation.initiate({
-            baseServerUrl: fakeBaseServerUrl,
-            outgoing: false
-          });
-
-          sinon.assert.calledOnce(reqCallsInfoStub);
-          sinon.assert.calledWith(reqCallsInfoStub);
-        });
-
-      it("should not call requestCallInfo on the client for incoming calls",
-        function() {
-          conversation.initiate({
-            baseServerUrl: fakeBaseServerUrl,
-            outgoing: false
-          });
-
-          sinon.assert.notCalled(reqCallInfoStub);
-        });
-
-      it("should update conversation session information from server data",
-        function() {
-          reqCallInfoStub.callsArgWith(1, null, fakeSessionData);
-
-          conversation.initiate({
-            baseServerUrl: fakeBaseServerUrl,
-            outgoing: true
-          });
+      describe("#setReady", function() {
+        it("should update conversation session information", function() {
+          conversation.setReady(fakeSessionData);
 
           expect(conversation.get("sessionId")).eql("sessionId");
           expect(conversation.get("sessionToken")).eql("sessionToken");
           expect(conversation.get("apiKey")).eql("apiKey");
         });
 
-      it("should trigger session:ready without fetching session data over "+
-         "HTTP when already set", function(done) {
-          conversation.set(fakeSessionData);
-
+        it("should trigger a `session:ready` event", function(done) {
           conversation.on("session:ready", function() {
-            sinon.assert.notCalled(reqCallInfoStub);
             done();
-          }).initiate({
-            baseServerUrl: fakeBaseServerUrl,
-            outgoing: true
+          }).setReady(fakeSessionData);
+        });
+      });
+
+      describe("#startSession", function() {
+        var model;
+
+        beforeEach(function() {
+          model = new sharedModels.ConversationModel(fakeSessionData, {
+            sdk: fakeSDK
+          });
+          model.startSession();
+        });
+
+        it("should start a session", function() {
+          sinon.assert.calledOnce(fakeSDK.initSession);
+        });
+
+        describe("Session events", function() {
+          it("should trigger a session:connected event on sessionConnected",
+            function(done) {
+              model.once("session:connected", function(){ done(); });
+
+              fakeSession.trigger("sessionConnected");
+            });
+
+          it("should trigger a session:ended event on sessionDisconnected",
+            function(done) {
+              model.once("session:ended", function(){ done(); });
+
+              fakeSession.trigger("sessionDisconnected", {reason: "ko"});
+            });
+
+          describe("connectionDestroyed event received", function() {
+            var fakeEvent = {reason: "ko", connection: {connectionId: 42}};
+
+            it("should trigger a session:peer-hungup model event",
+              function(done) {
+                model.once("session:peer-hungup", function(event) {
+                  expect(event.connectionId).eql(42);
+                  done();
+                });
+
+                fakeSession.trigger("connectionDestroyed", fakeEvent);
+              });
+
+            it("should terminate the session", function() {
+              sandbox.stub(model, "endSession");
+
+              fakeSession.trigger("connectionDestroyed", fakeEvent);
+
+              sinon.assert.calledOnce(model.endSession);
+            });
           });
 
-        });
+          describe("networkDisconnected event received", function() {
+            it("should trigger a session:network-disconnected event",
+              function(done) {
+                model.once("session:network-disconnected", function() {
+                  done();
+                });
 
-      it("should trigger a `session:error` on failure", function(done) {
-        reqCallInfoStub.callsArgWith(1,
-          new Error("failed: HTTP 400 Bad Request; fake"));
+                fakeSession.trigger("networkDisconnected");
+              });
 
-        conversation.on("session:error", function(err) {
-          expect(err.message).to.match(/failed: HTTP 400 Bad Request; fake/);
-          done();
-        }).initiate({
-          baseServerUrl: fakeBaseServerUrl,
-          outgoing: true
+            it("should terminate the session", function() {
+              sandbox.stub(model, "endSession");
+
+              fakeSession.trigger("networkDisconnected", {reason: "ko"});
+
+              sinon.assert.calledOnce(model.endSession);
+            });
+          });
         });
       });
-    });
 
-    describe("#setReady", function() {
-      it("should update conversation session information", function() {
-        conversation.setReady(fakeSessionData);
+      describe("#endSession", function() {
+        var model;
 
-        expect(conversation.get("sessionId")).eql("sessionId");
-        expect(conversation.get("sessionToken")).eql("sessionToken");
-        expect(conversation.get("apiKey")).eql("apiKey");
-      });
+        beforeEach(function() {
+          model = new sharedModels.ConversationModel(fakeSessionData, {
+            sdk: fakeSDK
+          });
+          model.startSession();
+        });
 
-      it("should trigger a `session:ready` event", function(done) {
-        conversation.on("session:ready", function() {
-          done();
-        }).setReady(fakeSessionData);
+        it("should disconnect current session", function() {
+          model.endSession();
+
+          sinon.assert.calledOnce(fakeSession.disconnect);
+        });
+
+        it("should set the ongoing attribute to false", function() {
+          model.endSession();
+
+          expect(model.get("ongoing")).eql(false);
+        });
       });
     });
   });
diff --git a/browser/components/loop/test/shared/router_test.js b/browser/components/loop/test/shared/router_test.js
index 2795a405d4e8..6ef5d2d6bf48 100644
--- a/browser/components/loop/test/shared/router_test.js
+++ b/browser/components/loop/test/shared/router_test.js
@@ -68,7 +68,7 @@ describe("loop.shared.router", function() {
       });
       conversation = new loop.shared.models.ConversationModel({
         loopToken: "fakeToken"
-      });
+      }, {sdk: {}});
       notifier = {
         notify: sandbox.spy(),
         warn: sandbox.spy(),
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index 717745307715..e87070fcae57 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -41,112 +41,133 @@ describe("loop.shared.views", function() {
   });
 
   describe("ConversationView", function() {
-    var fakeSDK, fakeSession;
+    var fakeSDK, fakeSessionData, fakeSession, model;
 
     beforeEach(function() {
+      fakeSessionData = {
+        sessionId:    "sessionId",
+        sessionToken: "sessionToken",
+        apiKey:       "apiKey"
+      };
       fakeSession = _.extend({
+        connection: {connectionId: 42},
         connect: sandbox.spy(),
         disconnect: sandbox.spy(),
-        unpublish: sandbox.spy()
+        publish: sandbox.spy(),
+        unpublish: sandbox.spy(),
+        subscribe: sandbox.spy()
       }, Backbone.Events);
       fakeSDK = {
         initPublisher: sandbox.spy(),
         initSession: sandbox.stub().returns(fakeSession)
       };
+      model = new sharedModels.ConversationModel(fakeSessionData, {
+        sdk: fakeSDK
+      });
     });
 
     describe("#initialize", function() {
-      it("should require an sdk object", function() {
+      it("should require a sdk object", function() {
         expect(function() {
           new sharedViews.ConversationView();
         }).to.Throw(Error, /sdk/);
       });
 
-      describe("constructed", function() {
-        var model, view;
+      it("should start a session", function() {
+        sandbox.stub(model, "startSession");
 
-        beforeEach(function() {
-          model = new sharedModels.ConversationModel();
-          view = new sharedViews.ConversationView({
-            sdk: fakeSDK,
-            model: model
-          });
-        });
+        new sharedViews.ConversationView({sdk: fakeSDK, model: model});
 
-        it("should initiate a session", function() {
-          sinon.assert.calledOnce(fakeSession.connect);
-        });
-
-        describe("sessionDisconnected event received", function() {
-          it("should trigger a session:ended event", function(done) {
-            model.once("session:ended", function() {
-              done();
-            });
-
-            fakeSession.trigger("sessionDisconnected", {reason: "ko"});
-          });
-        });
-
-        describe("connectionDestroyed event received", function() {
-          var fakeEvent = {reason: "ko", connection: {connectionId: 42}};
-
-          it("should trigger a session:peer-hungup model event",
-            function(done) {
-              model.once("session:peer-hungup", function(event) {
-                expect(event.connectionId).eql(42);
-                done();
-              });
-
-              fakeSession.trigger("connectionDestroyed", fakeEvent);
-            });
-
-          it("should disconnect the session", function() {
-            fakeSession.trigger("connectionDestroyed", fakeEvent);
-
-            sinon.assert.calledOnce(fakeSession.unpublish);
-          });
-
-          it("should unpublish current stream publisher", function() {
-            fakeSession.trigger("connectionDestroyed", fakeEvent);
-
-            sinon.assert.calledOnce(fakeSession.unpublish);
-          });
-        });
-
-        describe("networkDisconnected event received", function() {
-          it("should trigger a session:network-disconnected event",
-            function(done) {
-              model.once("session:network-disconnected", function() {
-                done();
-              });
-
-              fakeSession.trigger("networkDisconnected");
-            });
-
-          it("should disconnect the session", function() {
-            fakeSession.trigger("networkDisconnected", {reason: "ko"});
-
-            sinon.assert.calledOnce(fakeSession.unpublish);
-          });
-
-          it("should unpublish current stream publisher", function() {
-            fakeSession.trigger("networkDisconnected", {reason: "ko"});
-
-            sinon.assert.calledOnce(fakeSession.unpublish);
-          });
-        });
+        sinon.assert.calledOnce(model.startSession);
       });
     });
 
-    describe("#hangup", function() {
-      it("should disconnect the session", function() {
-        var model = new sharedModels.ConversationModel();
-        var view = new sharedViews.ConversationView({
-          sdk: fakeSDK,
-          model: model
+    describe("constructed", function() {
+      describe("#hangup", function() {
+        it("should disconnect the session", function() {
+          var view = new sharedViews.ConversationView({
+            sdk: fakeSDK,
+            model: model
+          });
+          sandbox.stub(model, "endSession");
+
+          view.hangup({preventDefault: function() {}});
+
+          sinon.assert.calledOnce(model.endSession);
         });
-        view.hangup({preventDefault: function() {}});
-        sinon.assert.calledOnce(fakeSession.disconnect);
+      });
+
+      describe("#publish", function() {
+        it("should publish local stream", function() {
+          var view = new sharedViews.ConversationView({
+            sdk: fakeSDK,
+            model: model
+          });
+
+          view.publish();
+
+          sinon.assert.calledOnce(fakeSDK.initPublisher);
+          sinon.assert.calledOnce(fakeSession.publish);
+        });
+      });
+
+      describe("#unpublish", function() {
+        it("should unpublish local stream", function() {
+          var view = new sharedViews.ConversationView({
+            sdk: fakeSDK,
+            model: model
+          });
+
+          view.unpublish();
+
+          sinon.assert.calledOnce(fakeSession.unpublish);
+        });
+      });
+
+      describe("Model events", function() {
+        var view;
+
+        beforeEach(function() {
+          sandbox.stub(sharedViews.ConversationView.prototype, "publish");
+          sandbox.stub(sharedViews.ConversationView.prototype, "unpublish");
+          view = new sharedViews.ConversationView({sdk: fakeSDK, model: model});
+        });
+
+        it("should publish local stream on session:connected", function() {
+          model.trigger("session:connected");
+
+          sinon.assert.calledOnce(view.publish);
+        });
+
+        it("should publish remote streams on session:stream-created",
+          function() {
+            var s1 = {connection: {connectionId: 42}};
+            var s2 = {connection: {connectionId: 43}};
+
+            model.trigger("session:stream-created", {streams: [s1, s2]});
+
+            sinon.assert.calledOnce(fakeSession.subscribe);
+            sinon.assert.calledWith(fakeSession.subscribe, s2);
+          });
+
+        it("should unpublish local stream on session:ended", function() {
+          model.trigger("session:ended");
+
+          sinon.assert.calledOnce(view.unpublish);
+        });
+
+        it("should unpublish local stream on session:peer-hungup", function() {
+          model.trigger("session:peer-hungup");
+
+          sinon.assert.calledOnce(view.unpublish);
+        });
+
+        it("should unpublish local stream on session:network-disconnected",
+          function() {
+            model.trigger("session:network-disconnected");
+
+            sinon.assert.calledOnce(view.unpublish);
+          });
       });
     });
   });
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 36ff56ad8895..7620a33409f0 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -31,7 +31,7 @@ describe("loop.webapp", function() {
     var router, conversation;
 
     beforeEach(function() {
-      conversation = new sharedModels.ConversationModel();
+      conversation = new sharedModels.ConversationModel({}, {sdk: {}});
       router = new loop.webapp.WebappRouter({
         conversation: conversation,
         notifier: notifier
@@ -90,14 +90,13 @@ describe("loop.webapp", function() {
           router.home();
 
           sinon.assert.calledOnce(router.loadView);
-          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
-            return obj instanceof loop.webapp.HomeView;
-          }));
+          sinon.assert.calledWith(router.loadView,
+            sinon.match.instanceOf(loop.webapp.HomeView));
         });
       });
 
       describe("#initiate", function() {
-        it("should set the token to the conversation model", function() {
+        it("should set the token on the conversation model", function() {
           router.initiate("fakeToken");
 
           expect(conversation.get("loopToken")).eql("fakeToken");
@@ -107,28 +106,36 @@ describe("loop.webapp", function() {
           router.initiate("fakeToken");
 
           sinon.assert.calledOnce(router.loadView);
-          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
-            return obj instanceof loop.webapp.ConversationFormView;
-          }));
+          sinon.assert.calledWith(router.loadView,
+            sinon.match.instanceOf(loop.webapp.ConversationFormView));
+        });
+
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=991118
+        it("should terminate any ongoing call session", function() {
+          sinon.stub(conversation, "endSession");
+          conversation.set("ongoing", true);
+
+          router.initiate("fakeToken");
+
+          sinon.assert.calledOnce(conversation.endSession);
         });
       });
 
-      describe("#conversation", function() {
+      describe("#loadConversation", function() {
         it("should load the ConversationView if session is set", function() {
           sandbox.stub(sharedViews.ConversationView.prototype, "initialize");
           conversation.set("sessionId", "fakeSessionId");
 
-          router.conversation();
+          router.loadConversation();
 
           sinon.assert.calledOnce(router.loadView);
-          sinon.assert.calledWith(router.loadView, sinon.match(function(obj) {
-            return obj instanceof sharedViews.ConversationView;
-          }));
+          sinon.assert.calledWith(router.loadView,
+            sinon.match.instanceOf(sharedViews.ConversationView));
         });
 
         it("should navigate to #call/{token} if session isn't ready",
           function() {
-            router.conversation("fakeToken");
+            router.loadConversation("fakeToken");
 
             sinon.assert.calledOnce(router.navigate);
             sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
@@ -199,7 +206,7 @@ describe("loop.webapp", function() {
       var conversation, initiate, view, fakeSubmitEvent;
 
       beforeEach(function() {
-        conversation = new sharedModels.ConversationModel();
+        conversation = new sharedModels.ConversationModel({}, {sdk: {}});
         view = new loop.webapp.ConversationFormView({
           model: conversation,
           notifier: notifier
@@ -237,7 +244,7 @@ describe("loop.webapp", function() {
       beforeEach(function() {
         conversation = new sharedModels.ConversationModel({
           loopToken: "fake"
-        });
+        }, {sdk: {}});
         view = new loop.webapp.ConversationFormView({
           model: conversation,
           notifier: notifier

From e2819ee27e0b37da86104167bef641b814e9da7a Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 056/117] Bug 998271 - L10n notifications, r=dmose

---
 .../loop/content/shared/js/router.js          |  8 +--
 .../loop/content/shared/js/views.js           | 34 ++++++++++-
 .../loop/standalone/content/js/webapp.js      |  4 +-
 .../loop/test/shared/router_test.js           | 21 ++++++-
 .../components/loop/test/shared/views_test.js | 60 +++++++++++++++++++
 5 files changed, 116 insertions(+), 11 deletions(-)

diff --git a/browser/components/loop/content/shared/js/router.js b/browser/components/loop/content/shared/js/router.js
index 87e8c495cc88..452b636e8b9a 100644
--- a/browser/components/loop/content/shared/js/router.js
+++ b/browser/components/loop/content/shared/js/router.js
@@ -9,8 +9,6 @@ loop.shared = loop.shared || {};
 loop.shared.router = (function(l10n) {
   "use strict";
 
-  var __ = l10n.get;
-
   /**
    * Base Router. Allows defining a main active view and ease toggling it when
    * the active route changes.
@@ -114,7 +112,7 @@ loop.shared.router = (function(l10n) {
      * Session has ended. Notifies the user and ends the call.
      */
     _onSessionEnded: function() {
-      this._notifier.warn(__("call_has_ended"));
+      this._notifier.warnL10n("call_has_ended");
       this.endCall();
     },
 
@@ -127,7 +125,7 @@ loop.shared.router = (function(l10n) {
      * @param {Object} event
      */
     _onPeerHungup: function() {
-      this._notifier.warn(__("peer_ended_conversation"));
+      this._notifier.warnL10n("peer_ended_conversation");
       this.endCall();
     },
 
@@ -135,7 +133,7 @@ loop.shared.router = (function(l10n) {
      * Network disconnected. Notifies the user and ends the call.
      */
     _onNetworkDisconnected: function() {
-      this._notifier.warn(__("network_disconnected"));
+      this._notifier.warnL10n("network_disconnected");
       this.endCall();
     }
   });
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 1a0be28feeaf..89146337bd61 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -138,7 +138,7 @@ loop.shared.views = (function(_, OT, l10n) {
     /**
      * Subscribes and attaches each created stream to a DOM element.
      *
-     * XXX: for now we only support a single remote stream, hence a singe DOM
+     * XXX: for now we only support a single remote stream, hence a single DOM
      *      element.
      *
      * http://tokbox.com/opentok/libraries/client/js/reference/StreamEvent.html
@@ -264,6 +264,20 @@ loop.shared.views = (function(_, OT, l10n) {
       this.collection.add(notification);
     },
 
+    /**
+     * Adds a new notification to the stack using an l10n message identifier,
+     * triggering rendering of it.
+     *
+     * @param  {String} messageId L10n message id
+     * @param  {String} level     Notification level
+     */
+    notifyL10n: function(messageId, level) {
+      this.notify({
+        message: l10n.get(messageId),
+        level: level
+      });
+    },
+
     /**
      * Adds a warning notification to the stack and renders it.
      *
@@ -273,6 +287,15 @@ loop.shared.views = (function(_, OT, l10n) {
       this.notify({level: "warning", message: message});
     },
 
+    /**
+     * Adds a l10n warning notification to the stack and renders it.
+     *
+     * @param  {String} messageId L10n message id
+     */
+    warnL10n: function(messageId) {
+      this.warn(l10n.get(messageId));
+    },
+
     /**
      * Adds an error notification to the stack and renders it.
      *
@@ -282,6 +305,15 @@ loop.shared.views = (function(_, OT, l10n) {
       this.notify({level: "error", message: message});
     },
 
+    /**
+     * Adds a l10n rror notification to the stack and renders it.
+     *
+     * @param  {String} messageId L10n message id
+     */
+    errorL10n: function(messageId) {
+      this.error(l10n.get(messageId));
+    },
+
     /**
      * Renders this view.
      *
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 45e8b6d33daa..13b682792f1a 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -80,7 +80,7 @@ loop.webapp = (function($, OT, webl10n) {
 
     _onSessionError: function(error) {
       console.error(error);
-      this.notifier.error(__("unable_retrieve_call_info"));
+      this.notifier.errorL10n("unable_retrieve_call_info");
     },
 
     /**
@@ -127,7 +127,7 @@ loop.webapp = (function($, OT, webl10n) {
      */
     startCall: function() {
       if (!this._conversation.get("loopToken")) {
-        this._notifier.error(__("missing_conversation_info"));
+        this._notifier.errorL10n("missing_conversation_info");
         this.navigate("home", {trigger: true});
       } else {
         this.navigate("call/ongoing/" + this._conversation.get("loopToken"), {
diff --git a/browser/components/loop/test/shared/router_test.js b/browser/components/loop/test/shared/router_test.js
index 6ef5d2d6bf48..25c5b3b2163e 100644
--- a/browser/components/loop/test/shared/router_test.js
+++ b/browser/components/loop/test/shared/router_test.js
@@ -72,7 +72,9 @@ describe("loop.shared.router", function() {
       notifier = {
         notify: sandbox.spy(),
         warn: sandbox.spy(),
-        error: sandbox.spy()
+        warnL10n: sandbox.spy(),
+        error: sandbox.spy(),
+        errorL10n: sandbox.spy()
       };
     });
 
@@ -117,10 +119,21 @@ describe("loop.shared.router", function() {
         sinon.assert.calledOnce(router.endCall);
       });
 
+      it("should warn the user that the session has ended", function() {
+        conversation.trigger("session:ended");
+
+        sinon.assert.calledOnce(notifier.warnL10n);
+        sinon.assert.calledWithExactly(notifier.warnL10n,
+                                       "call_has_ended");
+      });
+
       it("should warn the user when peer hangs up", function() {
         conversation.trigger("session:peer-hungup");
 
-        sinon.assert.calledOnce(notifier.warn);
+        sinon.assert.calledOnce(notifier.warnL10n);
+        sinon.assert.calledWithExactly(notifier.warnL10n,
+                                       "peer_ended_conversation");
+
       });
 
       it("should call endCall() when peer hangs up", function() {
@@ -132,7 +145,9 @@ describe("loop.shared.router", function() {
       it("should warn the user when network disconnects", function() {
         conversation.trigger("session:network-disconnected");
 
-        sinon.assert.calledOnce(notifier.warn);
+        sinon.assert.calledOnce(notifier.warnL10n);
+        sinon.assert.calledWithExactly(notifier.warnL10n,
+                                       "network_disconnected");
       });
 
       it("should call endCall() when network disconnects", function() {
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index e87070fcae57..a63fed32217e 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -215,6 +215,9 @@ describe("loop.shared.views", function() {
     var coll, notifData, testNotif;
 
     beforeEach(function() {
+      sandbox.stub(l10n, "get", function(x) {
+        return "translated:" + x;
+      });
       notifData = {level: "error", message: "plop"};
       testNotif = new sharedModels.NotificationModel(notifData);
       coll = new sharedModels.NotificationCollection();
@@ -269,6 +272,33 @@ describe("loop.shared.views", function() {
       });
     });
 
+    describe("#notifyL10n", function() {
+      var view;
+
+      beforeEach(function() {
+        view = new sharedViews.NotificationListView({collection: coll});
+      });
+
+      it("should translate a message string identifier", function() {
+        view.notifyL10n("fakeId", "warning");
+
+        sinon.assert.calledOnce(l10n.get);
+        sinon.assert.calledWithExactly(l10n.get, "fakeId");
+      });
+
+      it("should notify end user with the provided message", function() {
+        sandbox.stub(view, "notify");
+
+        view.notifyL10n("fakeId", "warning");
+
+        sinon.assert.calledOnce(view.notify);
+        sinon.assert.calledWithExactly(view.notify, {
+          message: "translated:fakeId",
+          level: "warning"
+        });
+      });
+    });
+
     describe("#warn", function() {
       it("should add a warning notification to the stack", function() {
         var view = new sharedViews.NotificationListView({collection: coll});
@@ -281,6 +311,21 @@ describe("loop.shared.views", function() {
       });
     });
 
+    describe("#warnL10n", function() {
+      it("should warn using a l10n string id", function() {
+        var view = new sharedViews.NotificationListView({collection: coll});
+        sandbox.stub(view, "notify");
+
+        view.warnL10n("fakeId");
+
+        sinon.assert.called(view.notify);
+        sinon.assert.calledWithExactly(view.notify, {
+          message: "translated:fakeId",
+          level: "warning"
+        });
+      });
+    });
+
     describe("#error", function() {
       it("should add an error notification to the stack", function() {
         var view = new sharedViews.NotificationListView({collection: coll});
@@ -293,6 +338,21 @@ describe("loop.shared.views", function() {
       });
     });
 
+    describe("#errorL10n", function() {
+      it("should notify an error using a l10n string id", function() {
+        var view = new sharedViews.NotificationListView({collection: coll});
+        sandbox.stub(view, "notify");
+
+        view.errorL10n("fakeId");
+
+        sinon.assert.called(view.notify);
+        sinon.assert.calledWithExactly(view.notify, {
+          message: "translated:fakeId",
+          level: "error"
+        });
+      });
+    });
+
     describe("Collection events", function() {
       var view;
 

From e4287a9ce1f08b07483dfcba946b5d2579001a5e Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 057/117] Bug 999480 - Panel to use a router & templated views,
 r=Standard8

---
 .../loop/content/shared/css/panel.css         | 10 ++-
 .../loop/content/shared/js/router.js          | 50 +++++++----
 .../loop/standalone/content/js/webapp.js      |  8 +-
 .../loop/test/shared/router_test.js           | 86 +++++++++++--------
 .../loop/test/standalone/webapp_test.js       | 28 +++---
 5 files changed, 111 insertions(+), 71 deletions(-)

diff --git a/browser/components/loop/content/shared/css/panel.css b/browser/components/loop/content/shared/css/panel.css
index d75b141b979f..d1961eb29187 100644
--- a/browser/components/loop/content/shared/css/panel.css
+++ b/browser/components/loop/content/shared/css/panel.css
@@ -4,6 +4,12 @@
 
 /* Panel styles */
 
+.panel {
+  /* XXX the Social API panel behaves weirdly on inner element size changes,
+     adding unwanted scrollbars; quickfix is to hide these for now. */
+  overflow: hidden;
+}
+
 .spacer {
   margin-bottom: 1em;
 }
@@ -55,6 +61,6 @@
   text-align: center;
 }
 
-.share .action .messages p {
-  margin: 0;
+.panel #messages .alert {
+  margin-bottom: 0;
 }
diff --git a/browser/components/loop/content/shared/js/router.js b/browser/components/loop/content/shared/js/router.js
index 452b636e8b9a..f81bde593ab3 100644
--- a/browser/components/loop/content/shared/js/router.js
+++ b/browser/components/loop/content/shared/js/router.js
@@ -16,7 +16,35 @@ loop.shared.router = (function(l10n) {
    * @link http://mikeygee.com/blog/backbone.html
    */
   var BaseRouter = Backbone.Router.extend({
-    activeView: undefined,
+    /**
+     * Active view.
+     * @type {loop.shared.views.BaseView}
+     */
+    _activeView: undefined,
+
+    /**
+     * Notifications dispatcher.
+     * @type {loop.shared.views.NotificationListView}
+     */
+    _notifier: undefined,
+
+    /**
+     * Constructor.
+     *
+     * Required options:
+     * - {loop.shared.views.NotificationListView} notifier Notifier view.
+     *
+     * @param  {Object} options Options object.
+     */
+    constructor: function(options) {
+      options = options || {};
+      if (!options.notifier) {
+        throw new Error("missing required notifier");
+      }
+      this._notifier = options.notifier;
+
+      Backbone.Router.apply(this, arguments);
+    },
 
     /**
      * Loads and render current active view.
@@ -24,11 +52,11 @@ loop.shared.router = (function(l10n) {
      * @param {loop.shared.views.BaseView} view View.
      */
     loadView : function(view) {
-      if (this.activeView) {
-        this.activeView.remove();
+      if (this._activeView) {
+        this._activeView.remove();
       }
-      this.activeView = view.render().show();
-      this.updateView(this.activeView.$el);
+      this._activeView = view.render().show();
+      this.updateView(this._activeView.$el);
     },
 
     /**
@@ -52,12 +80,6 @@ loop.shared.router = (function(l10n) {
      */
     _conversation: undefined,
 
-    /**
-     * Notifications dispatcher.
-     * @type {loop.shared.views.NotificationListView}
-     */
-    _notifier: undefined,
-
     /**
      * Constructor. Defining it as `constructor` allows implementing an
      * `initialize` method in child classes without needing calling this parent
@@ -65,7 +87,6 @@ loop.shared.router = (function(l10n) {
      *
      * Required options:
      * - {loop.shared.model.ConversationModel}    model    Conversation model.
-     * - {loop.shared.views.NotificationListView} notifier Notifier component.
      *
      * @param {Object} options Options object.
      */
@@ -76,11 +97,6 @@ loop.shared.router = (function(l10n) {
       }
       this._conversation = options.conversation;
 
-      if (!options.notifier) {
-        throw new Error("missing required notifier");
-      }
-      this._notifier = options.notifier;
-
       this.listenTo(this._conversation, "session:ready", this._onSessionReady);
       this.listenTo(this._conversation, "session:ended", this._onSessionEnded);
       this.listenTo(this._conversation, "session:peer-hungup",
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 13b682792f1a..fcbd0914d7b3 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -5,7 +5,7 @@
 /* global loop:true */
 
 var loop = loop || {};
-loop.webapp = (function($, OT, webl10n) {
+loop.webapp = (function($, _, OT) {
   "use strict";
 
   /**
@@ -19,9 +19,7 @@ loop.webapp = (function($, OT, webl10n) {
       sharedViews = loop.shared.views,
       // XXX this one should be configurable
       //     see https://bugzilla.mozilla.org/show_bug.cgi?id=987086
-      baseServerUrl = "http://localhost:5000",
-      // aliasing translation function as __ for concision
-      __ = webl10n.get;
+      baseServerUrl = "http://localhost:5000";
 
   /**
    * App router.
@@ -207,4 +205,4 @@ loop.webapp = (function($, OT, webl10n) {
     init: init,
     WebappRouter: WebappRouter
   };
-})(jQuery, window.OT, document.webL10n);
+})(jQuery, _, window.OT);
diff --git a/browser/components/loop/test/shared/router_test.js b/browser/components/loop/test/shared/router_test.js
index 25c5b3b2163e..cc33247c16c2 100644
--- a/browser/components/loop/test/shared/router_test.js
+++ b/browser/components/loop/test/shared/router_test.js
@@ -9,10 +9,17 @@ var expect = chai.expect;
 describe("loop.shared.router", function() {
   "use strict";
 
-  var sandbox;
+  var sandbox, notifier;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
+    notifier = {
+      notify: sandbox.spy(),
+      warn: sandbox.spy(),
+      warnL10n: sandbox.spy(),
+      error: sandbox.spy(),
+      errorL10n: sandbox.spy()
+    };
   });
 
   afterEach(function() {
@@ -20,46 +27,70 @@ describe("loop.shared.router", function() {
   });
 
   describe("BaseRouter", function() {
-    var router, view;
-
     beforeEach(function() {
-      router = new loop.shared.router.BaseRouter();
       $("#fixtures").html('<div id="main"></div>');
-      var TestView = loop.shared.views.BaseView.extend({
-        template: _.template("<p>plop</p>")
-      });
-      view = new TestView();
     });
 
     afterEach(function() {
       $("#fixtures").empty();
     });
 
-    describe("#loadView", function() {
-      it("should set the active view", function() {
-        router.loadView(view);
-
-        expect(router.activeView).eql(view);
+    describe("#constructor", function() {
+      it("should require a notifier", function() {
+        expect(function() {
+          new loop.shared.router.BaseRouter();
+        }).to.Throw(Error, /missing required notifier/);
       });
 
-      it("should load and render the passed view", function() {
-        router.loadView(view);
+      describe("inherited", function() {
+        var ExtendedRouter = loop.shared.router.BaseRouter.extend({});
 
-        expect($("#main p").text()).eql("plop");
+        it("should require a notifier", function() {
+          expect(function() {
+            new ExtendedRouter();
+          }).to.Throw(Error, /missing required notifier/);
+        });
       });
     });
 
-    describe("#updateView", function() {
-      it("should update the main element with provided contents", function() {
-        router.updateView($("<p>plip</p>"));
+    describe("constructed", function() {
+      var router, view, TestRouter;
 
-        expect($("#main p").text()).eql("plip");
+      beforeEach(function() {
+        TestRouter = loop.shared.router.BaseRouter.extend({});
+        var TestView = loop.shared.views.BaseView.extend({
+          template: _.template("<p>plop</p>")
+        });
+        view = new TestView();
+        router = new TestRouter({notifier: notifier});
+      });
+
+      describe("#loadView", function() {
+        it("should set the active view", function() {
+          router.loadView(view);
+
+          expect(router._activeView).eql(view);
+        });
+
+        it("should load and render the passed view", function() {
+          router.loadView(view);
+
+          expect($("#main p").text()).eql("plop");
+        });
+      });
+
+      describe("#updateView", function() {
+        it("should update the main element with provided contents", function() {
+          router.updateView($("<p>plip</p>"));
+
+          expect($("#main p").text()).eql("plip");
+        });
       });
     });
   });
 
   describe("BaseConversationRouter", function() {
-    var conversation, notifier, TestRouter;
+    var conversation, TestRouter;
 
     beforeEach(function() {
       TestRouter = loop.shared.router.BaseConversationRouter.extend({
@@ -69,13 +100,6 @@ describe("loop.shared.router", function() {
       conversation = new loop.shared.models.ConversationModel({
         loopToken: "fakeToken"
       }, {sdk: {}});
-      notifier = {
-        notify: sandbox.spy(),
-        warn: sandbox.spy(),
-        warnL10n: sandbox.spy(),
-        error: sandbox.spy(),
-        errorL10n: sandbox.spy()
-      };
     });
 
     describe("#constructor", function() {
@@ -84,12 +108,6 @@ describe("loop.shared.router", function() {
           new TestRouter();
         }).to.Throw(Error, /missing required conversation/);
       });
-
-      it("should require a notifier", function() {
-        expect(function() {
-          new TestRouter({conversation: {}});
-        }).to.Throw(Error, /missing required notifier/);
-      });
     });
 
     describe("Events", function() {
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 7620a33409f0..cebeea9a131e 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -19,7 +19,9 @@ describe("loop.webapp", function() {
     notifier = {
       notify: sandbox.spy(),
       warn: sandbox.spy(),
-      error: sandbox.spy()
+      warnL10n: sandbox.spy(),
+      error: sandbox.spy(),
+      errorL10n: sandbox.spy(),
     };
   });
 
@@ -51,8 +53,9 @@ describe("loop.webapp", function() {
       it("should notify the user if session token is missing", function() {
         router.startCall();
 
-        sinon.assert.calledOnce(notifier.error);
-        // XXX test for message contents (needs stubbing L10n)
+        sinon.assert.calledOnce(notifier.errorL10n);
+        sinon.assert.calledWithExactly(notifier.errorL10n,
+                                       "missing_conversation_info");
       });
 
       it("should navigate to call/ongoing/:token if session token is available",
@@ -188,18 +191,18 @@ describe("loop.webapp", function() {
   });
 
   describe("ConversationFormView", function() {
+    var conversation;
+
+    beforeEach(function() {
+      conversation = new sharedModels.ConversationModel({}, {sdk: {}});
+    });
+
     describe("#initialize", function() {
       it("should require a conversation option", function() {
         expect(function() {
           new loop.webapp.WebappRouter();
         }).to.Throw(Error, /missing required conversation/);
       });
-
-      it("should require a notifier option", function() {
-        expect(function() {
-          new loop.webapp.WebappRouter({conversation: {}});
-        }).to.Throw(Error, /missing required notifier/);
-      });
     });
 
     describe("#initiate", function() {
@@ -255,10 +258,9 @@ describe("loop.webapp", function() {
          " received", function() {
         conversation.trigger("session:error", "tech error");
 
-        // XXX We should test for the actual message content, but webl10n gets
-        //     in the way as translated messages are all empty because matching
-        //     DOM elements are missing.
-        sinon.assert.calledOnce(notifier.error);
+        sinon.assert.calledOnce(notifier.errorL10n);
+        sinon.assert.calledWithExactly(notifier.errorL10n,
+                                       "unable_retrieve_call_info");
       });
     });
   });

From a3b3b676d21d19e47047a876025e01527bf091e7 Mon Sep 17 00:00:00 2001
From: Romain Gauthier <romain.gauthier@monkeypatch.me>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 058/117] Bug 972941: Landing page for non WebRTC-compliant
 browsers on supported devices. r=nperriault

---
 .../loop/content/shared/js/views.js           | 18 ++++++++++++-
 .../loop/standalone/content/js/webapp.js      |  7 +++++
 .../loop/standalone/content/l10n/data.ini     |  7 +++++
 .../components/loop/test/shared/sdk_mock.js   | 22 ++++++++++++++++
 .../loop/test/standalone/index.html           |  1 +
 .../loop/test/standalone/webapp_test.js       | 26 +++++++++++++++++++
 6 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 browser/components/loop/test/shared/sdk_mock.js

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 89146337bd61..d47b650c2852 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -330,11 +330,27 @@ loop.shared.views = (function(_, OT, l10n) {
     }
   });
 
+  /**
+   * Unsupported Browsers view.
+   */
+  var UnsupportedView = BaseView.extend({
+    template: _.template([
+      '<div>',
+        '<h2 data-l10n-id="incompatible_browser"></h2>',
+        '<p data-l10n-id="powered_by_webrtc"></p>',
+        '<p data-l10n-id="use_latest_firefox" ',
+          'data-l10n-args=\'{"ff_url": "https://www.mozilla.org/firefox/"}\'>',
+        '</p>',
+      '</div>'
+    ].join(""))
+  });
+
   return {
     L10nView: L10nView,
     BaseView: BaseView,
     ConversationView: ConversationView,
     NotificationListView: NotificationListView,
-    NotificationView: NotificationView
+    NotificationView: NotificationView,
+    UnsupportedView: UnsupportedView
   };
 })(_, window.OT, document.webL10n || document.mozL10n);
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index fcbd0914d7b3..548fd98526c9 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -111,6 +111,7 @@ loop.webapp = (function($, _, OT) {
   var WebappRouter = loop.shared.router.BaseConversationRouter.extend({
     routes: {
       "":                    "home",
+      "unsupported":         "unsupported",
       "call/ongoing/:token": "loadConversation",
       "call/:token":         "initiate"
     },
@@ -152,6 +153,10 @@ loop.webapp = (function($, _, OT) {
       this.loadView(new HomeView());
     },
 
+    unsupported: function() {
+      this.loadView(new sharedViews.UnsupportedView());
+    },
+
     /**
      * Loads conversation launcher view, setting the received conversation token
      * to the current conversation model. If a session is currently established,
@@ -196,6 +201,8 @@ loop.webapp = (function($, _, OT) {
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
+    if (!OT.checkSystemRequirements())
+      router.navigate("unsupported", {trigger: true});
   }
 
   return {
diff --git a/browser/components/loop/standalone/content/l10n/data.ini b/browser/components/loop/standalone/content/l10n/data.ini
index 0e0883fb8e8c..212a7ad0a606 100644
--- a/browser/components/loop/standalone/content/l10n/data.ini
+++ b/browser/components/loop/standalone/content/l10n/data.ini
@@ -7,6 +7,9 @@ unable_retrieve_call_info=Unable to retrieve conversation information.
 stop=Stop
 start_call=Start the call
 welcome=Welcome to the Loop web client.
+incompatible_browser=Incompatible Browser
+powered_by_webrtc=The audio and video components of Loop are powered by WebRTC.
+use_latest_firefox.innerHTML=To use Loop, please use the latest version of <a href="{{ff_url}}">Firefox</a>.
 
 [fr]
 call_has_ended=L'appel est terminé.
@@ -17,3 +20,7 @@ unable_retrieve_call_info=Impossible de récupérer les informations liées à c
 stop=Arrêter
 start_call=Démarrer l'appel
 welcome=Bienvenue sur Loop.
+incompatible_browser=Navigateur non supporté
+powered_by_webrtc=Les fonctionnalités audio et vidéo de Loop utilisent WebRTC.
+use_latest_firefox.innerHTML=Pour utiliser Loop, merci d'utiliser la dernière version de <a href="{{ff_url}}">Firefox</a>.
+
diff --git a/browser/components/loop/test/shared/sdk_mock.js b/browser/components/loop/test/shared/sdk_mock.js
new file mode 100644
index 000000000000..e6592cf76fc1
--- /dev/null
+++ b/browser/components/loop/test/shared/sdk_mock.js
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * This file mocks the functions from the OT sdk that we use. This is to provide
+ * an interface that tests can mock out, without needing to maintain a copy of
+ * the sdk or load one from the network.
+ */
+(function (window) {
+  "use strict";
+
+  if (!window.OT) {
+    window.OT = {};
+  }
+
+  window.OT.checkSystemRequirements = function() {
+    return true;
+  };
+
+})(window);
+
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
index f84b04324d86..e30b99e8f744 100644
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -25,6 +25,7 @@
   <script src="../shared/vendor/mocha-1.17.1.js"></script>
   <script src="../shared/vendor/chai-1.9.0.js"></script>
   <script src="../shared/vendor/sinon-1.9.0.js"></script>
+  <script src="../shared/sdk_mock.js"></script>
   <script>
     chai.Assertion.includeStack = true;
     mocha.setup('bdd');
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index cebeea9a131e..363ca5644eb9 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -29,6 +29,22 @@ describe("loop.webapp", function() {
     sandbox.restore();
   });
 
+  describe("#init", function() {
+    it("should navigate to the unsupported route if the sdk detects the" +
+       "browser is unsupported", function() {
+         var WebappRouter = loop.webapp.WebappRouter;
+         sandbox.stub(window.OT, "checkSystemRequirements").returns(false);
+         sandbox.stub(WebappRouter.prototype, "navigate");
+
+         loop.webapp.init();
+
+         sinon.assert.calledOnce(WebappRouter.prototype.navigate);
+         sinon.assert.calledWithExactly(WebappRouter.prototype.navigate,
+                                        "unsupported", {trigger: true});
+       });
+
+  });
+
   describe("WebappRouter", function() {
     var router, conversation;
 
@@ -144,6 +160,16 @@ describe("loop.webapp", function() {
             sinon.assert.calledWithMatch(router.navigate, "call/fakeToken");
           });
       });
+
+      describe("#unsupported", function() {
+        it("should load the UnsupportedView", function() {
+          router.unsupported();
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWith(router.loadView,
+            sinon.match.instanceOf(sharedViews.UnsupportedView));
+        });
+      });
     });
 
     describe("Events", function() {

From 46959a8b27855fc356cb148d930d2ac818895ace Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 059/117] Bug 997178 - Restart a call, r=dmose

---
 .../loop/content/shared/js/models.js          | 10 ++----
 .../loop/content/shared/js/views.js           |  3 +-
 .../loop/test/shared/models_test.js           | 34 +++++++++++--------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/browser/components/loop/content/shared/js/models.js b/browser/components/loop/content/shared/js/models.js
index 2beabb70369a..b589d05cf833 100644
--- a/browser/components/loop/content/shared/js/models.js
+++ b/browser/components/loop/content/shared/js/models.js
@@ -75,11 +75,6 @@ loop.shared.models = (function() {
      * @param {Object} options Options object
      */
     initiate: function(options) {
-      // Check if the session is already set
-      if (this.isSessionReady()) {
-        return this.trigger("session:ready", this);
-      }
-
       var client = new loop.shared.Client({
         baseServerUrl: options.baseServerUrl
       });
@@ -144,7 +139,6 @@ loop.shared.models = (function() {
         throw new Error("Can't start session as it's not ready");
       }
       this.session = this.sdk.initSession(this.get("sessionId"));
-      this.session.connect(this.get("apiKey"), this.get("sessionToken"));
       this.listenTo(this.session, "sessionConnected", this._sessionConnected);
       this.listenTo(this.session, "streamCreated", this._streamCreated);
       this.listenTo(this.session, "connectionDestroyed",
@@ -153,6 +147,7 @@ loop.shared.models = (function() {
                                   this._sessionDisconnected);
       this.listenTo(this.session, "networkDisconnected",
                                   this._networkDisconnected);
+      this.session.connect(this.get("apiKey"), this.get("sessionToken"));
     },
 
     /**
@@ -160,6 +155,7 @@ loop.shared.models = (function() {
      */
     endSession: function() {
       this.session.disconnect();
+      this.once("session:ended", this.stopListening, this);
       this.set("ongoing", false);
     },
 
@@ -192,7 +188,7 @@ loop.shared.models = (function() {
      */
     _sessionDisconnected: function(event) {
       this.trigger("session:ended");
-      this.endSession();
+      this.set("ongoing", false);
     },
 
     /**
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index d47b650c2852..20f8083922a3 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -126,13 +126,12 @@ loop.shared.views = (function(_, OT, l10n) {
       }
       this.sdk = options.sdk;
 
-      this.model.startSession();
-
       this.listenTo(this.model, "session:connected", this.publish);
       this.listenTo(this.model, "session:stream-created", this._streamCreated);
       this.listenTo(this.model, ["session:peer-hungup",
                                  "session:network-disconnected",
                                  "session:ended"].join(" "), this.unpublish);
+      this.model.startSession();
     },
 
     /**
diff --git a/browser/components/loop/test/shared/models_test.js b/browser/components/loop/test/shared/models_test.js
index 80efa8b33f77..d9d0fe09a92d 100644
--- a/browser/components/loop/test/shared/models_test.js
+++ b/browser/components/loop/test/shared/models_test.js
@@ -119,20 +119,6 @@ describe("loop.shared.models", function() {
             sinon.assert.calledWith(conversation.setReady, fakeSessionData);
           });
 
-        it("should trigger session:ready without fetching session data over " +
-           "HTTP when already set", function(done) {
-            conversation.set(fakeSessionData);
-
-            conversation.on("session:ready", function() {
-              sinon.assert.notCalled(reqCallInfoStub);
-              done();
-            }).initiate({
-              baseServerUrl: fakeBaseServerUrl,
-              outgoing: true
-            });
-
-          });
-
         it("should trigger a `session:error` on failure", function(done) {
           reqCallInfoStub.callsArgWith(1,
             new Error("failed: HTTP 400 Bad Request; fake"));
@@ -192,6 +178,16 @@ describe("loop.shared.models", function() {
               fakeSession.trigger("sessionDisconnected", {reason: "ko"});
             });
 
+          it("should set the ongoing attribute to false on sessionDisconnected",
+            function(done) {
+              model.once("session:ended", function() {
+                expect(model.get("ongoing")).eql(false);
+                done();
+              });
+
+              fakeSession.trigger("sessionDisconnected", {reason: "ko"});
+            });
+
           describe("connectionDestroyed event received", function() {
             var fakeEvent = {reason: "ko", connection: {connectionId: 42}};
 
@@ -256,6 +252,16 @@ describe("loop.shared.models", function() {
 
           expect(model.get("ongoing")).eql(false);
         });
+
+        it("should stop listening to session events once the session is " +
+           "actually disconnected", function() {
+            sandbox.stub(model, "stopListening");
+
+            model.endSession();
+            model.trigger("session:ended");
+
+            sinon.assert.calledOnce(model.stopListening);
+          });
       });
     });
   });

From 1b7e6cebc8716e47666c11043decf9f8da8c9a36 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 060/117] Bug 1005041: In progress feedback when getting a call
 url, r=dmose

---
 .../loop/content/shared/css/panel.css         |  18 +++++++++++++++++-
 .../loop/content/shared/img/loading-icon.gif  | Bin 0 -> 2545 bytes
 .../loop/content/shared/js/views.js           |  10 +++++-----
 .../loop/test/standalone/webapp_test.js       |  17 ++++++++---------
 4 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 browser/components/loop/content/shared/img/loading-icon.gif

diff --git a/browser/components/loop/content/shared/css/panel.css b/browser/components/loop/content/shared/css/panel.css
index d1961eb29187..7960692c81ce 100644
--- a/browser/components/loop/content/shared/css/panel.css
+++ b/browser/components/loop/content/shared/css/panel.css
@@ -50,9 +50,25 @@
 }
 
 .share .action input {
+  border: 1px solid #ccc; /* Overriding background style for a text input (see
+                             below) resets its borders to a weird beveled style;
+                             defining a default 1px border solves the issue. */
   font-size: .9em;
   width: 60%;
-  padding: .4em;
+  padding: .5em;
+}
+
+.share .action input.pending {
+  background-image: url(../img/loading-icon.gif);
+  background-repeat: no-repeat;
+  background-position: right;
+}
+
+/* For some reason, buttons have a bigger default font size in FF; we're
+   reducing a bit for graphical consistency here. */
+.share .action button {
+  font-size: .9em;
+  padding-top: 6px;
 }
 
 /* Specific cases */
diff --git a/browser/components/loop/content/shared/img/loading-icon.gif b/browser/components/loop/content/shared/img/loading-icon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1c72ebb554be018511ae972c3f2361dff02dce02
GIT binary patch
literal 2545
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
M?FSZn2B>%I-}ej|s{jB1

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 20f8083922a3..c55006630168 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -335,11 +335,11 @@ loop.shared.views = (function(_, OT, l10n) {
   var UnsupportedView = BaseView.extend({
     template: _.template([
       '<div>',
-        '<h2 data-l10n-id="incompatible_browser"></h2>',
-        '<p data-l10n-id="powered_by_webrtc"></p>',
-        '<p data-l10n-id="use_latest_firefox" ',
-          'data-l10n-args=\'{"ff_url": "https://www.mozilla.org/firefox/"}\'>',
-        '</p>',
+      '  <h2 data-l10n-id="incompatible_browser"></h2>',
+      '  <p data-l10n-id="powered_by_webrtc"></p>',
+      '  <p data-l10n-id="use_latest_firefox" ',
+      '    data-l10n-args=\'{"ff_url": "https://www.mozilla.org/firefox/"}\'>',
+      '  </p>',
       '</div>'
     ].join(""))
   });
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index 363ca5644eb9..d5f6a05e7bde 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -32,17 +32,16 @@ describe("loop.webapp", function() {
   describe("#init", function() {
     it("should navigate to the unsupported route if the sdk detects the" +
        "browser is unsupported", function() {
-         var WebappRouter = loop.webapp.WebappRouter;
-         sandbox.stub(window.OT, "checkSystemRequirements").returns(false);
-         sandbox.stub(WebappRouter.prototype, "navigate");
+      var WebappRouter = loop.webapp.WebappRouter;
+      sandbox.stub(window.OT, "checkSystemRequirements").returns(false);
+      sandbox.stub(WebappRouter.prototype, "navigate");
 
-         loop.webapp.init();
-
-         sinon.assert.calledOnce(WebappRouter.prototype.navigate);
-         sinon.assert.calledWithExactly(WebappRouter.prototype.navigate,
-                                        "unsupported", {trigger: true});
-       });
+      loop.webapp.init();
 
+      sinon.assert.calledOnce(WebappRouter.prototype.navigate);
+      sinon.assert.calledWithExactly(WebappRouter.prototype.navigate,
+                                     "unsupported", {trigger: true});
+    });
   });
 
   describe("WebappRouter", function() {

From 17501430bb54bec1de52cbce0267df2d11ffc690 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 061/117] Bug 974895: Added landing page for unsupported
 devices, r=Standard8.

---
 .../loop/content/shared/js/views.js           | 18 ++++-
 .../loop/standalone/content/js/webapp.js      | 31 ++++++--
 .../loop/standalone/content/l10n/data.ini     |  7 +-
 .../loop/test/standalone/webapp_test.js       | 70 ++++++++++++++++---
 4 files changed, 109 insertions(+), 17 deletions(-)

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index c55006630168..25cab1052031 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -332,7 +332,7 @@ loop.shared.views = (function(_, OT, l10n) {
   /**
    * Unsupported Browsers view.
    */
-  var UnsupportedView = BaseView.extend({
+  var UnsupportedBrowserView = BaseView.extend({
     template: _.template([
       '<div>',
       '  <h2 data-l10n-id="incompatible_browser"></h2>',
@@ -344,12 +344,26 @@ loop.shared.views = (function(_, OT, l10n) {
     ].join(""))
   });
 
+  /**
+   * Unsupported Browsers view.
+   */
+  var UnsupportedDeviceView = BaseView.extend({
+    template: _.template([
+      '<div>',
+      '  <h2 data-l10n-id="incompatible_device"></h2>',
+      '  <p data-l10n-id="sorry_device_unsupported"></p>',
+      '  <p data-l10n-id="use_firefox_windows_mac_linux"></p>',
+      '</div>'
+    ].join(""))
+  });
+
   return {
     L10nView: L10nView,
     BaseView: BaseView,
     ConversationView: ConversationView,
     NotificationListView: NotificationListView,
     NotificationView: NotificationView,
-    UnsupportedView: UnsupportedView
+    UnsupportedBrowserView: UnsupportedBrowserView,
+    UnsupportedDeviceView: UnsupportedDeviceView
   };
 })(_, window.OT, document.webL10n || document.mozL10n);
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 548fd98526c9..9029776a59e0 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -111,7 +111,8 @@ loop.webapp = (function($, _, OT) {
   var WebappRouter = loop.shared.router.BaseConversationRouter.extend({
     routes: {
       "":                    "home",
-      "unsupported":         "unsupported",
+      "unsupportedDevice":   "unsupportedDevice",
+      "unsupportedBrowser":  "unsupportedBrowser",
       "call/ongoing/:token": "loadConversation",
       "call/:token":         "initiate"
     },
@@ -153,8 +154,12 @@ loop.webapp = (function($, _, OT) {
       this.loadView(new HomeView());
     },
 
-    unsupported: function() {
-      this.loadView(new sharedViews.UnsupportedView());
+    unsupportedDevice: function() {
+      this.loadView(new sharedViews.UnsupportedDeviceView());
+    },
+
+    unsupportedBrowser: function() {
+      this.loadView(new sharedViews.UnsupportedBrowserView());
     },
 
     /**
@@ -192,23 +197,39 @@ loop.webapp = (function($, _, OT) {
     }
   });
 
+  /**
+   * Local helpers.
+   */
+  function WebappHelper() {
+    this._iOSRegex = /^(iPad|iPhone|iPod)/;
+  }
+
+  WebappHelper.prototype.isIOS = function isIOS(platform) {
+    return this._iOSRegex.test(platform);
+  };
+
   /**
    * App initialization.
    */
   function init() {
+    var helper = new WebappHelper();
     router = new WebappRouter({
       conversation: new sharedModels.ConversationModel({}, {sdk: OT}),
       notifier: new sharedViews.NotificationListView({el: "#messages"})
     });
     Backbone.history.start();
-    if (!OT.checkSystemRequirements())
-      router.navigate("unsupported", {trigger: true});
+    if (helper.isIOS(navigator.platform)) {
+      router.navigate("unsupportedDevice", {trigger: true});
+    } else if (!OT.checkSystemRequirements()) {
+      router.navigate("unsupportedBrowser", {trigger: true});
+    }
   }
 
   return {
     baseServerUrl: baseServerUrl,
     ConversationFormView: ConversationFormView,
     HomeView: HomeView,
+    WebappHelper: WebappHelper,
     init: init,
     WebappRouter: WebappRouter
   };
diff --git a/browser/components/loop/standalone/content/l10n/data.ini b/browser/components/loop/standalone/content/l10n/data.ini
index 212a7ad0a606..328caaf0bbd5 100644
--- a/browser/components/loop/standalone/content/l10n/data.ini
+++ b/browser/components/loop/standalone/content/l10n/data.ini
@@ -10,6 +10,9 @@ welcome=Welcome to the Loop web client.
 incompatible_browser=Incompatible Browser
 powered_by_webrtc=The audio and video components of Loop are powered by WebRTC.
 use_latest_firefox.innerHTML=To use Loop, please use the latest version of <a href="{{ff_url}}">Firefox</a>.
+incompatible_device=Incompatible device
+sorry_device_unsupported=Sorry, Loop does not currently support your device.
+use_firefox_windows_mac_linux=Please open this page using the latest Firefox on Windows, Android, Mac or Linux.
 
 [fr]
 call_has_ended=L'appel est terminé.
@@ -23,4 +26,6 @@ welcome=Bienvenue sur Loop.
 incompatible_browser=Navigateur non supporté
 powered_by_webrtc=Les fonctionnalités audio et vidéo de Loop utilisent WebRTC.
 use_latest_firefox.innerHTML=Pour utiliser Loop, merci d'utiliser la dernière version de <a href="{{ff_url}}">Firefox</a>.
-
+incompatible_device=Plateforme non supportée
+sorry_device_unsupported=Désolé, Loop ne fonctionne actuellement pas sur votre appareil.
+use_firefox_windows_mac_linux=Merci d'ouvrir cette page avec une version récente de Firefox pour Windows, Android, Mac ou Linux.
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index d5f6a05e7bde..fd97a3dc4744 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -30,17 +30,38 @@ describe("loop.webapp", function() {
   });
 
   describe("#init", function() {
-    it("should navigate to the unsupported route if the sdk detects the" +
-       "browser is unsupported", function() {
-      var WebappRouter = loop.webapp.WebappRouter;
-      sandbox.stub(window.OT, "checkSystemRequirements").returns(false);
+    var WebappRouter;
+
+    beforeEach(function() {
+      WebappRouter = loop.webapp.WebappRouter;
       sandbox.stub(WebappRouter.prototype, "navigate");
+    });
+
+    afterEach(function() {
+      Backbone.history.stop();
+    });
+
+    it("should navigate to the unsupportedDevice route if the sdk detects " +
+       "the device is running iOS", function() {
+      sandbox.stub(loop.webapp.WebappHelper.prototype, "isIOS").returns(true);
 
       loop.webapp.init();
 
       sinon.assert.calledOnce(WebappRouter.prototype.navigate);
       sinon.assert.calledWithExactly(WebappRouter.prototype.navigate,
-                                     "unsupported", {trigger: true});
+                                     "unsupportedDevice", {trigger: true});
+    });
+
+    it("should navigate to the unsupportedBrowser route if the sdk detects " +
+       "the browser is unsupported", function() {
+      sandbox.stub(loop.webapp.WebappHelper.prototype, "isIOS").returns(false);
+      sandbox.stub(window.OT, "checkSystemRequirements").returns(false);
+
+      loop.webapp.init();
+
+      sinon.assert.calledOnce(WebappRouter.prototype.navigate);
+      sinon.assert.calledWithExactly(WebappRouter.prototype.navigate,
+                                     "unsupportedBrowser", {trigger: true});
     });
   });
 
@@ -160,13 +181,23 @@ describe("loop.webapp", function() {
           });
       });
 
-      describe("#unsupported", function() {
-        it("should load the UnsupportedView", function() {
-          router.unsupported();
+      describe("#unsupportedDevice", function() {
+        it("should load the UnsupportedDeviceView", function() {
+          router.unsupportedDevice();
 
           sinon.assert.calledOnce(router.loadView);
           sinon.assert.calledWith(router.loadView,
-            sinon.match.instanceOf(sharedViews.UnsupportedView));
+            sinon.match.instanceOf(sharedViews.UnsupportedDeviceView));
+        });
+      });
+
+      describe("#unsupportedBrowser", function() {
+        it("should load the UnsupportedBrowserView", function() {
+          router.unsupportedBrowser();
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWith(router.loadView,
+            sinon.match.instanceOf(sharedViews.UnsupportedBrowserView));
         });
       });
     });
@@ -289,4 +320,25 @@ describe("loop.webapp", function() {
       });
     });
   });
+
+  describe("WebappHelper", function() {
+    var helper;
+
+    beforeEach(function() {
+      helper = new loop.webapp.WebappHelper();
+    });
+
+    describe("#isIOS", function() {
+      it("should detect iOS", function() {
+        expect(helper.isIOS("iPad")).eql(true);
+        expect(helper.isIOS("iPod")).eql(true);
+        expect(helper.isIOS("iPhone")).eql(true);
+        expect(helper.isIOS("iPhone Simulator")).eql(true);
+      });
+
+      it("shouldn't detect iOS with other platforms", function() {
+        expect(helper.isIOS("MacIntel")).eql(false);
+      });
+    });
+  });
 });

From 7ac979f6f6aaad11af7793baba1ab8e30db8ba2c Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 062/117] Bug 1013092 Remove the logo from the video stream.
 r=nperriault

---
 browser/components/loop/content/shared/js/views.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 25cab1052031..e9a62c0fafbd 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -110,7 +110,11 @@ loop.shared.views = (function(_, OT, l10n) {
 
     // height set to "auto" to fix video layout on Google Chrome
     // @see https://bugzilla.mozilla.org/show_bug.cgi?id=991122
-    videoStyles: { width: "100%", height: "auto" },
+    videoStyles: {
+      width: "100%",
+      height: "auto",
+      style: { "bugDisplayMode": "off" }
+    },
 
     events: {
       'click .btn.stop': 'hangup'

From c7f16b64f5aca5811cf10cda9b00d4a58e4bd802 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 063/117] Bug 994151 Part 1. Ensure the client is registered
 before requesting a call url. r=dmose

---
 .../loop/content/shared/js/client.js          | 44 ++++++++++++++++++-
 .../loop/test/shared/client_test.js           | 26 ++++++++++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/browser/components/loop/content/shared/js/client.js b/browser/components/loop/content/shared/js/client.js
index cf198053c107..7dfd88bf2cc6 100644
--- a/browser/components/loop/content/shared/js/client.js
+++ b/browser/components/loop/content/shared/js/client.js
@@ -83,13 +83,30 @@ loop.shared.Client = (function($) {
     },
 
     /**
-     * Requests a call URL from the Loop server.
+     * Ensures the client is registered with the push server.
      *
+     * Callback parameters:
+     * - err null on successful registration, non-null otherwise.
+     *
+     * @param {Function} cb Callback(err)
+     */
+    _ensureRegistered: function(cb) {
+      navigator.mozLoop.ensureRegistered(function(err) {
+        cb(err);
+      }.bind(this));
+    },
+
+    /**
+     * Internal handler for requesting a call url from the server.
+     *
+     * Callback parameters:
+     * - err null on successful registration, non-null otherwise.
+     * - callUrl the obtained call url if successful
      * @param  {String} simplepushUrl a registered Simple Push URL
      * @param  {string} nickname the nickname of the future caller
      * @param  {Function} cb Callback(err, callUrl)
      */
-    requestCallUrl: function(nickname, cb) {
+    _requestCallUrlInternal: function(nickname, cb) {
       var endpoint = this.settings.baseServerUrl + "/call-url/",
           reqData  = {callerId: nickname};
 
@@ -105,6 +122,29 @@ loop.shared.Client = (function($) {
       req.fail(this._failureHandler.bind(this, cb));
     },
 
+    /**
+     * Requests a call URL from the Loop server.
+     *
+     * Callback parameters:
+     * - err null on successful registration, non-null otherwise.
+     * - callUrl the obtained call url if successful
+     *
+     * @param  {String} simplepushUrl a registered Simple Push URL
+     * @param  {string} nickname the nickname of the future caller
+     * @param  {Function} cb Callback(err, callUrl)
+     */
+    requestCallUrl: function(nickname, cb) {
+      this._ensureRegistered(function(err) {
+        if (err) {
+          console.log("Error registering with Loop server, code: " + err);
+          cb(err);
+          return;
+        }
+
+        this._requestCallUrlInternal(nickname, cb);
+      }.bind(this));
+    },
+
     /**
      * Requests call information from the server for all calls since the
      * given version.
diff --git a/browser/components/loop/test/shared/client_test.js b/browser/components/loop/test/shared/client_test.js
index 0ced77dcb74e..89f0dea91236 100644
--- a/browser/components/loop/test/shared/client_test.js
+++ b/browser/components/loop/test/shared/client_test.js
@@ -51,7 +51,31 @@ describe("loop.shared.Client", function() {
       var client;
 
       beforeEach(function() {
-        client = new loop.shared.Client({baseServerUrl: "http://fake.api"});
+        window.navigator.mozLoop = {
+          ensureRegistered: sinon.stub().callsArgWith(0, null)
+        };
+        client = new loop.shared.Client(
+          {baseServerUrl: "http://fake.api"}
+        );
+      });
+
+      afterEach(function() {
+        delete window.navigator.mozLoop;
+      });
+
+      it("should ensure loop is registered", function() {
+        client.requestCallUrl("foo", callback);
+
+        sinon.assert.calledOnce(navigator.mozLoop.ensureRegistered);
+      });
+
+      it("should send an error when registration fails", function() {
+        navigator.mozLoop.ensureRegistered.callsArgWith(0, "offline");
+
+        client.requestCallUrl("foo", callback);
+
+        sinon.assert.calledOnce(callback);
+        sinon.assert.calledWithExactly(callback, "offline");
       });
 
       it("should post to /call-url/", function() {

From 4b930a3ab5e0a0299a8799626a485a6dbe753cb0 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 064/117] Bug 994151 Part 2. Only register with the servers if
 the user has obtained call urls that haven't expired yet. r=dmose

---
 .../loop/content/shared/js/client.js          | 28 +++++++++++----
 .../loop/test/shared/client_test.js           | 35 ++++++++++++++-----
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/browser/components/loop/content/shared/js/client.js b/browser/components/loop/content/shared/js/client.js
index 7dfd88bf2cc6..746ddd02a48b 100644
--- a/browser/components/loop/content/shared/js/client.js
+++ b/browser/components/loop/content/shared/js/client.js
@@ -24,6 +24,13 @@ loop.shared.Client = (function($) {
   }
 
   Client.prototype = {
+    /**
+     * Converts from hours to seconds
+     */
+    _hoursToSeconds: function(value) {
+      return value * 60 * 60;
+    },
+
     /**
      * Validates a data object to confirm it has the specified properties.
      *
@@ -101,10 +108,13 @@ loop.shared.Client = (function($) {
      *
      * Callback parameters:
      * - err null on successful registration, non-null otherwise.
-     * - callUrl the obtained call url if successful
+     * - callUrlData an object of the obtained call url data if successful:
+     * -- call_url: The url of the call
+     * -- expiresAt: The amount of hours until expiry of the url
+     *
      * @param  {String} simplepushUrl a registered Simple Push URL
      * @param  {string} nickname the nickname of the future caller
-     * @param  {Function} cb Callback(err, callUrl)
+     * @param  {Function} cb Callback(err, callUrlData)
      */
     _requestCallUrlInternal: function(nickname, cb) {
       var endpoint = this.settings.baseServerUrl + "/call-url/",
@@ -112,7 +122,10 @@ loop.shared.Client = (function($) {
 
       var req = $.post(endpoint, reqData, function(callUrlData) {
         try {
-          cb(null, this._validate(callUrlData, ["call_url"]));
+          cb(null, this._validate(callUrlData, ["call_url", "expiresAt"]));
+
+          var expiresHours = this._hoursToSeconds(callUrlData.expiresAt);
+          navigator.mozLoop.noteCallUrlExpiry(expiresHours);
         } catch (err) {
           console.log("Error requesting call info", err);
           cb(err);
@@ -123,15 +136,18 @@ loop.shared.Client = (function($) {
     },
 
     /**
-     * Requests a call URL from the Loop server.
+     * Requests a call URL from the Loop server. It will note the
+     * expiry time for the url with the mozLoop api.
      *
      * Callback parameters:
      * - err null on successful registration, non-null otherwise.
-     * - callUrl the obtained call url if successful
+     * - callUrlData an object of the obtained call url data if successful:
+     * -- call_url: The url of the call
+     * -- expiresAt: The amount of hours until expiry of the url
      *
      * @param  {String} simplepushUrl a registered Simple Push URL
      * @param  {string} nickname the nickname of the future caller
-     * @param  {Function} cb Callback(err, callUrl)
+     * @param  {Function} cb Callback(err, callUrlData)
      */
     requestCallUrl: function(nickname, cb) {
       this._ensureRegistered(function(err) {
diff --git a/browser/components/loop/test/shared/client_test.js b/browser/components/loop/test/shared/client_test.js
index 89f0dea91236..656264fcf66b 100644
--- a/browser/components/loop/test/shared/client_test.js
+++ b/browser/components/loop/test/shared/client_test.js
@@ -52,7 +52,8 @@ describe("loop.shared.Client", function() {
 
       beforeEach(function() {
         window.navigator.mozLoop = {
-          ensureRegistered: sinon.stub().callsArgWith(0, null)
+          ensureRegistered: sinon.stub().callsArgWith(0, null),
+          noteCallUrlExpiry: sinon.spy()
         };
         client = new loop.shared.Client(
           {baseServerUrl: "http://fake.api"}
@@ -89,22 +90,40 @@ describe("loop.shared.Client", function() {
       });
 
       it("should request a call url", function() {
+        var callUrlData = {
+          "call_url": "fakeCallUrl",
+          "expiresAt": 60
+        };
+
         client.requestCallUrl("foo", callback);
-
-        expect(requests).to.have.length.of(1);
-
         requests[0].respond(200, {"Content-Type": "application/json"},
-                            '{"call_url": "fakeCallUrl"}');
-        sinon.assert.calledWithExactly(callback, null, "fakeCallUrl");
+                            JSON.stringify(callUrlData));
+
+        sinon.assert.calledWithExactly(callback, null, callUrlData);
+      });
+
+      it("should note the call url expiry", function() {
+        var callUrlData = {
+          "call_url": "fakeCallUrl",
+          "expiresAt": 60
+        };
+
+        client.requestCallUrl("foo", callback);
+        requests[0].respond(200, {"Content-Type": "application/json"},
+                            JSON.stringify(callUrlData));
+
+        // expiresAt is in hours, and noteCallUrlExpiry wants seconds.
+        sinon.assert.calledWithExactly(navigator.mozLoop.noteCallUrlExpiry,
+          60 * 60 * 60);
       });
 
       it("should send an error when the request fails", function() {
         client.requestCallUrl("foo", callback);
 
         expect(requests).to.have.length.of(1);
-
         requests[0].respond(400, {"Content-Type": "application/json"},
                             fakeErrorRes);
+
         sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
           return /400.*invalid token/.test(err.message);
         }));
@@ -112,9 +131,9 @@ describe("loop.shared.Client", function() {
 
       it("should send an error if the data is not valid", function() {
         client.requestCallUrl("foo", callback);
-
         requests[0].respond(200, {"Content-Type": "application/json"},
                             '{"bad": {}}');
+
         sinon.assert.calledWithMatch(callback, sinon.match(function(err) {
           return /Invalid data received/.test(err.message);
         }));

From 6fb426e9a9f9430bd120d0a407ca0d109041c495 Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Thu, 29 May 2014 21:20:11 +0100
Subject: [PATCH 065/117] Bug 976109 - Switch session tokens from cookies to
 Hawk, r=NiKo`,Standard8

---
 .../loop/content/shared/js/client.js          | 173 +++++-
 .../content/shared/libs/hawk-browser-2.2.1.js | 556 ++++++++++++++++++
 .../loop/content/shared/libs/sjcl.min.js      |  55 ++
 .../loop/content/shared/libs/token.js         |  78 +++
 .../loop/test/shared/client_test.js           |  66 ++-
 .../components/loop/test/shared/index.html    |   6 +-
 .../loop/test/standalone/index.html           |   1 -
 7 files changed, 900 insertions(+), 35 deletions(-)
 create mode 100644 browser/components/loop/content/shared/libs/hawk-browser-2.2.1.js
 create mode 100644 browser/components/loop/content/shared/libs/sjcl.min.js
 create mode 100644 browser/components/loop/content/shared/libs/token.js

diff --git a/browser/components/loop/content/shared/js/client.js b/browser/components/loop/content/shared/js/client.js
index 746ddd02a48b..9d7db0886e33 100644
--- a/browser/components/loop/content/shared/js/client.js
+++ b/browser/components/loop/content/shared/js/client.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* global loop:true */
+/* global loop:true, hawk, deriveHawkCredentials */
 
 var loop = loop || {};
 loop.shared = loop.shared || {};
@@ -20,6 +20,15 @@ loop.shared.Client = (function($) {
         !settings.baseServerUrl) {
       throw new Error("missing required baseServerUrl");
     }
+
+    // allowing an |in| test rather than a more type || allows us to dependency
+    // inject a non-existent mozLoop
+    if ("mozLoop" in settings) {
+      this.mozLoop = settings.mozLoop;
+    } else {
+      this.mozLoop = navigator.mozLoop;
+    }
+
     this.settings = settings;
   }
 
@@ -103,6 +112,46 @@ loop.shared.Client = (function($) {
       }.bind(this));
     },
 
+    /**
+     * Ensures that the client picks up the hawk-session-token
+     * put in preferences by the LoopService registration code,
+     * derives hawk credentials from them, and saves them in
+     * this._credentials.
+     *
+     * @param {Function} cb Callback(err)
+     *  if err is set to null in the callback, that indicates that the
+     *  credentials have been successfully attached to this object.
+     *
+     * @private
+     *
+     * @note That as currently written, this is only ever expected to be called
+     * from browser UI code (ie it relies on mozLoop).
+     */
+    _ensureCredentials: function(cb) {
+      if (this._credentials) {
+        cb(null);
+        return;
+      }
+
+      var hawkSessionToken =
+        this.mozLoop.getLoopCharPref("hawk-session-token");
+      if (!hawkSessionToken) {
+        var msg = "loop.hawk-session-token pref not found";
+        console.warn(msg);
+        cb(new Error(msg));
+        return;
+      }
+
+      // XXX do we want to use any of the other hawk params (eg to track clock
+      // skew, etc)?
+      var serverDerivedKeyLengthInBytes = 2 * 32;
+      deriveHawkCredentials(hawkSessionToken, "sessionToken",
+        serverDerivedKeyLengthInBytes, function (hawkCredentials) {
+          this._credentials = hawkCredentials;
+          cb(null);
+        }.bind(this));
+    },
+
     /**
      * Internal handler for requesting a call url from the server.
      *
@@ -120,17 +169,37 @@ loop.shared.Client = (function($) {
       var endpoint = this.settings.baseServerUrl + "/call-url/",
           reqData  = {callerId: nickname};
 
-      var req = $.post(endpoint, reqData, function(callUrlData) {
-        try {
-          cb(null, this._validate(callUrlData, ["call_url", "expiresAt"]));
+      var req = $.ajax({
+        type: "POST",
+        url: endpoint,
+        data: reqData,
+        xhrFields: {
+          withCredentials: false
+        },
+        crossDomain: true,
+        beforeSend: function (xhr, settings) {
+          try {
+            this._attachAnyServerCreds(xhr, settings);
+          } catch (ex) {
+            cb(ex);
+            return false;
+          }
+          return true;
+        }.bind(this),
+        success: function(callUrlData) {
+          // XXX split this out into two functions for better readability
+          try {
+            cb(null, this._validate(callUrlData, ["call_url", "expiresAt"]));
 
-          var expiresHours = this._hoursToSeconds(callUrlData.expiresAt);
-          navigator.mozLoop.noteCallUrlExpiry(expiresHours);
-        } catch (err) {
-          console.log("Error requesting call info", err);
-          cb(err);
-        }
-      }.bind(this), "json");
+            var expiresHours = this._hoursToSeconds(callUrlData.expiresAt);
+            navigator.mozLoop.noteCallUrlExpiry(expiresHours);
+          } catch (err) {
+            console.log("Error requesting call info", err);
+            cb(err);
+          }
+        }.bind(this),
+        dataType: "json"
+      });
 
       req.fail(this._failureHandler.bind(this, cb));
     },
@@ -156,8 +225,14 @@ loop.shared.Client = (function($) {
           cb(err);
           return;
         }
-
-        this._requestCallUrlInternal(nickname, cb);
+        this._ensureCredentials(function (err) {
+          if (err) {
+            console.log("Error setting up credentials: " + err);
+            cb(err);
+            return;
+          }
+          this._requestCallUrlInternal(nickname, cb);
+        }.bind(this));
       }.bind(this));
     },
 
@@ -170,6 +245,17 @@ loop.shared.Client = (function($) {
      * @param  {Function} cb Callback(err, calls)
      */
     requestCallsInfo: function(version, cb) {
+      this._ensureCredentials(function (err) {
+        if (err) {
+          console.log("Error setting up credentials: " + err);
+          cb(err);
+          return;
+        }
+        this._requestCallsInfoInternal(version, cb);
+      }.bind(this));
+    },
+
+    _requestCallsInfoInternal: function(version, cb) {
       if (!version) {
         throw new Error("missing required parameter version");
       }
@@ -180,14 +266,32 @@ loop.shared.Client = (function($) {
       // opens the chat window, but we'll need to decide that once we make a
       // decision on chrome versus content, and know if we're going with
       // LoopService or a frameworker.
-      var req = $.get(endpoint + "?version=" + version, function(callsData) {
-        try {
-          cb(null, this._validate(callsData, ["calls"]));
-        } catch (err) {
-          console.log("Error requesting calls info", err);
-          cb(err);
-        }
-      }.bind(this), "json");
+      var req = $.ajax({
+        type: "GET",
+        url: endpoint + "?version=" + version,
+        xhrFields: {
+          withCredentials: false
+        },
+        crossDomain: true,
+        beforeSend: function (xhr, settings) {
+          try {
+            this._attachAnyServerCreds(xhr, settings);
+          } catch (ex) {
+            cb(ex);
+            return false;
+          }
+          return true;
+        }.bind(this),
+        success: function(callsData) {
+          try {
+            cb(null, this._validate(callsData, ["calls"]));
+          } catch (err) {
+            console.log("Error requesting calls info", err);
+            cb(err);
+          }
+        }.bind(this),
+        dataType: "json"
+      });
 
       req.fail(this._failureHandler.bind(this, cb));
     },
@@ -224,6 +328,33 @@ loop.shared.Client = (function($) {
       }.bind(this));
 
       req.fail(this._failureHandler.bind(this, cb));
+    },
+
+    /**
+     * If this._credentials is set, adds a hawk Authorization header based
+     * based on those credentials to the passed-in XHR.
+     *
+     * @param xhr        request to add any header to
+     * @param settings   settings object passed to jQuery.ajax()
+     * @private
+     */
+    _attachAnyServerCreds: function(xhr, settings) {
+      // if the server needs credentials and didn't get them, it will
+      // return failure for us, so if we don't have any creds, don't try to
+      // attach them.
+      if (!this._credentials) {
+        return;
+      }
+
+      var header = hawk.client.header(settings.url, settings.type,
+        { credentials: this._credentials });
+      if (header.err) {
+        throw new Error(header.err);
+      }
+
+      xhr.setRequestHeader("Authorization", header.field);
+
+      return;
     }
   };
 
diff --git a/browser/components/loop/content/shared/libs/hawk-browser-2.2.1.js b/browser/components/loop/content/shared/libs/hawk-browser-2.2.1.js
new file mode 100644
index 000000000000..c223f791d8f8
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/hawk-browser-2.2.1.js
@@ -0,0 +1,556 @@
+/*
+    HTTP Hawk Authentication Scheme
+    Copyright (c) 2012-2014, Eran Hammer <eran@hammer.io>
+    BSD Licensed
+*/
+
+
+// Declare namespace
+
+var hawk = {
+    internals: {}
+};
+
+
+hawk.client = {
+
+    // Generate an Authorization header for a given request
+
+    /*
+        uri: 'http://example.com/resource?a=b' or object generated by hawk.utils.parseUri()
+        method: HTTP verb (e.g. 'GET', 'POST')
+        options: {
+
+            // Required
+
+            credentials: {
+                id: 'dh37fgj492je',
+                key: 'aoijedoaijsdlaksjdl',
+                algorithm: 'sha256'                                 // 'sha1', 'sha256'
+            },
+
+            // Optional
+
+            ext: 'application-specific',                        // Application specific data sent via the ext attribute
+            timestamp: Date.now() / 1000,                       // A pre-calculated timestamp in seconds
+            nonce: '2334f34f',                                  // A pre-generated nonce
+            localtimeOffsetMsec: 400,                           // Time offset to sync with server time (ignored if timestamp provided)
+            payload: '{"some":"payload"}',                      // UTF-8 encoded string for body hash generation (ignored if hash provided)
+            contentType: 'application/json',                    // Payload content-type (ignored if hash provided)
+            hash: 'U4MKKSmiVxk37JCCrAVIjV=',                    // Pre-calculated payload hash
+            app: '24s23423f34dx',                               // Oz application id
+            dlg: '234sz34tww3sd'                                // Oz delegated-by application id
+        }
+    */
+
+    header: function (uri, method, options) {
+
+        var result = {
+            field: '',
+            artifacts: {}
+        };
+
+        // Validate inputs
+
+        if (!uri || (typeof uri !== 'string' && typeof uri !== 'object') ||
+            !method || typeof method !== 'string' ||
+            !options || typeof options !== 'object') {
+
+            result.err = 'Invalid argument type';
+            return result;
+        }
+
+        // Application time
+
+        var timestamp = options.timestamp || hawk.utils.now(options.localtimeOffsetMsec);
+
+        // Validate credentials
+
+        var credentials = options.credentials;
+        if (!credentials ||
+            !credentials.id ||
+            !credentials.key ||
+            !credentials.algorithm) {
+
+            result.err = 'Invalid credentials object';
+            return result;
+        }
+
+        if (hawk.crypto.algorithms.indexOf(credentials.algorithm) === -1) {
+            result.err = 'Unknown algorithm';
+            return result;
+        }
+
+        // Parse URI
+
+        if (typeof uri === 'string') {
+            uri = hawk.utils.parseUri(uri);
+        }
+
+        // Calculate signature
+
+        var artifacts = {
+            ts: timestamp,
+            nonce: options.nonce || hawk.utils.randomString(6),
+            method: method,
+            resource: uri.relative,
+            host: uri.hostname,
+            port: uri.port,
+            hash: options.hash,
+            ext: options.ext,
+            app: options.app,
+            dlg: options.dlg
+        };
+
+        result.artifacts = artifacts;
+
+        // Calculate payload hash
+
+        if (!artifacts.hash &&
+            (options.payload || options.payload === '')) {
+
+            artifacts.hash = hawk.crypto.calculatePayloadHash(options.payload, credentials.algorithm, options.contentType);
+        }
+
+        var mac = hawk.crypto.calculateMac('header', credentials, artifacts);
+
+        // Construct header
+
+        var hasExt = artifacts.ext !== null && artifacts.ext !== undefined && artifacts.ext !== '';       // Other falsey values allowed
+        var header = 'Hawk id="' + credentials.id +
+                     '", ts="' + artifacts.ts +
+                     '", nonce="' + artifacts.nonce +
+                     (artifacts.hash ? '", hash="' + artifacts.hash : '') +
+                     (hasExt ? '", ext="' + hawk.utils.escapeHeaderAttribute(artifacts.ext) : '') +
+                     '", mac="' + mac + '"';
+
+        if (artifacts.app) {
+            header += ', app="' + artifacts.app +
+                      (artifacts.dlg ? '", dlg="' + artifacts.dlg : '') + '"';
+        }
+
+        result.field = header;
+
+        return result;
+    },
+
+
+    // Validate server response
+
+    /*
+        request:    object created via 'new XMLHttpRequest()' after response received
+        artifacts:  object received from header().artifacts
+        options: {
+            payload:    optional payload received
+            required:   specifies if a Server-Authorization header is required. Defaults to 'false'
+        }
+    */
+
+    authenticate: function (request, credentials, artifacts, options) {
+
+        options = options || {};
+
+        var getHeader = function (name) {
+
+            return request.getResponseHeader ? request.getResponseHeader(name) : request.getHeader(name);
+        };
+
+        var wwwAuthenticate = getHeader('www-authenticate');
+        if (wwwAuthenticate) {
+
+            // Parse HTTP WWW-Authenticate header
+
+            var attributes = hawk.utils.parseAuthorizationHeader(wwwAuthenticate, ['ts', 'tsm', 'error']);
+            if (!attributes) {
+                return false;
+            }
+
+            if (attributes.ts) {
+                var tsm = hawk.crypto.calculateTsMac(attributes.ts, credentials);
+                if (tsm !== attributes.tsm) {
+                    return false;
+                }
+
+                hawk.utils.setNtpOffset(attributes.ts - Math.floor((new Date()).getTime() / 1000));     // Keep offset at 1 second precision
+            }
+        }
+
+        // Parse HTTP Server-Authorization header
+
+        var serverAuthorization = getHeader('server-authorization');
+        if (!serverAuthorization &&
+            !options.required) {
+
+            return true;
+        }
+
+        var attributes = hawk.utils.parseAuthorizationHeader(serverAuthorization, ['mac', 'ext', 'hash']);
+        if (!attributes) {
+            return false;
+        }
+
+        var modArtifacts = {
+            ts: artifacts.ts,
+            nonce: artifacts.nonce,
+            method: artifacts.method,
+            resource: artifacts.resource,
+            host: artifacts.host,
+            port: artifacts.port,
+            hash: attributes.hash,
+            ext: attributes.ext,
+            app: artifacts.app,
+            dlg: artifacts.dlg
+        };
+
+        var mac = hawk.crypto.calculateMac('response', credentials, modArtifacts);
+        if (mac !== attributes.mac) {
+            return false;
+        }
+
+        if (!options.payload &&
+            options.payload !== '') {
+
+            return true;
+        }
+
+        if (!attributes.hash) {
+            return false;
+        }
+
+        var calculatedHash = hawk.crypto.calculatePayloadHash(options.payload, credentials.algorithm, getHeader('content-type'));
+        return (calculatedHash === attributes.hash);
+    },
+
+    message: function (host, port, message, options) {
+
+        // Validate inputs
+
+        if (!host || typeof host !== 'string' ||
+            !port || typeof port !== 'number' ||
+            message === null || message === undefined || typeof message !== 'string' ||
+            !options || typeof options !== 'object') {
+
+            return null;
+        }
+
+        // Application time
+
+        var timestamp = options.timestamp || hawk.utils.now(options.localtimeOffsetMsec);
+
+        // Validate credentials
+
+        var credentials = options.credentials;
+        if (!credentials ||
+            !credentials.id ||
+            !credentials.key ||
+            !credentials.algorithm) {
+
+            // Invalid credential object
+            return null;
+        }
+
+        if (hawk.crypto.algorithms.indexOf(credentials.algorithm) === -1) {
+            return null;
+        }
+
+        // Calculate signature
+
+        var artifacts = {
+            ts: timestamp,
+            nonce: options.nonce || hawk.utils.randomString(6),
+            host: host,
+            port: port,
+            hash: hawk.crypto.calculatePayloadHash(message, credentials.algorithm)
+        };
+
+        // Construct authorization
+
+        var result = {
+            id: credentials.id,
+            ts: artifacts.ts,
+            nonce: artifacts.nonce,
+            hash: artifacts.hash,
+            mac: hawk.crypto.calculateMac('message', credentials, artifacts)
+        };
+
+        return result;
+    },
+
+    authenticateTimestamp: function (message, credentials, updateClock) {           // updateClock defaults to true
+
+        var tsm = hawk.crypto.calculateTsMac(message.ts, credentials);
+        if (tsm !== message.tsm) {
+            return false;
+        }
+
+        if (updateClock !== false) {
+            hawk.utils.setNtpOffset(message.ts - Math.floor((new Date()).getTime() / 1000));    // Keep offset at 1 second precision
+        }
+
+        return true;
+    }
+};
+
+
+hawk.crypto = {
+
+    headerVersion: '1',
+
+    algorithms: ['sha1', 'sha256'],
+
+    calculateMac: function (type, credentials, options) {
+
+        var normalized = hawk.crypto.generateNormalizedString(type, options);
+
+        var hmac = CryptoJS['Hmac' + credentials.algorithm.toUpperCase()](normalized, credentials.key);
+        return hmac.toString(CryptoJS.enc.Base64);
+    },
+
+    generateNormalizedString: function (type, options) {
+
+        var normalized = 'hawk.' + hawk.crypto.headerVersion + '.' + type + '\n' +
+                         options.ts + '\n' +
+                         options.nonce + '\n' +
+                         (options.method || '').toUpperCase() + '\n' +
+                         (options.resource || '') + '\n' +
+                         options.host.toLowerCase() + '\n' +
+                         options.port + '\n' +
+                         (options.hash || '') + '\n';
+
+        if (options.ext) {
+            normalized += options.ext.replace('\\', '\\\\').replace('\n', '\\n');
+        }
+
+        normalized += '\n';
+
+        if (options.app) {
+            normalized += options.app + '\n' +
+                          (options.dlg || '') + '\n';
+        }
+
+        return normalized;
+    },
+
+    calculatePayloadHash: function (payload, algorithm, contentType) {
+
+        var hash = CryptoJS.algo[algorithm.toUpperCase()].create();
+        hash.update('hawk.' + hawk.crypto.headerVersion + '.payload\n');
+        hash.update(hawk.utils.parseContentType(contentType) + '\n');
+        hash.update(payload);
+        hash.update('\n');
+        return hash.finalize().toString(CryptoJS.enc.Base64);
+    },
+
+    calculateTsMac: function (ts, credentials) {
+
+        var hash = CryptoJS['Hmac' + credentials.algorithm.toUpperCase()]('hawk.' + hawk.crypto.headerVersion + '.ts\n' + ts + '\n', credentials.key);
+        return hash.toString(CryptoJS.enc.Base64);
+    }
+};
+
+
+// localStorage compatible interface
+
+hawk.internals.LocalStorage = function () {
+
+    this._cache = {};
+    this.length = 0;
+
+    this.getItem = function (key) {
+
+        return this._cache.hasOwnProperty(key) ? String(this._cache[key]) : null;
+    };
+
+    this.setItem = function (key, value) {
+
+        this._cache[key] = String(value);
+        this.length = Object.keys(this._cache).length;
+    };
+
+    this.removeItem = function (key) {
+
+        delete this._cache[key];
+        this.length = Object.keys(this._cache).length;
+    };
+
+    this.clear = function () {
+
+        this._cache = {};
+        this.length = 0;
+    };
+
+    this.key = function (i) {
+
+        return Object.keys(this._cache)[i || 0];
+    };
+};
+
+
+hawk.utils = {
+
+    storage: new hawk.internals.LocalStorage(),
+
+    setStorage: function (storage) {
+
+        var ntpOffset = hawk.utils.storage.getItem('hawk_ntp_offset');
+        hawk.utils.storage = storage;
+        if (ntpOffset) {
+            hawk.utils.setNtpOffset(ntpOffset);
+        }
+    },
+
+    setNtpOffset: function (offset) {
+
+        try {
+            hawk.utils.storage.setItem('hawk_ntp_offset', offset);
+        }
+        catch (err) {
+            console.error('[hawk] could not write to storage.');
+            console.error(err);
+        }
+    },
+
+    getNtpOffset: function () {
+
+        var offset = hawk.utils.storage.getItem('hawk_ntp_offset');
+        if (!offset) {
+            return 0;
+        }
+
+        return parseInt(offset, 10);
+    },
+
+    now: function (localtimeOffsetMsec) {
+
+        return Math.floor(((new Date()).getTime() + (localtimeOffsetMsec || 0)) / 1000) + hawk.utils.getNtpOffset();
+    },
+
+    escapeHeaderAttribute: function (attribute) {
+
+        return attribute.replace(/\\/g, '\\\\').replace(/\"/g, '\\"');
+    },
+
+    parseContentType: function (header) {
+
+        if (!header) {
+            return '';
+        }
+
+        return header.split(';')[0].replace(/^\s+|\s+$/g, '').toLowerCase();
+    },
+
+    parseAuthorizationHeader: function (header, keys) {
+
+        if (!header) {
+            return null;
+        }
+
+        var headerParts = header.match(/^(\w+)(?:\s+(.*))?$/);       // Header: scheme[ something]
+        if (!headerParts) {
+            return null;
+        }
+
+        var scheme = headerParts[1];
+        if (scheme.toLowerCase() !== 'hawk') {
+            return null;
+        }
+
+        var attributesString = headerParts[2];
+        if (!attributesString) {
+            return null;
+        }
+
+        var attributes = {};
+        var verify = attributesString.replace(/(\w+)="([^"\\]*)"\s*(?:,\s*|$)/g, function ($0, $1, $2) {
+
+            // Check valid attribute names
+
+            if (keys.indexOf($1) === -1) {
+                return;
+            }
+
+            // Allowed attribute value characters: !#$%&'()*+,-./:;<=>?@[]^_`{|}~ and space, a-z, A-Z, 0-9
+
+            if ($2.match(/^[ \w\!#\$%&'\(\)\*\+,\-\.\/\:;<\=>\?@\[\]\^`\{\|\}~]+$/) === null) {
+                return;
+            }
+
+            // Check for duplicates
+
+            if (attributes.hasOwnProperty($1)) {
+                return;
+            }
+
+            attributes[$1] = $2;
+            return '';
+        });
+
+        if (verify !== '') {
+            return null;
+        }
+
+        return attributes;
+    },
+
+    randomString: function (size) {
+
+        var randomSource = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        var len = randomSource.length;
+
+        var result = [];
+        for (var i = 0; i < size; ++i) {
+            result[i] = randomSource[Math.floor(Math.random() * len)];
+        }
+
+        return result.join('');
+    },
+
+    parseUri: function (input) {
+
+        // Based on: parseURI 1.2.2
+        // http://blog.stevenlevithan.com/archives/parseuri
+        // (c) Steven Levithan <stevenlevithan.com>
+        // MIT License
+
+        var keys = ['source', 'protocol', 'authority', 'userInfo', 'user', 'password', 'hostname', 'port', 'resource', 'relative', 'pathname', 'directory', 'file', 'query', 'fragment'];
+
+        var uriRegex = /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?(((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?)(?:#(.*))?)/;
+        var uriByNumber = input.match(uriRegex);
+        var uri = {};
+
+        for (var i = 0, il = keys.length; i < il; ++i) {
+            uri[keys[i]] = uriByNumber[i] || '';
+        }
+
+        if (uri.port === '') {
+            uri.port = (uri.protocol.toLowerCase() === 'http' ? '80' : (uri.protocol.toLowerCase() === 'https' ? '443' : ''));
+        }
+
+        return uri;
+    }
+};
+
+
+// $lab:coverage:off$
+
+// Based on: Crypto-JS v3.1.2
+// Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
+// http://code.google.com/p/crypto-js/
+// http://code.google.com/p/crypto-js/wiki/License
+
+var CryptoJS = CryptoJS || function (h, r) { var k = {}, l = k.lib = {}, n = function () { }, f = l.Base = { extend: function (a) { n.prototype = this; var b = new n; a && b.mixIn(a); b.hasOwnProperty("init") || (b.init = function () { b.$super.init.apply(this, arguments) }); b.init.prototype = b; b.$super = this; return b }, create: function () { var a = this.extend(); a.init.apply(a, arguments); return a }, init: function () { }, mixIn: function (a) { for (var b in a) a.hasOwnProperty(b) && (this[b] = a[b]); a.hasOwnProperty("toString") && (this.toString = a.toString) }, clone: function () { return this.init.prototype.extend(this) } }, j = l.WordArray = f.extend({ init: function (a, b) { a = this.words = a || []; this.sigBytes = b != r ? b : 4 * a.length }, toString: function (a) { return (a || s).stringify(this) }, concat: function (a) { var b = this.words, d = a.words, c = this.sigBytes; a = a.sigBytes; this.clamp(); if (c % 4) for (var e = 0; e < a; e++) b[c + e >>> 2] |= (d[e >>> 2] >>> 24 - 8 * (e % 4) & 255) << 24 - 8 * ((c + e) % 4); else if (65535 < d.length) for (e = 0; e < a; e += 4) b[c + e >>> 2] = d[e >>> 2]; else b.push.apply(b, d); this.sigBytes += a; return this }, clamp: function () { var a = this.words, b = this.sigBytes; a[b >>> 2] &= 4294967295 << 32 - 8 * (b % 4); a.length = h.ceil(b / 4) }, clone: function () { var a = f.clone.call(this); a.words = this.words.slice(0); return a }, random: function (a) { for (var b = [], d = 0; d < a; d += 4) b.push(4294967296 * h.random() | 0); return new j.init(b, a) } }), m = k.enc = {}, s = m.Hex = { stringify: function (a) { var b = a.words; a = a.sigBytes; for (var d = [], c = 0; c < a; c++) { var e = b[c >>> 2] >>> 24 - 8 * (c % 4) & 255; d.push((e >>> 4).toString(16)); d.push((e & 15).toString(16)) } return d.join("") }, parse: function (a) { for (var b = a.length, d = [], c = 0; c < b; c += 2) d[c >>> 3] |= parseInt(a.substr(c, 2), 16) << 24 - 4 * (c % 8); return new j.init(d, b / 2) } }, p = m.Latin1 = { stringify: function (a) { var b = a.words; a = a.sigBytes; for (var d = [], c = 0; c < a; c++) d.push(String.fromCharCode(b[c >>> 2] >>> 24 - 8 * (c % 4) & 255)); return d.join("") }, parse: function (a) { for (var b = a.length, d = [], c = 0; c < b; c++) d[c >>> 2] |= (a.charCodeAt(c) & 255) << 24 - 8 * (c % 4); return new j.init(d, b) } }, t = m.Utf8 = { stringify: function (a) { try { return decodeURIComponent(escape(p.stringify(a))) } catch (b) { throw Error("Malformed UTF-8 data"); } }, parse: function (a) { return p.parse(unescape(encodeURIComponent(a))) } }, q = l.BufferedBlockAlgorithm = f.extend({ reset: function () { this._data = new j.init; this._nDataBytes = 0 }, _append: function (a) { "string" == typeof a && (a = t.parse(a)); this._data.concat(a); this._nDataBytes += a.sigBytes }, _process: function (a) { var b = this._data, d = b.words, c = b.sigBytes, e = this.blockSize, f = c / (4 * e), f = a ? h.ceil(f) : h.max((f | 0) - this._minBufferSize, 0); a = f * e; c = h.min(4 * a, c); if (a) { for (var g = 0; g < a; g += e) this._doProcessBlock(d, g); g = d.splice(0, a); b.sigBytes -= c } return new j.init(g, c) }, clone: function () { var a = f.clone.call(this); a._data = this._data.clone(); return a }, _minBufferSize: 0 }); l.Hasher = q.extend({ cfg: f.extend(), init: function (a) { this.cfg = this.cfg.extend(a); this.reset() }, reset: function () { q.reset.call(this); this._doReset() }, update: function (a) { this._append(a); this._process(); return this }, finalize: function (a) { a && this._append(a); return this._doFinalize() }, blockSize: 16, _createHelper: function (a) { return function (b, d) { return (new a.init(d)).finalize(b) } }, _createHmacHelper: function (a) { return function (b, d) { return (new u.HMAC.init(a, d)).finalize(b) } } }); var u = k.algo = {}; return k }(Math);
+(function () { var k = CryptoJS, b = k.lib, m = b.WordArray, l = b.Hasher, d = [], b = k.algo.SHA1 = l.extend({ _doReset: function () { this._hash = new m.init([1732584193, 4023233417, 2562383102, 271733878, 3285377520]) }, _doProcessBlock: function (n, p) { for (var a = this._hash.words, e = a[0], f = a[1], h = a[2], j = a[3], b = a[4], c = 0; 80 > c; c++) { if (16 > c) d[c] = n[p + c] | 0; else { var g = d[c - 3] ^ d[c - 8] ^ d[c - 14] ^ d[c - 16]; d[c] = g << 1 | g >>> 31 } g = (e << 5 | e >>> 27) + b + d[c]; g = 20 > c ? g + ((f & h | ~f & j) + 1518500249) : 40 > c ? g + ((f ^ h ^ j) + 1859775393) : 60 > c ? g + ((f & h | f & j | h & j) - 1894007588) : g + ((f ^ h ^ j) - 899497514); b = j; j = h; h = f << 30 | f >>> 2; f = e; e = g } a[0] = a[0] + e | 0; a[1] = a[1] + f | 0; a[2] = a[2] + h | 0; a[3] = a[3] + j | 0; a[4] = a[4] + b | 0 }, _doFinalize: function () { var b = this._data, d = b.words, a = 8 * this._nDataBytes, e = 8 * b.sigBytes; d[e >>> 5] |= 128 << 24 - e % 32; d[(e + 64 >>> 9 << 4) + 14] = Math.floor(a / 4294967296); d[(e + 64 >>> 9 << 4) + 15] = a; b.sigBytes = 4 * d.length; this._process(); return this._hash }, clone: function () { var b = l.clone.call(this); b._hash = this._hash.clone(); return b } }); k.SHA1 = l._createHelper(b); k.HmacSHA1 = l._createHmacHelper(b) })();
+(function (k) { for (var g = CryptoJS, h = g.lib, v = h.WordArray, j = h.Hasher, h = g.algo, s = [], t = [], u = function (q) { return 4294967296 * (q - (q | 0)) | 0 }, l = 2, b = 0; 64 > b;) { var d; a: { d = l; for (var w = k.sqrt(d), r = 2; r <= w; r++) if (!(d % r)) { d = !1; break a } d = !0 } d && (8 > b && (s[b] = u(k.pow(l, 0.5))), t[b] = u(k.pow(l, 1 / 3)), b++); l++ } var n = [], h = h.SHA256 = j.extend({ _doReset: function () { this._hash = new v.init(s.slice(0)) }, _doProcessBlock: function (q, h) { for (var a = this._hash.words, c = a[0], d = a[1], b = a[2], k = a[3], f = a[4], g = a[5], j = a[6], l = a[7], e = 0; 64 > e; e++) { if (16 > e) n[e] = q[h + e] | 0; else { var m = n[e - 15], p = n[e - 2]; n[e] = ((m << 25 | m >>> 7) ^ (m << 14 | m >>> 18) ^ m >>> 3) + n[e - 7] + ((p << 15 | p >>> 17) ^ (p << 13 | p >>> 19) ^ p >>> 10) + n[e - 16] } m = l + ((f << 26 | f >>> 6) ^ (f << 21 | f >>> 11) ^ (f << 7 | f >>> 25)) + (f & g ^ ~f & j) + t[e] + n[e]; p = ((c << 30 | c >>> 2) ^ (c << 19 | c >>> 13) ^ (c << 10 | c >>> 22)) + (c & d ^ c & b ^ d & b); l = j; j = g; g = f; f = k + m | 0; k = b; b = d; d = c; c = m + p | 0 } a[0] = a[0] + c | 0; a[1] = a[1] + d | 0; a[2] = a[2] + b | 0; a[3] = a[3] + k | 0; a[4] = a[4] + f | 0; a[5] = a[5] + g | 0; a[6] = a[6] + j | 0; a[7] = a[7] + l | 0 }, _doFinalize: function () { var d = this._data, b = d.words, a = 8 * this._nDataBytes, c = 8 * d.sigBytes; b[c >>> 5] |= 128 << 24 - c % 32; b[(c + 64 >>> 9 << 4) + 14] = k.floor(a / 4294967296); b[(c + 64 >>> 9 << 4) + 15] = a; d.sigBytes = 4 * b.length; this._process(); return this._hash }, clone: function () { var b = j.clone.call(this); b._hash = this._hash.clone(); return b } }); g.SHA256 = j._createHelper(h); g.HmacSHA256 = j._createHmacHelper(h) })(Math);
+(function () { var c = CryptoJS, k = c.enc.Utf8; c.algo.HMAC = c.lib.Base.extend({ init: function (a, b) { a = this._hasher = new a.init; "string" == typeof b && (b = k.parse(b)); var c = a.blockSize, e = 4 * c; b.sigBytes > e && (b = a.finalize(b)); b.clamp(); for (var f = this._oKey = b.clone(), g = this._iKey = b.clone(), h = f.words, j = g.words, d = 0; d < c; d++) h[d] ^= 1549556828, j[d] ^= 909522486; f.sigBytes = g.sigBytes = e; this.reset() }, reset: function () { var a = this._hasher; a.reset(); a.update(this._iKey) }, update: function (a) { this._hasher.update(a); return this }, finalize: function (a) { var b = this._hasher; a = b.finalize(a); b.reset(); return b.finalize(this._oKey.clone().concat(a)) } }) })();
+(function () { var h = CryptoJS, j = h.lib.WordArray; h.enc.Base64 = { stringify: function (b) { var e = b.words, f = b.sigBytes, c = this._map; b.clamp(); b = []; for (var a = 0; a < f; a += 3) for (var d = (e[a >>> 2] >>> 24 - 8 * (a % 4) & 255) << 16 | (e[a + 1 >>> 2] >>> 24 - 8 * ((a + 1) % 4) & 255) << 8 | e[a + 2 >>> 2] >>> 24 - 8 * ((a + 2) % 4) & 255, g = 0; 4 > g && a + 0.75 * g < f; g++) b.push(c.charAt(d >>> 6 * (3 - g) & 63)); if (e = c.charAt(64)) for (; b.length % 4;) b.push(e); return b.join("") }, parse: function (b) { var e = b.length, f = this._map, c = f.charAt(64); c && (c = b.indexOf(c), -1 != c && (e = c)); for (var c = [], a = 0, d = 0; d < e; d++) if (d % 4) { var g = f.indexOf(b.charAt(d - 1)) << 2 * (d % 4), h = f.indexOf(b.charAt(d)) >>> 6 - 2 * (d % 4); c[a >>> 2] |= (g | h) << 24 - 8 * (a % 4); a++ } return j.create(c, a) }, _map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=" } })();
+
+hawk.crypto.internals = CryptoJS;
+
+
+// Export if used as a module
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = hawk;
+}
+
+// $lab:coverage:on$
diff --git a/browser/components/loop/content/shared/libs/sjcl.min.js b/browser/components/loop/content/shared/libs/sjcl.min.js
new file mode 100644
index 000000000000..404ce932fa9a
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/sjcl.min.js
@@ -0,0 +1,55 @@
+"use strict";function q(a){throw a;}var t=void 0,u=!1;var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};
+"undefined"!==typeof module&&module.exports&&(module.exports=sjcl);
+sjcl.cipher.aes=function(a){this.k[0][0][0]||this.D();var b,c,d,e,f=this.k[0][4],g=this.k[1];b=a.length;var h=1;4!==b&&(6!==b&&8!==b)&&q(new sjcl.exception.invalid("invalid aes key size"));this.b=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(0===a%b||8===b&&4===a%b)c=f[c>>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255],0===a%b&&(c=c<<8^c>>>24^h<<24,h=h<<1^283*(h>>7));d[a]=d[a-b]^c}for(b=0;a;b++,a--)c=d[b&3?a:a-4],e[b]=4>=a||4>b?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^g[3][f[c&
+255]]};
+sjcl.cipher.aes.prototype={encrypt:function(a){return y(this,a,0)},decrypt:function(a){return y(this,a,1)},k:[[[],[],[],[],[]],[[],[],[],[],[]]],D:function(){var a=this.k[0],b=this.k[1],c=a[4],d=b[4],e,f,g,h=[],l=[],k,n,m,p;for(e=0;0x100>e;e++)l[(h[e]=e<<1^283*(e>>7))^e]=e;for(f=g=0;!c[f];f^=k||1,g=l[g]||1){m=g^g<<1^g<<2^g<<3^g<<4;m=m>>8^m&255^99;c[f]=m;d[m]=f;n=h[e=h[k=h[f]]];p=0x1010101*n^0x10001*e^0x101*k^0x1010100*f;n=0x101*h[m]^0x1010100*m;for(e=0;4>e;e++)a[e][f]=n=n<<24^n>>>8,b[e][m]=p=p<<24^p>>>8}for(e=
+0;5>e;e++)a[e]=a[e].slice(0),b[e]=b[e].slice(0)}};
+function y(a,b,c){4!==b.length&&q(new sjcl.exception.invalid("invalid aes block size"));var d=a.b[c],e=b[0]^d[0],f=b[c?3:1]^d[1],g=b[2]^d[2];b=b[c?1:3]^d[3];var h,l,k,n=d.length/4-2,m,p=4,s=[0,0,0,0];h=a.k[c];a=h[0];var r=h[1],v=h[2],w=h[3],x=h[4];for(m=0;m<n;m++)h=a[e>>>24]^r[f>>16&255]^v[g>>8&255]^w[b&255]^d[p],l=a[f>>>24]^r[g>>16&255]^v[b>>8&255]^w[e&255]^d[p+1],k=a[g>>>24]^r[b>>16&255]^v[e>>8&255]^w[f&255]^d[p+2],b=a[b>>>24]^r[e>>16&255]^v[f>>8&255]^w[g&255]^d[p+3],p+=4,e=h,f=l,g=k;for(m=0;4>
+m;m++)s[c?3&-m:m]=x[e>>>24]<<24^x[f>>16&255]<<16^x[g>>8&255]<<8^x[b&255]^d[p++],h=e,e=f,f=g,g=b,b=h;return s}
+sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.P(a.slice(b/32),32-(b&31)).slice(1);return c===t?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<<c)-1},concat:function(a,b){if(0===a.length||0===b.length)return a.concat(b);var c=a[a.length-1],d=sjcl.bitArray.getPartial(c);return 32===d?a.concat(b):sjcl.bitArray.P(b,d,c|0,a.slice(0,a.length-1))},bitLength:function(a){var b=a.length;return 0===
+b?0:32*(b-1)+sjcl.bitArray.getPartial(a[b-1])},clamp:function(a,b){if(32*a.length<b)return a;a=a.slice(0,Math.ceil(b/32));var c=a.length;b&=31;0<c&&b&&(a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return u;var c=0,d;for(d=0;d<a.length;d++)c|=a[d]^b[d];return 0===
+c},P:function(a,b,c,d){var e;e=0;for(d===t&&(d=[]);32<=b;b-=32)d.push(c),c=0;if(0===b)return d.concat(a);for(e=0;e<a.length;e++)d.push(c|a[e]>>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32<b+a?c:d.pop(),1));return d},l:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]}};
+sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d<c/8;d++)0===(d&3)&&(e=a[d/4]),b+=String.fromCharCode(e>>>24),e<<=8;return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c<a.length;c++)d=d<<8|a.charCodeAt(c),3===(c&3)&&(b.push(d),d=0);c&3&&b.push(sjcl.bitArray.partial(8*(c&3),d));return b}};
+sjcl.codec.hex={fromBits:function(a){var b="",c;for(c=0;c<a.length;c++)b+=((a[c]|0)+0xf00000000000).toString(16).substr(4);return b.substr(0,sjcl.bitArray.bitLength(a)/4)},toBits:function(a){var b,c=[],d;a=a.replace(/\s|0x/g,"");d=a.length;a+="00000000";for(b=0;b<a.length;b+=8)c.push(parseInt(a.substr(b,8),16)^0);return sjcl.bitArray.clamp(c,4*d)}};
+sjcl.codec.base64={J:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",fromBits:function(a,b,c){var d="",e=0,f=sjcl.codec.base64.J,g=0,h=sjcl.bitArray.bitLength(a);c&&(f=f.substr(0,62)+"-_");for(c=0;6*d.length<h;)d+=f.charAt((g^a[c]>>>e)>>>26),6>e?(g=a[c]<<6-e,e+=26,c++):(g<<=6,e-=6);for(;d.length&3&&!b;)d+="=";return d},toBits:function(a,b){a=a.replace(/\s|=/g,"");var c=[],d,e=0,f=sjcl.codec.base64.J,g=0,h;b&&(f=f.substr(0,62)+"-_");for(d=0;d<a.length;d++)h=f.indexOf(a.charAt(d)),
+0>h&&q(new sjcl.exception.invalid("this isn't base64!")),26<e?(e-=26,c.push(g^h>>>e),g=h<<32-e):(e+=6,g^=h<<32-e);e&56&&c.push(sjcl.bitArray.partial(e&56,g,1));return c}};sjcl.codec.base64url={fromBits:function(a){return sjcl.codec.base64.fromBits(a,1,1)},toBits:function(a){return sjcl.codec.base64.toBits(a,1)}};sjcl.hash.sha256=function(a){this.b[0]||this.D();a?(this.r=a.r.slice(0),this.o=a.o.slice(0),this.h=a.h):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()};
+sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.r=this.N.slice(0);this.o=[];this.h=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.o=sjcl.bitArray.concat(this.o,a);b=this.h;a=this.h=b+sjcl.bitArray.bitLength(a);for(b=512+b&-512;b<=a;b+=512)z(this,c.splice(0,16));return this},finalize:function(){var a,b=this.o,c=this.r,b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.h/
+4294967296));for(b.push(this.h|0);b.length;)z(this,b.splice(0,16));this.reset();return c},N:[],b:[],D:function(){function a(a){return 0x100000000*(a-Math.floor(a))|0}var b=0,c=2,d;a:for(;64>b;c++){for(d=2;d*d<=c;d++)if(0===c%d)continue a;8>b&&(this.N[b]=a(Math.pow(c,0.5)));this.b[b]=a(Math.pow(c,1/3));b++}}};
+function z(a,b){var c,d,e,f=b.slice(0),g=a.r,h=a.b,l=g[0],k=g[1],n=g[2],m=g[3],p=g[4],s=g[5],r=g[6],v=g[7];for(c=0;64>c;c++)16>c?d=f[c]:(d=f[c+1&15],e=f[c+14&15],d=f[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+f[c&15]+f[c+9&15]|0),d=d+v+(p>>>6^p>>>11^p>>>25^p<<26^p<<21^p<<7)+(r^p&(s^r))+h[c],v=r,r=s,s=p,p=m+d|0,m=n,n=k,k=l,l=d+(k&n^m&(k^n))+(k>>>2^k>>>13^k>>>22^k<<30^k<<19^k<<10)|0;g[0]=g[0]+l|0;g[1]=g[1]+k|0;g[2]=g[2]+n|0;g[3]=g[3]+m|0;g[4]=g[4]+p|0;g[5]=g[5]+s|0;g[6]=
+g[6]+r|0;g[7]=g[7]+v|0}
+sjcl.mode.ccm={name:"ccm",encrypt:function(a,b,c,d,e){var f,g=b.slice(0),h=sjcl.bitArray,l=h.bitLength(c)/8,k=h.bitLength(g)/8;e=e||64;d=d||[];7>l&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(f=2;4>f&&k>>>8*f;f++);f<15-l&&(f=15-l);c=h.clamp(c,8*(15-f));b=sjcl.mode.ccm.L(a,b,c,d,e,f);g=sjcl.mode.ccm.p(a,g,c,b,e,f);return h.concat(g.data,g.tag)},decrypt:function(a,b,c,d,e){e=e||64;d=d||[];var f=sjcl.bitArray,g=f.bitLength(c)/8,h=f.bitLength(b),l=f.clamp(b,h-e),k=f.bitSlice(b,
+h-e),h=(h-e)/8;7>g&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(b=2;4>b&&h>>>8*b;b++);b<15-g&&(b=15-g);c=f.clamp(c,8*(15-b));l=sjcl.mode.ccm.p(a,l,c,k,e,b);a=sjcl.mode.ccm.L(a,l.data,c,d,e,b);f.equal(l.tag,a)||q(new sjcl.exception.corrupt("ccm: tag doesn't match"));return l.data},L:function(a,b,c,d,e,f){var g=[],h=sjcl.bitArray,l=h.l;e/=8;(e%2||4>e||16<e)&&q(new sjcl.exception.invalid("ccm: invalid tag length"));(0xffffffff<d.length||0xffffffff<b.length)&&q(new sjcl.exception.bug("ccm: can't deal with 4GiB or more data"));
+f=[h.partial(8,(d.length?64:0)|e-2<<2|f-1)];f=h.concat(f,c);f[3]|=h.bitLength(b)/8;f=a.encrypt(f);if(d.length){c=h.bitLength(d)/8;65279>=c?g=[h.partial(16,c)]:0xffffffff>=c&&(g=h.concat([h.partial(16,65534)],[c]));g=h.concat(g,d);for(d=0;d<g.length;d+=4)f=a.encrypt(l(f,g.slice(d,d+4).concat([0,0,0])))}for(d=0;d<b.length;d+=4)f=a.encrypt(l(f,b.slice(d,d+4).concat([0,0,0])));return h.clamp(f,8*e)},p:function(a,b,c,d,e,f){var g,h=sjcl.bitArray;g=h.l;var l=b.length,k=h.bitLength(b);c=h.concat([h.partial(8,
+f-1)],c).concat([0,0,0]).slice(0,4);d=h.bitSlice(g(d,a.encrypt(c)),0,e);if(!l)return{tag:d,data:[]};for(g=0;g<l;g+=4)c[3]++,e=a.encrypt(c),b[g]^=e[0],b[g+1]^=e[1],b[g+2]^=e[2],b[g+3]^=e[3];return{tag:d,data:h.clamp(b,k)}}};
+sjcl.mode.ocb2={name:"ocb2",encrypt:function(a,b,c,d,e,f){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));var g,h=sjcl.mode.ocb2.H,l=sjcl.bitArray,k=l.l,n=[0,0,0,0];c=h(a.encrypt(c));var m,p=[];d=d||[];e=e||64;for(g=0;g+4<b.length;g+=4)m=b.slice(g,g+4),n=k(n,m),p=p.concat(k(c,a.encrypt(k(c,m)))),c=h(c);m=b.slice(g);b=l.bitLength(m);g=a.encrypt(k(c,[0,0,0,b]));m=l.clamp(k(m.concat([0,0,0]),g),b);n=k(n,k(m.concat([0,0,0]),g));n=a.encrypt(k(n,k(c,h(c))));d.length&&
+(n=k(n,f?d:sjcl.mode.ocb2.pmac(a,d)));return p.concat(l.concat(m,l.clamp(n,e)))},decrypt:function(a,b,c,d,e,f){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));e=e||64;var g=sjcl.mode.ocb2.H,h=sjcl.bitArray,l=h.l,k=[0,0,0,0],n=g(a.encrypt(c)),m,p,s=sjcl.bitArray.bitLength(b)-e,r=[];d=d||[];for(c=0;c+4<s/32;c+=4)m=l(n,a.decrypt(l(n,b.slice(c,c+4)))),k=l(k,m),r=r.concat(m),n=g(n);p=s-32*c;m=a.encrypt(l(n,[0,0,0,p]));m=l(m,h.clamp(b.slice(c),p).concat([0,0,0]));
+k=l(k,m);k=a.encrypt(l(k,l(n,g(n))));d.length&&(k=l(k,f?d:sjcl.mode.ocb2.pmac(a,d)));h.equal(h.clamp(k,e),h.bitSlice(b,s))||q(new sjcl.exception.corrupt("ocb: tag doesn't match"));return r.concat(h.clamp(m,p))},pmac:function(a,b){var c,d=sjcl.mode.ocb2.H,e=sjcl.bitArray,f=e.l,g=[0,0,0,0],h=a.encrypt([0,0,0,0]),h=f(h,d(d(h)));for(c=0;c+4<b.length;c+=4)h=d(h),g=f(g,a.encrypt(f(h,b.slice(c,c+4))));c=b.slice(c);128>e.bitLength(c)&&(h=f(h,d(h)),c=e.concat(c,[-2147483648,0,0,0]));g=f(g,c);return a.encrypt(f(d(f(h,
+d(h))),g))},H:function(a){return[a[0]<<1^a[1]>>>31,a[1]<<1^a[2]>>>31,a[2]<<1^a[3]>>>31,a[3]<<1^135*(a[0]>>>31)]}};
+sjcl.mode.gcm={name:"gcm",encrypt:function(a,b,c,d,e){var f=b.slice(0);b=sjcl.bitArray;d=d||[];a=sjcl.mode.gcm.p(!0,a,f,d,c,e||128);return b.concat(a.data,a.tag)},decrypt:function(a,b,c,d,e){var f=b.slice(0),g=sjcl.bitArray,h=g.bitLength(f);e=e||128;d=d||[];e<=h?(b=g.bitSlice(f,h-e),f=g.bitSlice(f,0,h-e)):(b=f,f=[]);a=sjcl.mode.gcm.p(u,a,f,d,c,e);g.equal(a.tag,b)||q(new sjcl.exception.corrupt("gcm: tag doesn't match"));return a.data},Z:function(a,b){var c,d,e,f,g,h=sjcl.bitArray.l;e=[0,0,0,0];f=b.slice(0);
+for(c=0;128>c;c++){(d=0!==(a[Math.floor(c/32)]&1<<31-c%32))&&(e=h(e,f));g=0!==(f[3]&1);for(d=3;0<d;d--)f[d]=f[d]>>>1|(f[d-1]&1)<<31;f[0]>>>=1;g&&(f[0]^=-0x1f000000)}return e},g:function(a,b,c){var d,e=c.length;b=b.slice(0);for(d=0;d<e;d+=4)b[0]^=0xffffffff&c[d],b[1]^=0xffffffff&c[d+1],b[2]^=0xffffffff&c[d+2],b[3]^=0xffffffff&c[d+3],b=sjcl.mode.gcm.Z(b,a);return b},p:function(a,b,c,d,e,f){var g,h,l,k,n,m,p,s,r=sjcl.bitArray;m=c.length;p=r.bitLength(c);s=r.bitLength(d);h=r.bitLength(e);g=b.encrypt([0,
+0,0,0]);96===h?(e=e.slice(0),e=r.concat(e,[1])):(e=sjcl.mode.gcm.g(g,[0,0,0,0],e),e=sjcl.mode.gcm.g(g,e,[0,0,Math.floor(h/0x100000000),h&0xffffffff]));h=sjcl.mode.gcm.g(g,[0,0,0,0],d);n=e.slice(0);d=h.slice(0);a||(d=sjcl.mode.gcm.g(g,h,c));for(k=0;k<m;k+=4)n[3]++,l=b.encrypt(n),c[k]^=l[0],c[k+1]^=l[1],c[k+2]^=l[2],c[k+3]^=l[3];c=r.clamp(c,p);a&&(d=sjcl.mode.gcm.g(g,h,c));a=[Math.floor(s/0x100000000),s&0xffffffff,Math.floor(p/0x100000000),p&0xffffffff];d=sjcl.mode.gcm.g(g,d,a);l=b.encrypt(e);d[0]^=l[0];
+d[1]^=l[1];d[2]^=l[2];d[3]^=l[3];return{tag:r.bitSlice(d,0,f),data:c}}};sjcl.misc.hmac=function(a,b){this.M=b=b||sjcl.hash.sha256;var c=[[],[]],d,e=b.prototype.blockSize/32;this.n=[new b,new b];a.length>e&&(a=b.hash(a));for(d=0;d<e;d++)c[0][d]=a[d]^909522486,c[1][d]=a[d]^1549556828;this.n[0].update(c[0]);this.n[1].update(c[1]);this.G=new b(this.n[0])};
+sjcl.misc.hmac.prototype.encrypt=sjcl.misc.hmac.prototype.mac=function(a){this.Q&&q(new sjcl.exception.invalid("encrypt on already updated hmac called!"));this.update(a);return this.digest(a)};sjcl.misc.hmac.prototype.reset=function(){this.G=new this.M(this.n[0]);this.Q=u};sjcl.misc.hmac.prototype.update=function(a){this.Q=!0;this.G.update(a)};sjcl.misc.hmac.prototype.digest=function(){var a=this.G.finalize(),a=(new this.M(this.n[1])).update(a).finalize();this.reset();return a};
+sjcl.misc.pbkdf2=function(a,b,c,d,e){c=c||1E3;(0>d||0>c)&&q(sjcl.exception.invalid("invalid params to pbkdf2"));"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));e=e||sjcl.misc.hmac;a=new e(a);var f,g,h,l,k=[],n=sjcl.bitArray;for(l=1;32*k.length<(d||1);l++){e=f=a.encrypt(n.concat(b,[l]));for(g=1;g<c;g++){f=a.encrypt(f);for(h=0;h<f.length;h++)e[h]^=f[h]}k=k.concat(e)}d&&(k=n.clamp(k,d));return k};
+sjcl.prng=function(a){this.c=[new sjcl.hash.sha256];this.i=[0];this.F=0;this.s={};this.C=0;this.K={};this.O=this.d=this.j=this.W=0;this.b=[0,0,0,0,0,0,0,0];this.f=[0,0,0,0];this.A=t;this.B=a;this.q=u;this.w={progress:{},seeded:{}};this.m=this.V=0;this.t=1;this.u=2;this.S=0x10000;this.I=[0,48,64,96,128,192,0x100,384,512,768,1024];this.T=3E4;this.R=80};
+sjcl.prng.prototype={randomWords:function(a,b){var c=[],d;d=this.isReady(b);var e;d===this.m&&q(new sjcl.exception.notReady("generator isn't seeded"));if(d&this.u){d=!(d&this.t);e=[];var f=0,g;this.O=e[0]=(new Date).valueOf()+this.T;for(g=0;16>g;g++)e.push(0x100000000*Math.random()|0);for(g=0;g<this.c.length&&!(e=e.concat(this.c[g].finalize()),f+=this.i[g],this.i[g]=0,!d&&this.F&1<<g);g++);this.F>=1<<this.c.length&&(this.c.push(new sjcl.hash.sha256),this.i.push(0));this.d-=f;f>this.j&&(this.j=f);this.F++;
+this.b=sjcl.hash.sha256.hash(this.b.concat(e));this.A=new sjcl.cipher.aes(this.b);for(d=0;4>d&&!(this.f[d]=this.f[d]+1|0,this.f[d]);d++);}for(d=0;d<a;d+=4)0===(d+1)%this.S&&A(this),e=B(this),c.push(e[0],e[1],e[2],e[3]);A(this);return c.slice(0,a)},setDefaultParanoia:function(a,b){0===a&&"Setting paranoia=0 will ruin your security; use it only for testing"!==b&&q("Setting paranoia=0 will ruin your security; use it only for testing");this.B=a},addEntropy:function(a,b,c){c=c||"user";var d,e,f=(new Date).valueOf(),
+g=this.s[c],h=this.isReady(),l=0;d=this.K[c];d===t&&(d=this.K[c]=this.W++);g===t&&(g=this.s[c]=0);this.s[c]=(this.s[c]+1)%this.c.length;switch(typeof a){case "number":b===t&&(b=1);this.c[g].update([d,this.C++,1,b,f,1,a|0]);break;case "object":c=Object.prototype.toString.call(a);if("[object Uint32Array]"===c){e=[];for(c=0;c<a.length;c++)e.push(a[c]);a=e}else{"[object Array]"!==c&&(l=1);for(c=0;c<a.length&&!l;c++)"number"!==typeof a[c]&&(l=1)}if(!l){if(b===t)for(c=b=0;c<a.length;c++)for(e=a[c];0<e;)b++,
+e>>>=1;this.c[g].update([d,this.C++,2,b,f,a.length].concat(a))}break;case "string":b===t&&(b=a.length);this.c[g].update([d,this.C++,3,b,f,a.length]);this.c[g].update(a);break;default:l=1}l&&q(new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string"));this.i[g]+=b;this.d+=b;h===this.m&&(this.isReady()!==this.m&&C("seeded",Math.max(this.j,this.d)),C("progress",this.getProgress()))},isReady:function(a){a=this.I[a!==t?a:this.B];return this.j&&this.j>=a?this.i[0]>this.R&&
+(new Date).valueOf()>this.O?this.u|this.t:this.t:this.d>=a?this.u|this.m:this.m},getProgress:function(a){a=this.I[a?a:this.B];return this.j>=a?1:this.d>a?1:this.d/a},startCollectors:function(){this.q||(this.a={loadTimeCollector:D(this,this.aa),mouseCollector:D(this,this.ba),keyboardCollector:D(this,this.$),accelerometerCollector:D(this,this.U)},window.addEventListener?(window.addEventListener("load",this.a.loadTimeCollector,u),window.addEventListener("mousemove",this.a.mouseCollector,u),window.addEventListener("keypress",
+this.a.keyboardCollector,u),window.addEventListener("devicemotion",this.a.accelerometerCollector,u)):document.attachEvent?(document.attachEvent("onload",this.a.loadTimeCollector),document.attachEvent("onmousemove",this.a.mouseCollector),document.attachEvent("keypress",this.a.keyboardCollector)):q(new sjcl.exception.bug("can't attach event")),this.q=!0)},stopCollectors:function(){this.q&&(window.removeEventListener?(window.removeEventListener("load",this.a.loadTimeCollector,u),window.removeEventListener("mousemove",
+this.a.mouseCollector,u),window.removeEventListener("keypress",this.a.keyboardCollector,u),window.removeEventListener("devicemotion",this.a.accelerometerCollector,u)):document.detachEvent&&(document.detachEvent("onload",this.a.loadTimeCollector),document.detachEvent("onmousemove",this.a.mouseCollector),document.detachEvent("keypress",this.a.keyboardCollector)),this.q=u)},addEventListener:function(a,b){this.w[a][this.V++]=b},removeEventListener:function(a,b){var c,d,e=this.w[a],f=[];for(d in e)e.hasOwnProperty(d)&&
+e[d]===b&&f.push(d);for(c=0;c<f.length;c++)d=f[c],delete e[d]},$:function(){E(1)},ba:function(a){sjcl.random.addEntropy([a.x||a.clientX||a.offsetX||0,a.y||a.clientY||a.offsetY||0],2,"mouse");E(0)},aa:function(){E(2)},U:function(a){a=a.accelerationIncludingGravity.x||a.accelerationIncludingGravity.y||a.accelerationIncludingGravity.z;if(window.orientation){var b=window.orientation;"number"===typeof b&&sjcl.random.addEntropy(b,1,"accelerometer")}a&&sjcl.random.addEntropy(a,2,"accelerometer");E(0)}};
+function C(a,b){var c,d=sjcl.random.w[a],e=[];for(c in d)d.hasOwnProperty(c)&&e.push(d[c]);for(c=0;c<e.length;c++)e[c](b)}function E(a){window&&window.performance&&"function"===typeof window.performance.now?sjcl.random.addEntropy(window.performance.now(),a,"loadtime"):sjcl.random.addEntropy((new Date).valueOf(),a,"loadtime")}function A(a){a.b=B(a).concat(B(a));a.A=new sjcl.cipher.aes(a.b)}function B(a){for(var b=0;4>b&&!(a.f[b]=a.f[b]+1|0,a.f[b]);b++);return a.A.encrypt(a.f)}
+function D(a,b){return function(){b.apply(a,arguments)}}sjcl.random=new sjcl.prng(6);
+a:try{var F,G,H,I;if(I="undefined"!==typeof module){var J;if(J=module.exports){var K;try{K=require("crypto")}catch(L){K=null}J=(G=K)&&G.randomBytes}I=J}if(I)F=G.randomBytes(128),F=new Uint32Array((new Uint8Array(F)).buffer),sjcl.random.addEntropy(F,1024,"crypto['randomBytes']");else if(window&&Uint32Array){H=new Uint32Array(32);if(window.crypto&&window.crypto.getRandomValues)window.crypto.getRandomValues(H);else if(window.msCrypto&&window.msCrypto.getRandomValues)window.msCrypto.getRandomValues(H);
+else break a;sjcl.random.addEntropy(H,1024,"crypto['getRandomValues']")}}catch(M){"undefined"!==typeof window&&window.console&&(console.log("There was an error collecting entropy from the browser:"),console.log(M))}
+sjcl.json={defaults:{v:1,iter:1E3,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},Y:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.e({iv:sjcl.random.randomWords(4,0)},e.defaults),g;e.e(f,c);c=f.adata;"string"===typeof f.salt&&(f.salt=sjcl.codec.base64.toBits(f.salt));"string"===typeof f.iv&&(f.iv=sjcl.codec.base64.toBits(f.iv));(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||"string"===typeof a&&100>=f.iter||64!==f.ts&&96!==f.ts&&128!==f.ts||128!==f.ks&&192!==f.ks&&0x100!==f.ks||2>f.iv.length||4<
+f.iv.length)&&q(new sjcl.exception.invalid("json encrypt: invalid parameters"));"string"===typeof a?(g=sjcl.misc.cachedPbkdf2(a,f),a=g.key.slice(0,f.ks/32),f.salt=g.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.publicKey&&(g=a.kem(),f.kemtag=g.tag,a=g.key.slice(0,f.ks/32));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));"string"===typeof c&&(c=sjcl.codec.utf8String.toBits(c));g=new sjcl.cipher[f.cipher](a);e.e(d,f);d.key=a;f.ct=sjcl.mode[f.mode].encrypt(g,b,f.iv,c,f.ts);return f},encrypt:function(a,
+b,c,d){var e=sjcl.json,f=e.Y.apply(e,arguments);return e.encode(f)},X:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.e(e.e(e.e({},e.defaults),b),c,!0);var f;c=b.adata;"string"===typeof b.salt&&(b.salt=sjcl.codec.base64.toBits(b.salt));"string"===typeof b.iv&&(b.iv=sjcl.codec.base64.toBits(b.iv));(!sjcl.mode[b.mode]||!sjcl.cipher[b.cipher]||"string"===typeof a&&100>=b.iter||64!==b.ts&&96!==b.ts&&128!==b.ts||128!==b.ks&&192!==b.ks&&0x100!==b.ks||!b.iv||2>b.iv.length||4<b.iv.length)&&q(new sjcl.exception.invalid("json decrypt: invalid parameters"));
+"string"===typeof a?(f=sjcl.misc.cachedPbkdf2(a,b),a=f.key.slice(0,b.ks/32),b.salt=f.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.secretKey&&(a=a.unkem(sjcl.codec.base64.toBits(b.kemtag)).slice(0,b.ks/32));"string"===typeof c&&(c=sjcl.codec.utf8String.toBits(c));f=new sjcl.cipher[b.cipher](a);c=sjcl.mode[b.mode].decrypt(f,b.ct,b.iv,c,b.ts);e.e(d,b);d.key=a;return sjcl.codec.utf8String.fromBits(c)},decrypt:function(a,b,c,d){var e=sjcl.json;return e.X(a,e.decode(b),c,d)},encode:function(a){var b,c=
+"{",d="";for(b in a)if(a.hasOwnProperty(b))switch(b.match(/^[a-z0-9]+$/i)||q(new sjcl.exception.invalid("json encode: invalid property name")),c+=d+'"'+b+'":',d=",",typeof a[b]){case "number":case "boolean":c+=a[b];break;case "string":c+='"'+escape(a[b])+'"';break;case "object":c+='"'+sjcl.codec.base64.fromBits(a[b],0)+'"';break;default:q(new sjcl.exception.bug("json encode: unsupported type"))}return c+"}"},decode:function(a){a=a.replace(/\s/g,"");a.match(/^\{.*\}$/)||q(new sjcl.exception.invalid("json decode: this isn't json!"));
+a=a.replace(/^\{|\}$/g,"").split(/,/);var b={},c,d;for(c=0;c<a.length;c++)(d=a[c].match(/^(?:(["']?)([a-z][a-z0-9]*)\1):(?:(\d+)|"([a-z0-9+\/%*_.@=\-]*)")$/i))||q(new sjcl.exception.invalid("json decode: this isn't json!")),b[d[2]]=d[3]?parseInt(d[3],10):d[2].match(/^(ct|salt|iv)$/)?sjcl.codec.base64.toBits(d[4]):unescape(d[4]);return b},e:function(a,b,c){a===t&&(a={});if(b===t)return a;for(var d in b)b.hasOwnProperty(d)&&(c&&(a[d]!==t&&a[d]!==b[d])&&q(new sjcl.exception.invalid("required parameter overridden")),
+a[d]=b[d]);return a},ea:function(a,b){var c={},d;for(d in a)a.hasOwnProperty(d)&&a[d]!==b[d]&&(c[d]=a[d]);return c},da:function(a,b){var c={},d;for(d=0;d<b.length;d++)a[b[d]]!==t&&(c[b[d]]=a[b[d]]);return c}};sjcl.encrypt=sjcl.json.encrypt;sjcl.decrypt=sjcl.json.decrypt;sjcl.misc.ca={};
+sjcl.misc.cachedPbkdf2=function(a,b){var c=sjcl.misc.ca,d;b=b||{};d=b.iter||1E3;c=c[a]=c[a]||{};d=c[d]=c[d]||{firstSalt:b.salt&&b.salt.length?b.salt.slice(0):sjcl.random.randomWords(2,0)};c=b.salt===t?d.firstSalt:b.salt;d[c]=d[c]||sjcl.misc.pbkdf2(a,c,b.iter);return{key:d[c].slice(0),salt:c.slice(0)}};
+
diff --git a/browser/components/loop/content/shared/libs/token.js b/browser/components/loop/content/shared/libs/token.js
new file mode 100644
index 000000000000..fda27c1177da
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/token.js
@@ -0,0 +1,78 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+'use strict';
+ 
+var PREFIX_NAME = 'identity.mozilla.com/picl/v1/';
+var bitSlice = sjcl.bitArray.bitSlice;
+var salt = sjcl.codec.hex.toBits('');
+
+/**
+ * hkdf - The HMAC-based Key Derivation Function
+ * based on https://github.com/mozilla/node-hkdf
+ *
+ * @class hkdf
+ * @param {bitArray} ikm Initial keying material
+ * @param {bitArray} info Key derivation data
+ * @param {bitArray} salt Salt
+ * @param {integer} length Length of the derived key in bytes
+ * @return promise object- It will resolve with `output` data
+ */
+function hkdf(ikm, info, salt, length, callback) {
+  var mac = new sjcl.misc.hmac(salt, sjcl.hash.sha256);
+  mac.update(ikm);
+
+  // compute the PRK
+  var prk = mac.digest();
+
+  // hash length is 32 because only sjcl.hash.sha256 is used at this moment
+  var hashLength = 32;
+  var num_blocks = Math.ceil(length / hashLength);
+  var prev = sjcl.codec.hex.toBits('');
+  var output = '';
+
+  for (var i = 0; i < num_blocks; i++) {
+    var hmac = new sjcl.misc.hmac(prk, sjcl.hash.sha256);
+
+    var input = sjcl.bitArray.concat(
+      sjcl.bitArray.concat(prev, info),
+      sjcl.codec.utf8String.toBits((String.fromCharCode(i + 1)))
+    );
+
+    hmac.update(input);
+
+    prev = hmac.digest();
+    output += sjcl.codec.hex.fromBits(prev);
+  }
+
+  var truncated = sjcl.bitArray.clamp(sjcl.codec.hex.toBits(output), length * 8);
+
+  callback(truncated);
+}
+
+ 
+/**
+* @class hawkCredentials
+* @method deriveHawkCredentials
+* @param {String} tokenHex
+* @param {String} context
+* @param {int} size
+* @returns {Promise}
+*/
+function deriveHawkCredentials(tokenHex, context, size, callback) {
+  var token = sjcl.codec.hex.toBits(tokenHex);
+  var info = sjcl.codec.utf8String.toBits(PREFIX_NAME + context);
+
+  hkdf(token, info, salt, size || 3 * 32, function(out) {
+    var authKey = bitSlice(out, 8 * 32, 8 * 64);
+    var bundleKey = bitSlice(out, 8 * 64);
+    callback({
+      algorithm: 'sha256',
+      id: sjcl.codec.hex.fromBits(bitSlice(out, 0, 8 * 32)),
+      key: sjcl.codec.hex.fromBits(authKey),
+      bundleKey: bundleKey
+    });
+  });
+}
+ 
diff --git a/browser/components/loop/test/shared/client_test.js b/browser/components/loop/test/shared/client_test.js
index 656264fcf66b..f9c9699bcb1e 100644
--- a/browser/components/loop/test/shared/client_test.js
+++ b/browser/components/loop/test/shared/client_test.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* global loop, sinon */
+/*global loop, sinon, it, beforeEach, afterEach, describe, hawk */
 
 var expect = chai.expect;
 
@@ -12,7 +12,9 @@ describe("loop.shared.Client", function() {
   var sandbox,
       fakeXHR,
       requests = [],
-      callback;
+      callback,
+      mozLoop,
+      fakeToken;
 
   var fakeErrorRes = JSON.stringify({
       status: "errors",
@@ -32,6 +34,7 @@ describe("loop.shared.Client", function() {
       requests.push(xhr);
     };
     callback = sinon.spy();
+    fakeToken = "fakeTokenText";
   });
 
   afterEach(function() {
@@ -53,17 +56,17 @@ describe("loop.shared.Client", function() {
       beforeEach(function() {
         window.navigator.mozLoop = {
           ensureRegistered: sinon.stub().callsArgWith(0, null),
-          noteCallUrlExpiry: sinon.spy()
+          noteCallUrlExpiry: sinon.spy(),
+          getLoopCharPref: sandbox.stub()
+            .returns(null)
+            .withArgs("hawk-session-token")
+            .returns(fakeToken)
         };
         client = new loop.shared.Client(
-          {baseServerUrl: "http://fake.api"}
+          {baseServerUrl: "http://fake.api", mozLoop: window.navigator.mozLoop}
         );
       });
 
-      afterEach(function() {
-        delete window.navigator.mozLoop;
-      });
-
       it("should ensure loop is registered", function() {
         client.requestCallUrl("foo", callback);
 
@@ -86,7 +89,22 @@ describe("loop.shared.Client", function() {
         expect(requests[0].method).to.be.equal("POST");
         expect(requests[0].url).to.be.equal("http://fake.api/call-url/");
         expect(requests[0].requestBody).to.be.equal('callerId=foo');
+      });
 
+      it("should set the XHR Authorization header", function() {
+        sandbox.stub(hawk.client, "header").returns( {field: fakeToken} );
+        client._credentials = {
+          // XXX we probably really want to stub out external module calls
+          // eg deriveHawkCredentials, rather supplying them with valid arguments
+          // like we're doing here:
+          key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
+          algorithm: 'sha256',
+          user: 'Steve'
+        };
+
+        client.requestCallUrl("foo", callback);
+
+        expect(requests[0].requestHeaders.Authorization).to.equal(fakeToken);
       });
 
       it("should request a call url", function() {
@@ -144,7 +162,15 @@ describe("loop.shared.Client", function() {
       var client;
 
       beforeEach(function() {
-        client = new loop.shared.Client({baseServerUrl: "http://fake.api"});
+        mozLoop = {
+          getLoopCharPref: sandbox.stub()
+            .returns(null)
+            .withArgs("hawk-session-token")
+            .returns(fakeToken)
+        };
+        client = new loop.shared.Client(
+          {baseServerUrl: "http://fake.api", mozLoop: mozLoop}
+        );
       });
 
       it("should prevent launching a conversation when version is missing",
@@ -166,6 +192,22 @@ describe("loop.shared.Client", function() {
         sinon.assert.calledWithExactly(callback, null, [{apiKey: "fake"}]);
       });
 
+      it("should set the XHR Authorization header", function() {
+        sandbox.stub(hawk.client, "header").returns( {field: fakeToken} );
+        // XXX we probably really want to stub out external module calls
+        // eg deriveHawkCredentials, rather supplying them with valid arguments
+        // like we're doing here:
+        client._credentials = {
+          key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
+          algorithm: 'sha256',
+          user: 'Steve'
+        };
+
+        client.requestCallsInfo("foo", callback);
+
+        expect(requests[0].requestHeaders.Authorization).to.equal(fakeToken);
+      });
+
       it("should send an error when the request fails", function() {
         client.requestCallsInfo(42, callback);
 
@@ -191,7 +233,9 @@ describe("loop.shared.Client", function() {
       var client;
 
       beforeEach(function() {
-        client = new loop.shared.Client({baseServerUrl: "http://fake.api"});
+        client = new loop.shared.Client(
+          {baseServerUrl: "http://fake.api", mozLoop: undefined}
+        );
       });
 
       it("should prevent launching a conversation when token is missing",
@@ -234,7 +278,7 @@ describe("loop.shared.Client", function() {
       });
 
       it("should send an error if the data is not valid", function() {
-        client.requestCallsInfo("fake", callback);
+        client.requestCallInfo("fake", callback);
 
         requests[0].respond(200, {"Content-Type": "application/json"},
                             '{"bad": "one"}');
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index c1b4c0d46c73..fe7a67b3a2a6 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -5,9 +5,8 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Loop mocha tests</title>
+  <title>Loop shared mocha tests</title>
   <link rel="stylesheet" media="all" href="vendor/mocha-1.17.1.css">
-  <link rel="prefetch" type="application/l10n" href="../../content/l10n/data.ini">
 </head>
 <body>
   <div id="mocha">
@@ -21,6 +20,9 @@
   <script src="../../content/shared/libs/jquery-2.1.0.js"></script>
   <script src="../../content/shared/libs/lodash-2.4.1.js"></script>
   <script src="../../content/shared/libs/backbone-1.1.2.js"></script>
+  <script src="../../content/shared/libs/sjcl.min.js"></script>
+  <script src="../../content/shared/libs/token.js"></script>
+  <script src="../../content/shared/libs/hawk-browser-2.2.1.js"></script>
 
   <!-- test dependencies -->
   <script src="vendor/mocha-1.17.1.js"></script>
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
index e30b99e8f744..dc01a6f3d610 100644
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -7,7 +7,6 @@
   <meta charset="utf-8">
   <title>Loop mocha tests</title>
   <link rel="stylesheet" media="all" href="../shared/vendor/mocha-1.17.1.css">
-  <link rel="prefetch" type="application/l10n" href="../../content/l10n/data.ini">
 </head>
 <body>
   <div id="mocha">

From 0eec772206ffcb5fa7d3540a4c60033bf7a06d88 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Thu, 29 May 2014 21:25:39 +0100
Subject: [PATCH 066/117] Bug 994485 Make standalone tests work with combined
 repositories/changed file layout, and fix the standalone server. r=dmose

---
 browser/components/loop/standalone/server.js     |  3 +++
 browser/components/loop/test/index.html          |  3 ++-
 browser/components/loop/test/manifest.ini        |  1 +
 .../components/loop/test/standalone/index.html   |  4 ++--
 .../loop/test/standalone/test_standalone_all.py  | 16 ++++++++++++++++
 5 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 browser/components/loop/test/standalone/test_standalone_all.py

diff --git a/browser/components/loop/standalone/server.js b/browser/components/loop/standalone/server.js
index 60010cfb622e..0d962df0f4b7 100644
--- a/browser/components/loop/standalone/server.js
+++ b/browser/components/loop/standalone/server.js
@@ -5,6 +5,9 @@
 var express = require('express');
 var app = express();
 
+// This lets /test/ be mapped to the right place for running tests
+app.use(express.static(__dirname + '/../'));
+// This lets /content/ be mappy right for the static contents.
 app.use(express.static(__dirname + '/'));
 
 app.listen(3000);
diff --git a/browser/components/loop/test/index.html b/browser/components/loop/test/index.html
index 8fde1f177fd4..a2c3eb0f6e12 100644
--- a/browser/components/loop/test/index.html
+++ b/browser/components/loop/test/index.html
@@ -12,6 +12,7 @@
   <ul>
     <li><a href="shared/">Shared tests</a></li>
     <li><a href="desktop-local/">Local tests</a></li>
-  </ul>
+    <li><a href="standalone/">Standalone tests</a></li>
+ </ul>
 </body>
 </html>
diff --git a/browser/components/loop/test/manifest.ini b/browser/components/loop/test/manifest.ini
index 041dc95cfb73..01e0c781fc35 100644
--- a/browser/components/loop/test/manifest.ini
+++ b/browser/components/loop/test/manifest.ini
@@ -5,3 +5,4 @@ qemu = false
 
 [shared/test_shared_all.py]
 [desktop-local/test_desktop_all.py]
+[standalone/test_standalone_all.py]
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
index dc01a6f3d610..e0e9d701d17c 100644
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -33,12 +33,12 @@
   <script src="../../content/shared/js/models.js"></script>
   <script src="../../content/shared/js/views.js"></script>
   <script src="../../content/shared/js/router.js"></script>
-  <script src="../../content/js/webapp.js"></script>
+  <script src="../../standalone/content/js/webapp.js"></script>
   <!-- Test scripts -->
   <script src="webapp_test.js"></script>
   <script>
     mocha.run(function () {
-      $("#mocha").append("<p>Complete.</p>");
+      $("#mocha").append("<p id='complete'>Complete.</p>");
     });
 </script>
 </body>
diff --git a/browser/components/loop/test/standalone/test_standalone_all.py b/browser/components/loop/test/standalone/test_standalone_all.py
new file mode 100644
index 000000000000..8eae87443921
--- /dev/null
+++ b/browser/components/loop/test/standalone/test_standalone_all.py
@@ -0,0 +1,16 @@
+# need to get this dir in the path so that we make the import work
+import os
+import sys
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'shared'))
+
+from frontend_tester import BaseTestFrontendUnits
+
+
+class TestDesktopUnits(BaseTestFrontendUnits):
+
+    def setUp(self):
+        super(TestDesktopUnits, self).setUp()
+        self.set_server_prefix("browser/components/loop/test/standalone/")
+
+    def test_units(self):
+        self.check_page("index.html")

From 1c60c1dcef43fdada80d2925c6ac2d8f4e7dccd2 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Thu, 29 May 2014 22:12:30 +0100
Subject: [PATCH 067/117] Bug 994485 Update loop's readme and remove redundant
 make-links.sh DONTBUILD

---
 browser/components/loop/README.txt    | 16 ++++++----------
 browser/components/loop/make-links.sh | 25 -------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100755 browser/components/loop/make-links.sh

diff --git a/browser/components/loop/README.txt b/browser/components/loop/README.txt
index 2ac0262d6215..c0fa663d1edd 100644
--- a/browser/components/loop/README.txt
+++ b/browser/components/loop/README.txt
@@ -1,12 +1,8 @@
-In order for the loop component to build, run the make-links.sh script to
-setup symlinks from the Gecko tree into your loop-client-repo for shared code,
-noting that you'll need to put the correct path inside the [[ ]] placeholder
-(and remove the [[ ]] characters).
+This is the directory for the Loop desktop implementation and the standalone client.
 
-$ export LOOP_CLIENT_REPO=[[/absolute-path/to/my/loop-client-repo/clone]]
-$ ./make-links.sh
+The desktop implementation is the UX built into Firefox, activated by the Loop button on the toolbar. The standalone client is the link-clicker UX for any modern browser that supports WebRTC.
+
+The standalone client is a set of web pages intended to be hosted on a standalone server referenced by the loop-server.
+
+The standalone client exists in standalone/ but shares items (from content/shared/) with the desktop implementation. See the README.md file in the standalone/ directory for how to run the server locally.
 
-Note that changes to the shared directories affect both the standalone
-loop-client and the desktop client. This means that sometimes, in order to
-make a desktop client patch, you'll need to get reviews on patches to both
-mozilla-central/gecko-dev as well as loop-client.
diff --git a/browser/components/loop/make-links.sh b/browser/components/loop/make-links.sh
deleted file mode 100755
index 6127b66bf8f4..000000000000
--- a/browser/components/loop/make-links.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-if [ `basename $PWD` != "loop" ]; then
-  echo "this script must be executed in the loop directory"
-  exit -1
-fi
-
-if [ ! -d "$LOOP_CLIENT_REPO" ]; then
-  echo "LOOP_CLIENT_REPO in the environment must be set to a valid directory"
-  exit -1
-fi
-
-SHARED_CONTENT_TARGET=./content/shared
-rm -f ${SHARED_CONTENT_TARGET}
-
-SHARED_CONTENT=${LOOP_CLIENT_REPO}/content/shared
-ln -s ${SHARED_CONTENT} ${SHARED_CONTENT_TARGET}
-
-SHARED_TEST_TARGET=./test/shared
-rm -f ${SHARED_TEST_TARGET}
-
-SHARED_TEST=${LOOP_CLIENT_REPO}/test/shared
-ln -s ${SHARED_TEST} ${SHARED_TEST_TARGET}
-
-

From 753b295ea2565f282000ab7599c95937cddf0645 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 30 May 2014 12:19:41 +1000
Subject: [PATCH 068/117] Bug 1017941 - Initialize loop during delayedStartup()
 to avoid observer leaks. r=Unfocused

---
 browser/base/content/browser-loop.js | 16 ++++------------
 browser/base/content/browser.js      |  4 ++++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/browser/base/content/browser-loop.js b/browser/base/content/browser-loop.js
index 42d43893a617..271547865bfc 100644
--- a/browser/base/content/browser-loop.js
+++ b/browser/base/content/browser-loop.js
@@ -57,20 +57,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService", "resource:///modules/l
     },
 
     /**
-     * Triggers the initialization of the loop service after startup has finished.
+     * Triggers the initialization of the loop service.  Called by
+     * delayedStartup.
      */
     initialize: function() {
-      var observer = function observer(sbject, topic, data) {
-        if (topic == "browser-delayed-startup-finished") {
-          Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
-          MozLoopService.initialize();
-        }
-      };
-      Services.obs.addObserver(observer,
-                               "browser-delayed-startup-finished", false);
-    }
+      MozLoopService.initialize();
+    },
 
   };
-
-  LoopUI.initialize();
 })();
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2c78d2e37a76..17caac3660cf 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1185,6 +1185,10 @@ var gBrowserInit = {
     gDataNotificationInfoBar.init();
 #endif
 
+#ifdef MOZ_LOOP
+    LoopUI.initialize();
+#endif
+
     gBrowserThumbnails.init();
 
     // Add Devtools menuitems and listeners

From d45530e59781831d5e871d655945470e6c6e82c2 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Fri, 30 May 2014 13:22:30 +0100
Subject: [PATCH 069/117] Bug 1017882 Remove unnecessary and incorrect padding
 value for notification close buttons. r=nperriault

---
 browser/components/loop/content/shared/css/common.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index 83943669802c..a1917badefed 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -138,7 +138,6 @@ img {
 button.close {
   background: none;
   border: none;
-  padding: none;
   cursor: pointer;
 }
 

From b1bb17685221246914a46b539e7a55ab9b3a884b Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Fri, 30 May 2014 18:25:23 -0500
Subject: [PATCH 070/117] Bug 1017206: Update SDK to 2.2.5 rs=me

---
 .../loop/content/shared/libs/sdk.js           | 1242 +++++++++++------
 1 file changed, 837 insertions(+), 405 deletions(-)

diff --git a/browser/components/loop/content/shared/libs/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
index 57b0702fefd5..72be279b4d18 100644
--- a/browser/components/loop/content/shared/libs/sdk.js
+++ b/browser/components/loop/content/shared/libs/sdk.js
@@ -1,18 +1,20 @@
 /**
- * @license  OpenTok JavaScript Library v2.2.4.1
+ * @license  OpenTok JavaScript Library v2.2.5
  * http://www.tokbox.com/
  *
- * Copyright (c) 2013 TokBox, Inc.
+ * Copyright (c) 2014 TokBox, Inc.
+ * Released under the MIT license
+ * http://opensource.org/licenses/MIT
  *
- * Date: March 27 05:49:25 2014
+ * Date: May 22 07:14:18 2014
  */
 
 (function(window) {
   if (!window.OT) window.OT = {};
 
   OT.properties = {
-    version: 'v2.2.4.1',         // The current version (eg. v2.0.4) (This is replaced by gradle)
-    build: 'e42c038',    // The current build hash (This is replaced by gradle)
+    version: 'v2.2.5',         // The current version (eg. v2.0.4) (This is replaced by gradle)
+    build: '12d9384',    // The current build hash (This is replaced by gradle)
 
     // Whether or not to turn on debug logging by default
     debug: 'false',
@@ -48,12 +50,14 @@
 
 })(window);
 /**
- * @license  Common JS Helpers on OpenTok 0.2.0 da024f2 master
+ * @license  Common JS Helpers on OpenTok 0.2.0 1f056b9 master
  * http://www.tokbox.com/
  *
  * Copyright (c) 2014 TokBox, Inc.
+ * Released under the MIT license
+ * http://opensource.org/licenses/MIT
  *
- * Date: March 17 02:18:55 2014
+ * Date: May 19 04:04:43 2014
  *
  */
 
@@ -103,8 +107,8 @@
     }
   };
 
-  OTHelpers.forEach = function(array, iter) {
-    return _each.call(array, iter);
+  OTHelpers.forEach = function(array, iter, ctx) {
+    return _each.call(array, iter, ctx);
   };
 
   var _map = Array.prototype.map || function(iter, ctx) {
@@ -374,7 +378,11 @@
       }
     }
 
-    return {browser: browser, version: version};
+    return {
+      browser: browser,
+      version: version,
+      iframeNeedsLoad: userAgent.indexOf('webkit') < 0
+    };
   }();
 
   OTHelpers.browser = function() {
@@ -418,7 +426,7 @@
       };
     }
 
-    Object.defineProperties(self, propsDefinition);
+    OTHelpers.defineProperties(self, propsDefinition);
   };
 
   var generatePropertyFunction = function(object, getter, setter) {
@@ -506,8 +514,13 @@
   };
 
 
-/// Stolen from Underscore, this needs replacing
-
+// These next bits are included from Underscore.js. The original copyright
+// notice is below.
+//
+// http://underscorejs.org
+// (c) 2009-2011 Jeremy Ashkenas, DocumentCloud Inc.
+// (c) 2011-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+// Underscore may be freely distributed under the MIT license.
 
   // Invert the keys and values of an object. The values must be serializable.
   OTHelpers.invert = function(obj) {
@@ -647,7 +660,7 @@
   OTHelpers.statable = function(self, possibleStates, initialState, stateChanged,
     stateChangedFailed) {
     var previousState,
-        currentState = initialState;
+        currentState = self.currentState = initialState;
 
     var setState = function(state) {
       if (currentState !== state) {
@@ -658,8 +671,8 @@
           return;
         }
 
-        previousState = currentState;
-        currentState = state;
+        self.previousState = previousState = currentState;
+        self.currentState = currentState = state;
         if (stateChanged && OTHelpers.isFunction(stateChanged)) stateChanged(state, previousState);
       }
     };
@@ -690,16 +703,6 @@
       return OTHelpers.arrayIndexOf(arguments, currentState) === -1;
     };
 
-    Object.defineProperties(self, {
-      state: {
-        get: function() { return currentState; }
-      },
-
-      previousState: {
-        get: function() { return previousState; }
-      }
-    });
-
     return setState;
   };
 
@@ -863,7 +866,14 @@ OTHelpers.useLogHelpers = function(on){
     on.NONE     = 0;
 
     var _logLevel = on.NONE,
-        _logs = [];
+        _logs = [],
+        _canApplyConsole = true;
+
+    try {
+        Function.prototype.bind.call(window.console.log, window.console);
+    } catch (err) {
+        _canApplyConsole = false;
+    }
 
     // Some objects can't be logged in the console, mostly these are certain
     // types of native objects that are exposed to JS. This is only really a
@@ -897,7 +907,7 @@ OTHelpers.useLogHelpers = function(on){
                     // the desired console method isn't a real object, which means
                     // that we can't use apply on it. We force it to be a real object
                     // using Function.bind, assuming that's available.
-                    if (cons[method].apply || Function.prototype.bind) {
+                    if (cons[method].apply || _canApplyConsole) {
                         if (!cons[method].apply) {
                             cons[method] = Function.prototype.bind.call(cons[method], cons);
                         }
@@ -933,7 +943,7 @@ OTHelpers.useLogHelpers = function(on){
 
     on.setLogLevel = function(level) {
         _logLevel = typeof(level) === 'number' ? level : 0;
-        on.debug("OT.setLogLevel(" + _logLevel + ")");
+        on.debug("TB.setLogLevel(" + _logLevel + ")");
         return _logLevel;
     };
 
@@ -1694,6 +1704,10 @@ OTHelpers.roundFloat = function(value, places) {
 // DOM helpers
 (function(window, OTHelpers, undefined) {
 
+OTHelpers.isElementNode = function(node) {
+    return node && typeof node === 'object' && node.nodeType == 1;
+};
+
 // Returns true if the client supports element.classList
 OTHelpers.supportsClassList = function() {
     var hasSupport = typeof(document !== "undefined") && ("classList" in document.createElement("a"));
@@ -1734,8 +1748,8 @@ OTHelpers.emptyElement = function(element) {
     return element;
 };
 
-OTHelpers.createElement = function(nodeName, attributes, innerHTML) {
-    var element = document.createElement(nodeName);
+OTHelpers.createElement = function(nodeName, attributes, children, doc) {
+    var element = (doc || document).createElement(nodeName);
 
     if (attributes) {
         for (var name in attributes) {
@@ -1756,8 +1770,18 @@ OTHelpers.createElement = function(nodeName, attributes, innerHTML) {
         }
     }
 
-    if (innerHTML) {
-        element.innerHTML = innerHTML;
+    var setChildren = function(child) {
+        if(typeof child === 'string') {
+            element.innerHTML = element.innerHTML + child;
+        } else {
+            element.appendChild(child);
+        }
+    };
+
+    if(OTHelpers.isArray(children)) {
+        OTHelpers.forEach(children, setChildren);
+    } else if(children) {
+        setChildren(children);
     }
 
     return element;
@@ -1795,6 +1819,7 @@ OTHelpers.on = function(element, eventName,  handler) {
           if (oldHandler) oldHandler.apply(this, arguments);
         };
     }
+    return element;
 };
 
 // Helper function for removing event listeners from dom elements.
@@ -1973,58 +1998,178 @@ OTHelpers.observeNodeOrChildNodeRemoval = function(element, onChange) {
 
 (function(window, OTHelpers, undefined) {
 
-OTHelpers.Modal = function(title, body) {
-    /*jshint multistr:true*/
-    var tmpl = "\
-        <header>\
-            <h1><%= title %></h1>\
-        </header>\
-        <div class='OT_dialog-body'>\
-            <%= body %>\
-        </div>\
-    ";
+  OTHelpers.Modal = function(options) {
 
-    this.el = OTHelpers.createElement("section", {
-            className: "OT_root OT_dialog OT_modal"
-        },
-        OTHelpers.template(tmpl, {
-            title: title,
-            body: body
-        })
-    );
+    OTHelpers.eventing(this, true);
 
-    // We're going to center the element in the window. We need to add the
-    // element to the body before we do, otherwise we can't calculate the dialog's
-    // widths and heights. This means we need to hide the element first.
-    this.el.style.display = 'none';
-    document.body.appendChild(this.el);
-    OTHelpers.centerElement(this.el);
-    OTHelpers.show(this.el);
+    var callback = arguments[arguments.length - 1];
+
+    if(!OTHelpers.isFunction(callback)) {
+      throw new Error('OTHelpers.Modal2 must be given a callback');
+    }
+
+    if(arguments.length < 2) {
+      options = {};
+    }
+
+    var domElement = document.createElement('iframe');
+
+    domElement.id = options.id || OTHelpers.uuid();
+    domElement.style.position = 'absolute';
+    domElement.style.position = 'fixed';
+    domElement.style.height = '100%';
+    domElement.style.width = '100%';
+    domElement.style.top = '0px';
+    domElement.style.left = '0px';
+    domElement.style.right = '0px';
+    domElement.style.bottom = '0px';
+    domElement.style.zIndex = 1000;
+    domElement.style.border = '0';
+
+    try {
+      domElement.style.backgroundColor = 'rgba(0,0,0,0.2)';
+    } catch (err) {
+      // Old IE browsers don't support rgba and we still want to show the upgrade message
+      // but we just make the background of the iframe completely transparent.
+      domElement.style.backgroundColor = 'transparent';
+      domElement.setAttribute('allowTransparency', 'true');
+    }
+
+    domElement.scrolling = 'no';
+    domElement.setAttribute('scrolling', 'no');
+
+    var wrappedCallback = function() {
+      var doc = domElement.contentDocument || domElement.contentWindow.document;
+      doc.body.style.backgroundColor = 'transparent';
+      doc.body.style.border = 'none';
+      callback(
+        domElement.contentWindow,
+        doc
+      );
+    };
+
+    document.body.appendChild(domElement);
+    
+    if(OTHelpers.browserVersion().iframeNeedsLoad) {
+      OTHelpers.on(domElement, 'load', wrappedCallback);
+    } else {
+      setTimeout(wrappedCallback);
+    }
 
     this.close = function() {
-        OTHelpers.removeElement(this.el);
-        this.el = null;
-        return this;
+      OTHelpers.removeElement(domElement);
+      this.trigger('closed');
+      this.element = domElement = null;
+      return this;
     };
-};
 
-// Custom alert dialog
-OTHelpers.tbAlert = function(title, message) {
-    var modal = new OTHelpers.Modal(title, "<div>" + message + "</div>");
-    OTHelpers.addClass(modal.el, "OT_tbalert");
+    this.element = domElement;
 
-    var closeBtn = OTHelpers.createElement("input", {
-            className: "OT_closeButton",
-            type: "button",
-            value: "close"
-    });
-    modal.el.appendChild(closeBtn);
+  };
+  
+})(window, window.OTHelpers);
 
-    closeBtn.onclick = function() {
-        if (modal) modal.close();
-        modal = null;
-    };
-};
+/*
+ * getComputedStyle from 
+ * https://github.com/jonathantneal/Polyfills-for-IE8/blob/master/getComputedStyle.js
+
+// tb_require('../helpers.js')
+// tb_require('./dom.js')
+
+/*jshint strict: false, eqnull: true, browser:true, smarttabs:true*/
+
+(function(window, OTHelpers, undefined) {
+
+  /*jshint eqnull: true, browser: true */
+
+
+  function getPixelSize(element, style, property, fontSize) {
+    var sizeWithSuffix = style[property],
+        size = parseFloat(sizeWithSuffix),
+        suffix = sizeWithSuffix.split(/\d/)[0],
+        rootSize;
+
+    fontSize = fontSize != null ?
+      fontSize : /%|em/.test(suffix) && element.parentElement ?
+        getPixelSize(element.parentElement, element.parentElement.currentStyle, 'fontSize', null) :
+        16;
+    rootSize = property === 'fontSize' ?
+      fontSize : /width/i.test(property) ? element.clientWidth : element.clientHeight;
+
+    return (suffix === 'em') ?
+      size * fontSize : (suffix === 'in') ?
+        size * 96 : (suffix === 'pt') ?
+          size * 96 / 72 : (suffix === '%') ?
+            size / 100 * rootSize : size;
+  }
+
+  function setShortStyleProperty(style, property) {
+    var
+    borderSuffix = property === 'border' ? 'Width' : '',
+    t = property + 'Top' + borderSuffix,
+    r = property + 'Right' + borderSuffix,
+    b = property + 'Bottom' + borderSuffix,
+    l = property + 'Left' + borderSuffix;
+
+    style[property] = (style[t] === style[r] === style[b] === style[l] ? [style[t]]
+    : style[t] === style[b] && style[l] === style[r] ? [style[t], style[r]]
+    : style[l] === style[r] ? [style[t], style[r], style[b]]
+    : [style[t], style[r], style[b], style[l]]).join(' ');
+  }
+
+  function CSSStyleDeclaration(element) {
+    var currentStyle = element.currentStyle,
+        style = this,
+        fontSize = getPixelSize(element, currentStyle, 'fontSize', null),
+        property;
+
+    for (property in currentStyle) {
+      if (/width|height|margin.|padding.|border.+W/.test(property) && style[property] !== 'auto') {
+        style[property] = getPixelSize(element, currentStyle, property, fontSize) + 'px';
+      } else if (property === 'styleFloat') {
+        /*jshint -W069 */
+        style['float'] = currentStyle[property];
+      } else {
+        style[property] = currentStyle[property];
+      }
+    }
+
+    setShortStyleProperty(style, 'margin');
+    setShortStyleProperty(style, 'padding');
+    setShortStyleProperty(style, 'border');
+
+    style.fontSize = fontSize + 'px';
+
+    return style;
+  }
+
+  CSSStyleDeclaration.prototype = {
+    constructor: CSSStyleDeclaration,
+    getPropertyPriority: function () {},
+    getPropertyValue: function ( prop ) {
+      return this[prop] || '';
+    },
+    item: function () {},
+    removeProperty: function () {},
+    setProperty: function () {},
+    getPropertyCSSValue: function () {}
+  };
+
+  function getComputedStyle(element) {
+    return new CSSStyleDeclaration(element);
+  }
+
+
+  OTHelpers.getComputedStyle = function(element) {
+    if(element &&
+        element.ownerDocument &&
+        element.ownerDocument.defaultView &&
+        element.ownerDocument.defaultView.getComputedStyle) {
+      return element.ownerDocument.defaultView.getComputedStyle(element);
+    } else {
+      return getComputedStyle(element);
+    }
+  };
 
 })(window, window.OTHelpers);
 
@@ -2181,146 +2326,146 @@ OTHelpers.centerElement = function(element, width, height) {
 
 // tb_require('../helpers.js')
 // tb_require('./dom.js')
+// tb_require('./getcomputedstyle.js')
 
 (function(window, OTHelpers, undefined) {
 
-var displayStateCache = {},
-    defaultDisplays = {};
+  var displayStateCache = {},
+      defaultDisplays = {};
 
-var defaultDisplayValueForElement = function(element) {
-    if (defaultDisplays[element.ownerDocument] && defaultDisplays[element.ownerDocument][element.nodeName]) {
+  var defaultDisplayValueForElement = function(element) {
+      if (defaultDisplays[element.ownerDocument] &&
+        defaultDisplays[element.ownerDocument][element.nodeName]) {
         return defaultDisplays[element.ownerDocument][element.nodeName];
-    }
+      }
 
-    if (!defaultDisplays[element.ownerDocument]) defaultDisplays[element.ownerDocument] = {};
+      if (!defaultDisplays[element.ownerDocument]) defaultDisplays[element.ownerDocument] = {};
     
-    // We need to know what display value to use for this node. The easiest way
-    // is to actually create a node and read it out.
-    var testNode = element.ownerDocument.createElement(element.nodeName),
-        defaultDisplay;
+      // We need to know what display value to use for this node. The easiest way
+      // is to actually create a node and read it out.
+      var testNode = element.ownerDocument.createElement(element.nodeName),
+          defaultDisplay;
 
-    element.ownerDocument.body.appendChild(testNode);
-    defaultDisplay = defaultDisplays[element.ownerDocument][element.nodeName] = OTHelpers.css(testNode, 'display');
+      element.ownerDocument.body.appendChild(testNode);
+      defaultDisplay = defaultDisplays[element.ownerDocument][element.nodeName] =
+        OTHelpers.css(testNode, 'display');
 
-    OTHelpers.removeElement(testNode);
-    testNode = null;
+      OTHelpers.removeElement(testNode);
+      testNode = null;
 
-    return defaultDisplay;
-};
+      return defaultDisplay;
+    };
 
-var isHidden = function(element) {
-    var computedStyle = element.ownerDocument.defaultView.getComputedStyle(element, null);
+  var isHidden = function(element) {
+    var computedStyle = OTHelpers.getComputedStyle(element);
     return computedStyle.getPropertyValue('display') === 'none';
-};
+  };
 
-OTHelpers.show = function(element) {
-    var display = element.style.display; 
-        //,
-        // computedStyle = element.ownerDocument.defaultView.getComputedStyle(element, null),
-        // computedDisplay = computedStyle.getPropertyValue('display');
+  OTHelpers.show = function(element) {
+    var display = element.style.display;
 
     if (display === '' || display === 'none') {
-        element.style.display = displayStateCache[element] || '';
-        delete displayStateCache[element];
+      element.style.display = displayStateCache[element] || '';
+      delete displayStateCache[element];
     }
 
     if (isHidden(element)) {
-        // It's still hidden so there's probably a stylesheet that declares this 
-        // element as display:none;
-        displayStateCache[element] = 'none';
+      // It's still hidden so there's probably a stylesheet that declares this
+      // element as display:none;
+      displayStateCache[element] = 'none';
 
-        element.style.display = defaultDisplayValueForElement(element);
+      element.style.display = defaultDisplayValueForElement(element);
     }
 
     return this;
-};
+  };
 
-OTHelpers.hide = function(element) {
+  OTHelpers.hide = function(element) {
     if (element.style.display === 'none') return;
 
     displayStateCache[element] = element.style.display;
     element.style.display = 'none';
 
     return this;
-};
+  };
 
-OTHelpers.css = function(element, nameOrHash, value) {
+  OTHelpers.css = function(element, nameOrHash, value) {
     if (typeof(nameOrHash) !== 'string') {
-        var style = element.style;
+      var style = element.style;
 
-        for (var cssName in nameOrHash) {
-            style[cssName] = nameOrHash[cssName];
-        }
+      for (var cssName in nameOrHash) {
+        style[cssName] = nameOrHash[cssName];
+      }
 
-        return this;
+      return this;
+
+    } else if (value !== undefined) {
+      element.style[nameOrHash] = value;
+      return this;
+
+    } else {
+      // Normalise vendor prefixes from the form MozTranform to -moz-transform
+      // except for ms extensions, which are weird...
+
+      var name = nameOrHash.replace( /([A-Z]|^ms)/g, '-$1' ).toLowerCase(),
+          computedStyle = OTHelpers.getComputedStyle(element),
+          currentValue = computedStyle.getPropertyValue(name);
+
+      if (currentValue === '') {
+        currentValue = element.style[name];
+      }
+
+      return currentValue;
     }
-    else if (value !== undefined) {
-        element.style[nameOrHash] = value;
-        return this;
-    }
-    else {
-        // Normalise vendor prefixes from the form MozTranform to -moz-transform
-        // except for ms extensions, which are weird...
-        var name = nameOrHash.replace( /([A-Z]|^ms)/g, "-$1" ).toLowerCase(),
-            computedStyle = element.ownerDocument.defaultView.getComputedStyle(element, null),
-            currentValue = computedStyle.getPropertyValue(name);
-
-        if (currentValue === '') {
-            currentValue = element.style[name];
-        }
-
-        return currentValue;
-    }
-};
+  };
 
 
 // Apply +styles+ to +element+ while executing +callback+, restoring the previous
 // styles after the callback executes.
-OTHelpers.applyCSS = function(element, styles, callback) {
+  OTHelpers.applyCSS = function(element, styles, callback) {
     var oldStyles = {},
         name,
         ret;
 
     // Backup the old styles
     for (name in styles) {
-        if (styles.hasOwnProperty(name)) {
-            // We intentionally read out of style here, instead of using the css
-            // helper. This is because the css helper uses querySelector and we
-            // only want to pull values out of the style (domeElement.style) hash.
-            oldStyles[name] = element.style[name];
+      if (styles.hasOwnProperty(name)) {
+        // We intentionally read out of style here, instead of using the css
+        // helper. This is because the css helper uses querySelector and we
+        // only want to pull values out of the style (domeElement.style) hash.
+        oldStyles[name] = element.style[name];
 
-            OTHelpers.css(element, name, styles[name]);
-        }
+        OTHelpers.css(element, name, styles[name]);
+      }
     }
 
     ret = callback();
 
     // Restore the old styles
     for (name in styles) {
-        if (styles.hasOwnProperty(name)) {
-            OTHelpers.css(element, name, oldStyles[name] || '');
-        }
+      if (styles.hasOwnProperty(name)) {
+        OTHelpers.css(element, name, oldStyles[name] || '');
+      }
     }
 
     return ret;
-};
+  };
 
 // Make +element+ visible while executing +callback+.
-OTHelpers.makeVisibleAndYield = function(element, callback) {
-    // find whether it's the element or an ancester that's display none and 
+  OTHelpers.makeVisibleAndYield = function(element, callback) {
+    // find whether it's the element or an ancester that's display none and
     // then apply to whichever it is
     var targetElement = OTHelpers.findElementWithDisplayNone(element);
     if (!targetElement) return;
 
     return OTHelpers.applyCSS(targetElement, {
-            display: "block",
-            visibility: "hidden"
-        },
-        callback
-    );
-};
+      display: 'block',
+      visibility: 'hidden'
+    }, callback);
+  };
 
 })(window, window.OTHelpers);
+
 // AJAX helpers
 
 /*jshint browser:true, smarttabs:true*/
@@ -2349,7 +2494,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
     var done = function(error, event) {
       if(error) {
-        callback(error);
+        callback(error, event && event.target && event.target.responseText);
       } else {
         var response;
 
@@ -2357,7 +2502,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           response = JSON.parse(event.target.responseText);
         } catch(e) {
           // Badly formed JSON
-          callback(e);
+          callback(e, event && event.target && event.target.responseText);
           return;
         }
 
@@ -2488,6 +2633,237 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   };
 
 })(window, window.OTHelpers);
+!(function() {
+
+  OT.Dialogs = {};
+
+  var addCss = function(document, url, callback) {
+    var head = document.head || document.getElementsByTagName('head')[0];
+    var cssTag = OT.$.createElement('link', {
+      type: 'text/css',
+      media: 'screen',
+      rel: 'stylesheet',
+      href: url
+    });
+    head.appendChild(cssTag);
+    OT.$.on(cssTag, 'error', function(error) {
+      OT.error('Could not load CSS for dialog', url, error && error.message || error);
+    });
+    OT.$.on(cssTag, 'load', callback);
+  };
+
+  var addDialogCSS = function(document, urls, callback) {
+    var allURLs = [
+      '//fonts.googleapis.com/css?family=Didact+Gothic',
+      OT.properties.cssURL
+    ].concat(urls);
+    var remainingStylesheets = allURLs.length;
+    OT.$.forEach(allURLs, function(stylesheetUrl) {
+      addCss(document, stylesheetUrl, function() {
+        if(--remainingStylesheets <= 0) {
+          callback();
+        }
+      });
+    });
+
+  };
+  
+  var templateElement = function(classes, children, tagName) {
+    var el = OT.$.createElement(tagName || 'div', { 'class': classes }, children, this);
+    el.on = OT.$.bind(OT.$.on, OT.$, el);
+    return el;
+  };
+
+  OT.Dialogs.AllowDeny = {};
+  OT.Dialogs.AllowDeny.Chrome = {};
+  OT.Dialogs.AllowDeny.Firefox = {};
+
+  OT.Dialogs.AllowDeny.Chrome.initialPrompt = function() {
+    var modal = new OT.$.Modal(function(window, document) {
+
+      var el = templateElement.bind(document),
+          close, root;
+
+      close = el('OT_closeButton', '&times;')
+        .on('click', function() {
+          modal.close();
+        });
+
+      root = el('OT_root OT_dialog OT_dialog-allow-deny-chrome-first', [
+        close,
+        el('OT_dialog-messages', [
+          el('OT_dialog-messages-main', 'Allow camera and mic access'),
+          el('OT_dialog-messages-minor', 'Click the Allow button in the upper-right corner ' +
+            'of your browser to enable real-time communication.'),
+          el('OT_dialog-allow-highlight-chrome')
+        ])
+      ]);
+
+      addDialogCSS(document, [], function() {
+        document.body.appendChild(root);
+      });
+
+    });
+    return modal;
+  };
+
+  OT.Dialogs.AllowDeny.Chrome.previouslyDenied = function(website) {
+    var modal = new OT.$.Modal(function(window, document) {
+
+      var el = templateElement.bind(document),
+          close,
+          root;
+
+      close = el('OT_closeButton', '&times;')
+        .on('click', function() {
+          modal.close();
+        });
+
+      root = el('OT_root OT_dialog OT_dialog-allow-deny-chrome-pre-denied', [
+        close,
+        el('OT_dialog-messages', [
+          el('OT_dialog-messages-main', 'Allow camera and mic access'),
+          el('OT_dialog-messages-minor', [
+            'To interact with this app, follow these 3 steps:',
+            el('OT_dialog-3steps', [
+              el('OT_dialog-3steps-step', [
+                el('OT_dialog-3steps-step-num', '1'),
+                'Find this icon in the URL bar and click it',
+                el('OT_dialog-allow-camera-icon')
+              ]),
+              el('OT_dialog-3steps-seperator'),
+              el('OT_dialog-3steps-step', [
+                el('OT_dialog-3steps-step-num', '2'),
+                'Select "Ask if ' + website + ' wants to access your camera and mic" ' +
+                  'and then click Done.'
+              ]),
+              el('OT_dialog-3steps-seperator'),
+              el('OT_dialog-3steps-step', [
+                el('OT_dialog-3steps-step-num', '3'),
+                'Refresh your browser.'
+              ])
+            ])
+          ])
+        ])
+      ]);
+
+      addDialogCSS(document, [], function() {
+        document.body.appendChild(root);
+      });
+
+    });
+    return modal;
+  };
+
+  OT.Dialogs.AllowDeny.Chrome.deniedNow = function() {
+    var modal = new OT.$.Modal(function(window, document) {
+
+      var el = templateElement.bind(document),
+          root;
+
+      root = el('OT_root OT_dialog-blackout',
+        el('OT_dialog OT_dialog-allow-deny-chrome-now-denied', [
+          el('OT_dialog-messages', [
+            el('OT_dialog-messages-main ',
+              el('OT_dialog-allow-camera-icon')
+            ),
+            el('OT_dialog-messages-minor',
+              'Find & click this icon to allow camera and mic access.'
+            )
+          ])
+        ])
+      );
+
+      addDialogCSS(document, [], function() {
+        document.body.appendChild(root);
+      });
+
+    });
+    return modal;
+  };
+
+  OT.Dialogs.AllowDeny.Firefox.maybeDenied = function() {
+    var modal = new OT.$.Modal(function(window, document) {
+
+      var el = templateElement.bind(document),
+          close,
+          root;
+
+      close = el('OT_closeButton', '&times;')
+        .on('click', function() {
+          modal.close();
+        });
+
+      root = el('OT_root OT_dialog OT_dialog-allow-deny-firefox-maybe-denied', [
+        close,
+        el('OT_dialog-messages', [
+          el('OT_dialog-messages-main', 'Please allow camera & mic access'),
+          el('OT_dialog-messages-minor', [
+            'To interact with this app, follow these 3 steps:',
+            el('OT_dialog-3steps', [
+              el('OT_dialog-3steps-step', [
+                el('OT_dialog-3steps-step-num', '1'),
+                'Reload the page, or click the camera icon ' +
+                  'in the browser URL bar.'
+              ]),
+              el('OT_dialog-3steps-seperator'),
+              el('OT_dialog-3steps-step', [
+                el('OT_dialog-3steps-step-num', '2'),
+                'In the menu, select your camera & mic.'
+              ]),
+              el('OT_dialog-3steps-seperator'),
+              el('OT_dialog-3steps-step', [
+                el('OT_dialog-3steps-step-num', '3'),
+                'Click "Share Selected Devices."'
+              ])
+            ])
+          ])
+        ])
+      ]);
+
+      addDialogCSS(document, [], function() {
+        document.body.appendChild(root);
+      });
+
+    });
+    return modal;
+  };
+
+
+  OT.Dialogs.AllowDeny.Firefox.denied = function() {
+    var modal = new OT.$.Modal(function(window, document) {
+
+      var el = templateElement.bind(document),
+          btn = templateElement.bind(document, 'OT_dialog-button OT_dialog-button-large'),
+          root,
+          refreshButton;
+
+      refreshButton = btn('Reload')
+        .on('click', function() {
+          modal.trigger('refresh');
+        });
+
+      root = el('OT_root OT_dialog-blackout',
+        el('OT_dialog OT_dialog-allow-deny-firefox-denied', [
+          el('OT_dialog-messages', [
+            el('OT_dialog-messages-minor',
+              'Access to camera and microphone has been denied. ' +
+              'Click the button to reload page.'
+            )
+          ]),
+          el('OT_dialog-single-button', refreshButton)
+        ])
+      );
+
+      addDialogCSS(document, [], function() {
+        document.body.appendChild(root);
+      });
+
+    });
+    return modal;
+  };
+
+})();
 !(function(window) {
 
   /* global OTHelpers */
@@ -2500,6 +2876,25 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   // Allow events to be bound on OT
   OT.$.eventing(OT);
 
+  // REMOVE THIS POST IE MERGE
+
+  OT.$.defineGetters = function(self, getters, enumerable) {
+    var propsDefinition = {};
+
+    if (enumerable === void 0) enumerable = false;
+
+    for (var key in getters) {
+      propsDefinition[key] = {
+        get: getters[key],
+        enumerable: enumerable
+      };
+    }
+
+    Object.defineProperties(self, propsDefinition);
+  };
+
+  // STOP REMOVING HERE
+
   // OT.$.Modal was OT.Modal before the great common-js-helpers move
   OT.Modal = OT.$.Modal;
 
@@ -2622,7 +3017,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
       window.location.protocol.indexOf('chrome-extension') >= 0)) {
       props.assetURL = props.cdnURLSSL + '/webrtc/' + props.version;
       props.loggingURL = props.loggingURLSSL;
-      props.apiURL = props.apiURLSSL;
     } else {
       props.assetURL = props.cdnURL + '/webrtc/' + props.version;
     }
@@ -3105,10 +3499,11 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
       }
     });
 
-    this.addError = function(errorMsg, helpMsg) {
+    this.addError = function(errorMsg, helpMsg, classNames) {
       container.innerHTML = '<p>' + errorMsg +
-        ' <span class="ot-help-message">' + helpMsg + '</span></p>';
-      OT.$.addClass(container, 'OT_subscriber_error');
+        (helpMsg ? ' <span class="ot-help-message">' + helpMsg + '</span>' : '') +
+        '</p>';
+      OT.$.addClass(container, classNames || 'OT_subscriber_error');
       if(container.querySelector('p').offsetHeight > container.offsetHeight) {
         container.querySelector('span').style.display = 'none';
       }
@@ -3218,15 +3613,15 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   };
 
   gumNamesToMessages = {
-    PermissionDeniedError: 'User denied permission for scripts from this origin to ' +
-      'access the media device.',
+    PermissionDeniedError: 'End-user denied permission to hardware devices',
     NotSupportedError: 'A constraint specified is not supported by the browser.',
-    ConstraintNotSatisfiedError: 'One of the mandatory constraints could not be satisfied.',
+    ConstraintNotSatisfiedError: 'It\'s not possible to satisfy one or more constraints ' +
+      'passed into the getUserMedia function',
     OverconstrainedError: 'Due to changes in the environment, one or more mandatory ' +
       'constraints can no longer be satisfied.',
-    NoDevicesFoundError: 'No video or audio input devices are available on this machine.',
-    HardwareUnavailableError: 'The selected audio or video input devices are not available, ' +
-      'possibly because they are in use by another application.'
+    NoDevicesFoundError: 'No voice or video input devices are available on this machine.',
+    HardwareUnavailableError: 'The selected voice or video devices are unavailable. Verify ' +
+      'that the chosen devices are not in use by another application.'
   };
 
 // Map vendor error strings to names and messages
@@ -4191,11 +4586,16 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
     // Uses HTML5 local storage to save a client ID.
     this.getClientGuid = function() {
-      var  guid = OT.$.getCookie('opentok_client_id');
+      var guid = OT.$.getCookie('opentok_client_id');
       if (!guid) {
         guid = OT.$.uuid();
         OT.$.setCookie('opentok_client_id', guid);
       }
+      // once we have a guid, memoise this function so if cookies & local storage are disabled
+      // we still hand back the same guid each call within this page at least. OPENTOK-14015
+      this.getClientGuid = function() {
+        return guid;
+      };
       return guid;
     };
   };
@@ -4385,15 +4785,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 *   next largest setting supported.
 *   </p>
 *   <p>
-*   The actual resolution used by the Publisher is set as the <code>videoHeight</code> and 
-*   <code>videoWidth</code> properties of the Publisher object. The actual resolution of a
-*   Subscriber video stream is set as the <code>videoWidth</code> and <code>videoHeight</code> 
-*   properties of the Subscriber object. These may differ from the values of the 
-*   <code>resolution</code> property passed in as the <code>properties</code> property of the
-*   <code>OT.initPublisher()</code> method, if the browser does not support the requested
-*   resolution.
-*   </p>
-*   <p>
 *   For OpenTok cloud-enabled sessions, lowering the frame rate or lowering the resolution reduces
 *   the maximum bandwidth the stream can use. However, in peer-to-peer sessions, lowering the frame
 *   rate or resolution may not reduce the stream's bandwidth.
@@ -4881,16 +5272,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           this.trigger('update:'+event.target.id, event);
         }.bind(this),
 
-        onModelIdUpdate = function onModelIdUpdate (oldId, newId) {
-          if (_byId[oldId] === void 0) return;
-
-          // Match their old index to their new id and remove any
-          // reference to the old one.
-          var index = _byId[oldId];
-          delete _byId[oldId];
-          _byId[newId] = index;
-        }.bind(this),
-
         onModelDestroy = function onModelDestroyed (event) {
           this.remove(event.target, event.reason);
         }.bind(this);
@@ -4901,7 +5282,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
       _models.forEach(function(model) {
         model.off('updated', onModelUpdate, this);
         model.off('destroyed', onModelDestroy, this);
-        model.off('idUpdated', onModelIdUpdate, this);
       }, this);
 
       _models = [];
@@ -4992,7 +5372,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
       model.on('updated', onModelUpdate, this);
       model.on('destroyed', onModelDestroy, this);
-      model.on('idUpdated', onModelIdUpdate, this);
 
       this.trigger('add', model);
       this.trigger('add:'+id, model);
@@ -5014,7 +5393,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
       model.off('updated', onModelUpdate, this);
       model.off('destroyed', onModelDestroy, this);
-      model.off('idUpdated', onModelIdUpdate, this);
 
       this.trigger('remove', model, reason);
       this.trigger('remove:'+id, model, reason);
@@ -5083,6 +5461,12 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *   <li><code>streamDestroyed</code> &#151; See <a href="StreamEvent.html#preventDefault">
   *   StreamEvent.preventDefault()</a>.</li>
   *
+  *   <li><code>accessDialogOpened</code> &#151; See the
+  *   <a href="Publisher.html#event:accessDialogOpened">accessDialogOpened event</a>.</li>
+  *
+  *   <li><code>accessDenied</code> &#151; See the <a href="Publisher.html#event:accessDenied">
+  *   accessDenied event</a>.</li>
+  *
   * </ul>
   *
   * @method #preventDefault
@@ -5165,7 +5549,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
     API_RESPONSE_FAILURE: 1014,
     UNABLE_TO_PUBLISH: 1500,
     UNABLE_TO_SUBSCRIBE: 1501,
-    UNABLE_TO_SIGNAL: 1510,
     UNABLE_TO_FORCE_DISCONNECT: 1520,
     UNABLE_TO_FORCE_UNPUBLISH: 1530
   };
@@ -5191,15 +5574,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *   <b>title</b>
   *   </td>
   *  </tr>
-  *  <tr>
-  *   <td>
-  *   1000
-  *
-  *   </td>
-  *   <td>
-  *   Failed To Load
-  *   </td>
-  *  </tr>
   *
   *  <tr>
   *   <td>
@@ -5302,15 +5676,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *
   *  <tr>
   *    <td>
-  *    1510
-  *    </td>
-  *    <td>
-  *    Unable to Signal
-  *    </td>
-  *   </tr>
-  *
-  *  <tr>
-  *    <td>
   *    1520
   *    </td>
   *    <td>
@@ -5361,6 +5726,11 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *  <p>Check the <code>message</code> property for more details about the error.</p>
   *
   * @property {String} message The error message.
+  *
+  * @property {Object} target The object that the event pertains to. For an
+  * <code>exception</code> event, this will be an object other than the OT object
+  * (such as a Session object or a Publisher object).
+  *
   * @property {String} title The error title.
   * @augments Event
   */
@@ -5499,7 +5869,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
  * <pre>
  * session.on("streamCreated", function(event) {
  *   // streamContainer is a DOM element
- *   subscriber = session.subscribe(event.stream, streamContainer);
+ *   subscriber = session.subscribe(event.stream, targetElement);
  * }).connect(token);
  * </pre>
  *
@@ -5521,7 +5891,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
  * starts</p>
  *
  * <pre>
- * var publisher = session.publish(publisherContainer)
+ * var publisher = session.publish(targetElement)
  *   .on("streamCreated", function(event) {
  *     console.log("Publisher started streaming.");
  *   );
@@ -5534,7 +5904,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
  * when the streaming stops:</p>
  *
  * <pre>
- * var publisher = session.publish(publisherContainer)
+ * var publisher = session.publish(targetElement)
  *   .on("streamDestroyed", function(event) {
  *     event.preventDefault();
  *     console.log("Publisher stopped streaming.");
@@ -5877,7 +6247,25 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 /* jshint ignore:start */
 // https://code.google.com/p/stringencoding/
 // An implementation of http://encoding.spec.whatwg.org/#api
-//
+
+/**
+ * @license  Copyright 2014 Joshua Bell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original source: https://github.com/inexorabletash/text-encoding
+ ***/
+
 (function(global) {
   'use strict';
 
@@ -8546,6 +8934,10 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
     //// Private Event Handlers
     var webSocketConnected = function webSocketConnected () {
           if (connectTimeout) clearTimeout(connectTimeout);
+          if (this.isNot('connecting')) {
+            OT.debug('webSocketConnected reached in state other than connecting');
+            return;
+          }
 
           // Connect to Rumor by registering our connection id and the
           // app server address to notify if we disconnect.
@@ -8565,10 +8957,18 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
             lastMessageTimestamp = OT.$.now();
             sendKeepAlive();
           }, WEB_SOCKET_KEEP_ALIVE_INTERVAL);
-        },
+        }.bind(this),
 
         webSocketConnectTimedOut = function webSocketConnectTimedOut () {
+          var webSocketWas = webSocket;
           error('Timed out while waiting for the Rumor socket to connect.');
+          // This will prevent a socket eventually connecting
+          // But call it _after_ the error just in case any of
+          // the callbacks fire synchronously, breaking the error
+          // handling code.
+          try {
+            webSocketWas.close();
+          } catch(x) {}
         },
 
         webSocketError = function webSocketError () {},
@@ -9113,7 +9513,14 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
     return message;
   };
-
+  
+  OT.Raptor.parseIceServers = function (message) {
+    try {
+      return JSON.parse(message.data).content.iceServers;
+    } catch (e) {
+      return [];
+    }
+  };
 
   OT.Raptor.Message = {};
 
@@ -9670,8 +10077,8 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
                                                       minBitrate,
                                                       maxBitrate);
 
-      this.publish(message, function(error) {
-        completion(error, streamId);
+      this.publish(message, function(error, message) {
+        completion(error, streamId, message);
       });
     };
 
@@ -9833,7 +10240,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   };
 
   OT.Raptor.Dispatcher.prototype.onClose = function(reason) {
-    this.trigger('close', reason);
+    this.emit('close', reason);
   };
 
 
@@ -9848,10 +10255,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
       var error;
 
       if (rumorMessage.isError) {
-        // error = new OT.Error(OT.ExceptionCodes.CONNECT_REJECTED,
-        //   connectErrorReasons[message.payload.reason] || "Failed to connect");
-        // @todo This is wrong. We don't know what operation was actually failing,
-        //        we can only blindly trigger the completion handler
         error = new OT.Error(rumorMessage.status);
       }
 
@@ -10059,8 +10462,8 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
   OT.Raptor.Dispatcher.prototype.dispatchArchive = function (message) {
     switch (message.method) {
-      case 'create':
-        this.emit('archive#create', message.content);
+      case 'created':
+        this.emit('archive#created', message.content);
         break;
       
       case 'updated':
@@ -10155,7 +10558,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
         state.streams.push( parseAndAddStreamToSession(streamParams, session) );
       });
       
-      content.archives.forEach(function(archiveParams) {
+      (content.archive || content.archives).forEach(function(archiveParams) {
         state.archives.push( parseAndAddArchiveToSession(archiveParams, session) );
       });
 
@@ -10379,7 +10782,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
                                signalType, data);
     });
 
-    dispatcher.on('archive#create', function(archive) {
+    dispatcher.on('archive#created', function(archive) {
       parseAndAddArchiveToSession(archive, session);
     });
 
@@ -10559,6 +10962,11 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
    *   <td><b>Description</b></td>
    * </tr>
    * <tr>
+   *   <td>1010</td>
+   *   <td>The client is not connected to the OpenTok session. Check that client connects
+   *     successfully and has not disconnected before calling forceDisconnect().</td>
+   * </tr>
+   * <tr>
    *   <td>1520</td>
    *   <td>Unable to force disconnect. The client's token does not have the role set to moderator.
    *     Once the client has connected to the session, the <code>capabilities</code> property of
@@ -10574,6 +10982,11 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
    *   <td><b>Description</b></td>
    * </tr>
    * <tr>
+   *   <td>1010</td>
+   *   <td>The client is not connected to the OpenTok session. Check that client connects
+   *     successfully and has not disconnected before calling forceUnpublish().</td>
+   * </tr>
+   * <tr>
    *   <td>1530</td>
    *   <td>Unable to force unpublish. The client's token does not have the role set to moderator.
    *     Once the client has connected to the session, the <code>capabilities</code> property of
@@ -10595,9 +11008,9 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
    * </tr>
    * <tr>
    *   <td>1010</td>
-   *   <td>Cannot publish: the client is not connected to the OpenTok session. Check that your
-   *     application makes the client connect successfully before trying to publish. And check
-   *     that the client has not disconnected before trying to publish.</td>
+   *   <td>The client is not connected to the OpenTok session. Check that the client connects
+   *     successfully before trying to publish. And check that the client has not disconnected
+   *     before trying to publish.</td>
    * </tr>
    * <tr>
    *   <td>1500</td>
@@ -10620,10 +11033,22 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
    *   <td><b>Description</b></td>
    * </tr>
    * <tr>
-   *   <td>1510</td>
-   *   <td>Unable to signal. Check that the <code>to</code> property of the signal parameter is
-   *     set to a valid Connection object. Also, make sure that you are connected to the
-   *     session.</td>
+   *     <td>400</td>
+   *     <td>One of the signal properties &mdash; data, type, or to &mdash;
+   *                 is invalid. Or the data cannot be parsed as JSON.</td>
+   * </tr>
+   * <tr>
+   *   <td>404</td> <td>The to connection does not exist.</td>
+   * </tr>
+   * <tr>
+   *   <td>413</td> <td>The type string exceeds the maximum length (128 bytes),
+   *     or the data string exceeds the maximum size (8 kB).</td>
+   * </tr>
+   * <tr>
+   *   <td>500</td>
+   *   <td>The client is not connected to the OpenTok session. Check that the client connects
+   *     successfully before trying to signal. And check that the client has not disconnected before
+   *     trying to publish.</td>
    * </tr>
    * </tbody></table>
    *
@@ -10694,7 +11119,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   };
 
   var errorsCodesToTitle = {
-    1000: 'Failed To Load',
     1004: 'Authentication error',
     1005: 'Invalid Session ID',
     1006: 'Connect Failed',
@@ -10707,24 +11131,10 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
     1013: 'Connection Failed',
     1014: 'API Response Failure',
     1500: 'Unable to Publish',
-    1510: 'Unable to Signal',
     1520: 'Unable to Force Disconnect',
     1530: 'Unable to Force Unpublish',
-    1540: 'Unable to record archive',
-    1550: 'Unable to play back archive',
-    1560: 'Unable to create archive',
-    1570: 'Unable to load archive',
     2000: 'Internal Error',
     2001: 'Embed Failed',
-    3000: 'Archive load exception',
-    3001: 'Archive create exception',
-    3002: 'Playback stop exception',
-    3003: 'Playback start exception',
-    3004: 'Record start exception',
-    3005: 'Record stop exception',
-    3006: 'Archive load exception',
-    3007: 'Session recording in progress',
-    3008: 'Archive recording internal failure',
     4000: 'WebSocket Connection Failed',
     4001: 'WebSocket Network Disconnected'
   };
@@ -11046,9 +11456,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
  * <code>height</code>. Both are numbers. The <code>width</code> property is the width of the
  * encoded stream; the <code>height</code> property is the height of the encoded stream. (These
  * are independent of the actual width of Publisher and Subscriber objects corresponding to the
- * stream.) The height and width of the <code>videoDimensions</code> of a Stream object may differ
- * from the <code>videoHeight</code> dimensions of a Subcriber object using the stream, if the
- * browser does not support the resolution of the stream. This property can change if a stream
+ * stream.) This property can change if a stream
  * published from an iOS device resizes, based on a change in the device orientation. When this
  * occurs, the {@link Session} object dispatches a <code>streamPropertyChanged</code> event (see
  * {@link StreamPropertyChangedEvent}.)
@@ -11541,7 +11949,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
     );
   };
 
-  /**
+  /*
    * Negotiates a WebRTC PeerConnection.
    *
    * Responsible for:
@@ -11583,7 +11991,10 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           if (!_peerConnection) {
             try {
               OT.debug('Creating peer connection config "' + JSON.stringify(config) + '".');
-
+              if (!config.iceServers || config.iceServers.length === 0) {
+                // This should never happen unless something is misconfigured
+                OT.error('No ice servers present');
+              }
               _peerConnection = OT.$.createPeerConnection(config, {
                 optional: [
                   { DtlsSrtpKeyAgreement: true }
@@ -11831,6 +12242,12 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
       return this;
     };
+    
+    this.setIceServers = function (iceServers) {
+      if (iceServers) {
+        config.iceServers = iceServers;
+      }
+    };
 
     this.registerMessageDelegate = function(delegateFn) {
       return _messageDelegates.push(delegateFn);
@@ -12072,7 +12489,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 })(window);
 !(function() {
 
-  /**
+  /*
    * Abstracts PeerConnection related stuff away from OT.Publisher.
    *
    * Responsible for:
@@ -12177,18 +12594,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
     };
 
     // Init
-    this.init = function() {
-      var iceServers = session.sessionInfo.iceServers.map(function(is) {
-        var iceServer = OT.$.clone(is);
-
-        if (iceServer.url.trim().substr(0, 5) === 'turn:') {
-          // Make the username sessionId:connectionId:streamId for tracking purposes.
-          iceServer.username = session.id + '.' + session.connection.id + '.' + streamId;
-        }
-
-        return iceServer;
-      });
-
+    this.init = function(iceServers) {
       _peerConnection = OT.PeerConnections.add(remoteConnection, streamId, {
         iceServers: iceServers
       });
@@ -12214,7 +12620,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 })(window);
 !(function() {
 
-  /**
+  /*
    * Abstracts PeerConnection related stuff away from OT.Subscriber.
    *
    * Responsible for:
@@ -12319,7 +12725,9 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           tracks = stream[method]();
 
           for (var k=0, numTracks=tracks.length; k < numTracks; ++k){
-            tracks[k].enabled=enabled;
+            // Only change the enabled property if it's different
+            // otherwise we get flickering of the video
+            if (tracks[k].enabled !== enabled) tracks[k].enabled=enabled;
           }
         }
       };
@@ -12367,20 +12775,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
     // Init
     this.init = function() {
-      var iceServers = session.sessionInfo.iceServers.map(function(is) {
-        var iceServer = OT.$.clone(is);
-
-        if (iceServer.url.trim().substr(0, 5) === 'turn:') {
-          // Make the username sessionId:connectionId:streamId for tracking purposes.
-          iceServer.username = session.id + '.' + session.connection.id + '.' + stream.id;
-        }
-
-        return iceServer;
-      });
-
-      _peerConnection = OT.PeerConnections.add(remoteConnection, stream.streamId, {
-        iceServers: iceServers
-      });
+      _peerConnection = OT.PeerConnections.add(remoteConnection, stream.streamId, {});
 
       _peerConnection.on({
         close: _onPeerClosed,
@@ -12421,11 +12816,13 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           }));
         }
 
-        session._.subscriberCreate(stream, subscriber, channelsToSubscribeTo, function(err) {
-          if (err) {
-            this.trigger('error', null, err.message, this, 'Subscribe');
-          }
-        }.bind(this));
+        session._.subscriberCreate(stream, subscriber, channelsToSubscribeTo,
+          function(err, message) {
+            if (err) {
+              this.trigger('error', null, err.message, this, 'Subscribe');
+            }
+            _peerConnection.setIceServers(OT.Raptor.parseIceServers(message));
+          }.bind(this));
       }
     };
   };
@@ -13280,7 +13677,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 })(window);
 !(function() {
 
-/**
+/*
  * A Publishers Microphone.
  *
  * TODO
@@ -13603,19 +14000,16 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
  *
  *  var session = OT.initSession(apiKey, sessionID);
  *  session.on("sessionConnected", function(event) {
- *
- *      var publisherContainer = document.getElementById('publisherContainer');
- *          // This example assumes that a publisherContainer div exists
- *
- *      var publisherProperties = {width: 400, height:300, name:"Bob's stream"};
- *      publisher = OT.initPublisher(publisherContainer, publisherProperties);
- *      session.publish(publisher);
+ *    // This example assumes that a DOM element with the ID 'publisherElement' exists
+ *    var publisherProperties = {width: 400, height:300, name:"Bob's stream"};
+ *    publisher = OT.initPublisher('publisherElement', publisherProperties);
+ *    session.publish(publisher);
  *  });
  *  session.connect(token);
  *  </pre>
  *
  *      <p>This example creates a Publisher object and adds its video to a DOM element
- *      named <code>publisherContainer</code> by calling the <code>OT.initPublisher()</code>
+ *      with the ID <code>publisherElement</code> by calling the <code>OT.initPublisher()</code>
  *      method. It then publishes a stream to the session by calling
  *      the <code>publish()</code> method of the Session object.</p>
  *
@@ -13626,16 +14020,8 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
  * @property {Element} element The HTML DOM element containing the Publisher.
  * @property {String} id The DOM ID of the Publisher.
  * @property {Stream} stream The {@link Stream} object corresponding the the stream of
- * the Publihser.
+ * the Publisher.
  * @property {Session} session The {@link Session} to which the Publisher belongs.
- * @property {Number} videoHeight The height, in pixels, of the Publisher video. This may
- * differ from the <code>resolution</code> property passed in as the <code>properties</code>
- * property of the <code>OT.initPublisher()</code> method, if the browser does not support
- * the requested resolution.
- * @property {Number} videoWidth The width, in pixels, of the Publisher video. This may differ
- * from the <code>resolution</code> property passed in as the <code>properties</code> property
- * of the <code>OT.initPublisher()</code> method, if the browser does not support the requested
- * resolution.
  *
  * @see <a href="OT.html#initPublisher">OT.initPublisher</a>
  * @see <a href="Session.html#publish">Session.publish()</a>
@@ -13670,7 +14056,8 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
         _validFrameRates = [ 1, 7, 15, 30 ],
         _qosIntervals = {},
         _prevStats,
-        _state;
+        _state,
+        _iceServers;
 
     _validResolutions = {
       '320x240': {width: 320, height: 240},
@@ -13835,25 +14222,78 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           logAnalyticsEvent('publish', 'Failure', 'reason',
             'GetUserMedia:Publisher Access Denied: Permission Denied');
 
+          var browser = OT.$.browserVersion();
+
           var event = new OT.Event(OT.Event.names.ACCESS_DENIED),
             defaultAction = function() {
-              if (!event.isDefaultPrevented() && _container) _container.destroy();
+              if(!event.isDefaultPrevented()) {
+                if(browser.browser === 'Chrome') {
+                  if (_container) {
+                    _container.addError('', null, 'OT_publisher-denied-chrome');
+                  }
+                  if(!accessDialogWasOpened) {
+                    OT.Dialogs.AllowDeny.Chrome.previouslyDenied(window.location.hostname);
+                  } else {
+                    OT.Dialogs.AllowDeny.Chrome.deniedNow();
+                  }
+                } else if(browser.browser === 'Firefox') {
+                  if(_container) {
+                    _container.addError('', 'Click the reload button in the URL bar to change ' +
+                      'camera & mic settings.', 'OT_publisher-denied-firefox');
+                  }
+                  OT.Dialogs.AllowDeny.Firefox.denied().on({
+                    refresh: function() {
+                      window.location.reload();
+                    }
+                  });
+                }
+              }
             };
 
           this.dispatchEvent(event, defaultAction);
         },
 
+        accessDialogPrompt,
+        accessDialogFirefoxTimeout,
+        accessDialogWasOpened = false,
+
         onAccessDialogOpened = function() {
+
+          accessDialogWasOpened = true;
+
           logAnalyticsEvent('accessDialog', 'Opened', '', '');
 
+          var browser = OT.$.browserVersion();
+
           this.dispatchEvent(
-            new OT.Event(OT.Event.names.ACCESS_DIALOG_OPENED, false)
+            new OT.Event(OT.Event.names.ACCESS_DIALOG_OPENED, true),
+            function(event) {
+              if(!event.isDefaultPrevented()) {
+                if(browser.browser === 'Chrome') {
+                  accessDialogPrompt = OT.Dialogs.AllowDeny.Chrome.initialPrompt();
+                } else if(browser.browser === 'Firefox') {
+                  accessDialogFirefoxTimeout = setTimeout(function() {
+                    accessDialogPrompt = OT.Dialogs.AllowDeny.Firefox.maybeDenied();
+                  }, 7000);
+                }
+              }
+            }
           );
         },
 
         onAccessDialogClosed = function() {
           logAnalyticsEvent('accessDialog', 'Closed', '', '');
 
+          if(accessDialogFirefoxTimeout) {
+            clearTimeout(accessDialogFirefoxTimeout);
+            accessDialogFirefoxTimeout = null;
+          }
+
+          if(accessDialogPrompt) {
+            accessDialogPrompt.close();
+            accessDialogPrompt = null;
+          }
+
           this.dispatchEvent(
             new OT.Event(OT.Event.names.ACCESS_DIALOG_CLOSED, false)
           );
@@ -13921,15 +14361,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           _stream = stream;
           _stream.on('destroyed', this.disconnect, this);
 
-          var oldGuid = _guid;
-          _guid = OT.Publisher.nextId();
-
-          // Our publisher has changed guids, let people that rely
-          // on the GUID be non-volatile know.
-          if (oldGuid) {
-            this.trigger('idUpdated', oldGuid, _guid);
-          }
-
           _state.set('Publishing');
           _publishStartTime = new Date();
 
@@ -13985,7 +14416,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
               error: onPeerConnectionFailure
             }, this);
 
-            peerConnection.init();
+            peerConnection.init(_iceServers);
           }
 
           return peerConnection;
@@ -14018,7 +14449,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
               break;
 
             case 'showArchiveStatus':
-              logAnalyticsEvent('showArchiveStatus', 'styleChange', 'mode', value);
+              logAnalyticsEvent('showArchiveStatus', 'styleChange', 'mode', value ? 'on': 'off');
               _chrome.archive.setShowArchiveStatus(value);
               break;
 
@@ -14036,7 +14467,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           if(this.getStyle('bugDisplayMode') === 'off') {
             logAnalyticsEvent('bugDisplayMode', 'createChrome', 'mode', 'off');
           }
-          if(this.getStyle('showArchiveStatus') === 'off') {
+          if(!this.getStyle('showArchiveStatus')) {
             logAnalyticsEvent('showArchiveStatus', 'createChrome', 'mode', 'off');
           }
           _chrome = new OT.Chrome({
@@ -14398,7 +14829,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
           _state.set('PublishingToSession');
 
-          var onStreamRegistered = function(err, streamId) {
+          var onStreamRegistered = function(err, streamId, message) {
             if (err) {
               // @todo we should respect err.code here and translate it to the local
               // client equivalent.
@@ -14412,6 +14843,8 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
             }
 
             _streamId = streamId;
+            
+            _iceServers = OT.Raptor.parseIceServers(message);
           }.bind(this);
               
           // We set the streamWidth and streamHeight to be the minimum of the requested
@@ -14612,6 +15045,12 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 	/**
 	* Dispatched when the user has clicked the Deny button, preventing the
 	* app from having access to the camera and microphone.
+	* <p>
+	* The default behavior of this event is to display a user interface element
+	* in the Publisher object, indicating that that user has denied access to
+	* the camera and microphone. Call the <code>preventDefault()</code> method
+	* method of the event object in the event listener to prevent this message
+	* from being displayed.
 	* @see Event
 	* @name accessDenied
 	* @event
@@ -14621,6 +15060,10 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 	/**
 	* Dispatched when the Allow/Deny dialog box is opened. (This is the dialog box in which
 	* the user can grant the app access to the camera and microphone.)
+	* <p>
+	* The default behavior of this event is to display a message in the browser that instructs
+	* the user how to enable the camera and microphone. Call the <code>preventDefault()</code>
+	* method of the event object in the event listener to prevent this message from being displayed.
 	* @see Event
 	* @name accessDialogOpened
 	* @event
@@ -14649,9 +15092,9 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 	 * The publisher has stopped streaming to the session. The default behavior is that
 	 * the Publisher object is removed from the HTML DOM). The Publisher object dispatches a 
 	 * <code>destroyed</code> event when the element is removed from the HTML DOM. If you call the 
-	 * <code>preventDefault()</code> method in the event listener for the 
-	 * <code>streamDestroyed</code> event, the default behavior is prevented, and you 
-	 * can, optionally, retain the Publisher for reuse or clean it up using your own code.
+	 * <code>preventDefault()</code> method of the event object in the event listener, the default
+	 * behavior is prevented, and you can, optionally, retain the Publisher for reuse or clean it up
+	 * using your own code.
 	 * @name streamDestroyed
 	 * @event
 	 * @memberof Publisher
@@ -14682,12 +15125,6 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
  * @property {Element} element The HTML DOM element containing the Subscriber.
  * @property {String} id The DOM ID of the Subscriber.
  * @property {Stream} stream The stream to which you are subscribing.
- * @property {Number} videoHeight The height, in pixels, of the Subscriber video in the HTML DOM.
- * This may differ from the <code>videoHeight</code> dimensions of the Stream object, if the
- * browser does not support the resolution of the stream.
- * @property {Number} videoWidth The width, in pixels, of the Subscriber video in the HTML DOM.
- * This may differ from the <code>videoWidth</code> dimensions of the Stream object, if the
- * browser does not support the resolution of the stream.
  *
  * @class Subscriber
  * @augments EventDispatcher
@@ -15561,14 +15998,43 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 	* Dispatched when the OpenTok media server stops sending video to the subscriber.
 	* This feature of the OpenTok media server has a subscriber drop the video stream
 	* when connectivity degrades. The subscriber continues to receive the audio stream,
-	* if there is one. This feature is only available in sessions that use the OpenTok
-	* media server, not in peer-to-peer sessions.
+	* if there is one.
+	* <p>
+	* If connectivity improves to support video again, the Subscriber object dispatches
+	* a videoEnabled event, and the Subscriber resumes receiving video.
+	* <p>
+	* This feature is only available in sessions that use the OpenTok media server,
+	* not in peer-to-peer sessions.
+	*
 	* @see Event
+	* @see event:videoEnabled
 	* @name videoDisabled
 	* @event
 	* @memberof Subscriber
 	*/
 
+	/**
+	* Dispatched when the OpenTok media server resumes sending video to the subscriber
+	* after video was previously disabled.
+	* <p>
+	* The OpenTok media server has a subscriber drop the video stream when connectivity
+	* degrades (and the Subscriber dispatches a videoDisabled event). When the connectivity
+	* improves to support video the Subscriber dispatches the videoEnabled event and
+	* video resumes.
+	* <p>
+	* To prevent video from resuming, in the <code>videoEnabled</code> event listener,
+	* call <code>subscribeToVideo(false)</code> on the Subscriber object.
+	* <p>
+	* This feature is only available in sessions that use the OpenTok media server,
+	* not in peer-to-peer sessions.
+	*
+	* @see Event
+	* @see event:videoDisabled
+	* @name videoEnabled
+	* @event
+	* @memberof Subscriber
+	*/
+
 	/**
 	* Dispatched when the Subscriber element is removed from the HTML DOM. When this event is
 	* dispatched, you may choose to adjust or remove HTML DOM elements related to the subscriber.
@@ -15584,8 +16050,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
 
   var parseErrorFromJSONDocument,
       onGetResponseCallback,
-      onGetErrorCallback,
-      normaliseIceServers;
+      onGetErrorCallback;
 
   OT.SessionInfo = function(jsonDocument) {
     var sessionJSON = jsonDocument[0];
@@ -15608,21 +16073,13 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
       sessionJSON.properties.p2p &&
       sessionJSON.properties.p2p.preference &&
       sessionJSON.properties.p2p.preference.value === 'enabled';
-
-    this.iceServers = sessionJSON.ice_servers ? normaliseIceServers(sessionJSON.ice_servers) : [];
-
-    if(this.iceServers.length === 0) {
-      // We haven't got any ICE Servers from Anvil, default to something
-      OT.warn('SessionInfo contained not ICE Servers, using the default');
-      this.iceServers = [ {'url': 'stun:stun.l.google.com:19302'} ];
-    }
   };
 
   // Retrieves Session Info for +session+. The SessionInfo object will be passed
   // to the +onSuccess+ callback. The +onFailure+ callback will be passed an error
   // object and the DOMEvent that relates to the error.
   OT.SessionInfo.get = function(session, onSuccess, onFailure) {
-    var sessionInfoURL = OT.properties.apiURL + '/session/' + session.id + '?extended=true',
+    var sessionInfoURL = OT.properties.apiURLSSL + '/session/' + session.id + '?extended=true',
 
         startTime = OT.$.now(),
 
@@ -15632,11 +16089,11 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
           if (error === false) {
             onGetResponseCallback(session, onSuccess, sessionInfo);
           } else {
-            onGetErrorCallback(session, onFailure, error);
+            onGetErrorCallback(session, onFailure, error, JSON.stringify(sessionInfo));
           }
         };
 
-    session.logEvent('getSessionInfo', 'Attempt', 'api_url', OT.properties.apiURL);
+    session.logEvent('getSessionInfo', 'Attempt', 'api_url', OT.properties.apiURLSSL);
 
     OT.$.getJSON(sessionInfoURL, {
       headers: {
@@ -15645,10 +16102,11 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
       }
     }, function(error, sessionInfo) {
       if(error) {
+        var responseText = sessionInfo;
         console.log('getJSON said error:', error);
         onGetErrorCallback(session, onFailure,
-          new OT.Error(error.target && error.target.status, error.message ||
-            'Could not connect to the OpenTok API Server.'));
+          new OT.Error(error.target && error.target.status || error.code, error.message ||
+            'Could not connect to the OpenTok API Server.'), responseText);
       } else {
         validateRawSessionInfo(sessionInfo);
       }
@@ -15686,71 +16144,24 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
     } else {
       return {
         code: null,
-        message: 'Unknown error: getSessionInfo JSON response was badly formed ' +
-            jsonDocument.toString.substring(0, 1000)
+        message: 'Unknown error: getSessionInfo JSON response was badly formed'
       };
     }
   };
 
   onGetResponseCallback = function(session, onSuccess, rawSessionInfo) {
-    session.logEvent('getSessionInfo', 'Success', 'api_url', OT.properties.apiURL);
+    session.logEvent('getSessionInfo', 'Success', 'api_url', OT.properties.apiURLSSL);
 
     onSuccess( new OT.SessionInfo(rawSessionInfo) );
   };
 
-  onGetErrorCallback = function(session, onFailure, error) {
+  onGetErrorCallback = function(session, onFailure, error, responseText) {
     session.logEvent('Connect', 'Failure', 'errorMessage',
-      'GetSessionInfo:' + error.code + ':' + error.message);
+      'GetSessionInfo:' + error.code + ':' + error.message + ':' + responseText);
 
     onFailure(error, session);
   };
 
-  // This is ugly. Here we are handling the following:
-  // 1. Firefox doesn't support TURN until version 25. We fallback to STUN
-  // in previous versions.
-  //
-  // 2. In FF >= 23 the new syntax for declaring Ice Servers with credentials
-  // is used. i.e. url, credential, and username as opposed to just url and credential.
-  //
-  // 3. FF >= 27 supports the TURN transport parameter, in older versions we need
-  // to strip it out.
-  //
-  normaliseIceServers = function (iceServers) {
-    if (!iceServers) return [];
-
-    var userAgent = (typeof navigator !== 'undefined') &&
-          navigator.userAgent.match(/(Firefox)\/([0-9]+\.[0-9]+)/),
-        firefoxVersion = userAgent ? parseFloat(userAgent[2], 10) : void 0,
-        bits;
-
-    return iceServers.map(function(iceServer) {
-      // We don't need to normalise STUN, just pass it on through
-      if (iceServer.url.trim().substr(0, 5) !== 'turn:') {
-        return iceServer;
-      }
-
-      if (userAgent !== null) {
-        // TURN is broken in these versions of FF: Fallback to STUN.
-        if (firefoxVersion < 25) {
-          return {url: iceServer.url.replace('turn:', 'stun:')};
-        }
-
-        // FF < 27 doesn't support the TURN transport parameter, so we strip it out
-        if (firefoxVersion < 27 && iceServer.url.indexOf('?') !== -1) {
-          iceServer.url = iceServer.url.trim().split('?')[0];
-        }
-      }
-
-      bits = iceServer.url.trim().split(/[:@]/);
-
-      return {
-        username: bits[1],
-        credential: iceServer.credential,
-        url: bits[0] + ':' + bits[2]
-      };
-    });
-  };
-
 })(window);
 !(function() {
 	/**
@@ -16022,7 +16433,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
       if(propertyName === 'status' && newValue === 'stopped') {
         this.dispatchEvent(new OT.ArchiveEvent('archiveStopped', archive));
       } else {
-        this.dispatchEvent(new OT.ArhiveEvent('archiveUpdated', archive));
+        this.dispatchEvent(new OT.ArchiveEvent('archiveUpdated', archive));
       }
     };
 
@@ -16524,9 +16935,9 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *                 // See https://dashboard.tokbox.com/projects
   * var session = OT.initSession(apiKey, sessionID);
   * session.on("sessionConnected", function (event) {
-  *     var divProps = {width: 400, height:300, name:"Bob's stream"};
+  *     var publisherOptions = {width: 400, height:300, name:"Bob's stream"};
   *     // This assumes that there is a DOM element with the ID 'publisher':
-  *     publisher = OT.initPublisher('publisher', divProps);
+  *     publisher = OT.initPublisher('publisher', publisherOptions);
   *     session.publish(publisher);
   * });
   * session.connect(token);
@@ -16763,7 +17174,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *
   * <h5>Example</h5>
   *
-  * The following code subscribes to other clients streams:
+  * The following code subscribes to other clients' streams:
   *
   * <pre>
   * var apiKey = ""; // Replace with your API key. See https://dashboard.tokbox.com/projects
@@ -16772,7 +17183,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *
   * var session = OT.initSession(apiKey, sessionID);
   * session.on("streamCreated", function(event) {
-  *   subscriber = session.subscribe(streamContainer);
+  *   subscriber = session.subscribe(event.stream, targetElement);
   * });
   * session.connect(token);
   * </pre>
@@ -17203,8 +17614,9 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *   <li><code>to</code> &mdash; (Array) An array of <a href="Connection.html">Connection</a>
   *      objects, corresponding to clients that the message is to be sent to. If you do not
   *      specify this property, the signal is sent to all clients connected to the session.</li>
-  *   <li><code>data</code> &mdash; (Signal) The data to send. The limit to the size of data
-  *     string is 8kB.</li>
+  *   <li><code>data</code> &mdash; (String) The data to send. The limit to the length of data
+  *     string is 8kB. Do not set the data string to <code>null</code> or
+  *     <code>undefined</code>.</li>
   *   <li><code>type</code> &mdash; (String) The type of the signal. You can use the type to
   *     filter signals when setting an event handler for the <code>signal:type</code> event
   *     (where you replace <code>type</code> with the type string). The maximum length of the
@@ -17238,7 +17650,7 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   *                        or the data string exceeds the maximum size (8 kB).</td>
   *         </tr>
   *         <tr>
-  *           <td>500</td> <td>The WebSocket connection is down.</td>
+  *           <td>500</td> <td>You are not connected to the OpenTok session.</td>
   *         </tr>
   *      </table>
   *   </li>
@@ -17267,6 +17679,12 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
         _options = null;
       }
 
+      if (this.isNot('connected')) {
+        var notConnectedErrorMsg = 'Unable to send signal - you are not connected to the session.';
+        dispatchError(500, notConnectedErrorMsg, _completion);
+        return;
+      }
+
       _socket.signal(_options, _completion);
       if (options && options.data && (typeof(options.data) !== 'string')) {
         OT.warn('Signaling of anything other than Strings is deprecated. ' +
@@ -17362,6 +17780,13 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   */
 
     this.forceDisconnect = function(connectionOrConnectionId, completionHandler) {
+      if (this.isNot('connected')) {
+        var notConnectedErrorMsg = 'Cannot call forceDisconnect(). You are not ' +
+                                   'connected to the session.';
+        dispatchError(OT.ExceptionCodes.NOT_CONNECTED, notConnectedErrorMsg, completionHandler);
+        return;
+      }
+
       var notPermittedErrorMsg = 'This token does not allow forceDisconnect. ' +
         'The role must be at least `moderator` to enable this functionality';
 
@@ -17445,6 +17870,13 @@ OTHelpers.makeVisibleAndYield = function(element, callback) {
   * @memberOf Session
   */
     this.forceUnpublish = function(streamOrStreamId, completionHandler) {
+      if (this.isNot('connected')) {
+        var notConnectedErrorMsg = 'Cannot call forceUnpublish(). You are not ' +
+                                   'connected to the session.';
+        dispatchError(OT.ExceptionCodes.NOT_CONNECTED, notConnectedErrorMsg, completionHandler);
+        return;
+      }
+
       var notPermittedErrorMsg = 'This token does not allow forceUnpublish. ' +
         'The role must be at least `moderator` to enable this functionality';
 

From bfe48acf8ffe062ec78f37aa529b1bbf44f64a3e Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Mon, 2 Jun 2014 20:30:02 +0100
Subject: [PATCH 071/117] Bug 994152 Loop needs a "do not disturb" control.
 r=mhammond,r=Standard8

---
 browser/app/profile/firefox.js                |  1 +
 browser/components/loop/MozLoopAPI.jsm        | 14 ++++
 browser/components/loop/MozLoopService.jsm    | 40 ++++++++++++
 browser/components/loop/content/js/panel.js   | 61 ++++++++++++++++--
 .../loop/content/shared/css/panel.css         | 13 ++--
 .../loop/test/desktop-local/panel_test.js     | 64 ++++++++++++++++++-
 .../test/xpcshell/test_loopservice_dnd.js     | 34 ++++++++++
 .../loop/test/xpcshell/xpcshell.ini           |  1 +
 .../en-US/chrome/browser/loop/loop.properties |  1 +
 9 files changed, 213 insertions(+), 16 deletions(-)
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_dnd.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 49da008e7479..4fb543bcfda8 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1505,6 +1505,7 @@ pref("image.mem.max_decoded_image_kb", 256000);
 // XXX This is a temporary development server. The production one will be
 // coming soon.
 pref("loop.server", "http://loop.dev.mozaws.net");
+pref("loop.do_not_disturb", false);
 #endif
 
 // serverURL to be assigned by services team
diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index ad317ff6191c..9fe14bd0b163 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -25,6 +25,20 @@ this.EXPORTED_SYMBOLS = ["injectLoopAPI"];
  */
 function injectLoopAPI(targetWindow) {
   let api = {
+    /**
+     * Sets and gets the "do not disturb" mode activation flag.
+     */
+    doNotDisturb: {
+      enumerable: true,
+      configurable: true,
+      get: function() {
+        return MozLoopService.doNotDisturb;
+      },
+      set: function(aFlag) {
+        MozLoopService.doNotDisturb = aFlag;
+      }
+    },
+
     /**
      * Returns the url for the Loop server from preferences.
      *
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 9783f8dda2ac..d66fe1ee200c 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -200,6 +200,24 @@ let MozLoopServiceInternal = {
     }
   },
 
+  /**
+   * Retrieves MozLoopService "do not disturb" pref value.
+   *
+   * @return {Boolean} aFlag
+   */
+  get doNotDisturb() {
+    return Services.prefs.getBoolPref("loop.do_not_disturb");
+  },
+
+  /**
+   * Sets MozLoopService "do not disturb" pref value.
+   *
+   * @param {Boolean} aFlag
+   */
+  set doNotDisturb(aFlag) {
+    Services.prefs.setBoolPref("loop.do_not_disturb", Boolean(aFlag));
+  },
+
   /**
    * Starts the initialization of the service, which goes and registers
    * with the push server and the loop server.
@@ -327,6 +345,10 @@ let MozLoopServiceInternal = {
    * @param {String} version The version information from the server.
    */
   onHandleNotification: function(version) {
+    if (this.doNotDisturb) {
+      return;
+    }
+
     this.openChatWindow(null, "LooP", "about:loopconversation#start/" + version);
   },
 
@@ -503,6 +525,24 @@ this.MozLoopService = {
       return JSON.stringify(stringData[key]);
   },
 
+  /**
+   * Retrieves MozLoopService "do not disturb" value.
+   *
+   * @return {Boolean}
+   */
+  get doNotDisturb() {
+    return MozLoopServiceInternal.doNotDisturb;
+  },
+
+  /**
+   * Sets MozLoopService "do not disturb" value.
+   *
+   * @param {Boolean} aFlag
+   */
+  set doNotDisturb(aFlag) {
+    MozLoopServiceInternal.doNotDisturb = aFlag;
+  },
+
   /**
    * Returns the current locale
    *
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 6ddc69a454ee..60456bd8dc52 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -18,6 +18,37 @@ loop.panel = (function(_, mozL10n) {
    */
   var router;
 
+  /**
+   * Do not disturb panel subview.
+   */
+  var DoNotDisturbView = sharedViews.BaseView.extend({
+    template: _.template([
+      '<label>',
+      '  <input type="checkbox" <%- checked %>>',
+      '  <span data-l10n-id="do_not_disturb"></span>',
+      '</label>',
+    ].join('')),
+
+    events: {
+      "click input[type=checkbox]": "toggle"
+    },
+
+    /**
+     * Toggles mozLoop activation status.
+     */
+    toggle: function() {
+      navigator.mozLoop.doNotDisturb = !navigator.mozLoop.doNotDisturb;
+      this.render();
+    },
+
+    render: function() {
+      this.$el.html(this.template({
+        checked: navigator.mozLoop.doNotDisturb ? "checked" : ""
+      }));
+      return this;
+    }
+  });
+
   /**
    * Panel view.
    */
@@ -27,23 +58,30 @@ loop.panel = (function(_, mozL10n) {
       '  <p data-l10n-id="get_link_to_share"></p>',
       '</div>',
       '<div class="action">',
-      '  <p class="invite">',
-      '    <input type="text" name="caller" data-l10n-id="caller">',
-      '    <button class="get-url btn btn-success disabled" href=""',
+      '  <form class="invite">',
+      '    <input type="text" name="caller" data-l10n-id="caller" required>',
+      '    <button type="submit" class="get-url btn btn-success"',
       '       data-l10n-id="get_a_call_url"></button>',
-      '  </p>',
+      '  </form>',
       '  <p class="result hide">',
       '    <input id="call-url" type="url" readonly>',
       '    <a class="go-back btn btn-info" href="" data-l10n-id="new_url"></a>',
       '  </p>',
+      '  <p class="dnd"></p>',
       '</div>',
     ].join("")),
 
     className: "share generate-url",
 
+    /**
+     * Do not disturb view.
+     * @type {DoNotDisturbView|undefined}
+     */
+    dndView: undefined,
+
     events: {
       "keyup input[name=caller]": "changeButtonState",
-      "click .get-url": "getCallUrl",
+      "submit form.invite": "getCallUrl",
       "click a.go-back": "goBack"
     },
 
@@ -54,7 +92,7 @@ loop.panel = (function(_, mozL10n) {
       }
       this.notifier = options.notifier;
       this.client = new loop.shared.Client({
-        baseServerUrl: window.navigator.mozLoop.serverUrl
+        baseServerUrl: navigator.mozLoop.serverUrl
       });
     },
 
@@ -69,6 +107,7 @@ loop.panel = (function(_, mozL10n) {
         this.clearPending();
         if (err) {
           this.notifier.errorL10n("unable_retrieve_url");
+          this.render();
           return;
         }
         this.onCallUrlReceived(callUrlData);
@@ -113,6 +152,13 @@ loop.panel = (function(_, mozL10n) {
       } else {
         this.$(".get-url").addClass("disabled").attr("disabled", "disabled");
       }
+    },
+
+    render: function() {
+      this.$el.html(this.template());
+      // Do not Disturb sub view
+      this.dndView = new DoNotDisturbView({el: this.$(".dnd")}).render();
+      return this;
     }
   });
 
@@ -179,7 +225,7 @@ loop.panel = (function(_, mozL10n) {
   function init() {
     // Do the initial L10n setup, we do this before anything
     // else to ensure the L10n environment is setup correctly.
-    mozL10n.initialize(window.navigator.mozLoop);
+    mozL10n.initialize(navigator.mozLoop);
 
     router = new PanelRouter({
       document: document,
@@ -196,6 +242,7 @@ loop.panel = (function(_, mozL10n) {
   return {
     init: init,
     PanelView: PanelView,
+    DoNotDisturbView: DoNotDisturbView,
     PanelRouter: PanelRouter
   };
 })(_, document.mozL10n);
diff --git a/browser/components/loop/content/shared/css/panel.css b/browser/components/loop/content/shared/css/panel.css
index 7960692c81ce..c99d09840b35 100644
--- a/browser/components/loop/content/shared/css/panel.css
+++ b/browser/components/loop/content/shared/css/panel.css
@@ -49,12 +49,17 @@
   margin: 0 0 1em 0;
 }
 
-.share .action input {
+.share .action p.dnd {
+  margin-top: 1em;
+}
+
+.share .action input[type="text"],
+.share .action input[type="url"] {
   border: 1px solid #ccc; /* Overriding background style for a text input (see
                              below) resets its borders to a weird beveled style;
                              defining a default 1px border solves the issue. */
   font-size: .9em;
-  width: 60%;
+  width: 65%;
   padding: .5em;
 }
 
@@ -73,10 +78,6 @@
 
 /* Specific cases */
 
-.share.generate-url .action {
-  text-align: center;
-}
-
 .panel #messages .alert {
   margin-bottom: 0;
 }
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index ccba5a729cfd..f167b1d56ab3 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -35,7 +35,8 @@ describe("loop.panel", function() {
       errorL10n: sandbox.spy()
     };
 
-    window.navigator.mozLoop = {
+    navigator.mozLoop = {
+      doNotDisturb: true,
       get serverUrl() {
         return "http://example.com";
       },
@@ -46,11 +47,11 @@ describe("loop.panel", function() {
         return "en-US";
       }
     };
-    document.mozL10n.initialize(window.navigator.mozLoop);
+    document.mozL10n.initialize(navigator.mozLoop);
   });
 
   afterEach(function() {
-    delete window.navigator.mozLoop;
+    delete navigator.mozLoop;
     $("#fixtures").empty();
     sandbox.restore();
   });
@@ -157,6 +158,51 @@ describe("loop.panel", function() {
     });
   });
 
+  describe("loop.panel.DoNotDisturbView", function() {
+    var view;
+
+    beforeEach(function() {
+      $("#fixtures").append('<div id="dnd-view"></div>');
+      view = new loop.panel.DoNotDisturbView({el: $("#dnd-view")});
+    });
+
+    describe("#toggle", function() {
+      beforeEach(function() {
+        navigator.mozLoop.doNotDisturb = false;
+      });
+
+      it("should toggle the value of mozLoop.doNotDisturb", function() {
+        view.toggle();
+
+        expect(navigator.mozLoop.doNotDisturb).eql(true);
+      });
+
+      it("should update the DnD checkbox value", function() {
+        view.toggle();
+
+        expect(view.$("input").is(":checked")).eql(true);
+      });
+    });
+
+    describe("render", function() {
+      it("should check the dnd checkbox when dnd is enabled", function() {
+        navigator.mozLoop.doNotDisturb = false;
+
+        view.render();
+
+        expect(view.$("input").is(":checked")).eql(false);
+      });
+
+      it("should uncheck the dnd checkbox when dnd is disabled", function() {
+        navigator.mozLoop.doNotDisturb = true;
+
+        view.render();
+
+        expect(view.$("input").is(":checked")).eql(true);
+      });
+    });
+  });
+
   describe("loop.panel.PanelView", function() {
     beforeEach(function() {
       $("#fixtures").append('<div id="messages"></div><div id="main"></div>');
@@ -265,5 +311,17 @@ describe("loop.panel", function() {
          it("should do set the enabled state if there is text");
       });
     });
+
+    describe("#render", function() {
+      it("should render a DoNotDisturbView", function() {
+        var renderDnD = sandbox.stub(loop.panel.DoNotDisturbView.prototype,
+                                     "render");
+        var view = new loop.panel.PanelView({notifier: notifier});
+
+        view.render();
+
+        sinon.assert.calledOnce(renderDnD);
+      });
+    });
   });
 });
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
new file mode 100644
index 000000000000..bd2f426bd05c
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+                                  "resource:///modules/loop/MozLoopService.jsm");
+
+do_register_cleanup(function() {
+  Services.prefs.clearUserPref("loop.do_not_disturb");
+});
+
+function test_get_do_not_disturb() {
+  Services.prefs.setBoolPref("loop.do_not_disturb", false);
+
+  do_check_false(MozLoopService.doNotDisturb);
+
+  Services.prefs.setBoolPref("loop.do_not_disturb", true);
+
+  do_check_true(MozLoopService.doNotDisturb);
+}
+
+function test_set_do_not_disturb() {
+  Services.prefs.setBoolPref("loop.do_not_disturb", false);
+
+  MozLoopService.doNotDisturb = true;
+
+  do_check_true(Services.prefs.getBoolPref("loop.do_not_disturb"));
+}
+
+function run_test()
+{
+  test_get_do_not_disturb();
+  test_set_do_not_disturb();
+}
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index d784e770ad88..96259ea0170c 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -3,6 +3,7 @@ head = head.js
 tail =
 firefox-appdir = browser
 
+[test_loopservice_dnd.js]
 [test_loopservice_expiry.js]
 [test_loopservice_initialize.js]
 [test_loopservice_locales.js]
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 4aaf7fbe2858..492f38d4bb0f 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -10,3 +10,4 @@ peer_ended_conversation=Your peer ended the conversation.
 stop=Stop
 call_has_ended=Your call has ended.
 close_window=Close this window
+do_not_disturb=Do not disturb

From d31d4243712b779a7120630dba67436322a13aad Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Wed, 4 Jun 2014 09:36:50 +0100
Subject: [PATCH 072/117] Bug 1020121 Remove unnecessary/erroneous .gitignore
 files from loop. r=nperriault

---
 browser/components/loop/content/.gitignore | 1 -
 browser/components/loop/test/.gitignore    | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 browser/components/loop/content/.gitignore
 delete mode 100644 browser/components/loop/test/.gitignore

diff --git a/browser/components/loop/content/.gitignore b/browser/components/loop/content/.gitignore
deleted file mode 100644
index 8a205e8dc3e7..000000000000
--- a/browser/components/loop/content/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-shared
diff --git a/browser/components/loop/test/.gitignore b/browser/components/loop/test/.gitignore
deleted file mode 100644
index 8a205e8dc3e7..000000000000
--- a/browser/components/loop/test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-shared

From 580ad47021f116a26bd84945b63ffc6d2f351172 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Wed, 4 Jun 2014 09:40:52 +0100
Subject: [PATCH 073/117] Bug 1003029 Use local versions of OT assets for Loop.
 r=Standard

---
 .../loop/content/shared/libs/sdk.js           |   6 ++++--
 .../shared/libs/sdk/2.2.5/css/ot.min.css      |   1 +
 .../sdk/2.2.5/images/access-denied-chrome.png | Bin 0 -> 10531 bytes
 .../images/access-denied-copy-firefox.png     | Bin 0 -> 6556 bytes
 .../2.2.5/images/access-denied-firefox.png    | Bin 0 -> 7871 bytes
 .../2.2.5/images/access-predenied-chrome.png  | Bin 0 -> 9563 bytes
 .../sdk/2.2.5/images/access-prompt-chrome.png | Bin 0 -> 19523 bytes
 .../sdk/2.2.5/images/audioonly-publisher.png  | Bin 0 -> 1389 bytes
 .../sdk/2.2.5/images/audioonly-subscriber.png | Bin 0 -> 2464 bytes
 .../shared/libs/sdk/2.2.5/images/buttons.png  | Bin 0 -> 2908 bytes
 .../shared/libs/sdk/2.2.5/images/loader.gif   | Bin 0 -> 8787 bytes
 .../shared/libs/sdk/2.2.5/images/mic-off.png  | Bin 0 -> 1047 bytes
 .../shared/libs/sdk/2.2.5/images/mic-on.png   | Bin 0 -> 734 bytes
 .../libs/sdk/2.2.5/images/speaker-off.png     | Bin 0 -> 861 bytes
 .../libs/sdk/2.2.5/images/speaker-on.png      | Bin 0 -> 622 bytes
 .../libs/sdk/2.2.5/js/dynamic_config.min.js   |  17 +++++++++++++++++
 browser/components/loop/jar.mn                |  18 +++++++++++++++++-
 17 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/buttons.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/loader.gif
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-off.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-on.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-off.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-on.png
 create mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js

diff --git a/browser/components/loop/content/shared/libs/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
index 72be279b4d18..59df0cfca06f 100644
--- a/browser/components/loop/content/shared/libs/sdk.js
+++ b/browser/components/loop/content/shared/libs/sdk.js
@@ -22,7 +22,8 @@
     websiteURL: 'http://www.tokbox.com',
 
     // The URL of the CDN
-    cdnURL: 'http://static.opentok.com',
+    // XXX: patched for loop so we use local files
+    cdnURL: 'loop/otcdn',
     // The URL to use for logging
     loggingURL: 'http://hlg.tokbox.com/prod',
     // The anvil API URL
@@ -36,7 +37,8 @@
     // If this environment supports SSL
     supportSSL: 'true',
     // The CDN to use if we're using SSL
-    cdnURLSSL: 'https://static.opentok.com',
+    // XXX: patched for loop so we use local files
+    cdnURLSSL: 'loop/otcdn',
     // The loggging URL to use if we're using SSL
     loggingURLSSL: 'https://hlg.tokbox.com/prod',
     // The anvil API URL to use if we're using SSL
diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css b/browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css
new file mode 100644
index 000000000000..43da149a633e
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css
@@ -0,0 +1 @@
+.OT_root,.OT_root *{color:#fff;margin:0;padding:0;border:0;font-size:100%;font-family:Arial,Helvetica,sans-serif;vertical-align:baseline}.OT_root h1,.OT_root h2,.OT_root h3,.OT_root h4,.OT_root h5,.OT_root h6{color:#fff;font-family:Arial,Helvetica,sans-serif;font-size:100%;font-weight:bold}.OT_root strong{font-weight:bold}.OT_root em{font-style:italic}.OT_root a,.OT_root a:link,.OT_root a:visited,.OT_root a:hover,.OT_root a:active{font-family:Arial,Helvetica,sans-serif}.OT_root ul,.OT_root ol{margin:1em 1em 1em 2em}.OT_root ol{list-style:decimal outside}.OT_root ul{list-style:disc outside}.OT_root dl{margin:4px}.OT_root dl dt,.OT_root dl dd{float:left;margin:0;padding:0}.OT_root dl dt{clear:left;text-align:right;width:50px}.OT_root dl dd{margin-left:10px}.OT_root img{border:0 none}.OT_dialog{border:0;border-radius:0;top:50%;left:50%;position:absolute;position:fixed;padding:0;background-color:#363636;color:#fff;z-index:9999;box-shadow:2px 4px 6px #999;font-family:'Didact Gothic',sans-serif}.OT_dialog-blackout{position:absolute;position:fixed;top:0;right:0;bottom:0;left:0;background-color:#363636}.OT_dialog-blackout .OT_dialog{box-shadow:0 0 0 transparent}.OT_dialog *{font-family:'Didact Gothic',sans-serif}.OT_dialog-plugin-prompt{margin-left:-350px;margin-top:-141px;width:650px;height:282px}.OT_dialog-plugin-reinstall{margin-left:-271px;margin-top:-117px;width:542px;height:234px}.OT_dialog-plugin-upgrading{margin-left:-267px;margin-top:-94px;width:514px;height:188px}.OT_dialog-allow-deny-chrome-first{margin-left:-227px;margin-top:-122px;width:453px;height:244px}.OT_dialog-allow-deny-chrome-pre-denied{margin-left:-263px;margin-top:-135px;width:526px;height:270px}.OT_dialog-allow-deny-chrome-now-denied{margin-left:-120px;margin-top:-85px;width:256px;height:170px}.OT_dialog-allow-deny-firefox-denied{margin-left:-160px;margin-top:-105px;width:320px;height:190px}.OT_dialog-allow-deny-firefox-maybe-denied{margin-left:-281px;margin-top:-126px;width:562px;height:252px}.OT_dialog-allow-highlight-chrome{display:inline-block;margin-top:20px;width:227px;height:94px;background-image:url(../images/rtc/access-prompt-chrome.png)}.OT_closeButton{top:15px;right:15px;position:absolute;font-size:18px;cursor:pointer}.OT_dialog-messages{position:absolute;top:32px;left:32px;right:32px;text-align:center}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-messages{top:45px}.OT_dialog-messages-main{font-weight:300;font-size:18pt;line-height:24px}.OT_dialog-messages-minor{font-weight:300;margin-top:12px;font-size:13px;line-height:18px;color:#a4a4a4}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-messages-minor{margin-top:4px}.OT_dialog-messages-minor strong{font-weight:300;color:#fff}.OT_dialog-single-button{position:absolute;bottom:41px;left:50%;margin-left:-97px;height:47px;width:193px}.OT_dialog-button-pair{position:absolute;bottom:45px;left:5px;right:0;height:94px}.OT_dialog-button-with-title{padding-left:30px;padding-right:30px;width:260px;float:left}.OT_dialog-button-pair-seperator{border-right:1px solid #555;height:112px;width:1px;float:left}.OT_dialog-button-title{font-weight:300;text-align:center;margin-bottom:15px;font-size:12px;line-height:150%;color:#a4a4a4}.OT_dialog-button-title strong{color:#fff;font-weight:100;display:block}.OT_dialog-button{font-weight:100;display:block;line-height:50px;height:47px;background-color:#29a4da;text-align:center;font-size:16pt;cursor:pointer}.OT_dialog-button.OT_dialog-button-large{line-height:60px;height:58px}.OT_dialog-progress-bar{border:1px solid #4e4e4e;height:8px}.OT_dialog-progress-bar-fill{background-color:#29a4da;height:10px;margin-top:-1px;margin-left:-1px;margin-right:-1px}.OT_dialog-plugin-upgrading .OT_dialog-plugin-upgrade-percentage{font-size:36pt;font-weight:100}.OT_dialog-plugin-upgrading .OT_dialog-progress-bar{margin-top:25px;margin-bottom:25px}.OT_dialog-3steps{margin-top:24px}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-3steps{margin-top:21px}.OT_dialog-3steps-step{float:left;-moz-box-sizing:border-box;box-sizing:border-box;width:33%;height:140px;padding:0 10px;color:#a4a4a4}.OT_dialog-3steps-seperator{float:left;-moz-box-sizing:border-box;box-sizing:border-box;margin-top:10px;width:1px;height:68px;background-color:#555}.OT_dialog-allow-deny-chrome-pre-denied .OT_dialog-3steps-seperator{margin-top:16px}.OT_dialog-3steps-step-num{font-size:20px;background-color:#2aa3d8;border-radius:20px;line-height:33px;height:33px;width:33px;margin:0 auto 17px}.OT_dialog-allow-deny-chrome-pre-denied .OT_dialog-3steps-step-num{margin-bottom:10px}.OT_dialog-allow-camera-icon{background-color:#000;width:113px;height:48px;margin:10px auto 0;background-image:url(../images/rtc/access-predenied-chrome.png)}.OT_publisher-denied-firefox{background-color:#fff}.OT_publisher-denied-firefox p{width:232px;height:103px;top:50%;left:50%;display:block;position:absolute;margin-top:-52px;margin-left:-116px;background-image:url(../images/rtc/access-denied-firefox.png);background-position:50% 0;background-repeat:no-repeat}.OT_publisher-denied-firefox span{display:block;position:absolute;bottom:0;right:0;left:0;margin:0 auto;width:232px;height:31px;background-image:url(../images/rtc/access-denied-copy-firefox.png);text-indent:100%;white-space:nowrap;overflow:hidden}.OT_centered{position:fixed;left:50%;top:50%;margin:0}.OT_publisher,.OT_subscriber{position:relative;min-width:48px;min-height:48px}.OT_publisher video,.OT_subscriber video{width:100%;height:100%}.OT_publisher.OT_mirrored video{-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1)}.OT_subscriber_error{background-color:#000;color:#fff;text-align:center}.OT_subscriber_error>p{padding:20px}.OT_publisher .OT_bar,.OT_subscriber .OT_bar,.OT_publisher .OT_name,.OT_subscriber .OT_name,.OT_publisher .OT_archiving,.OT_subscriber .OT_archiving,.OT_publisher .OT_archiving-status,.OT_subscriber .OT_archiving-status,.OT_publihser .OT_archiving-light-box,.OT_subscriber .OT_archiving-light-box{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;top:0;left:0;right:0;display:block;height:34px;position:absolute}.OT_publisher .OT_bar,.OT_subscriber .OT_bar{background:rgba(0,0,0,0.4)}.OT_publisher .OT_name,.OT_subscriber .OT_name{background-color:transparent;color:#fff;font-size:15px;line-height:34px;font-weight:normal;padding:0 4px 0 36px}.OT_publisher .OT_archiving-status,.OT_subscriber .OT_archiving-status{background:rgba(0,0,0,0.4);top:auto;bottom:0;left:34px;padding:0 4px;color:rgba(255,255,255,0.8);font-size:15px;line-height:34px;font-weight:normal}.OT_micro .OT_archiving-status,.OT_micro:hover .OT_archiving-status,.OT_mini .OT_archiving-status,.OT_mini:hover .OT_archiving-status{display:none}.OT_publisher .OT_archiving-light-box,.OT_subscriber .OT_archiving-light-box{background:rgba(0,0,0,0.4);top:auto;bottom:0;right:auto;width:34px;height:34px}.OT_archiving-light{width:7px;height:7px;-webkit-border-radius:30px;-moz-border-radius:30px;border-radius:30px;position:absolute;top:14px;left:14px;background-color:#575757;-webkit-box-shadow:0 0 5px 1px #575757;-moz-box-shadow:0 0 5px 1px #575757;box-shadow:0 0 5px 1px #575757}.OT_archiving-light.OT_active{background-color:#970d13;-webkit-animation:OT_pulse 1.3s ease-in;-moz-animation:OT_pulse 1.3s ease-in;-webkit-animation:OT_pulse 1.3s ease-in;-webkit-animation-iteration-count:infinite;-moz-animation-iteration-count:infinite;-webkit-animation-iteration-count:infinite}@-moz-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-webkit-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-o-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-ms-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-webkit-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}.OT_mini .OT_bar,.OT_bar.OT_mode-mini,.OT_bar.OT_mode-mini-auto{bottom:0;height:auto}.OT_mini .OT_name.OT_mode-off,.OT_mini .OT_name.OT_mode-on,.OT_mini .OT_name.OT_mode-auto,.OT_mini:hover .OT_name.OT_mode-auto{display:none}.OT_publisher .OT_name,.OT_subscriber .OT_name{left:24px;right:37px;height:34px}.OT_publisher .OT_name-no-bug,.OT_subscriber .OT_name-no-bug{left:10px;padding-left:0}.OT_publisher .OT_mute,.OT_subscriber .OT_mute,.OT_publisher .OT_opentok,.OT_subscriber .OT_opentok{border:0;cursor:pointer;display:block;position:absolute;text-align:center;text-indent:-9999em;background-color:transparent;background-repeat:no-repeat}.OT_publisher .OT_opentok,.OT_subscriber .OT_opentok{background:url(../images/rtc/buttons.png) 0 -32px no-repeat;cursor:default;height:18px;left:8px;line-height:18px;top:8px;width:16px}.OT_micro .OT_opentok{display:none!important}.OT_publisher .OT_mute,.OT_subscriber .OT_mute{right:0;top:0;border-left:1px solid rgba(255,255,255,0.2);height:36px;width:37px}.OT_mini .OT_mute,.OT_mute.OT_mode-mini,.OT_mute.OT_mode-mini-auto{top:50%;left:50%;right:auto;margin-top:-18px;margin-left:-18.5px;border-left:none}.OT_publisher .OT_mute{background-image:url(../images/rtc/mic-on.png);background-position:9px 5px}.OT_publisher .OT_mute.OT_active{background-image:url(../images/rtc/mic-off.png);background-position:9px 4px}.OT_subscriber .OT_mute{background-image:url(../images/rtc/speaker-on.png);background-position:8px 7px}.OT_subscriber .OT_mute.OT_active{background-image:url(../images/rtc/speaker-off.png);background-position:7px 7px}.OT_publisher .OT_edge-bar-item,.OT_subscriber .OT_edge-bar-item{-ms-transition-property:top,bottom,opacity;-ms-transition-duration:.5s;-moz-transition-property:top,bottom,opacity;-moz-transition-duration:.5s;-webkit-transition-property:top,bottom,opacity;-webkit-transition-duration:.5s;-o-transition-property:top,bottom,opacity;-o-transition-duration:.5s;transition-property:top,bottom,opacity;transition-duration:.5s;transition-timing-function:ease-in}.OT_publisher .OT_edge-bar-item.OT_mode-off,.OT_subscriber .OT_edge-bar-item.OT_mode-off,.OT_publisher .OT_edge-bar-item.OT_mode-auto,.OT_subscriber .OT_edge-bar-item.OT_mode-auto,.OT_publisher .OT_edge-bar-item.OT_mode-mini-auto,.OT_subscriber .OT_edge-bar-item.OT_mode-mini-auto{top:-25px;opacity:0}.OT_mini .OT_mute.OT_mode-auto,.OT_publisher .OT_mute.OT_mode-mini-auto,.OT_subscriber .OT_mute.OT_mode-mini-auto{top:50%}.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-off,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-off,.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-mini-auto,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-mini-auto{top:auto;bottom:-25px}.OT_publisher .OT_edge-bar-item.OT_mode-on,.OT_subscriber .OT_edge-bar-item.OT_mode-on,.OT_publisher:hover .OT_edge-bar-item.OT_mode-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_mode-auto,.OT_publisher:hover .OT_edge-bar-item.OT_mode-mini-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_mode-mini-auto{top:0;opacity:1}.OT_mini .OT_mute.OT_mode-on,.OT_mini:hover .OT_mute.OT_mode-auto,.OT_mute.OT_mode-mini,.OT_root:hover .OT_mute.OT_mode-mini-auto{top:50%}.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-on,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-on,.OT_publisher:hover .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto{top:auto;bottom:0;opacity:1}.OT_publisher .OT_opentok.OT_mode-off,.OT_publisher .OT_opentok.OT_mode-auto,.OT_subscriber .OT_opentok.OT_mode-off,.OT_subscriber .OT_opentok.OT_mode-auto{top:-17px}.OT_publisher .OT_opentok.OT_mode-on,.OT_publisher:hover .OT_opentok.OT_mode-auto,.OT_subscriber .OT_opentok.OT_mode-on,.OT_subscriber:hover .OT_opentok.OT_mode-auto{top:8px}.OT_video-container{position:absolute;background-color:#000;overflow:hidden}.OT_hidden-audio{position:absolute!important;height:1px!important;width:1px!important}.OT_root .OT_video-loading{background:url('../images/rtc/loader.gif') no-repeat;display:none;position:absolute;width:32px;height:32px;left:50%;top:50%;margin-left:-16px;margin-top:-16px}.OT_publisher.OT_loading .OT_video-loading,.OT_subscriber.OT_loading .OT_video-loading{display:block}.OT_publisher.OT_loading video,.OT_subscriber.OT_loading video{display:none}.OT_video-poster{width:100%;height:100%;background-position:50% 50%;background-repeat:no-repeat;display:none}.OT_publisher .OT_video-poster{background-image:url(../images/rtc/audioonly-publisher.png)}.OT_subscriber .OT_video-poster{background-image:url(../images/rtc/audioonly-subscriber.png)}
\ No newline at end of file
diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png
new file mode 100644
index 0000000000000000000000000000000000000000..777e02f1a8b329949b9661b20190274a46c3f178
GIT binary patch
literal 10531
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png
new file mode 100644
index 0000000000000000000000000000000000000000..18b494e7e672e43f4c244411606ea973bff9b53a
GIT binary patch
literal 6556
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
O0000<MNUMnLSTX&q651C

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc6bebe9632ecba852e800f7c6e6f3eea0953d01
GIT binary patch
literal 7871
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e23411986733d0a982cf334608ed951ea6af1c7
GIT binary patch
literal 9563
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%0A6{1Jvkvn5+0=g`GXip$%
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
FV1mIKt7iZJ

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png
new file mode 100644
index 0000000000000000000000000000000000000000..6728fe807f59bf4f41c29da27887256caba86d02
GIT binary patch
literal 19523
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png
new file mode 100644
index 0000000000000000000000000000000000000000..24c9a7cb90e105f636fc0ba658cd6bc29b1425fc
GIT binary patch
literal 1389
zcmV-z1(N!SP)<h;3K|Lk000e1NJLTq000yK001Ef1^@s6**=RC00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6m&&cbVG7wVRUJ4ZXi@?ZDjy6FE=kS
zGffYRzW@LL9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gHF34$HUIzw$4Nv%
zR7i=Pm0N5TRTPH5J=b%;&<h1DK}|^TfgqS5Aqrjs0wN897a$D=0uK@^SP2jw5YZMy
z0<j^fnxGH~MUlo73JHmq;ENg&F)>6)Fe*VxdwQKSGv~}~ALg_iN@-J9GPC#0?Ejy&
z{<ZdAf>GM0Iy7D9Mkq>J)%eZ#IPN%nP*+1YfEX=dzwJFrBphXy^x5b-Ott!0w0#Yi
zMon0|hnZ%WCD9m{jSwelU#7RAnXN+M^_~n5DWfG60!!1#sXD8G%e#*-b3+w%exC0V
zX}16GkO3M_vKGNxRxgu%j~THPNAF3vsh(0*rN%H>tQ*{~s@M{K_B=k#yEMJ?8WLdt
z7hKSFcJ*{|RyXdUVeM{aYX&D1Y08pmh{i!P010*$dOA7PmEnaQ>#=rz#EN8^-)oj}
z0fxx(8}(EgVJ?-Fkt`n%i8L4{s9Hdn&x2(_rj5_mJ;SQO_`8y#YHUrWNLExrNd-h=
zpc^0r2ql;&l2AU5m5ryEHX@;J@@%ps@Ju&~Vi314As`ZkR0)elBs5GWMB|{FL#Z2t
z-H$XQl#Lv+ilQ5!h}&Q(gSqJUv@j?`q;$x_76f74kunkR_rH>Np#sx3)}g2>YZQeG
zdusVf6l=zyxdb`LtH#qP*RQeOw)lQ`Ex&52#^G3kmC-mCfoTZRFU_L!9uC}LhrcD2
zwV0`!9E`;A>px|l77FuX**F+eh6<o4WZrLra1`*1Jd}5iQbJb;2kb1(kr<SYMM1Ds
z(+yhV2^Pnb0oDvbJQdX1fKJ6^MH0C7?fQ%)keW)XmUnsHviKwB1peqcemsGaE(?GI
z@)eU6eqi@O&IQ*6>9MbBIxWiE8_0FFbJOa@1n?z)%OV0P3;4lF3cj~V0;zH?m!VKL
zc9wr!hssaBMn%$+bHE=|ce0qM@H1a>%F8iPO7QahH9+X)Iq!Kygy3o4=iO`{9j;Rp
zrYx$WLVZe~BUMxR#m=%=KwiQR1B9;2G26mc6?SMk*L%BJ(B00zIrnyyvi~MQdNgOV
ztZO{Y^qfnTVbWYZhYl#jfBp<Ta~5Jo6Rgw>;;%l(p~n{Tu@E?lN<t_YNIHRUT!$^a
zJ?w11NxHM0v!+Qjo?_{jhsYEu1lt?XEAFE;RmxL+T^!A{Q?sR-TMS|QKWDDh%V9Ij
zgpzVrtbUTFVnqgQ=ZBbMD`|+vSZnpt*PY?G>u?Ui4FLv%Dbi<&qB18Or6W0pS5`m4
zSH&Ddwt#~zJQ|C!S;BnVBI0C&lUgWXnEYvmIAj<csGfWG79F<hHMSB8hq-8mnXKvH
zOExc`!F$7DhV9Gi7hvDINfrsQID|s94Yz(oLV%u5aO|Ma^SO~$gI4^osh+5!Fj-M~
zKoLw5DseN!ctxYXmn=Kj!o;@gv}G->_#Rh%pKE*H95|N(4Qux>U(?xUhMBD!sD>G|
zPE8Arv2-a!W03ctt0VB*&VrYRoJ+>FIpH{L+qHo<4M0_?PL=R@X+;3k3{VwN)Sw^h
z1_%{20m(E(6X55;_rc4Pb{$rAw$lWh8_4p$V?10wfq9V_Q*@IDRh3DKAT9(kp`sR!
vEK5pkeA;}t>U&(t=lIceIJ5kbU=#cYq}!}^Q*#`X00000NkvXXu0mjfDh+5e

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png
new file mode 100644
index 0000000000000000000000000000000000000000..c023ecdae077423f6a506f820160f47b5f72f571
GIT binary patch
literal 2464
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/buttons.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/buttons.png
new file mode 100644
index 0000000000000000000000000000000000000000..94053ac8553747047b6988707544ce07aba48fb4
GIT binary patch
literal 2908
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/loader.gif b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a1a30c0c0e566b123cea88066c32b9fd1c10df9
GIT binary patch
literal 8787
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
Vdg(4YZw9%Qd*k<?Q2gih{{Xx=OTYjC

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-off.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b35a72829d9820c873a4357735f81d57d4ef623
GIT binary patch
literal 1047
zcmV+y1nB#TP)<h;3K|Lk000e1NJLTq000#L0012b1^@s6MMNk200004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q18_-1
zK~zYIrIlT1TtyVef3r<@W`ngtj3PAYgNvUOi=t5JgAr-8RxQ<H715}OAVMB2SdmhS
z4}PHNQz<G)MMaDt5-ZwDZJ{>cQ>rM$D2R<8wc<w!ng47x$A_KW-fnj{QvYzdch1cG
z=A1J#=Q=YR2UY>MI_C~iP?S7yEwBuj1tuyX{K7&qvvI3y&dja{n2XUx>9HvN5hZJR
z-j34w-I&hIdVvpsAwa;LN~r|A*Ja)jU{xiAAKP`7oO5%)I$#_Kz`Mcw#lW*&paa0m
z9X)M)m{}Qk6SxDI2S$|Ag}}Bh@M<N5?@sfyNq4RWY|7vg@Otq6D6qwyT)S0Qw=<TC
z4W(38O3wp3vuQ{0e%`Q0viGeD3qmnGa6l=&1-y{0&js)MfqNb9L?@R!L+eqV4ScMW
zJ_Vl2J==r#D-7ERL~H?Qlm?=-H%j+s+X3KnU{oo+13Z!Kj|cB>1a5K8?a$+Wi_*nW
z+83quP2Zw430wh8Qa`KLwJiKo@ct@bM{e&*wc2JgTMbNM4C8o_dd{z`gmAbAxa5@J
zPe1hYO6lR?{R6<Oz<s`4_Dbn{;GDw2C}q~+67Wp-3{e7JQA!s8_W&n=O~L!iOQq88
z!nkSR!)7Z=Uqxv$O1{lqFFr4s*==T4%k^TPQW}cVXHhz@!RyKISzt*egcPM89B$Cs
zZ}F&7S{l5+8F(KU^5ybkV6AiRuVQFWFA&RfsT=D6Y-mI&Jp`-;jsvTKJ!aO|3jGA=
z1#SYK&Wm)A1K6mP0M-D%1J?li&8)vUEJ}S*`ZG#jM5&z5-q#)Sswh3!m}_P$%<Nds
z@wAyOD}qP!q}QUfD8omhG!~_aDD95Y)+i0+@i#>2c$C(e*+phHlfhF>Xs-5eWbmFS
zRoew0r4XfUQL060CQ5_Z<Eoi`X=W3yWx^t0JFq32_ENu&KU1#>D}W6^A8-)3s}jOY
z+pM?orV4BZ)&s@=(cc-i6Bw(6(5@VIS5C>1!X~ZxFY`*>I(sV>1O6$PYX2L0rs^p+
z^8LLOr~-q)QtF%1(4$cr27U#;1*XhwI!Dx$%dic=R$%2BICc!!1w2^^p#~?zzr7CZ
z_}A>Fe&BB4+*3Tw-mV0Ofy;m@#&R5I0ZR&t&jJxRN<I8<fJ4AXl@L;c^)GlT80X{8
RuiXFu002ovPDHLkV1lo_*TMh*

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-on.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff0f369cdd064675a902a931c896672aaf916658
GIT binary patch
literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq000vJ000~a1^@s6g9d~d00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0yjxS
zK~zYIm6Shd6j2bye|wzxo&o<frqG;NDB6S+1|*H3A|Z`7CRQm^rnJx$!NN)i>8&h+
zgcJ&?LJ%wz1A>j9XdxJzB#8eY^MyNIi<?b0ce}Z}fn}L_-}k+lVctNAnKWe5qDkLP
zO8viR(oh+vOlZoahKsa*4U?vdcu9fK72pL>IpDs3z||PS%Y3ki@SrfB?z_9<xbn<Q
zIt*-g$SN-%V+cECne}%mlqJ%i53~{w5Nd008@}5t@TMJT6_cta-8E^jd*MAZY0&xA
zDzF6H1a1JgffMD_q&33?cnn+vMykM=A5?*3z?X8dwo=bJ4`8eUEO#!ZD_gDr<G_{&
z8a)bR_$^?(5<_UXa|qaI6-<gpA`{wh-c}5uk&VVWa3+RO2UhZow0tC19A9((?wq{>
zPWgDu0QC;#)qxqupLYJP*aGkun2jO4114y`(IVRhCLA~GyoG%TljeP2O}k$+Y0jkg
zCT;qE&ZL^3Pdk3T?K+d9X=lv=k4)+-O3S1^KTl0sGwDcn*1Cd@0#9hZhz;N=@EX_z
zP68vq9Z32ieGW{<5Pp}mV^?(4q*asZEi1e3@zEk)=@7Z-0Pr;zs>Kl2%kZ66(4P)|
zPhve;HSd^o9Jm0S0|v;gqlAQ%^u9?yXiofR;A0Ho=N_ghatpWzT%toCTPy|M0uN&d
z&$2Qnf#Dv7vSfyxzehIdGH@NZ2%M++<|567nb|MEfN#Jj-~+H4LwE!5A1YriKdi`M
Q82|tP07*qoM6N<$f@$zE$p8QV

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-off.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..58c3c5ef3d051c447175d4e426ad9da6a5a7cfcb
GIT binary patch
literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq000;O000yS1^@s6m$m(a00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0=7v+
zK~y-6os~(5lt&cDfA7=u*FA|E!MTi*n2Q%tPhu3o1rZcMya>rHL?Y%YA|CXTarEYb
zptxKF^<;<(xRK-_CYnG93L|JhP!#vkxYVn*+rNjdk#e-#(Rcakt-tr`E2@xmNzye*
zljtD9{k!0PGq^Y0<Jl1W(@yb&QUC@_1kOpC(x&)4U=J`BST59q@#Am+Na{{gNYVpI
zGlmrJ4(_*uyMp_nWLpv3FAWQjK`tc7V@b0!z%Qw|g8S-Z`!eYh-dDQ-FtdBWLf}te
zG;mtd{NVmAur!Omni{$e1YqW{0Kt8X$7nAajb*^^Kn*xiRw^%nzq0uI0A0135^Qq2
z!ji@T6z=hJU;r3sHk!9%z5Xk345*md{<2cpnL!2y3mA4Ec;^;LnhV^JG^-GrO6w$n
zfnKWDW4r(y20k&fePyMxH%<1sW1%O&_%;Jv1V#c&3gC-3TrE^@jP-wjgFs<syQ^h+
z1elXWKBu*ndFRU|%`~%zz<FSLLF=c!Jto@dG4=zyl4)zTEN=z(GU@fyWiG3LZ_@fQ
z&{F`FHe&+xdW_eBElKaImgSnv-xw1A2&krY6I!QefX>qAG2R9GlKzvV&A>C@{~@uX
zfc~`p3b<JSH{JsP*yJ%j0oEmbZM7^5;7}f9W($BFl4`(g;13J#qk(_ZG`VyE-LI1|
zgr-%?at^RPnfC!J&8(RxN?HJ%0j9NWIk<lo-2cn22?h5>slX4Cn(1meAZf(Vd`Uf>
zH>CynI=DA7!1n;|aa^<6T%SRXO6qi2Izl#NfNjaP%st+bv{X_(K~75Q`WQeF+)pP!
ze+XU#k4J+0&j6AZOM0FlzeyVPF_7-yel0<+r0>E(zohw+o+iktJl8$|G7(q-i~%mz
ns?|NYKRr~(fxpdc@u2+`NX+Ca%_PBT00000NkvXXu0mjf-}`<7

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-on.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc4da4fe74cc30d632cd28f96174ab172fd2e245
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq000*N000vR1^@s6d%Kpl00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0mn&1
zK~y-6rIf#q4N(||pL30vD>vDYUE9cQ)(Wy@2?g6+r9wd>N}ZmDkmV0hXcTIyRnlmM
zf{5(KkHpFqHV8sk!G7;1%TeqnId|MKW4+1bJm<XUd(W4dlYtsCX|G8yOo}GGHfc+p
zx=<sy4NL>;fn&fSV5ynsN9r8#x8TgAJKpiEuZ@|sXwpDceWSvk1SXtk0GfIJ7?=n4
zuQ=SK-N4yoshjXDu%{|KGieMM?BiVmRweUK2|ok2^$UzK4g;rv3mI?)*x9>-exLeF
zfp?TNybd@4%r$_Gf7t!+(1C=%0vie)uZ}Seh7g_tkAO}C7%J(YsKX|0b^Z>t3jP#u
z&iNiNT6J5B8uxJt$O_&YpzZt_X#H#WoR0&53f?B*t@9A@J_8njwKamD19z7(<Pg6V
z{NunH=Y7Dfh8NY*)n=amT*lY}KBQ&{;Z+Es8)F;?HUrl);IvPA_5x?<z5j~|w}F=>
zO>}{yz|GP&O*-iRl;6+A#Cu}WWNERh^n*6@{04A2SsL-+92f=euQ=Rw5_ssmYr!l4
z9pDFWyDGd=CXJXh@2}>(Ne@iA_TRzD0UeXx`2inI+Fqyb7iMF@9wFe*z5oCK07*qo
IM6N<$g8JwS0RR91

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js b/browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js
new file mode 100644
index 000000000000..cad5686e4af2
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js
@@ -0,0 +1,17 @@
+!(function() {
+  TB.Config.replaceWith({
+    global: {
+      exceptionLogging: {
+        enabled: true,
+        messageLimitPerPartner: 100
+      },
+
+      iceServers: {
+        enabled: false
+      },
+    },
+
+    partners: {
+    }
+  });
+})(TB);
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index b67887b2eaf1..553341c0eaf0 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -15,7 +15,6 @@ browser.jar:
   content/browser/loop/shared/js/models.js           (content/shared/js/models.js)
   content/browser/loop/shared/js/router.js           (content/shared/js/router.js)
   content/browser/loop/shared/js/views.js            (content/shared/js/views.js)
-  content/browser/loop/shared/libs/sdk.js            (content/shared/libs/sdk.js)
   content/browser/loop/shared/libs/lodash-2.4.1.js   (content/shared/libs/lodash-2.4.1.js)
   content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
@@ -26,3 +25,20 @@ browser.jar:
   content/browser/loop/js/desktopRouter.js           (content/js/desktopRouter.js)
   content/browser/loop/js/conversation.js            (content/js/conversation.js)
   content/browser/loop/js/panel.js                   (content/js/panel.js)
+  # Partner SDK assets
+  content/browser/loop/shared/libs/sdk.js                                             (content/shared/libs/sdk.js)
+  content/browser/loop/otcdn/webrtc/v2.2.5/css/ot.min.css                             (content/shared/libs/sdk/2.2.5/css/ot.min.css)
+  content/browser/loop/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js                   (content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/rtc/access-denied-chrome.png    (content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png  (content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png       (content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png     (content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png        (content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png         (content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png        (content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/buttons.png                     (content/shared/libs/sdk/2.2.5/images/buttons.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/loader.gif                      (content/shared/libs/sdk/2.2.5/images/loader.gif)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png                     (content/shared/libs/sdk/2.2.5/images/mic-off.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png                      (content/shared/libs/sdk/2.2.5/images/mic-on.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png                 (content/shared/libs/sdk/2.2.5/images/speaker-off.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png                  (content/shared/libs/sdk/2.2.5/images/speaker-on.png)

From 935ab98fc1c4ad9b78a7dc6cc50683286fe336e4 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 4 Jun 2014 13:16:06 +0100
Subject: [PATCH 074/117] Backed out changeset 3540ecf33808 / bug 1003029 due
 to test failures.

---
 .../loop/content/shared/libs/sdk.js           |   6 ++----
 .../shared/libs/sdk/2.2.5/css/ot.min.css      |   1 -
 .../sdk/2.2.5/images/access-denied-chrome.png | Bin 10531 -> 0 bytes
 .../images/access-denied-copy-firefox.png     | Bin 6556 -> 0 bytes
 .../2.2.5/images/access-denied-firefox.png    | Bin 7871 -> 0 bytes
 .../2.2.5/images/access-predenied-chrome.png  | Bin 9563 -> 0 bytes
 .../sdk/2.2.5/images/access-prompt-chrome.png | Bin 19523 -> 0 bytes
 .../sdk/2.2.5/images/audioonly-publisher.png  | Bin 1389 -> 0 bytes
 .../sdk/2.2.5/images/audioonly-subscriber.png | Bin 2464 -> 0 bytes
 .../shared/libs/sdk/2.2.5/images/buttons.png  | Bin 2908 -> 0 bytes
 .../shared/libs/sdk/2.2.5/images/loader.gif   | Bin 8787 -> 0 bytes
 .../shared/libs/sdk/2.2.5/images/mic-off.png  | Bin 1047 -> 0 bytes
 .../shared/libs/sdk/2.2.5/images/mic-on.png   | Bin 734 -> 0 bytes
 .../libs/sdk/2.2.5/images/speaker-off.png     | Bin 861 -> 0 bytes
 .../libs/sdk/2.2.5/images/speaker-on.png      | Bin 622 -> 0 bytes
 .../libs/sdk/2.2.5/js/dynamic_config.min.js   |  17 -----------------
 browser/components/loop/jar.mn                |  18 +-----------------
 17 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/buttons.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/loader.gif
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-off.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-on.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-off.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-on.png
 delete mode 100644 browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js

diff --git a/browser/components/loop/content/shared/libs/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
index 59df0cfca06f..72be279b4d18 100644
--- a/browser/components/loop/content/shared/libs/sdk.js
+++ b/browser/components/loop/content/shared/libs/sdk.js
@@ -22,8 +22,7 @@
     websiteURL: 'http://www.tokbox.com',
 
     // The URL of the CDN
-    // XXX: patched for loop so we use local files
-    cdnURL: 'loop/otcdn',
+    cdnURL: 'http://static.opentok.com',
     // The URL to use for logging
     loggingURL: 'http://hlg.tokbox.com/prod',
     // The anvil API URL
@@ -37,8 +36,7 @@
     // If this environment supports SSL
     supportSSL: 'true',
     // The CDN to use if we're using SSL
-    // XXX: patched for loop so we use local files
-    cdnURLSSL: 'loop/otcdn',
+    cdnURLSSL: 'https://static.opentok.com',
     // The loggging URL to use if we're using SSL
     loggingURLSSL: 'https://hlg.tokbox.com/prod',
     // The anvil API URL to use if we're using SSL
diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css b/browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css
deleted file mode 100644
index 43da149a633e..000000000000
--- a/browser/components/loop/content/shared/libs/sdk/2.2.5/css/ot.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.OT_root,.OT_root *{color:#fff;margin:0;padding:0;border:0;font-size:100%;font-family:Arial,Helvetica,sans-serif;vertical-align:baseline}.OT_root h1,.OT_root h2,.OT_root h3,.OT_root h4,.OT_root h5,.OT_root h6{color:#fff;font-family:Arial,Helvetica,sans-serif;font-size:100%;font-weight:bold}.OT_root strong{font-weight:bold}.OT_root em{font-style:italic}.OT_root a,.OT_root a:link,.OT_root a:visited,.OT_root a:hover,.OT_root a:active{font-family:Arial,Helvetica,sans-serif}.OT_root ul,.OT_root ol{margin:1em 1em 1em 2em}.OT_root ol{list-style:decimal outside}.OT_root ul{list-style:disc outside}.OT_root dl{margin:4px}.OT_root dl dt,.OT_root dl dd{float:left;margin:0;padding:0}.OT_root dl dt{clear:left;text-align:right;width:50px}.OT_root dl dd{margin-left:10px}.OT_root img{border:0 none}.OT_dialog{border:0;border-radius:0;top:50%;left:50%;position:absolute;position:fixed;padding:0;background-color:#363636;color:#fff;z-index:9999;box-shadow:2px 4px 6px #999;font-family:'Didact Gothic',sans-serif}.OT_dialog-blackout{position:absolute;position:fixed;top:0;right:0;bottom:0;left:0;background-color:#363636}.OT_dialog-blackout .OT_dialog{box-shadow:0 0 0 transparent}.OT_dialog *{font-family:'Didact Gothic',sans-serif}.OT_dialog-plugin-prompt{margin-left:-350px;margin-top:-141px;width:650px;height:282px}.OT_dialog-plugin-reinstall{margin-left:-271px;margin-top:-117px;width:542px;height:234px}.OT_dialog-plugin-upgrading{margin-left:-267px;margin-top:-94px;width:514px;height:188px}.OT_dialog-allow-deny-chrome-first{margin-left:-227px;margin-top:-122px;width:453px;height:244px}.OT_dialog-allow-deny-chrome-pre-denied{margin-left:-263px;margin-top:-135px;width:526px;height:270px}.OT_dialog-allow-deny-chrome-now-denied{margin-left:-120px;margin-top:-85px;width:256px;height:170px}.OT_dialog-allow-deny-firefox-denied{margin-left:-160px;margin-top:-105px;width:320px;height:190px}.OT_dialog-allow-deny-firefox-maybe-denied{margin-left:-281px;margin-top:-126px;width:562px;height:252px}.OT_dialog-allow-highlight-chrome{display:inline-block;margin-top:20px;width:227px;height:94px;background-image:url(../images/rtc/access-prompt-chrome.png)}.OT_closeButton{top:15px;right:15px;position:absolute;font-size:18px;cursor:pointer}.OT_dialog-messages{position:absolute;top:32px;left:32px;right:32px;text-align:center}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-messages{top:45px}.OT_dialog-messages-main{font-weight:300;font-size:18pt;line-height:24px}.OT_dialog-messages-minor{font-weight:300;margin-top:12px;font-size:13px;line-height:18px;color:#a4a4a4}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-messages-minor{margin-top:4px}.OT_dialog-messages-minor strong{font-weight:300;color:#fff}.OT_dialog-single-button{position:absolute;bottom:41px;left:50%;margin-left:-97px;height:47px;width:193px}.OT_dialog-button-pair{position:absolute;bottom:45px;left:5px;right:0;height:94px}.OT_dialog-button-with-title{padding-left:30px;padding-right:30px;width:260px;float:left}.OT_dialog-button-pair-seperator{border-right:1px solid #555;height:112px;width:1px;float:left}.OT_dialog-button-title{font-weight:300;text-align:center;margin-bottom:15px;font-size:12px;line-height:150%;color:#a4a4a4}.OT_dialog-button-title strong{color:#fff;font-weight:100;display:block}.OT_dialog-button{font-weight:100;display:block;line-height:50px;height:47px;background-color:#29a4da;text-align:center;font-size:16pt;cursor:pointer}.OT_dialog-button.OT_dialog-button-large{line-height:60px;height:58px}.OT_dialog-progress-bar{border:1px solid #4e4e4e;height:8px}.OT_dialog-progress-bar-fill{background-color:#29a4da;height:10px;margin-top:-1px;margin-left:-1px;margin-right:-1px}.OT_dialog-plugin-upgrading .OT_dialog-plugin-upgrade-percentage{font-size:36pt;font-weight:100}.OT_dialog-plugin-upgrading .OT_dialog-progress-bar{margin-top:25px;margin-bottom:25px}.OT_dialog-3steps{margin-top:24px}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-3steps{margin-top:21px}.OT_dialog-3steps-step{float:left;-moz-box-sizing:border-box;box-sizing:border-box;width:33%;height:140px;padding:0 10px;color:#a4a4a4}.OT_dialog-3steps-seperator{float:left;-moz-box-sizing:border-box;box-sizing:border-box;margin-top:10px;width:1px;height:68px;background-color:#555}.OT_dialog-allow-deny-chrome-pre-denied .OT_dialog-3steps-seperator{margin-top:16px}.OT_dialog-3steps-step-num{font-size:20px;background-color:#2aa3d8;border-radius:20px;line-height:33px;height:33px;width:33px;margin:0 auto 17px}.OT_dialog-allow-deny-chrome-pre-denied .OT_dialog-3steps-step-num{margin-bottom:10px}.OT_dialog-allow-camera-icon{background-color:#000;width:113px;height:48px;margin:10px auto 0;background-image:url(../images/rtc/access-predenied-chrome.png)}.OT_publisher-denied-firefox{background-color:#fff}.OT_publisher-denied-firefox p{width:232px;height:103px;top:50%;left:50%;display:block;position:absolute;margin-top:-52px;margin-left:-116px;background-image:url(../images/rtc/access-denied-firefox.png);background-position:50% 0;background-repeat:no-repeat}.OT_publisher-denied-firefox span{display:block;position:absolute;bottom:0;right:0;left:0;margin:0 auto;width:232px;height:31px;background-image:url(../images/rtc/access-denied-copy-firefox.png);text-indent:100%;white-space:nowrap;overflow:hidden}.OT_centered{position:fixed;left:50%;top:50%;margin:0}.OT_publisher,.OT_subscriber{position:relative;min-width:48px;min-height:48px}.OT_publisher video,.OT_subscriber video{width:100%;height:100%}.OT_publisher.OT_mirrored video{-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1)}.OT_subscriber_error{background-color:#000;color:#fff;text-align:center}.OT_subscriber_error>p{padding:20px}.OT_publisher .OT_bar,.OT_subscriber .OT_bar,.OT_publisher .OT_name,.OT_subscriber .OT_name,.OT_publisher .OT_archiving,.OT_subscriber .OT_archiving,.OT_publisher .OT_archiving-status,.OT_subscriber .OT_archiving-status,.OT_publihser .OT_archiving-light-box,.OT_subscriber .OT_archiving-light-box{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;top:0;left:0;right:0;display:block;height:34px;position:absolute}.OT_publisher .OT_bar,.OT_subscriber .OT_bar{background:rgba(0,0,0,0.4)}.OT_publisher .OT_name,.OT_subscriber .OT_name{background-color:transparent;color:#fff;font-size:15px;line-height:34px;font-weight:normal;padding:0 4px 0 36px}.OT_publisher .OT_archiving-status,.OT_subscriber .OT_archiving-status{background:rgba(0,0,0,0.4);top:auto;bottom:0;left:34px;padding:0 4px;color:rgba(255,255,255,0.8);font-size:15px;line-height:34px;font-weight:normal}.OT_micro .OT_archiving-status,.OT_micro:hover .OT_archiving-status,.OT_mini .OT_archiving-status,.OT_mini:hover .OT_archiving-status{display:none}.OT_publisher .OT_archiving-light-box,.OT_subscriber .OT_archiving-light-box{background:rgba(0,0,0,0.4);top:auto;bottom:0;right:auto;width:34px;height:34px}.OT_archiving-light{width:7px;height:7px;-webkit-border-radius:30px;-moz-border-radius:30px;border-radius:30px;position:absolute;top:14px;left:14px;background-color:#575757;-webkit-box-shadow:0 0 5px 1px #575757;-moz-box-shadow:0 0 5px 1px #575757;box-shadow:0 0 5px 1px #575757}.OT_archiving-light.OT_active{background-color:#970d13;-webkit-animation:OT_pulse 1.3s ease-in;-moz-animation:OT_pulse 1.3s ease-in;-webkit-animation:OT_pulse 1.3s ease-in;-webkit-animation-iteration-count:infinite;-moz-animation-iteration-count:infinite;-webkit-animation-iteration-count:infinite}@-moz-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-webkit-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-o-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-ms-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-webkit-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}.OT_mini .OT_bar,.OT_bar.OT_mode-mini,.OT_bar.OT_mode-mini-auto{bottom:0;height:auto}.OT_mini .OT_name.OT_mode-off,.OT_mini .OT_name.OT_mode-on,.OT_mini .OT_name.OT_mode-auto,.OT_mini:hover .OT_name.OT_mode-auto{display:none}.OT_publisher .OT_name,.OT_subscriber .OT_name{left:24px;right:37px;height:34px}.OT_publisher .OT_name-no-bug,.OT_subscriber .OT_name-no-bug{left:10px;padding-left:0}.OT_publisher .OT_mute,.OT_subscriber .OT_mute,.OT_publisher .OT_opentok,.OT_subscriber .OT_opentok{border:0;cursor:pointer;display:block;position:absolute;text-align:center;text-indent:-9999em;background-color:transparent;background-repeat:no-repeat}.OT_publisher .OT_opentok,.OT_subscriber .OT_opentok{background:url(../images/rtc/buttons.png) 0 -32px no-repeat;cursor:default;height:18px;left:8px;line-height:18px;top:8px;width:16px}.OT_micro .OT_opentok{display:none!important}.OT_publisher .OT_mute,.OT_subscriber .OT_mute{right:0;top:0;border-left:1px solid rgba(255,255,255,0.2);height:36px;width:37px}.OT_mini .OT_mute,.OT_mute.OT_mode-mini,.OT_mute.OT_mode-mini-auto{top:50%;left:50%;right:auto;margin-top:-18px;margin-left:-18.5px;border-left:none}.OT_publisher .OT_mute{background-image:url(../images/rtc/mic-on.png);background-position:9px 5px}.OT_publisher .OT_mute.OT_active{background-image:url(../images/rtc/mic-off.png);background-position:9px 4px}.OT_subscriber .OT_mute{background-image:url(../images/rtc/speaker-on.png);background-position:8px 7px}.OT_subscriber .OT_mute.OT_active{background-image:url(../images/rtc/speaker-off.png);background-position:7px 7px}.OT_publisher .OT_edge-bar-item,.OT_subscriber .OT_edge-bar-item{-ms-transition-property:top,bottom,opacity;-ms-transition-duration:.5s;-moz-transition-property:top,bottom,opacity;-moz-transition-duration:.5s;-webkit-transition-property:top,bottom,opacity;-webkit-transition-duration:.5s;-o-transition-property:top,bottom,opacity;-o-transition-duration:.5s;transition-property:top,bottom,opacity;transition-duration:.5s;transition-timing-function:ease-in}.OT_publisher .OT_edge-bar-item.OT_mode-off,.OT_subscriber .OT_edge-bar-item.OT_mode-off,.OT_publisher .OT_edge-bar-item.OT_mode-auto,.OT_subscriber .OT_edge-bar-item.OT_mode-auto,.OT_publisher .OT_edge-bar-item.OT_mode-mini-auto,.OT_subscriber .OT_edge-bar-item.OT_mode-mini-auto{top:-25px;opacity:0}.OT_mini .OT_mute.OT_mode-auto,.OT_publisher .OT_mute.OT_mode-mini-auto,.OT_subscriber .OT_mute.OT_mode-mini-auto{top:50%}.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-off,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-off,.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-mini-auto,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-mini-auto{top:auto;bottom:-25px}.OT_publisher .OT_edge-bar-item.OT_mode-on,.OT_subscriber .OT_edge-bar-item.OT_mode-on,.OT_publisher:hover .OT_edge-bar-item.OT_mode-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_mode-auto,.OT_publisher:hover .OT_edge-bar-item.OT_mode-mini-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_mode-mini-auto{top:0;opacity:1}.OT_mini .OT_mute.OT_mode-on,.OT_mini:hover .OT_mute.OT_mode-auto,.OT_mute.OT_mode-mini,.OT_root:hover .OT_mute.OT_mode-mini-auto{top:50%}.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-on,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-on,.OT_publisher:hover .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto{top:auto;bottom:0;opacity:1}.OT_publisher .OT_opentok.OT_mode-off,.OT_publisher .OT_opentok.OT_mode-auto,.OT_subscriber .OT_opentok.OT_mode-off,.OT_subscriber .OT_opentok.OT_mode-auto{top:-17px}.OT_publisher .OT_opentok.OT_mode-on,.OT_publisher:hover .OT_opentok.OT_mode-auto,.OT_subscriber .OT_opentok.OT_mode-on,.OT_subscriber:hover .OT_opentok.OT_mode-auto{top:8px}.OT_video-container{position:absolute;background-color:#000;overflow:hidden}.OT_hidden-audio{position:absolute!important;height:1px!important;width:1px!important}.OT_root .OT_video-loading{background:url('../images/rtc/loader.gif') no-repeat;display:none;position:absolute;width:32px;height:32px;left:50%;top:50%;margin-left:-16px;margin-top:-16px}.OT_publisher.OT_loading .OT_video-loading,.OT_subscriber.OT_loading .OT_video-loading{display:block}.OT_publisher.OT_loading video,.OT_subscriber.OT_loading video{display:none}.OT_video-poster{width:100%;height:100%;background-position:50% 50%;background-repeat:no-repeat;display:none}.OT_publisher .OT_video-poster{background-image:url(../images/rtc/audioonly-publisher.png)}.OT_subscriber .OT_video-poster{background-image:url(../images/rtc/audioonly-subscriber.png)}
\ No newline at end of file
diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png
deleted file mode 100644
index 777e02f1a8b329949b9661b20190274a46c3f178..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10531
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

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png
deleted file mode 100644
index 18b494e7e672e43f4c244411606ea973bff9b53a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6556
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
O0000<MNUMnLSTX&q651C

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png
deleted file mode 100644
index cc6bebe9632ecba852e800f7c6e6f3eea0953d01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7871
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

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png
deleted file mode 100644
index 9e23411986733d0a982cf334608ed951ea6af1c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9563
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%0A6{1Jvkvn5+0=g`GXip$%
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
FV1mIKt7iZJ

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png
deleted file mode 100644
index 6728fe807f59bf4f41c29da27887256caba86d02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19523
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

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png
deleted file mode 100644
index 24c9a7cb90e105f636fc0ba658cd6bc29b1425fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1389
zcmV-z1(N!SP)<h;3K|Lk000e1NJLTq000yK001Ef1^@s6**=RC00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6m&&cbVG7wVRUJ4ZXi@?ZDjy6FE=kS
zGffYRzW@LL9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gHF34$HUIzw$4Nv%
zR7i=Pm0N5TRTPH5J=b%;&<h1DK}|^TfgqS5Aqrjs0wN897a$D=0uK@^SP2jw5YZMy
z0<j^fnxGH~MUlo73JHmq;ENg&F)>6)Fe*VxdwQKSGv~}~ALg_iN@-J9GPC#0?Ejy&
z{<ZdAf>GM0Iy7D9Mkq>J)%eZ#IPN%nP*+1YfEX=dzwJFrBphXy^x5b-Ott!0w0#Yi
zMon0|hnZ%WCD9m{jSwelU#7RAnXN+M^_~n5DWfG60!!1#sXD8G%e#*-b3+w%exC0V
zX}16GkO3M_vKGNxRxgu%j~THPNAF3vsh(0*rN%H>tQ*{~s@M{K_B=k#yEMJ?8WLdt
z7hKSFcJ*{|RyXdUVeM{aYX&D1Y08pmh{i!P010*$dOA7PmEnaQ>#=rz#EN8^-)oj}
z0fxx(8}(EgVJ?-Fkt`n%i8L4{s9Hdn&x2(_rj5_mJ;SQO_`8y#YHUrWNLExrNd-h=
zpc^0r2ql;&l2AU5m5ryEHX@;J@@%ps@Ju&~Vi314As`ZkR0)elBs5GWMB|{FL#Z2t
z-H$XQl#Lv+ilQ5!h}&Q(gSqJUv@j?`q;$x_76f74kunkR_rH>Np#sx3)}g2>YZQeG
zdusVf6l=zyxdb`LtH#qP*RQeOw)lQ`Ex&52#^G3kmC-mCfoTZRFU_L!9uC}LhrcD2
zwV0`!9E`;A>px|l77FuX**F+eh6<o4WZrLra1`*1Jd}5iQbJb;2kb1(kr<SYMM1Ds
z(+yhV2^Pnb0oDvbJQdX1fKJ6^MH0C7?fQ%)keW)XmUnsHviKwB1peqcemsGaE(?GI
z@)eU6eqi@O&IQ*6>9MbBIxWiE8_0FFbJOa@1n?z)%OV0P3;4lF3cj~V0;zH?m!VKL
zc9wr!hssaBMn%$+bHE=|ce0qM@H1a>%F8iPO7QahH9+X)Iq!Kygy3o4=iO`{9j;Rp
zrYx$WLVZe~BUMxR#m=%=KwiQR1B9;2G26mc6?SMk*L%BJ(B00zIrnyyvi~MQdNgOV
ztZO{Y^qfnTVbWYZhYl#jfBp<Ta~5Jo6Rgw>;;%l(p~n{Tu@E?lN<t_YNIHRUT!$^a
zJ?w11NxHM0v!+Qjo?_{jhsYEu1lt?XEAFE;RmxL+T^!A{Q?sR-TMS|QKWDDh%V9Ij
zgpzVrtbUTFVnqgQ=ZBbMD`|+vSZnpt*PY?G>u?Ui4FLv%Dbi<&qB18Or6W0pS5`m4
zSH&Ddwt#~zJQ|C!S;BnVBI0C&lUgWXnEYvmIAj<csGfWG79F<hHMSB8hq-8mnXKvH
zOExc`!F$7DhV9Gi7hvDINfrsQID|s94Yz(oLV%u5aO|Ma^SO~$gI4^osh+5!Fj-M~
zKoLw5DseN!ctxYXmn=Kj!o;@gv}G->_#Rh%pKE*H95|N(4Qux>U(?xUhMBD!sD>G|
zPE8Arv2-a!W03ctt0VB*&VrYRoJ+>FIpH{L+qHo<4M0_?PL=R@X+;3k3{VwN)Sw^h
z1_%{20m(E(6X55;_rc4Pb{$rAw$lWh8_4p$V?10wfq9V_Q*@IDRh3DKAT9(kp`sR!
vEK5pkeA;}t>U&(t=lIceIJ5kbU=#cYq}!}^Q*#`X00000NkvXXu0mjfDh+5e

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png
deleted file mode 100644
index c023ecdae077423f6a506f820160f47b5f72f571..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2464
zcmV;R319Y!P)<h;3K|Lk000e1NJLTq001HY0021%1^@s6Q&#z!00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6m&&cbVG7wVRUJ4ZXi@?ZDjy6FE=kS
zGffYRzW@LL9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gHF34$HUIz!`bk7V
zR9J=8nR|>}RUOB_=W(C&+@%esEhSLF0yQcmMnZ|0hMDbvns$e7+g;eMtPzx;KuiG9
zpkRX07-zR#Y7C~k6e6~+%f4C(N_<2fM!E?6QMAMs+L*9HXJ=>b+<VW%KbX5rx7+PL
zx&*(;%}nn6?(cl=dHjCocZOhzv~lCcHw?qLgfZp=IH9$EK`GTQgcukd9TkzC)*1jn
zmkNY)K9EQx4m374zO-!Fvc!4kowu!_p<!P#nLM&-)28O>_GGC*rmM5F^HY@4+W~w<
zN@-LomEGlX`HrWbep-I0Ad%YJ+b_2)Yd?U?JkRUx>+9RGWFXmW_BO`YmpSK?0A7(&
zJ~c8j^3Uk^mX?-=cs%|m&iOje^KS3$?cKd3Ah}$wD;A4=-Eka7DTNRMzVG+?zJKT7
z;NS!R<n#G8sZ{D!&bePIl`dM+q3P)8h;hz00Qeq&t9;*oZE|w*n*RR&2>@tmY57Si
zmAXeMbr)Mokg>6`@a30ZKD>7A+Fx?cKW<sp2E#B`jE#*A0Kl3xYmRcx?=Vf%U2u<N
zGMO|X<T6TWnh;XfS|2-b;K0AnWWRayW-FOYj@h=owo<9A>Feuz69Bes+44?9Lxaud
z*|<X~y_GT6!8yN@a}LHB2zmc~^7;G;A;eQch@TA)4<D<4w!gpMZ*Fex;hc9_mi0vd
z1po-c@E=O4^>YTvX0z8Z#`f5@eWBwxux%TLVSrK!LI||h&|0q$LfloYR&USe^FQ!B
z?~##_5gqyPegALOY89^Qu8!_WDQ~V;tIOv!G}&yn)iljM*L7(kk$`R6h<anXlv0pV
z!uNfY%jI8{N~N|aXf-u8k$61b8jr`H+p}lSao~dxe^!ueHhaBkng<h!1WhKBux)!r
zfa%g&!}onmPEL0B_V(U6o84JKGMP+_bAC9POs-6)({LOIl+HapX{`|i0gA=qhQ}X&
z{13B%%<7d=`c>PuSH|OU*tR_{2mm02z%)(7<M9X2W;?5A##n1KG3PQIXM(XT>)MWv
zjtdq9lF4Lj&iR$m#9WLhrLZjPngxLnLRK)wDCd0MLo$OeFveCc6eLM0or)8S6{R$>
zAdni&If0mqX6uo23UM}HOSWg7uRby$8~`$z45yUdOetLrpnG(5^xdUu@P-?1AVP>X
z#@MBJKLd{g0MBN#7cj;Snx=WVZQCG(tOIZpA>@RV@-x2gpA&#E49fsO2-#XopkR#M
zozLf6_wV07z$vAVI*xOBGMR+qH~_F5066C=2!fNvVsXJywO&doRr`9r<2XpAQZP-^
z^?iTu)~#DtbHgw;#^Z4$5(yZF0VyQ_fKs|jN_l9}1Rv=803M{2!Y~Y2mIc!^VHidX
zz_pw)Rx(X9H9d?+2`iaQ!m_MIQwZ^Xl{q~?*1#sX*7{KZ_iC+ATkDK5*tQ)F*`gGN
zA%Gd<$!l8cKT{#Z1D@wS5(I&c_68rKUJS!9+tbq{=<x8c+`D)0eWg-qBBHLzJI9Sy
zr{9oL-diXXP5^ZQtx~B(-NyhxYdwB0dq`_NUi+L{g3-J=1w=~e*H%~>00ssI{;QOF
z`-4@tXpm?HrlWgGso*pat@ZI*4_wsQ*-2|~zm-zr9Kak?N*$^-esNtwJuwr=E42n=
zjImGGK)QV27g20ksFYGa?dj=>-ex`L9E6afQtIewAWErcg%D6mficzs07FAV|MEQV
zVc++$i23sOFbsDAz>PQF_&LVd>Ke$iyLa!Na#}w}27@4&lv09o{<T|fxg`w%)oS(O
za=F|e1i?aJjte0+@7%dl0D#u|+qGy4t@Yk|!zqx_(a};61iuKw5R}rCZQBn4z|hc;
zoSdB8QYw|Y<_Ytn5aQ}Wp>PZUa=F|F&iQ87b-_75B7_*85d;8&Ao!u@dE-(_*tUH~
zdwY8x00ssIWN&ZpH;cvM=RME+qYz>?prcBuZ&a(*^@T#=ts2BiLdag%b>TP;2qE|E
z+O<p6KXh8WZEkM9sj;!~*RJa#48!WllP5Pl`Q(!a>uowZIxe;>YXj%}QcCG^0A&Dg
zYOSA_Qoc|(F_FvVRsi^2EEZdrPN(6z?h}PVp)LA-){=AEwrvkJG&DS5nkK5%swx(X
z_m|7%9}f-=&TAbvH8oww7<<BX-4&@+3a;zEq_zG+cXxMXP9Ol#*4FlLDwX;U=Nv&0
zpj0ZoQZARj>-+x5=;-LIKut|eR}ez(Hw<ID>$*rJ5^x;nuK;pgU0ua`+c_2CZEbBg
zCzHuthG8V6l<+(cl}hEf@B2ex7(TC*I--;+126!rB7|H;DZQR^{#nbi;5ZIk*M(si
zKUYe9tGm1Vw0tw?V~OqCx37xF<B!<3y^Rn;g%AjW06`ES3`0mM5p5wTrQn>yG)-8R
z1<v^xA>{5tq43<9{LdLAQhR&*#g60LY8b|5O6gjyHI!1Pg#TJ)I8F#TptbJp>gxLa
z+5FBMq+Xq!otK!V`G#d#r_{w->-&Nr_|eXtJLep17WJpV`1trc6B84dwts;T;y?3&
zsMmr(JkNvYd6=FI7n7wwGL_!{FGwbni4#Iro}s#5*4o<In9Jqny$EJ}Ad|^_j8eLu
zQo4>(dIhEQ0z$}zgplQg5JoA5<2XpC)2GxtVHl!RDxq91LkRJ%*7}4}>X_F04XyR7
zQp%T<Qm-F8cyMY$pSFB6nM{IGdK+V`-7t(RIOpJ;!!Qgm#=sbh;shwAV2n+jJl8uF
zLLk~;MVFKkQc4IR5QgD+?U=lKXlUs0DIl3lhBC%pw{3f^>$+3N+Yvw%HRpSHQ#%$%
zeehFCAq+$KzVBBmm8<vd+jj`4&5>uGc}5wA@m3;{Ksud9GMPjy7MlW!4)o@Gf)u?#
z)O%6>skL)5l}b%Sw)LCmCZ*JuwAQ~-O1-y4RbQyJ{)<xTPNmc*9((MuBU8{bS?}1f
zgPNv!8Rz_ywaL1g5VDF8ay}uXfe?}=gt#*`1mL9B`n}q9RBQdV*7~qg>UE{mp`M<e
eO8o=T3;z!{?=7q62jiOn0000<MNUMnLSTYsCa1gr

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/buttons.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/buttons.png
deleted file mode 100644
index 94053ac8553747047b6988707544ce07aba48fb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2908
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

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/loader.gif b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/loader.gif
deleted file mode 100644
index 4a1a30c0c0e566b123cea88066c32b9fd1c10df9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8787
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
Vdg(4YZw9%Qd*k<?Q2gih{{Xx=OTYjC

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-off.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-off.png
deleted file mode 100644
index 5b35a72829d9820c873a4357735f81d57d4ef623..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1047
zcmV+y1nB#TP)<h;3K|Lk000e1NJLTq000#L0012b1^@s6MMNk200004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q18_-1
zK~zYIrIlT1TtyVef3r<@W`ngtj3PAYgNvUOi=t5JgAr-8RxQ<H715}OAVMB2SdmhS
z4}PHNQz<G)MMaDt5-ZwDZJ{>cQ>rM$D2R<8wc<w!ng47x$A_KW-fnj{QvYzdch1cG
z=A1J#=Q=YR2UY>MI_C~iP?S7yEwBuj1tuyX{K7&qvvI3y&dja{n2XUx>9HvN5hZJR
z-j34w-I&hIdVvpsAwa;LN~r|A*Ja)jU{xiAAKP`7oO5%)I$#_Kz`Mcw#lW*&paa0m
z9X)M)m{}Qk6SxDI2S$|Ag}}Bh@M<N5?@sfyNq4RWY|7vg@Otq6D6qwyT)S0Qw=<TC
z4W(38O3wp3vuQ{0e%`Q0viGeD3qmnGa6l=&1-y{0&js)MfqNb9L?@R!L+eqV4ScMW
zJ_Vl2J==r#D-7ERL~H?Qlm?=-H%j+s+X3KnU{oo+13Z!Kj|cB>1a5K8?a$+Wi_*nW
z+83quP2Zw430wh8Qa`KLwJiKo@ct@bM{e&*wc2JgTMbNM4C8o_dd{z`gmAbAxa5@J
zPe1hYO6lR?{R6<Oz<s`4_Dbn{;GDw2C}q~+67Wp-3{e7JQA!s8_W&n=O~L!iOQq88
z!nkSR!)7Z=Uqxv$O1{lqFFr4s*==T4%k^TPQW}cVXHhz@!RyKISzt*egcPM89B$Cs
zZ}F&7S{l5+8F(KU^5ybkV6AiRuVQFWFA&RfsT=D6Y-mI&Jp`-;jsvTKJ!aO|3jGA=
z1#SYK&Wm)A1K6mP0M-D%1J?li&8)vUEJ}S*`ZG#jM5&z5-q#)Sswh3!m}_P$%<Nds
z@wAyOD}qP!q}QUfD8omhG!~_aDD95Y)+i0+@i#>2c$C(e*+phHlfhF>Xs-5eWbmFS
zRoew0r4XfUQL060CQ5_Z<Eoi`X=W3yWx^t0JFq32_ENu&KU1#>D}W6^A8-)3s}jOY
z+pM?orV4BZ)&s@=(cc-i6Bw(6(5@VIS5C>1!X~ZxFY`*>I(sV>1O6$PYX2L0rs^p+
z^8LLOr~-q)QtF%1(4$cr27U#;1*XhwI!Dx$%dic=R$%2BICc!!1w2^^p#~?zzr7CZ
z_}A>Fe&BB4+*3Tw-mV0Ofy;m@#&R5I0ZR&t&jJxRN<I8<fJ4AXl@L;c^)GlT80X{8
RuiXFu002ovPDHLkV1lo_*TMh*

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-on.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/mic-on.png
deleted file mode 100644
index ff0f369cdd064675a902a931c896672aaf916658..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq000vJ000~a1^@s6g9d~d00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0yjxS
zK~zYIm6Shd6j2bye|wzxo&o<frqG;NDB6S+1|*H3A|Z`7CRQm^rnJx$!NN)i>8&h+
zgcJ&?LJ%wz1A>j9XdxJzB#8eY^MyNIi<?b0ce}Z}fn}L_-}k+lVctNAnKWe5qDkLP
zO8viR(oh+vOlZoahKsa*4U?vdcu9fK72pL>IpDs3z||PS%Y3ki@SrfB?z_9<xbn<Q
zIt*-g$SN-%V+cECne}%mlqJ%i53~{w5Nd008@}5t@TMJT6_cta-8E^jd*MAZY0&xA
zDzF6H1a1JgffMD_q&33?cnn+vMykM=A5?*3z?X8dwo=bJ4`8eUEO#!ZD_gDr<G_{&
z8a)bR_$^?(5<_UXa|qaI6-<gpA`{wh-c}5uk&VVWa3+RO2UhZow0tC19A9((?wq{>
zPWgDu0QC;#)qxqupLYJP*aGkun2jO4114y`(IVRhCLA~GyoG%TljeP2O}k$+Y0jkg
zCT;qE&ZL^3Pdk3T?K+d9X=lv=k4)+-O3S1^KTl0sGwDcn*1Cd@0#9hZhz;N=@EX_z
zP68vq9Z32ieGW{<5Pp}mV^?(4q*asZEi1e3@zEk)=@7Z-0Pr;zs>Kl2%kZ66(4P)|
zPhve;HSd^o9Jm0S0|v;gqlAQ%^u9?yXiofR;A0Ho=N_ghatpWzT%toCTPy|M0uN&d
z&$2Qnf#Dv7vSfyxzehIdGH@NZ2%M++<|567nb|MEfN#Jj-~+H4LwE!5A1YriKdi`M
Q82|tP07*qoM6N<$f@$zE$p8QV

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-off.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-off.png
deleted file mode 100644
index 58c3c5ef3d051c447175d4e426ad9da6a5a7cfcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq000;O000yS1^@s6m$m(a00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0=7v+
zK~y-6os~(5lt&cDfA7=u*FA|E!MTi*n2Q%tPhu3o1rZcMya>rHL?Y%YA|CXTarEYb
zptxKF^<;<(xRK-_CYnG93L|JhP!#vkxYVn*+rNjdk#e-#(Rcakt-tr`E2@xmNzye*
zljtD9{k!0PGq^Y0<Jl1W(@yb&QUC@_1kOpC(x&)4U=J`BST59q@#Am+Na{{gNYVpI
zGlmrJ4(_*uyMp_nWLpv3FAWQjK`tc7V@b0!z%Qw|g8S-Z`!eYh-dDQ-FtdBWLf}te
zG;mtd{NVmAur!Omni{$e1YqW{0Kt8X$7nAajb*^^Kn*xiRw^%nzq0uI0A0135^Qq2
z!ji@T6z=hJU;r3sHk!9%z5Xk345*md{<2cpnL!2y3mA4Ec;^;LnhV^JG^-GrO6w$n
zfnKWDW4r(y20k&fePyMxH%<1sW1%O&_%;Jv1V#c&3gC-3TrE^@jP-wjgFs<syQ^h+
z1elXWKBu*ndFRU|%`~%zz<FSLLF=c!Jto@dG4=zyl4)zTEN=z(GU@fyWiG3LZ_@fQ
z&{F`FHe&+xdW_eBElKaImgSnv-xw1A2&krY6I!QefX>qAG2R9GlKzvV&A>C@{~@uX
zfc~`p3b<JSH{JsP*yJ%j0oEmbZM7^5;7}f9W($BFl4`(g;13J#qk(_ZG`VyE-LI1|
zgr-%?at^RPnfC!J&8(RxN?HJ%0j9NWIk<lo-2cn22?h5>slX4Cn(1meAZf(Vd`Uf>
zH>CynI=DA7!1n;|aa^<6T%SRXO6qi2Izl#NfNjaP%st+bv{X_(K~75Q`WQeF+)pP!
ze+XU#k4J+0&j6AZOM0FlzeyVPF_7-yel0<+r0>E(zohw+o+iktJl8$|G7(q-i~%mz
ns?|NYKRr~(fxpdc@u2+`NX+Ca%_PBT00000NkvXXu0mjf-}`<7

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-on.png b/browser/components/loop/content/shared/libs/sdk/2.2.5/images/speaker-on.png
deleted file mode 100644
index dc4da4fe74cc30d632cd28f96174ab172fd2e245..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq000*N000vR1^@s6d%Kpl00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0mn&1
zK~y-6rIf#q4N(||pL30vD>vDYUE9cQ)(Wy@2?g6+r9wd>N}ZmDkmV0hXcTIyRnlmM
zf{5(KkHpFqHV8sk!G7;1%TeqnId|MKW4+1bJm<XUd(W4dlYtsCX|G8yOo}GGHfc+p
zx=<sy4NL>;fn&fSV5ynsN9r8#x8TgAJKpiEuZ@|sXwpDceWSvk1SXtk0GfIJ7?=n4
zuQ=SK-N4yoshjXDu%{|KGieMM?BiVmRweUK2|ok2^$UzK4g;rv3mI?)*x9>-exLeF
zfp?TNybd@4%r$_Gf7t!+(1C=%0vie)uZ}Seh7g_tkAO}C7%J(YsKX|0b^Z>t3jP#u
z&iNiNT6J5B8uxJt$O_&YpzZt_X#H#WoR0&53f?B*t@9A@J_8njwKamD19z7(<Pg6V
z{NunH=Y7Dfh8NY*)n=amT*lY}KBQ&{;Z+Es8)F;?HUrl);IvPA_5x?<z5j~|w}F=>
zO>}{yz|GP&O*-iRl;6+A#Cu}WWNERh^n*6@{04A2SsL-+92f=euQ=Rw5_ssmYr!l4
z9pDFWyDGd=CXJXh@2}>(Ne@iA_TRzD0UeXx`2inI+Fqyb7iMF@9wFe*z5oCK07*qo
IM6N<$g8JwS0RR91

diff --git a/browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js b/browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js
deleted file mode 100644
index cad5686e4af2..000000000000
--- a/browser/components/loop/content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-!(function() {
-  TB.Config.replaceWith({
-    global: {
-      exceptionLogging: {
-        enabled: true,
-        messageLimitPerPartner: 100
-      },
-
-      iceServers: {
-        enabled: false
-      },
-    },
-
-    partners: {
-    }
-  });
-})(TB);
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 553341c0eaf0..b67887b2eaf1 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -15,6 +15,7 @@ browser.jar:
   content/browser/loop/shared/js/models.js           (content/shared/js/models.js)
   content/browser/loop/shared/js/router.js           (content/shared/js/router.js)
   content/browser/loop/shared/js/views.js            (content/shared/js/views.js)
+  content/browser/loop/shared/libs/sdk.js            (content/shared/libs/sdk.js)
   content/browser/loop/shared/libs/lodash-2.4.1.js   (content/shared/libs/lodash-2.4.1.js)
   content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
@@ -25,20 +26,3 @@ browser.jar:
   content/browser/loop/js/desktopRouter.js           (content/js/desktopRouter.js)
   content/browser/loop/js/conversation.js            (content/js/conversation.js)
   content/browser/loop/js/panel.js                   (content/js/panel.js)
-  # Partner SDK assets
-  content/browser/loop/shared/libs/sdk.js                                             (content/shared/libs/sdk.js)
-  content/browser/loop/otcdn/webrtc/v2.2.5/css/ot.min.css                             (content/shared/libs/sdk/2.2.5/css/ot.min.css)
-  content/browser/loop/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js                   (content/shared/libs/sdk/2.2.5/js/dynamic_config.min.js)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/rtc/access-denied-chrome.png    (content/shared/libs/sdk/2.2.5/images/access-denied-chrome.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png  (content/shared/libs/sdk/2.2.5/images/access-denied-copy-firefox.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png       (content/shared/libs/sdk/2.2.5/images/access-denied-firefox.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png     (content/shared/libs/sdk/2.2.5/images/access-predenied-chrome.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png        (content/shared/libs/sdk/2.2.5/images/access-prompt-chrome.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png         (content/shared/libs/sdk/2.2.5/images/audioonly-publisher.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png        (content/shared/libs/sdk/2.2.5/images/audioonly-subscriber.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/buttons.png                     (content/shared/libs/sdk/2.2.5/images/buttons.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/loader.gif                      (content/shared/libs/sdk/2.2.5/images/loader.gif)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png                     (content/shared/libs/sdk/2.2.5/images/mic-off.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png                      (content/shared/libs/sdk/2.2.5/images/mic-on.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png                 (content/shared/libs/sdk/2.2.5/images/speaker-off.png)
-  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png                  (content/shared/libs/sdk/2.2.5/images/speaker-on.png)

From 74aef7c36a230fde2862423d9cf49a8bd15ceb45 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Wed, 4 Jun 2014 14:42:41 +0100
Subject: [PATCH 075/117] Bug 1017394 In MozLoopService use promises rather
 than callbacks to make the code cleaner. r=mhammond

---
 browser/components/loop/MozLoopAPI.jsm        |   8 +-
 browser/components/loop/MozLoopService.jsm    | 161 ++++++------------
 .../xpcshell/test_loopservice_initialize.js   |  43 ++---
 .../xpcshell/test_loopservice_registration.js |  28 ++-
 .../test_loopservice_token_validation.js      |   4 +-
 5 files changed, 100 insertions(+), 144 deletions(-)

diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index 9fe14bd0b163..d8ac2961819e 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -98,7 +98,13 @@ function injectLoopAPI(targetWindow) {
       configurable: true,
       writable: true,
       value: function(callback) {
-        return MozLoopService.register(callback);
+        // We translate from a promise to a callback, as we can't pass promises from
+        // Promise.jsm across the priv versus unpriv boundary.
+        return MozLoopService.register().then(() => {
+          callback(null);
+        }, err => {
+          callback(err);
+        });
       }
     },
 
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index d66fe1ee200c..27494c13fae3 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -8,6 +8,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Promise.jsm");
 let console = (Cu.import("resource://gre/modules/devtools/Console.jsm", {})).console;
 
 this.EXPORTED_SYMBOLS = ["MozLoopService"];
@@ -155,21 +156,22 @@ let MozLoopServiceInternal = {
   // The uri of the Loop server.
   loopServerUri: Services.prefs.getCharPref("loop.server"),
 
-  // Any callbacks needed when the registration process completes.
-  registrationCallbacks: [],
+  // The current deferred for the registration process. This is set if in progress
+  // or the registration was successful. This is null if a registration attempt was
+  // unsuccessful.
+  _registeredDeferred: null,
 
   /**
    * The initial delay for push registration. This ensures we don't start
    * kicking off straight after browser startup, just a few seconds later.
    */
   get initialRegistrationDelayMilliseconds() {
-    // Default to 5 seconds
-    let initialDelay = 5000;
     try {
       // Let a pref override this for developer & testing use.
-      initialDelay = Services.prefs.getIntPref("loop.initialDelay");
+      return Services.prefs.getIntPref("loop.initialDelay");
     } catch (x) {
-      // It is ok for the pref not to exist.
+      // Default to 5 seconds
+      return 5000;
     }
     return initialDelay;
   },
@@ -180,14 +182,12 @@ let MozLoopServiceInternal = {
    * In seconds since epoch.
    */
   get expiryTimeSeconds() {
-    let expiryTimeSeconds = 0;
     try {
-      expiryTimeSeconds = Services.prefs.getIntPref("loop.urlsExpiryTimeSeconds");
+      return Services.prefs.getIntPref("loop.urlsExpiryTimeSeconds");
     } catch (x) {
       // It is ok for the pref not to exist.
+      return 0;
     }
-
-    return expiryTimeSeconds;
   },
 
   /**
@@ -218,94 +218,27 @@ let MozLoopServiceInternal = {
     Services.prefs.setBoolPref("loop.do_not_disturb", Boolean(aFlag));
   },
 
-  /**
-   * Starts the initialization of the service, which goes and registers
-   * with the push server and the loop server.
-   *
-   * Callback parameters:
-   * - err null on successful initialization and registration,
-   *       false if initialization is complete, but registration has not taken
-   *             place,
-   *       <other> anything else if registration has failed.
-   *
-   * @param {Function} callback Optional, called when initialization finishes.
-   */
-  initialize: function(callback) {
-    if (this.registeredPushServer || this.initalizeTimer || this.registrationInProgress) {
-      if (callback)
-        callback(this.registeredPushServer ? null : false);
-      return;
-    }
-
-    function secondsToMilli(value) {
-      return value * 1000;
-    }
-
-    // If expiresTime is in the future then kick-off registration.
-    if (secondsToMilli(this.expiryTimeSeconds) > Date.now()) {
-      // Kick off the push notification service into registering after a timeout
-      // this ensures we're not doing too much straight after the browser's finished
-      // starting up.
-      this.initializeTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-      this.initializeTimer.initWithCallback(function() {
-        this.registerWithServers(callback);
-        this.initializeTimer = null;
-      }.bind(this),
-      this.initialRegistrationDelayMilliseconds, Ci.nsITimer.TYPE_ONE_SHOT);
-    }
-    else if (callback) {
-      // Callback with false as we haven't needed to do registration.
-      callback(false);
-    }
-  },
-
   /**
    * Starts registration of Loop with the push server, and then will register
    * with the Loop server. It will return early if already registered.
    *
-   * Callback parameters:
-   * - err null on successful registration, non-null otherwise.
-   *
-   * @param {Function} callback Called when the registration process finishes.
+   * @returns {Promise} a promise that is resolved with no params on completion, or
+   *          rejected with an error code or string.
    */
-  registerWithServers: function(callback) {
-    // If we've already registered, return straight away, but save the callback
-    // so we can let the caller know.
-    if (this.registeredLoopServer) {
-      callback(null);
-      return;
+  promiseRegisteredWithServers: function() {
+    if (this._registeredDeferred) {
+      return this._registeredDeferred.promise;
     }
 
-    // We need to register, so save the callback.
-    if (callback) {
-      this.registrationCallbacks.push(callback);
-    }
-
-    // If we're already in progress, just return straight away.
-    if (this.registrationInProgress) {
-      return;
-    }
-
-    this.registrationInProgress = true;
+    this._registeredDeferred = Promise.defer();
+    // We grab the promise early in case .initialize or its results sets
+    // it back to null on error.
+    let result = this._registeredDeferred.promise;
 
     PushHandlerHack.initialize(this.onPushRegistered.bind(this),
                                this.onHandleNotification.bind(this));
-  },
 
-  /**
-   * Handles the end of the registration process.
-   *
-   * @param {Object|null} err null on success, non-null otherwise.
-   */
-  endRegistration: function(err) {
-    // Reset the in progress flag
-    this.registrationInProgress = false;
-
-    // Call any callbacks, then release them.
-    this.registrationCallbacks.forEach(function(callback) {
-      callback(err);
-    });
-    this.registrationCallbacks.length = 0;
+    return result;
   },
 
   /**
@@ -316,7 +249,8 @@ let MozLoopServiceInternal = {
    */
   onPushRegistered: function(err, pushUrl) {
     if (err) {
-      this.endRegistration(err);
+      this._registeredDeferred.reject(err);
+      this._registeredDeferred = null;
       return;
     }
 
@@ -364,7 +298,8 @@ let MozLoopServiceInternal = {
       // XXX Bubble the precise details up to the UI somehow (bug 1013248).
       Cu.reportError("Failed to register with the loop server. Code: " +
         status + " Text: " + this.loopXhr.statusText);
-      this.endRegistration(status);
+      this._registeredDeferred.reject(status);
+      this._registeredDeferred = null;
       return;
     }
 
@@ -378,14 +313,17 @@ let MozLoopServiceInternal = {
       } else {
         // XXX Bubble the precise details up to the UI somehow (bug 1013248).
         console.warn("Loop server sent an invalid session token");
-        this.endRegistration("session-token-wrong-size");
+        this._registeredDeferred.reject("session-token-wrong-size");
+        this._registeredDeferred = null;
         return;
       }
     }
 
     // If we made it this far, we registered just fine.
     this.registeredLoopServer = true;
-    this.endRegistration(null);
+    this._registeredDeferred.resolve();
+    // No need to clear the promise here, everything was good, so we don't need
+    // to re-register.
   },
 
   /**
@@ -465,30 +403,39 @@ this.MozLoopService = {
   /**
    * Initialized the loop service, and starts registration with the
    * push and loop servers.
-   *
-   * Callback parameters:
-   * - err null on successful initialization and registration,
-   *       false if initialization is complete, but registration has not taken
-   *             place,
-   *       <other> anything else if registration has failed.
-   *
-   * @param {Function} callback Optional, called when initialization finishes.
    */
-  initialize: function(callback) {
-    MozLoopServiceInternal.initialize(callback);
+  initialize: function() {
+    // If expiresTime is in the future then kick-off registration.
+    if ((MozLoopServiceInternal.expiryTimeSeconds * 1000) > Date.now()) {
+      this._startInitializeTimer();
+    }
+  },
+
+  /**
+   * Internal function, exposed for testing purposes only. Used to start the
+   * initialize timer.
+   */
+  _startInitializeTimer: function() {
+    // Kick off the push notification service into registering after a timeout
+    // this ensures we're not doing too much straight after the browser's finished
+    // starting up.
+    this._initializeTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    this._initializeTimer.initWithCallback(function() {
+      this.register();
+      this._initializeTimer = null;
+    }.bind(this),
+    MozLoopServiceInternal.initialRegistrationDelayMilliseconds, Ci.nsITimer.TYPE_ONE_SHOT);
   },
 
   /**
    * Starts registration of Loop with the push server, and then will register
    * with the Loop server. It will return early if already registered.
    *
-   * Callback parameters:
-   * - err null on successful registration, non-null otherwise.
-   *
-   * @param {Function} callback Called when the registration process finishes.
+   * @returns {Promise} a promise that is resolved with no params on completion, or
+   *          rejected with an error code or string.
    */
-  register: function(callback) {
-    MozLoopServiceInternal.registerWithServers(callback);
+  register: function() {
+    return MozLoopServiceInternal.promiseRegisteredWithServers();
   },
 
   /**
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
index 3eaed019921d..48c83a98e62a 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
@@ -8,51 +8,51 @@ var server;
 
 const kServerPushUrl = "http://localhost:3456";
 
+var startTimerCalled = false;
+
 /**
  * Tests that registration doesn't happen when the expiry time is
  * not set.
  */
-add_test(function test_initialize_no_expiry() {
-  MozLoopService.initialize(function(err) {
-    Assert.equal(err, false,
-      "should not register when no expiry time is set");
+add_task(function test_initialize_no_expiry() {
+  startTimerCalled = false;
 
-    run_next_test();
-  });
+  MozLoopService.initialize();
+
+  Assert.equal(startTimerCalled, false,
+    "should not register when no expiry time is set");
 });
 
 /**
  * Tests that registration doesn't happen when the expiry time is
  * in the past.
  */
-add_test(function test_initialize_expiry_past() {
+add_task(function test_initialize_expiry_past() {
   // Set time to be 2 seconds in the past.
   var nowSeconds = Date.now() / 1000;
   Services.prefs.setIntPref("loop.urlsExpiryTimeSeconds", nowSeconds - 2);
+  startTimerCalled = false;
 
-  MozLoopService.initialize(function(err) {
-    Assert.equal(err, false,
-      "should not register when expiry time is in past");
+  MozLoopService.initialize();
 
-    run_next_test();
-  });
+  Assert.equal(startTimerCalled, false,
+    "should not register when expiry time is in past");
 });
 
 /**
  * Tests that registration happens when the expiry time is in
  * the future.
  */
-add_test(function test_initialize_and_register() {
+add_task(function test_initialize_starts_timer() {
   // Set time to be 1 minute in the future
   var nowSeconds = Date.now() / 1000;
   Services.prefs.setIntPref("loop.urlsExpiryTimeSeconds", nowSeconds + 60);
+  startTimerCalled = false;
 
-  MozLoopService.initialize(function(err) {
-    Assert.equal(err, null,
-      "should not register when expiry time is in past");
+  MozLoopService.initialize();
 
-    run_next_test();
-  });
+  Assert.equal(startTimerCalled, true,
+    "should start the timer when expiry time is in the future");
 });
 
 function run_test()
@@ -70,8 +70,11 @@ function run_test()
   Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
   Services.prefs.setCharPref("loop.server", "http://localhost:" + server.identity.primaryPort);
 
-  // Set the initial registration delay to a short value for fast run tests.
-  Services.prefs.setIntPref("loop.initialDelay", 10);
+  // Override MozLoopService's initializeTimer, so that we can verify the timeout is called
+  // correctly.
+  MozLoopService._startInitializeTimer = function() {
+    startTimerCalled = true;
+  };
 
   do_register_cleanup(function() {
     gMockWebSocketChannelFactory.unregister();
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
index 30b77c83c7cf..42c3975377a9 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
@@ -15,9 +15,10 @@ add_test(function test_register_offline() {
   // It should callback with failure if in offline mode
   Services.io.offline = true;
 
-  MozLoopService.register(function(err) {
-    Assert.equal(err, "offline", "Expected error of 'offline' to be returned");
-
+  MozLoopService.register().then(() => {
+    do_throw("should not succeed when offline");
+  }, err => {
+    Assert.equal(err, "offline", "should reject with 'offline' when offline");
     Services.io.offline = false;
     run_next_test();
   });
@@ -28,7 +29,9 @@ add_test(function test_register_offline() {
  * failure is reported.
  */
 add_test(function test_register_websocket_success_loop_server_fail() {
-  MozLoopService.register(function(err) {
+  MozLoopService.register().then(() => {
+    do_throw("should not succeed when loop server registration fails");
+  }, err => {
     // 404 is an expected failure indicated by the lack of route being set
     // up on the Loop server mock. This is added in the next test.
     Assert.equal(err, 404, "Expected no errors in websocket registration");
@@ -65,22 +68,18 @@ add_test(function test_registration_returns_hawk_session_token() {
     response.finish();
   });
 
-  MozLoopService.register(function(err) {
-
-    Assert.equal(err, null, "Should not cause an error to be called back on" +
-      " an otherwise valid request");
-
+  MozLoopService.register().then(() => {
     var hawkSessionPref;
     try {
       hawkSessionPref = Services.prefs.getCharPref("loop.hawk-session-token");
     } catch (ex) {
-      // avoid slowing/hanging the tests if the pref isn't there
-      dump("unexpected exception: " + ex + "\n");
     }
     Assert.equal(hawkSessionPref, fakeSessionToken, "Should store" +
       " Hawk-Session-Token header contents in loop.hawk-session-token pref");
 
     run_next_test();
+  }, err => {
+    do_throw("shouldn't error on a succesful request");
   });
 });
 
@@ -99,15 +98,14 @@ add_test(function test_register_success() {
     response.processAsync();
     response.finish();
   });
-
-  MozLoopService.register(function(err) {
-    Assert.equal(err, null, "Expected no errors in websocket registration");
-
+  MozLoopService.register().then(() => {
     let instances = gMockWebSocketChannelFactory.createdInstances;
     Assert.equal(instances.length, 1,
                  "Should create only one instance of websocket");
 
     run_next_test();
+  }, err => {
+    do_throw("shouldn't error on a succesful request");
   });
 });
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
index d89411ee3e06..158959c62c4c 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
@@ -20,7 +20,9 @@ add_test(function test_registration_handles_bogus_hawk_token() {
     response.finish();
   });
 
-  MozLoopService.register(function(err) {
+  MozLoopService.register().then(() => {
+    do_throw("should not succeed with a bogus token");
+  }, err => {
 
     Assert.equal(err, "session-token-wrong-size", "Should cause an error to be" +
       " called back if the session-token is not 64 characters long");

From f101778976ed0ee416bd52096ce354948d590118 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 5 Jun 2014 10:29:54 +0100
Subject: [PATCH 076/117] Bug 1017902 Use saved hawk session tokens, if
 possible, when registering with the server to preserve the session across
 restarts. r=jparsons,r=mhammond

---
 browser/components/loop/MozLoopService.jsm    | 106 ++++++++++++++----
 browser/components/loop/test/xpcshell/head.js |  22 ++++
 .../test/xpcshell/test_loopservice_dnd.js     |   3 -
 .../test/xpcshell/test_loopservice_expiry.js  |   3 -
 .../test_loopservice_get_loop_char_pref.js    |   3 -
 .../xpcshell/test_loopservice_initialize.js   |  16 +--
 .../test/xpcshell/test_loopservice_locales.js |   4 -
 .../xpcshell/test_loopservice_registration.js |  58 ++--------
 .../xpcshell/test_loopservice_token_save.js   |  48 ++++++++
 .../xpcshell/test_loopservice_token_send.js   |  48 ++++++++
 .../test_loopservice_token_validation.js      |  17 +--
 .../loop/test/xpcshell/xpcshell.ini           |   4 +-
 12 files changed, 221 insertions(+), 111 deletions(-)
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_token_save.js
 create mode 100644 browser/components/loop/test/xpcshell/test_loopservice_token_send.js

diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 27494c13fae3..ba6931b95904 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -18,6 +18,15 @@ XPCOMUtils.defineLazyModuleGetter(this, "injectLoopAPI",
 
 XPCOMUtils.defineLazyModuleGetter(this, "Chat", "resource:///modules/Chat.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
+                                  "resource://services-common/utils.js");
+
+XPCOMUtils.defineLazyModuleGetter(this, "CryptoUtils",
+                                  "resource://services-crypto/utils.js");
+
+XPCOMUtils.defineLazyModuleGetter(this, "HAWKAuthenticatedRESTRequest",
+                                  "resource://services-common/hawkrequest.js");
+
 /**
  * We don't have push notifications on desktop currently, so this is a
  * workaround to get them going for us.
@@ -200,6 +209,13 @@ let MozLoopServiceInternal = {
     }
   },
 
+  /**
+   * Returns true if the expiry time is in the future.
+   */
+  urlExpiryTimeIsInFuture: function() {
+    return this.expiryTimeSeconds * 1000 > Date.now();
+  },
+
   /**
    * Retrieves MozLoopService "do not disturb" pref value.
    *
@@ -241,6 +257,30 @@ let MozLoopServiceInternal = {
     return result;
   },
 
+  /**
+   * Derives hawk credentials for the given token and context.
+   *
+   * @param {String} tokenHex The token value in hex.
+   * @param {String} context  The context for the token.
+   */
+  deriveHawkCredentials: function(tokenHex, context) {
+    const PREFIX_NAME = "identity.mozilla.com/picl/v1/";
+
+    let token = CommonUtils.hexToBytes(tokenHex);
+    let keyWord = CommonUtils.stringToBytes(PREFIX_NAME + context);
+
+    // XXX Using 2 * 32 for now to be in sync with client.js, but we might
+    // want to make this 3 * 32 to allow for extra, if we start using the extra
+    // field.
+    let out = CryptoUtils.hkdf(token, undefined, keyWord, 2 * 32);
+
+    return {
+      algorithm: "sha256",
+      key: out.slice(32, 64),
+      id: CommonUtils.bytesAsHex(out.slice(0, 32))
+    };
+  },
+
   /**
    * Callback from PushHandlerHack - The push server has been registered
    * and has given us a push url.
@@ -254,22 +294,49 @@ let MozLoopServiceInternal = {
       return;
     }
 
-    this.loopXhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
-      .createInstance(Ci.nsIXMLHttpRequest);
+    this.registerWithLoopServer(pushUrl);
+  },
 
-    this.loopXhr.open('POST', MozLoopServiceInternal.loopServerUri + "/registration",
-                          true);
-    this.loopXhr.setRequestHeader('Content-Type', 'application/json');
+  /**
+   * Registers with the Loop server.
+   *
+   * @param {String} pushUrl The push url given by the push server.
+   * @param {Boolean} noRetry Optional, don't retry if authentication fails.
+   */
+  registerWithLoopServer: function(pushUrl, noRetry) {
+    let sessionToken;
+    try {
+      sessionToken = Services.prefs.getCharPref("loop.hawk-session-token");
+    } catch (x) {
+      // It is ok for this not to exist, we'll default to sending no-creds
+    }
 
-    this.loopXhr.channel.loadFlags = Ci.nsIChannel.INHIBIT_CACHING
-      | Ci.nsIChannel.LOAD_BYPASS_CACHE
-      | Ci.nsIChannel.LOAD_EXPLICIT_CREDENTIALS;
+    let credentials;
+    if (sessionToken) {
+      credentials = this.deriveHawkCredentials(sessionToken, "sessionToken");
+    }
 
-    this.loopXhr.onreadystatechange = this.onLoopRegistered.bind(this);
+    let uri = Services.io.newURI(this.loopServerUri, null, null).resolve("/registration");
+    this.loopXhr = new HAWKAuthenticatedRESTRequest(uri, credentials);
 
-    this.loopXhr.sendAsBinary(JSON.stringify({
-      simple_push_url: pushUrl
-    }));
+    this.loopXhr.dispatch('POST', { simple_push_url: pushUrl }, (error) => {
+      if (this.loopXhr.response.status == 401) {
+        if (this.urlExpiryTimeIsInFuture()) {
+          // XXX Should this be reported to the user is a visible manner?
+          Cu.reportError("Loop session token is invalid, all previously "
+                         + "generated urls will no longer work.");
+        }
+
+        // Authorization failed, invalid token, we need to try again with a new token.
+        Services.prefs.clearUserPref("loop.hawk-session-token");
+        this.registerWithLoopServer(pushUrl, true);
+
+        return;
+      }
+
+      // No authorization issues, so complete registration.
+      this.onLoopRegistered(error);
+    });
   },
 
   /**
@@ -289,22 +356,19 @@ let MozLoopServiceInternal = {
   /**
    * Callback from the loopXhr. Checks the registration result.
    */
-  onLoopRegistered: function() {
-    if (this.loopXhr.readyState != Ci.nsIXMLHttpRequest.DONE)
-      return;
-
-    let status = this.loopXhr.status;
+  onLoopRegistered: function(error) {
+    let status = this.loopXhr.response.status;
     if (status != 200) {
       // XXX Bubble the precise details up to the UI somehow (bug 1013248).
       Cu.reportError("Failed to register with the loop server. Code: " +
-        status + " Text: " + this.loopXhr.statusText);
+        status + " Text: " + this.loopXhr.response.statusText);
       this._registeredDeferred.reject(status);
       this._registeredDeferred = null;
       return;
     }
 
-    let sessionToken = this.loopXhr.getResponseHeader("Hawk-Session-Token");
-    if (sessionToken !== null) {
+    let sessionToken = this.loopXhr.response.headers["hawk-session-token"];
+    if (sessionToken) {
 
       // XXX should do more validation here
       if (sessionToken.length === 64) {
@@ -406,7 +470,7 @@ this.MozLoopService = {
    */
   initialize: function() {
     // If expiresTime is in the future then kick-off registration.
-    if ((MozLoopServiceInternal.expiryTimeSeconds * 1000) > Date.now()) {
+    if (MozLoopServiceInternal.urlExpiryTimeIsInFuture()) {
       this._startInitializeTimer();
     }
   },
diff --git a/browser/components/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
index e35f114bb344..474d0645f67d 100644
--- a/browser/components/loop/test/xpcshell/head.js
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -8,9 +8,31 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Http.jsm");
 Cu.import("resource://testing-common/httpd.js");
 
+XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
+                                  "resource:///modules/loop/MozLoopService.jsm");
+
 const kMockWebSocketChannelName = "Mock WebSocket Channel";
 const kWebSocketChannelContractID = "@mozilla.org/network/protocol;1?name=wss";
 
+const kServerPushUrl = "http://localhost:3456";
+
+// Fake loop server
+var loopServer;
+
+function setupFakeLoopServer() {
+  loopServer = new HttpServer();
+  loopServer.start(-1);
+
+  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
+
+  Services.prefs.setCharPref("loop.server",
+    "http://localhost:" + loopServer.identity.primaryPort);
+
+  do_register_cleanup(function() {
+    loopServer.stop(function() {});
+  });
+}
+
 /**
  * Mock nsIWebSocketChannel for tests. This mocks the WebSocketChannel, and
  * enables us to check parameters and return messages similar to the push
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
index bd2f426bd05c..a633e1388197 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
-                                  "resource:///modules/loop/MozLoopService.jsm");
-
 do_register_cleanup(function() {
   Services.prefs.clearUserPref("loop.do_not_disturb");
 });
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_expiry.js b/browser/components/loop/test/xpcshell/test_loopservice_expiry.js
index 8b1adbd08f20..71fecd996a49 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_expiry.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_expiry.js
@@ -1,9 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
-                                  "resource:///modules/loop/MozLoopService.jsm");
-
 function expiryTimePref() {
   return Services.prefs.getIntPref("loop.urlsExpiryTimeSeconds");
 }
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js b/browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js
index 2f7fe342b61e..f2f0230eaef2 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_get_loop_char_pref.js
@@ -2,9 +2,6 @@
  http://creativecommons.org/publicdomain/zero/1.0/ */
 /*global XPCOMUtils, Services, Assert */
 
-XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
-  "resource:///modules/loop/MozLoopService.jsm");
-
 var fakePrefName = "color";
 var fakePrefValue = "green";
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
index 48c83a98e62a..7731ecaddc48 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
-                                  "resource:///modules/loop/MozLoopService.jsm");
-
-var server;
-
-const kServerPushUrl = "http://localhost:3456";
-
 var startTimerCalled = false;
 
 /**
@@ -57,9 +50,9 @@ add_task(function test_initialize_starts_timer() {
 
 function run_test()
 {
-  server = new HttpServer();
-  server.start(-1);
-  server.registerPathHandler("/registration", (request, response) => {
+  setupFakeLoopServer();
+
+  loopServer.registerPathHandler("/registration", (request, response) => {
     response.setStatusLine(null, 200, "OK");
     response.processAsync();
     response.finish();
@@ -67,8 +60,6 @@ function run_test()
 
   // Registrations and pref settings.
   gMockWebSocketChannelFactory.register();
-  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
-  Services.prefs.setCharPref("loop.server", "http://localhost:" + server.identity.primaryPort);
 
   // Override MozLoopService's initializeTimer, so that we can verify the timeout is called
   // correctly.
@@ -78,7 +69,6 @@ function run_test()
 
   do_register_cleanup(function() {
     gMockWebSocketChannelFactory.unregister();
-    server.stop(function() {});
   });
 
   run_next_test();
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_locales.js b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
index 727ca86089c8..c500002a62cf 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_locales.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
@@ -1,10 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
-                                  "resource:///modules/loop/MozLoopService.jsm");
-
-
 function test_locale() {
   // Set the pref to something controlled.
   Services.prefs.setCharPref("general.useragent.locale", "ab-CD");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
index 42c3975377a9..ad65d335e1e8 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
-                                  "resource:///modules/loop/MozLoopService.jsm");
-
-var server;
-
-const kServerPushUrl = "http://localhost:3456";
+/**
+ * This file is to test general registration. Note that once successful
+ * registration has taken place, we can no longer test the server side
+ * parts as the service protects against this, hence, they need testing in
+ * other test files.
+ */
 
 /**
  * Tests reported failures when we're in offline mode.
@@ -52,48 +52,12 @@ add_test(function test_register_websocket_success_loop_server_fail() {
   });
 });
 
-/**
- * Test that things behave reasonably when a reasonable Hawk-Session-Token
- * header is returned with the registration response.
- */
-add_test(function test_registration_returns_hawk_session_token() {
-
-  var fakeSessionToken = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750";
-  Services.prefs.clearUserPref("loop.hawk-session-token");
-
-  server.registerPathHandler("/registration", (request, response) => {
-    response.setStatusLine(null, 200, "OK");
-    response.setHeader("Hawk-Session-Token", fakeSessionToken, false);
-    response.processAsync();
-    response.finish();
-  });
-
-  MozLoopService.register().then(() => {
-    var hawkSessionPref;
-    try {
-      hawkSessionPref = Services.prefs.getCharPref("loop.hawk-session-token");
-    } catch (ex) {
-    }
-    Assert.equal(hawkSessionPref, fakeSessionToken, "Should store" +
-      " Hawk-Session-Token header contents in loop.hawk-session-token pref");
-
-    run_next_test();
-  }, err => {
-    do_throw("shouldn't error on a succesful request");
-  });
-});
-
-// XXX should send existing token pref if already set
-
-// XXX should call back the error string "no-hawk-token" and when
-// Hawk-Session-Token is unset if we're waiting for one
-
 /**
  * Tests that we get a success response when both websocket and Loop server
  * registration are complete.
  */
 add_test(function test_register_success() {
-  server.registerPathHandler("/registration", (request, response) => {
+  loopServer.registerPathHandler("/registration", (request, response) => {
     response.setStatusLine(null, 200, "OK");
     response.processAsync();
     response.finish();
@@ -111,21 +75,15 @@ add_test(function test_register_success() {
 
 function run_test()
 {
-  server = new HttpServer();
-  server.start(-1);
+  setupFakeLoopServer();
 
   // Registrations and pref settings.
   gMockWebSocketChannelFactory.register();
-  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
-
-  Services.prefs.setCharPref("loop.server", "http://localhost:" + server.identity.primaryPort);
 
   do_register_cleanup(function() {
     gMockWebSocketChannelFactory.unregister();
     Services.prefs.clearUserPref("loop.hawk-session-token");
-    server.stop(function() {});
   });
 
   run_next_test();
-
 }
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_save.js b/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
new file mode 100644
index 000000000000..337bae588c4c
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
@@ -0,0 +1,48 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that things behave reasonably when a reasonable Hawk-Session-Token
+ * header is returned with the registration response.
+ */
+add_test(function test_registration_returns_hawk_session_token() {
+
+  var fakeSessionToken = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750";
+  Services.prefs.clearUserPref("loop.hawk-session-token");
+
+  loopServer.registerPathHandler("/registration", (request, response) => {
+    response.setStatusLine(null, 200, "OK");
+    response.setHeader("Hawk-Session-Token", fakeSessionToken, false);
+    response.processAsync();
+    response.finish();
+  });
+
+  MozLoopService.register().then(() => {
+    var hawkSessionPref;
+    try {
+      hawkSessionPref = Services.prefs.getCharPref("loop.hawk-session-token");
+    } catch (ex) {
+    }
+    Assert.equal(hawkSessionPref, fakeSessionToken, "Should store" +
+      " Hawk-Session-Token header contents in loop.hawk-session-token pref");
+
+    run_next_test();
+  }, err => {
+    do_throw("shouldn't error on a successful request");
+  });
+});
+
+function run_test()
+{
+  setupFakeLoopServer();
+
+  // Registrations and pref settings.
+  gMockWebSocketChannelFactory.register();
+
+  do_register_cleanup(function() {
+    gMockWebSocketChannelFactory.unregister();
+    Services.prefs.clearUserPref("loop.hawk-session-token");
+  });
+
+  run_next_test();
+}
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_send.js b/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
new file mode 100644
index 000000000000..144fa8f8d481
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
@@ -0,0 +1,48 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+add_test(function test_registration_uses_hawk_session_token() {
+  Services.prefs.setCharPref("loop.hawk-session-token",
+    "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750");
+
+  loopServer.registerPathHandler("/registration", (request, response) => {
+    // Check that we have an Authorization header with the correct bits. The
+    // translation of values are tested in different modules, for the components
+    // that we use.
+    // XXX In future, we should reconsider our stubbing model, and possibly stub
+    // components/interfaces at a higher level.
+    let header = request.getHeader("Authorization");
+
+    Assert.notEqual(header.contains("Hawk id="), -1, "Should contain a hawk id");
+    Assert.notEqual(header.contains("ts="), -1, "Should contain a timestamp");
+    Assert.notEqual(header.contains("nonce="), -1, "Should contain a nonce");
+    Assert.notEqual(header.contains("hash="), -1, "Should contain a hash");
+    Assert.notEqual(header.contains("mac="), -1, "Should contain a mac");
+
+    response.setStatusLine(null, 200, "OK");
+    response.processAsync();
+    response.finish();
+  });
+
+  MozLoopService.register().then(() => {
+    run_next_test();
+  }, err => {
+    do_throw("shouldn't error on a succesful request");
+  });
+});
+
+
+function run_test()
+{
+  setupFakeLoopServer();
+
+  // Registrations and pref settings.
+  gMockWebSocketChannelFactory.register();
+
+  do_register_cleanup(function() {
+    gMockWebSocketChannelFactory.unregister();
+    Services.prefs.clearUserPref("loop.hawk-session-token");
+  });
+
+  run_next_test();
+}
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
index 158959c62c4c..dd0c2f934d66 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
@@ -1,9 +1,5 @@
-XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
-  "resource:///modules/loop/MozLoopService.jsm");
-
-var server;
-
-const kServerPushUrl = "http://localhost:3456";
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // XXX should report error if Hawk-Session-Token is lexically invalid
 // (not a string of 64 hex digits) to help resist other possible injection
@@ -13,7 +9,7 @@ add_test(function test_registration_handles_bogus_hawk_token() {
   var wrongSizeToken = "jdkasjkasjdlaksj";
   Services.prefs.clearUserPref("loop.hawk-session-token");
 
-  server.registerPathHandler("/registration", (request, response) => {
+  loopServer.registerPathHandler("/registration", (request, response) => {
     response.setStatusLine(null, 200, "OK");
     response.setHeader("Hawk-Session-Token", wrongSizeToken, false);
     response.processAsync();
@@ -42,19 +38,14 @@ add_test(function test_registration_handles_bogus_hawk_token() {
 
 function run_test()
 {
-  server = new HttpServer();
-  server.start(-1);
+  setupFakeLoopServer();
 
   // Registrations and pref settings.
   gMockWebSocketChannelFactory.register();
-  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
-
-  Services.prefs.setCharPref("loop.server", "http://localhost:" + server.identity.primaryPort);
 
   do_register_cleanup(function() {
     gMockWebSocketChannelFactory.unregister();
     Services.prefs.clearUserPref("loop.hawk-session-token");
-    server.stop(function() {});
   });
 
   run_next_test();
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index 96259ea0170c..682731ec1ebf 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -5,8 +5,10 @@ firefox-appdir = browser
 
 [test_loopservice_dnd.js]
 [test_loopservice_expiry.js]
+[test_loopservice_get_loop_char_pref.js]
 [test_loopservice_initialize.js]
 [test_loopservice_locales.js]
 [test_loopservice_registration.js]
+[test_loopservice_token_save.js]
+[test_loopservice_token_send.js]
 [test_loopservice_token_validation.js]
-[test_loopservice_get_loop_char_pref.js]

From 579f9a8d9faea979e70ba51a447ff1a6027458d6 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 5 Jun 2014 15:18:41 +0200
Subject: [PATCH 077/117] Bug 987086 Loop web client should use configuration
 for determining server url. r=nperriault, r=Standard8

---
 browser/components/loop/standalone/Makefile        |  6 +++++-
 browser/components/loop/standalone/README.md       | 11 +++++++++++
 .../components/loop/standalone/content/index.html  |  1 +
 .../loop/standalone/content/js/webapp.js           | 14 ++++----------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/browser/components/loop/standalone/Makefile b/browser/components/loop/standalone/Makefile
index 306c0f6c4c33..f6d5e043083c 100644
--- a/browser/components/loop/standalone/Makefile
+++ b/browser/components/loop/standalone/Makefile
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+LOOP_SERVER_URL := $(shell echo $${LOOP_SERVER_URL-http://localhost:5000})
 NODE_LOCAL_BIN=./node_modules/.bin
 
 install:
@@ -13,8 +14,11 @@ test:
 lint:
 	@$(NODE_LOCAL_BIN)/jshint *.js content test
 
-runserver:
+runserver: config
 	@node server.js
 
 frontend:
 	@echo "Not implemented yet."
+
+config:
+	@echo "var loop = loop || {};\nloop.config = {serverUrl: '`echo $(LOOP_SERVER_URL)`'};" > content/config.js
diff --git a/browser/components/loop/standalone/README.md b/browser/components/loop/standalone/README.md
index 4349c817d1cb..ca378d659c2d 100644
--- a/browser/components/loop/standalone/README.md
+++ b/browser/components/loop/standalone/README.md
@@ -11,6 +11,17 @@ Installation
 
     $ make install
 
+Configuration
+-------------
+
+You will need to generate a configuration file, you can do so with:
+
+	$ make config
+
+It will read the configuration from the `LOOP_SERVER_URL` env variable and
+generate the appropriate configuration file. This setting defines the root url
+of the loop server, without trailing slash.
+
 Usage
 -----
 
diff --git a/browser/components/loop/standalone/content/index.html b/browser/components/loop/standalone/content/index.html
index 9c13bb3d0ae3..95558e3343df 100644
--- a/browser/components/loop/standalone/content/index.html
+++ b/browser/components/loop/standalone/content/index.html
@@ -29,6 +29,7 @@
     <script type="text/javascript" src="shared/libs/backbone-1.1.2.js"></script>
 
     <!-- app scripts -->
+    <script type="text/javascript" src="config.js"></script>
     <script type="text/javascript" src="shared/js/client.js"></script>
     <script type="text/javascript" src="shared/js/models.js"></script>
     <script type="text/javascript" src="shared/js/views.js"></script>
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 9029776a59e0..04a099aa1605 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -8,18 +8,12 @@ var loop = loop || {};
 loop.webapp = (function($, _, OT) {
   "use strict";
 
-  /**
-   * Base Loop server URL.
-   *
-   * XXX: should be configurable, but how?
-   *
-   * @type {String}
-   */
+  loop.config = loop.config || {};
+  loop.config.serverUrl = loop.config.serverUrl || "http://localhost:5000";
+
   var sharedModels = loop.shared.models,
       sharedViews = loop.shared.views,
-      // XXX this one should be configurable
-      //     see https://bugzilla.mozilla.org/show_bug.cgi?id=987086
-      baseServerUrl = "http://localhost:5000";
+      baseServerUrl = loop.config.serverUrl;
 
   /**
    * App router.

From a2215a102c9fd091854ad8e147768331ea0d7044 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Thu, 5 Jun 2014 15:51:59 +0200
Subject: [PATCH 078/117] Bug 1018875 Prevent displaying OT GuM custom dialog.
 r=Standard8

---
 .../loop/content/shared/js/views.js           | 13 ++++++
 .../components/loop/test/shared/views_test.js | 45 ++++++++++++++++---
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index e9a62c0fafbd..cc78801cd44e 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -178,7 +178,16 @@ loop.shared.views = (function(_, OT, l10n) {
      */
     publish: function(event) {
       var outgoing = this.$(".outgoing").get(0);
+
       this.publisher = this.sdk.initPublisher(outgoing, this.videoStyles);
+
+      // Suppress OT GuM custom dialog, see bug 1018875
+      function preventOpeningAccessDialog(event) {
+        event.preventDefault();
+      }
+      this.publisher.on("accessDialogOpened", preventOpeningAccessDialog);
+      this.publisher.on("accessDenied", preventOpeningAccessDialog);
+
       this.model.session.publish(this.publisher);
     },
 
@@ -186,6 +195,10 @@ loop.shared.views = (function(_, OT, l10n) {
      * Unpublishes local stream.
      */
     unpublish: function() {
+      // Unregister access OT GuM custom dialog listeners, see bug 1018875
+      this.publisher.off("accessDialogOpened");
+      this.publisher.off("accessDenied");
+
       this.model.session.unpublish(this.publisher);
     },
 
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index a63fed32217e..9f595a066577 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -41,7 +41,7 @@ describe("loop.shared.views", function() {
   });
 
   describe("ConversationView", function() {
-    var fakeSDK, fakeSessionData, fakeSession, model;
+    var fakeSDK, fakeSessionData, fakeSession, fakePublisher, model;
 
     beforeEach(function() {
       fakeSessionData = {
@@ -57,8 +57,12 @@ describe("loop.shared.views", function() {
         unpublish: sandbox.spy(),
         subscribe: sandbox.spy()
       }, Backbone.Events);
+      fakePublisher = {
+        on: sandbox.spy(),
+        off: sandbox.spy()
+      };
       fakeSDK = {
-        initPublisher: sandbox.spy(),
+        initPublisher: sandbox.stub().returns(fakePublisher),
         initSession: sandbox.stub().returns(fakeSession)
       };
       model = new sharedModels.ConversationModel(fakeSessionData, {
@@ -90,6 +94,7 @@ describe("loop.shared.views", function() {
             model: model
           });
           sandbox.stub(model, "endSession");
+          view.publish();
 
           view.hangup({preventDefault: function() {}});
 
@@ -98,30 +103,58 @@ describe("loop.shared.views", function() {
       });
 
       describe("#publish", function() {
-        it("should publish local stream", function() {
-          var view = new sharedViews.ConversationView({
+        var view;
+
+        beforeEach(function() {
+          view = new sharedViews.ConversationView({
             sdk: fakeSDK,
             model: model
           });
+        });
 
+        it("should publish local stream", function() {
           view.publish();
 
           sinon.assert.calledOnce(fakeSDK.initPublisher);
           sinon.assert.calledOnce(fakeSession.publish);
         });
+
+        it("should start listening to OT publisher accessDialogOpened and " +
+          " accessDenied events",
+          function() {
+            view.publish();
+
+            sinon.assert.calledTwice(fakePublisher.on);
+            sinon.assert.calledWith(fakePublisher.on, "accessDialogOpened");
+            sinon.assert.calledWith(fakePublisher.on, "accessDenied");
+          });
       });
 
       describe("#unpublish", function() {
-        it("should unpublish local stream", function() {
-          var view = new sharedViews.ConversationView({
+        var view;
+
+        beforeEach(function() {
+          view = new sharedViews.ConversationView({
             sdk: fakeSDK,
             model: model
           });
+          view.publish();
+        });
 
+        it("should unpublish local stream", function() {
           view.unpublish();
 
           sinon.assert.calledOnce(fakeSession.unpublish);
         });
+
+        it("should unsubscribe from accessDialogOpened and accessDenied events",
+          function() {
+            view.unpublish();
+
+            sinon.assert.calledTwice(fakePublisher.off);
+            sinon.assert.calledWith(fakePublisher.off, "accessDialogOpened");
+            sinon.assert.calledWith(fakePublisher.off, "accessDenied");
+          });
       });
 
       describe("Model events", function() {

From 7953db044871ab1fd9a2b0647057e69288528692 Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Thu, 5 Jun 2014 09:23:39 -0500
Subject: [PATCH 079/117] Bug 1020540 - Include only those components we need
 from SJCL r=Standard8

---
 .../loop/content/shared/libs/sjcl.min.js      | 63 +++----------------
 1 file changed, 10 insertions(+), 53 deletions(-)

diff --git a/browser/components/loop/content/shared/libs/sjcl.min.js b/browser/components/loop/content/shared/libs/sjcl.min.js
index 404ce932fa9a..a31261640931 100644
--- a/browser/components/loop/content/shared/libs/sjcl.min.js
+++ b/browser/components/loop/content/shared/libs/sjcl.min.js
@@ -1,55 +1,12 @@
-"use strict";function q(a){throw a;}var t=void 0,u=!1;var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};
+"use strict";var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};
 "undefined"!==typeof module&&module.exports&&(module.exports=sjcl);
-sjcl.cipher.aes=function(a){this.k[0][0][0]||this.D();var b,c,d,e,f=this.k[0][4],g=this.k[1];b=a.length;var h=1;4!==b&&(6!==b&&8!==b)&&q(new sjcl.exception.invalid("invalid aes key size"));this.b=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(0===a%b||8===b&&4===a%b)c=f[c>>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255],0===a%b&&(c=c<<8^c>>>24^h<<24,h=h<<1^283*(h>>7));d[a]=d[a-b]^c}for(b=0;a;b++,a--)c=d[b&3?a:a-4],e[b]=4>=a||4>b?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^g[3][f[c&
-255]]};
-sjcl.cipher.aes.prototype={encrypt:function(a){return y(this,a,0)},decrypt:function(a){return y(this,a,1)},k:[[[],[],[],[],[]],[[],[],[],[],[]]],D:function(){var a=this.k[0],b=this.k[1],c=a[4],d=b[4],e,f,g,h=[],l=[],k,n,m,p;for(e=0;0x100>e;e++)l[(h[e]=e<<1^283*(e>>7))^e]=e;for(f=g=0;!c[f];f^=k||1,g=l[g]||1){m=g^g<<1^g<<2^g<<3^g<<4;m=m>>8^m&255^99;c[f]=m;d[m]=f;n=h[e=h[k=h[f]]];p=0x1010101*n^0x10001*e^0x101*k^0x1010100*f;n=0x101*h[m]^0x1010100*m;for(e=0;4>e;e++)a[e][f]=n=n<<24^n>>>8,b[e][m]=p=p<<24^p>>>8}for(e=
-0;5>e;e++)a[e]=a[e].slice(0),b[e]=b[e].slice(0)}};
-function y(a,b,c){4!==b.length&&q(new sjcl.exception.invalid("invalid aes block size"));var d=a.b[c],e=b[0]^d[0],f=b[c?3:1]^d[1],g=b[2]^d[2];b=b[c?1:3]^d[3];var h,l,k,n=d.length/4-2,m,p=4,s=[0,0,0,0];h=a.k[c];a=h[0];var r=h[1],v=h[2],w=h[3],x=h[4];for(m=0;m<n;m++)h=a[e>>>24]^r[f>>16&255]^v[g>>8&255]^w[b&255]^d[p],l=a[f>>>24]^r[g>>16&255]^v[b>>8&255]^w[e&255]^d[p+1],k=a[g>>>24]^r[b>>16&255]^v[e>>8&255]^w[f&255]^d[p+2],b=a[b>>>24]^r[e>>16&255]^v[f>>8&255]^w[g&255]^d[p+3],p+=4,e=h,f=l,g=k;for(m=0;4>
-m;m++)s[c?3&-m:m]=x[e>>>24]<<24^x[f>>16&255]<<16^x[g>>8&255]<<8^x[b&255]^d[p++],h=e,e=f,f=g,g=b,b=h;return s}
-sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.P(a.slice(b/32),32-(b&31)).slice(1);return c===t?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<<c)-1},concat:function(a,b){if(0===a.length||0===b.length)return a.concat(b);var c=a[a.length-1],d=sjcl.bitArray.getPartial(c);return 32===d?a.concat(b):sjcl.bitArray.P(b,d,c|0,a.slice(0,a.length-1))},bitLength:function(a){var b=a.length;return 0===
-b?0:32*(b-1)+sjcl.bitArray.getPartial(a[b-1])},clamp:function(a,b){if(32*a.length<b)return a;a=a.slice(0,Math.ceil(b/32));var c=a.length;b&=31;0<c&&b&&(a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return u;var c=0,d;for(d=0;d<a.length;d++)c|=a[d]^b[d];return 0===
-c},P:function(a,b,c,d){var e;e=0;for(d===t&&(d=[]);32<=b;b-=32)d.push(c),c=0;if(0===b)return d.concat(a);for(e=0;e<a.length;e++)d.push(c|a[e]>>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32<b+a?c:d.pop(),1));return d},l:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]}};
+sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.i(a.slice(b/32),32-(b&31)).slice(1);return void 0===c?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<<c)-1},concat:function(a,b){if(0===a.length||0===b.length)return a.concat(b);var c=a[a.length-1],d=sjcl.bitArray.getPartial(c);return 32===d?a.concat(b):sjcl.bitArray.i(b,d,c|0,a.slice(0,a.length-1))},bitLength:function(a){var b=a.length;return 0===
+b?0:32*(b-1)+sjcl.bitArray.getPartial(a[b-1])},clamp:function(a,b){if(32*a.length<b)return a;a=a.slice(0,Math.ceil(b/32));var c=a.length;b&=31;0<c&&b&&(a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return!1;var c=0,d;for(d=0;d<a.length;d++)c|=a[d]^b[d];return 0===
+c},i:function(a,b,c,d){var e;e=0;for(void 0===d&&(d=[]);32<=b;b-=32)d.push(c),c=0;if(0===b)return d.concat(a);for(e=0;e<a.length;e++)d.push(c|a[e]>>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32<b+a?c:d.pop(),1));return d},k:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]}};
 sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d<c/8;d++)0===(d&3)&&(e=a[d/4]),b+=String.fromCharCode(e>>>24),e<<=8;return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c<a.length;c++)d=d<<8|a.charCodeAt(c),3===(c&3)&&(b.push(d),d=0);c&3&&b.push(sjcl.bitArray.partial(8*(c&3),d));return b}};
-sjcl.codec.hex={fromBits:function(a){var b="",c;for(c=0;c<a.length;c++)b+=((a[c]|0)+0xf00000000000).toString(16).substr(4);return b.substr(0,sjcl.bitArray.bitLength(a)/4)},toBits:function(a){var b,c=[],d;a=a.replace(/\s|0x/g,"");d=a.length;a+="00000000";for(b=0;b<a.length;b+=8)c.push(parseInt(a.substr(b,8),16)^0);return sjcl.bitArray.clamp(c,4*d)}};
-sjcl.codec.base64={J:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",fromBits:function(a,b,c){var d="",e=0,f=sjcl.codec.base64.J,g=0,h=sjcl.bitArray.bitLength(a);c&&(f=f.substr(0,62)+"-_");for(c=0;6*d.length<h;)d+=f.charAt((g^a[c]>>>e)>>>26),6>e?(g=a[c]<<6-e,e+=26,c++):(g<<=6,e-=6);for(;d.length&3&&!b;)d+="=";return d},toBits:function(a,b){a=a.replace(/\s|=/g,"");var c=[],d,e=0,f=sjcl.codec.base64.J,g=0,h;b&&(f=f.substr(0,62)+"-_");for(d=0;d<a.length;d++)h=f.indexOf(a.charAt(d)),
-0>h&&q(new sjcl.exception.invalid("this isn't base64!")),26<e?(e-=26,c.push(g^h>>>e),g=h<<32-e):(e+=6,g^=h<<32-e);e&56&&c.push(sjcl.bitArray.partial(e&56,g,1));return c}};sjcl.codec.base64url={fromBits:function(a){return sjcl.codec.base64.fromBits(a,1,1)},toBits:function(a){return sjcl.codec.base64.toBits(a,1)}};sjcl.hash.sha256=function(a){this.b[0]||this.D();a?(this.r=a.r.slice(0),this.o=a.o.slice(0),this.h=a.h):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()};
-sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.r=this.N.slice(0);this.o=[];this.h=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.o=sjcl.bitArray.concat(this.o,a);b=this.h;a=this.h=b+sjcl.bitArray.bitLength(a);for(b=512+b&-512;b<=a;b+=512)z(this,c.splice(0,16));return this},finalize:function(){var a,b=this.o,c=this.r,b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.h/
-4294967296));for(b.push(this.h|0);b.length;)z(this,b.splice(0,16));this.reset();return c},N:[],b:[],D:function(){function a(a){return 0x100000000*(a-Math.floor(a))|0}var b=0,c=2,d;a:for(;64>b;c++){for(d=2;d*d<=c;d++)if(0===c%d)continue a;8>b&&(this.N[b]=a(Math.pow(c,0.5)));this.b[b]=a(Math.pow(c,1/3));b++}}};
-function z(a,b){var c,d,e,f=b.slice(0),g=a.r,h=a.b,l=g[0],k=g[1],n=g[2],m=g[3],p=g[4],s=g[5],r=g[6],v=g[7];for(c=0;64>c;c++)16>c?d=f[c]:(d=f[c+1&15],e=f[c+14&15],d=f[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+f[c&15]+f[c+9&15]|0),d=d+v+(p>>>6^p>>>11^p>>>25^p<<26^p<<21^p<<7)+(r^p&(s^r))+h[c],v=r,r=s,s=p,p=m+d|0,m=n,n=k,k=l,l=d+(k&n^m&(k^n))+(k>>>2^k>>>13^k>>>22^k<<30^k<<19^k<<10)|0;g[0]=g[0]+l|0;g[1]=g[1]+k|0;g[2]=g[2]+n|0;g[3]=g[3]+m|0;g[4]=g[4]+p|0;g[5]=g[5]+s|0;g[6]=
-g[6]+r|0;g[7]=g[7]+v|0}
-sjcl.mode.ccm={name:"ccm",encrypt:function(a,b,c,d,e){var f,g=b.slice(0),h=sjcl.bitArray,l=h.bitLength(c)/8,k=h.bitLength(g)/8;e=e||64;d=d||[];7>l&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(f=2;4>f&&k>>>8*f;f++);f<15-l&&(f=15-l);c=h.clamp(c,8*(15-f));b=sjcl.mode.ccm.L(a,b,c,d,e,f);g=sjcl.mode.ccm.p(a,g,c,b,e,f);return h.concat(g.data,g.tag)},decrypt:function(a,b,c,d,e){e=e||64;d=d||[];var f=sjcl.bitArray,g=f.bitLength(c)/8,h=f.bitLength(b),l=f.clamp(b,h-e),k=f.bitSlice(b,
-h-e),h=(h-e)/8;7>g&&q(new sjcl.exception.invalid("ccm: iv must be at least 7 bytes"));for(b=2;4>b&&h>>>8*b;b++);b<15-g&&(b=15-g);c=f.clamp(c,8*(15-b));l=sjcl.mode.ccm.p(a,l,c,k,e,b);a=sjcl.mode.ccm.L(a,l.data,c,d,e,b);f.equal(l.tag,a)||q(new sjcl.exception.corrupt("ccm: tag doesn't match"));return l.data},L:function(a,b,c,d,e,f){var g=[],h=sjcl.bitArray,l=h.l;e/=8;(e%2||4>e||16<e)&&q(new sjcl.exception.invalid("ccm: invalid tag length"));(0xffffffff<d.length||0xffffffff<b.length)&&q(new sjcl.exception.bug("ccm: can't deal with 4GiB or more data"));
-f=[h.partial(8,(d.length?64:0)|e-2<<2|f-1)];f=h.concat(f,c);f[3]|=h.bitLength(b)/8;f=a.encrypt(f);if(d.length){c=h.bitLength(d)/8;65279>=c?g=[h.partial(16,c)]:0xffffffff>=c&&(g=h.concat([h.partial(16,65534)],[c]));g=h.concat(g,d);for(d=0;d<g.length;d+=4)f=a.encrypt(l(f,g.slice(d,d+4).concat([0,0,0])))}for(d=0;d<b.length;d+=4)f=a.encrypt(l(f,b.slice(d,d+4).concat([0,0,0])));return h.clamp(f,8*e)},p:function(a,b,c,d,e,f){var g,h=sjcl.bitArray;g=h.l;var l=b.length,k=h.bitLength(b);c=h.concat([h.partial(8,
-f-1)],c).concat([0,0,0]).slice(0,4);d=h.bitSlice(g(d,a.encrypt(c)),0,e);if(!l)return{tag:d,data:[]};for(g=0;g<l;g+=4)c[3]++,e=a.encrypt(c),b[g]^=e[0],b[g+1]^=e[1],b[g+2]^=e[2],b[g+3]^=e[3];return{tag:d,data:h.clamp(b,k)}}};
-sjcl.mode.ocb2={name:"ocb2",encrypt:function(a,b,c,d,e,f){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));var g,h=sjcl.mode.ocb2.H,l=sjcl.bitArray,k=l.l,n=[0,0,0,0];c=h(a.encrypt(c));var m,p=[];d=d||[];e=e||64;for(g=0;g+4<b.length;g+=4)m=b.slice(g,g+4),n=k(n,m),p=p.concat(k(c,a.encrypt(k(c,m)))),c=h(c);m=b.slice(g);b=l.bitLength(m);g=a.encrypt(k(c,[0,0,0,b]));m=l.clamp(k(m.concat([0,0,0]),g),b);n=k(n,k(m.concat([0,0,0]),g));n=a.encrypt(k(n,k(c,h(c))));d.length&&
-(n=k(n,f?d:sjcl.mode.ocb2.pmac(a,d)));return p.concat(l.concat(m,l.clamp(n,e)))},decrypt:function(a,b,c,d,e,f){128!==sjcl.bitArray.bitLength(c)&&q(new sjcl.exception.invalid("ocb iv must be 128 bits"));e=e||64;var g=sjcl.mode.ocb2.H,h=sjcl.bitArray,l=h.l,k=[0,0,0,0],n=g(a.encrypt(c)),m,p,s=sjcl.bitArray.bitLength(b)-e,r=[];d=d||[];for(c=0;c+4<s/32;c+=4)m=l(n,a.decrypt(l(n,b.slice(c,c+4)))),k=l(k,m),r=r.concat(m),n=g(n);p=s-32*c;m=a.encrypt(l(n,[0,0,0,p]));m=l(m,h.clamp(b.slice(c),p).concat([0,0,0]));
-k=l(k,m);k=a.encrypt(l(k,l(n,g(n))));d.length&&(k=l(k,f?d:sjcl.mode.ocb2.pmac(a,d)));h.equal(h.clamp(k,e),h.bitSlice(b,s))||q(new sjcl.exception.corrupt("ocb: tag doesn't match"));return r.concat(h.clamp(m,p))},pmac:function(a,b){var c,d=sjcl.mode.ocb2.H,e=sjcl.bitArray,f=e.l,g=[0,0,0,0],h=a.encrypt([0,0,0,0]),h=f(h,d(d(h)));for(c=0;c+4<b.length;c+=4)h=d(h),g=f(g,a.encrypt(f(h,b.slice(c,c+4))));c=b.slice(c);128>e.bitLength(c)&&(h=f(h,d(h)),c=e.concat(c,[-2147483648,0,0,0]));g=f(g,c);return a.encrypt(f(d(f(h,
-d(h))),g))},H:function(a){return[a[0]<<1^a[1]>>>31,a[1]<<1^a[2]>>>31,a[2]<<1^a[3]>>>31,a[3]<<1^135*(a[0]>>>31)]}};
-sjcl.mode.gcm={name:"gcm",encrypt:function(a,b,c,d,e){var f=b.slice(0);b=sjcl.bitArray;d=d||[];a=sjcl.mode.gcm.p(!0,a,f,d,c,e||128);return b.concat(a.data,a.tag)},decrypt:function(a,b,c,d,e){var f=b.slice(0),g=sjcl.bitArray,h=g.bitLength(f);e=e||128;d=d||[];e<=h?(b=g.bitSlice(f,h-e),f=g.bitSlice(f,0,h-e)):(b=f,f=[]);a=sjcl.mode.gcm.p(u,a,f,d,c,e);g.equal(a.tag,b)||q(new sjcl.exception.corrupt("gcm: tag doesn't match"));return a.data},Z:function(a,b){var c,d,e,f,g,h=sjcl.bitArray.l;e=[0,0,0,0];f=b.slice(0);
-for(c=0;128>c;c++){(d=0!==(a[Math.floor(c/32)]&1<<31-c%32))&&(e=h(e,f));g=0!==(f[3]&1);for(d=3;0<d;d--)f[d]=f[d]>>>1|(f[d-1]&1)<<31;f[0]>>>=1;g&&(f[0]^=-0x1f000000)}return e},g:function(a,b,c){var d,e=c.length;b=b.slice(0);for(d=0;d<e;d+=4)b[0]^=0xffffffff&c[d],b[1]^=0xffffffff&c[d+1],b[2]^=0xffffffff&c[d+2],b[3]^=0xffffffff&c[d+3],b=sjcl.mode.gcm.Z(b,a);return b},p:function(a,b,c,d,e,f){var g,h,l,k,n,m,p,s,r=sjcl.bitArray;m=c.length;p=r.bitLength(c);s=r.bitLength(d);h=r.bitLength(e);g=b.encrypt([0,
-0,0,0]);96===h?(e=e.slice(0),e=r.concat(e,[1])):(e=sjcl.mode.gcm.g(g,[0,0,0,0],e),e=sjcl.mode.gcm.g(g,e,[0,0,Math.floor(h/0x100000000),h&0xffffffff]));h=sjcl.mode.gcm.g(g,[0,0,0,0],d);n=e.slice(0);d=h.slice(0);a||(d=sjcl.mode.gcm.g(g,h,c));for(k=0;k<m;k+=4)n[3]++,l=b.encrypt(n),c[k]^=l[0],c[k+1]^=l[1],c[k+2]^=l[2],c[k+3]^=l[3];c=r.clamp(c,p);a&&(d=sjcl.mode.gcm.g(g,h,c));a=[Math.floor(s/0x100000000),s&0xffffffff,Math.floor(p/0x100000000),p&0xffffffff];d=sjcl.mode.gcm.g(g,d,a);l=b.encrypt(e);d[0]^=l[0];
-d[1]^=l[1];d[2]^=l[2];d[3]^=l[3];return{tag:r.bitSlice(d,0,f),data:c}}};sjcl.misc.hmac=function(a,b){this.M=b=b||sjcl.hash.sha256;var c=[[],[]],d,e=b.prototype.blockSize/32;this.n=[new b,new b];a.length>e&&(a=b.hash(a));for(d=0;d<e;d++)c[0][d]=a[d]^909522486,c[1][d]=a[d]^1549556828;this.n[0].update(c[0]);this.n[1].update(c[1]);this.G=new b(this.n[0])};
-sjcl.misc.hmac.prototype.encrypt=sjcl.misc.hmac.prototype.mac=function(a){this.Q&&q(new sjcl.exception.invalid("encrypt on already updated hmac called!"));this.update(a);return this.digest(a)};sjcl.misc.hmac.prototype.reset=function(){this.G=new this.M(this.n[0]);this.Q=u};sjcl.misc.hmac.prototype.update=function(a){this.Q=!0;this.G.update(a)};sjcl.misc.hmac.prototype.digest=function(){var a=this.G.finalize(),a=(new this.M(this.n[1])).update(a).finalize();this.reset();return a};
-sjcl.misc.pbkdf2=function(a,b,c,d,e){c=c||1E3;(0>d||0>c)&&q(sjcl.exception.invalid("invalid params to pbkdf2"));"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));e=e||sjcl.misc.hmac;a=new e(a);var f,g,h,l,k=[],n=sjcl.bitArray;for(l=1;32*k.length<(d||1);l++){e=f=a.encrypt(n.concat(b,[l]));for(g=1;g<c;g++){f=a.encrypt(f);for(h=0;h<f.length;h++)e[h]^=f[h]}k=k.concat(e)}d&&(k=n.clamp(k,d));return k};
-sjcl.prng=function(a){this.c=[new sjcl.hash.sha256];this.i=[0];this.F=0;this.s={};this.C=0;this.K={};this.O=this.d=this.j=this.W=0;this.b=[0,0,0,0,0,0,0,0];this.f=[0,0,0,0];this.A=t;this.B=a;this.q=u;this.w={progress:{},seeded:{}};this.m=this.V=0;this.t=1;this.u=2;this.S=0x10000;this.I=[0,48,64,96,128,192,0x100,384,512,768,1024];this.T=3E4;this.R=80};
-sjcl.prng.prototype={randomWords:function(a,b){var c=[],d;d=this.isReady(b);var e;d===this.m&&q(new sjcl.exception.notReady("generator isn't seeded"));if(d&this.u){d=!(d&this.t);e=[];var f=0,g;this.O=e[0]=(new Date).valueOf()+this.T;for(g=0;16>g;g++)e.push(0x100000000*Math.random()|0);for(g=0;g<this.c.length&&!(e=e.concat(this.c[g].finalize()),f+=this.i[g],this.i[g]=0,!d&&this.F&1<<g);g++);this.F>=1<<this.c.length&&(this.c.push(new sjcl.hash.sha256),this.i.push(0));this.d-=f;f>this.j&&(this.j=f);this.F++;
-this.b=sjcl.hash.sha256.hash(this.b.concat(e));this.A=new sjcl.cipher.aes(this.b);for(d=0;4>d&&!(this.f[d]=this.f[d]+1|0,this.f[d]);d++);}for(d=0;d<a;d+=4)0===(d+1)%this.S&&A(this),e=B(this),c.push(e[0],e[1],e[2],e[3]);A(this);return c.slice(0,a)},setDefaultParanoia:function(a,b){0===a&&"Setting paranoia=0 will ruin your security; use it only for testing"!==b&&q("Setting paranoia=0 will ruin your security; use it only for testing");this.B=a},addEntropy:function(a,b,c){c=c||"user";var d,e,f=(new Date).valueOf(),
-g=this.s[c],h=this.isReady(),l=0;d=this.K[c];d===t&&(d=this.K[c]=this.W++);g===t&&(g=this.s[c]=0);this.s[c]=(this.s[c]+1)%this.c.length;switch(typeof a){case "number":b===t&&(b=1);this.c[g].update([d,this.C++,1,b,f,1,a|0]);break;case "object":c=Object.prototype.toString.call(a);if("[object Uint32Array]"===c){e=[];for(c=0;c<a.length;c++)e.push(a[c]);a=e}else{"[object Array]"!==c&&(l=1);for(c=0;c<a.length&&!l;c++)"number"!==typeof a[c]&&(l=1)}if(!l){if(b===t)for(c=b=0;c<a.length;c++)for(e=a[c];0<e;)b++,
-e>>>=1;this.c[g].update([d,this.C++,2,b,f,a.length].concat(a))}break;case "string":b===t&&(b=a.length);this.c[g].update([d,this.C++,3,b,f,a.length]);this.c[g].update(a);break;default:l=1}l&&q(new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string"));this.i[g]+=b;this.d+=b;h===this.m&&(this.isReady()!==this.m&&C("seeded",Math.max(this.j,this.d)),C("progress",this.getProgress()))},isReady:function(a){a=this.I[a!==t?a:this.B];return this.j&&this.j>=a?this.i[0]>this.R&&
-(new Date).valueOf()>this.O?this.u|this.t:this.t:this.d>=a?this.u|this.m:this.m},getProgress:function(a){a=this.I[a?a:this.B];return this.j>=a?1:this.d>a?1:this.d/a},startCollectors:function(){this.q||(this.a={loadTimeCollector:D(this,this.aa),mouseCollector:D(this,this.ba),keyboardCollector:D(this,this.$),accelerometerCollector:D(this,this.U)},window.addEventListener?(window.addEventListener("load",this.a.loadTimeCollector,u),window.addEventListener("mousemove",this.a.mouseCollector,u),window.addEventListener("keypress",
-this.a.keyboardCollector,u),window.addEventListener("devicemotion",this.a.accelerometerCollector,u)):document.attachEvent?(document.attachEvent("onload",this.a.loadTimeCollector),document.attachEvent("onmousemove",this.a.mouseCollector),document.attachEvent("keypress",this.a.keyboardCollector)):q(new sjcl.exception.bug("can't attach event")),this.q=!0)},stopCollectors:function(){this.q&&(window.removeEventListener?(window.removeEventListener("load",this.a.loadTimeCollector,u),window.removeEventListener("mousemove",
-this.a.mouseCollector,u),window.removeEventListener("keypress",this.a.keyboardCollector,u),window.removeEventListener("devicemotion",this.a.accelerometerCollector,u)):document.detachEvent&&(document.detachEvent("onload",this.a.loadTimeCollector),document.detachEvent("onmousemove",this.a.mouseCollector),document.detachEvent("keypress",this.a.keyboardCollector)),this.q=u)},addEventListener:function(a,b){this.w[a][this.V++]=b},removeEventListener:function(a,b){var c,d,e=this.w[a],f=[];for(d in e)e.hasOwnProperty(d)&&
-e[d]===b&&f.push(d);for(c=0;c<f.length;c++)d=f[c],delete e[d]},$:function(){E(1)},ba:function(a){sjcl.random.addEntropy([a.x||a.clientX||a.offsetX||0,a.y||a.clientY||a.offsetY||0],2,"mouse");E(0)},aa:function(){E(2)},U:function(a){a=a.accelerationIncludingGravity.x||a.accelerationIncludingGravity.y||a.accelerationIncludingGravity.z;if(window.orientation){var b=window.orientation;"number"===typeof b&&sjcl.random.addEntropy(b,1,"accelerometer")}a&&sjcl.random.addEntropy(a,2,"accelerometer");E(0)}};
-function C(a,b){var c,d=sjcl.random.w[a],e=[];for(c in d)d.hasOwnProperty(c)&&e.push(d[c]);for(c=0;c<e.length;c++)e[c](b)}function E(a){window&&window.performance&&"function"===typeof window.performance.now?sjcl.random.addEntropy(window.performance.now(),a,"loadtime"):sjcl.random.addEntropy((new Date).valueOf(),a,"loadtime")}function A(a){a.b=B(a).concat(B(a));a.A=new sjcl.cipher.aes(a.b)}function B(a){for(var b=0;4>b&&!(a.f[b]=a.f[b]+1|0,a.f[b]);b++);return a.A.encrypt(a.f)}
-function D(a,b){return function(){b.apply(a,arguments)}}sjcl.random=new sjcl.prng(6);
-a:try{var F,G,H,I;if(I="undefined"!==typeof module){var J;if(J=module.exports){var K;try{K=require("crypto")}catch(L){K=null}J=(G=K)&&G.randomBytes}I=J}if(I)F=G.randomBytes(128),F=new Uint32Array((new Uint8Array(F)).buffer),sjcl.random.addEntropy(F,1024,"crypto['randomBytes']");else if(window&&Uint32Array){H=new Uint32Array(32);if(window.crypto&&window.crypto.getRandomValues)window.crypto.getRandomValues(H);else if(window.msCrypto&&window.msCrypto.getRandomValues)window.msCrypto.getRandomValues(H);
-else break a;sjcl.random.addEntropy(H,1024,"crypto['getRandomValues']")}}catch(M){"undefined"!==typeof window&&window.console&&(console.log("There was an error collecting entropy from the browser:"),console.log(M))}
-sjcl.json={defaults:{v:1,iter:1E3,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},Y:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.e({iv:sjcl.random.randomWords(4,0)},e.defaults),g;e.e(f,c);c=f.adata;"string"===typeof f.salt&&(f.salt=sjcl.codec.base64.toBits(f.salt));"string"===typeof f.iv&&(f.iv=sjcl.codec.base64.toBits(f.iv));(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||"string"===typeof a&&100>=f.iter||64!==f.ts&&96!==f.ts&&128!==f.ts||128!==f.ks&&192!==f.ks&&0x100!==f.ks||2>f.iv.length||4<
-f.iv.length)&&q(new sjcl.exception.invalid("json encrypt: invalid parameters"));"string"===typeof a?(g=sjcl.misc.cachedPbkdf2(a,f),a=g.key.slice(0,f.ks/32),f.salt=g.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.publicKey&&(g=a.kem(),f.kemtag=g.tag,a=g.key.slice(0,f.ks/32));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));"string"===typeof c&&(c=sjcl.codec.utf8String.toBits(c));g=new sjcl.cipher[f.cipher](a);e.e(d,f);d.key=a;f.ct=sjcl.mode[f.mode].encrypt(g,b,f.iv,c,f.ts);return f},encrypt:function(a,
-b,c,d){var e=sjcl.json,f=e.Y.apply(e,arguments);return e.encode(f)},X:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.e(e.e(e.e({},e.defaults),b),c,!0);var f;c=b.adata;"string"===typeof b.salt&&(b.salt=sjcl.codec.base64.toBits(b.salt));"string"===typeof b.iv&&(b.iv=sjcl.codec.base64.toBits(b.iv));(!sjcl.mode[b.mode]||!sjcl.cipher[b.cipher]||"string"===typeof a&&100>=b.iter||64!==b.ts&&96!==b.ts&&128!==b.ts||128!==b.ks&&192!==b.ks&&0x100!==b.ks||!b.iv||2>b.iv.length||4<b.iv.length)&&q(new sjcl.exception.invalid("json decrypt: invalid parameters"));
-"string"===typeof a?(f=sjcl.misc.cachedPbkdf2(a,b),a=f.key.slice(0,b.ks/32),b.salt=f.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.secretKey&&(a=a.unkem(sjcl.codec.base64.toBits(b.kemtag)).slice(0,b.ks/32));"string"===typeof c&&(c=sjcl.codec.utf8String.toBits(c));f=new sjcl.cipher[b.cipher](a);c=sjcl.mode[b.mode].decrypt(f,b.ct,b.iv,c,b.ts);e.e(d,b);d.key=a;return sjcl.codec.utf8String.fromBits(c)},decrypt:function(a,b,c,d){var e=sjcl.json;return e.X(a,e.decode(b),c,d)},encode:function(a){var b,c=
-"{",d="";for(b in a)if(a.hasOwnProperty(b))switch(b.match(/^[a-z0-9]+$/i)||q(new sjcl.exception.invalid("json encode: invalid property name")),c+=d+'"'+b+'":',d=",",typeof a[b]){case "number":case "boolean":c+=a[b];break;case "string":c+='"'+escape(a[b])+'"';break;case "object":c+='"'+sjcl.codec.base64.fromBits(a[b],0)+'"';break;default:q(new sjcl.exception.bug("json encode: unsupported type"))}return c+"}"},decode:function(a){a=a.replace(/\s/g,"");a.match(/^\{.*\}$/)||q(new sjcl.exception.invalid("json decode: this isn't json!"));
-a=a.replace(/^\{|\}$/g,"").split(/,/);var b={},c,d;for(c=0;c<a.length;c++)(d=a[c].match(/^(?:(["']?)([a-z][a-z0-9]*)\1):(?:(\d+)|"([a-z0-9+\/%*_.@=\-]*)")$/i))||q(new sjcl.exception.invalid("json decode: this isn't json!")),b[d[2]]=d[3]?parseInt(d[3],10):d[2].match(/^(ct|salt|iv)$/)?sjcl.codec.base64.toBits(d[4]):unescape(d[4]);return b},e:function(a,b,c){a===t&&(a={});if(b===t)return a;for(var d in b)b.hasOwnProperty(d)&&(c&&(a[d]!==t&&a[d]!==b[d])&&q(new sjcl.exception.invalid("required parameter overridden")),
-a[d]=b[d]);return a},ea:function(a,b){var c={},d;for(d in a)a.hasOwnProperty(d)&&a[d]!==b[d]&&(c[d]=a[d]);return c},da:function(a,b){var c={},d;for(d=0;d<b.length;d++)a[b[d]]!==t&&(c[b[d]]=a[b[d]]);return c}};sjcl.encrypt=sjcl.json.encrypt;sjcl.decrypt=sjcl.json.decrypt;sjcl.misc.ca={};
-sjcl.misc.cachedPbkdf2=function(a,b){var c=sjcl.misc.ca,d;b=b||{};d=b.iter||1E3;c=c[a]=c[a]||{};d=c[d]=c[d]||{firstSalt:b.salt&&b.salt.length?b.salt.slice(0):sjcl.random.randomWords(2,0)};c=b.salt===t?d.firstSalt:b.salt;d[c]=d[c]||sjcl.misc.pbkdf2(a,c,b.iter);return{key:d[c].slice(0),salt:c.slice(0)}};
-
+sjcl.codec.hex={fromBits:function(a){var b="",c;for(c=0;c<a.length;c++)b+=((a[c]|0)+0xf00000000000).toString(16).substr(4);return b.substr(0,sjcl.bitArray.bitLength(a)/4)},toBits:function(a){var b,c=[],d;a=a.replace(/\s|0x/g,"");d=a.length;a+="00000000";for(b=0;b<a.length;b+=8)c.push(parseInt(a.substr(b,8),16)^0);return sjcl.bitArray.clamp(c,4*d)}};sjcl.hash.sha256=function(a){this.e[0]||s(this);a?(this.d=a.d.slice(0),this.c=a.c.slice(0),this.a=a.a):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()};
+sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.d=this.h.slice(0);this.c=[];this.a=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.c=sjcl.bitArray.concat(this.c,a);b=this.a;a=this.a=b+sjcl.bitArray.bitLength(a);for(b=512+b&-512;b<=a;b+=512)t(this,c.splice(0,16));return this},finalize:function(){var a,b=this.c,c=this.d,b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.a/
+4294967296));for(b.push(this.a|0);b.length;)t(this,b.splice(0,16));this.reset();return c},h:[],e:[]};
+function t(a,b){var c,d,e,k=b.slice(0),f=a.d,u=a.e,q=f[0],g=f[1],l=f[2],n=f[3],h=f[4],p=f[5],m=f[6],r=f[7];for(c=0;64>c;c++)16>c?d=k[c]:(d=k[c+1&15],e=k[c+14&15],d=k[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+k[c&15]+k[c+9&15]|0),d=d+r+(h>>>6^h>>>11^h>>>25^h<<26^h<<21^h<<7)+(m^h&(p^m))+u[c],r=m,m=p,p=h,h=n+d|0,n=l,l=g,g=q,q=d+(g&l^n&(g^l))+(g>>>2^g>>>13^g>>>22^g<<30^g<<19^g<<10)|0;f[0]=f[0]+q|0;f[1]=f[1]+g|0;f[2]=f[2]+l|0;f[3]=f[3]+n|0;f[4]=f[4]+h|0;f[5]=f[5]+p|0;f[6]=
+f[6]+m|0;f[7]=f[7]+r|0}function s(a){function b(a){return 0x100000000*(a-Math.floor(a))|0}var c=0,d=2,e;a:for(;64>c;d++){for(e=2;e*e<=d;e++)if(0===d%e)continue a;8>c&&(a.h[c]=b(Math.pow(d,0.5)));a.e[c]=b(Math.pow(d,1/3));c++}}sjcl.misc.hmac=function(a,b){this.g=b=b||sjcl.hash.sha256;var c=[[],[]],d,e=b.prototype.blockSize/32;this.b=[new b,new b];a.length>e&&(a=b.hash(a));for(d=0;d<e;d++)c[0][d]=a[d]^909522486,c[1][d]=a[d]^1549556828;this.b[0].update(c[0]);this.b[1].update(c[1]);this.f=new b(this.b[0])};
+sjcl.misc.hmac.prototype.encrypt=sjcl.misc.hmac.prototype.mac=function(a){if(this.j)throw new sjcl.exception.invalid("encrypt on already updated hmac called!");this.update(a);return this.digest(a)};sjcl.misc.hmac.prototype.reset=function(){this.f=new this.g(this.b[0]);this.j=!1};sjcl.misc.hmac.prototype.update=function(a){this.j=!0;this.f.update(a)};sjcl.misc.hmac.prototype.digest=function(){var a=this.f.finalize(),a=(new this.g(this.b[1])).update(a).finalize();this.reset();return a};

From 3e420161df31bbfc39236950d51a9fb83ff4c41c Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Thu, 5 Jun 2014 15:45:16 +0100
Subject: [PATCH 080/117] Bug 994483 Add Loop unit tests to tbpl. r=dburns

---
 browser/components/loop/manifest.ini          | 22 +++++++++++++++++++
 .../test/desktop-local/test_desktop_all.py    |  2 +-
 browser/components/loop/test/manifest.ini     |  8 -------
 .../loop/test/shared/frontend_tester.py       |  5 +++++
 .../loop/test/shared/test_shared_all.py       |  2 +-
 .../test/standalone/test_standalone_all.py    |  2 +-
 .../client/marionette/tests/unit-tests.ini    |  3 +++
 7 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 browser/components/loop/manifest.ini
 delete mode 100644 browser/components/loop/test/manifest.ini

diff --git a/browser/components/loop/manifest.ini b/browser/components/loop/manifest.ini
new file mode 100644
index 000000000000..718bfd558de2
--- /dev/null
+++ b/browser/components/loop/manifest.ini
@@ -0,0 +1,22 @@
+; This file is in the main loop directory, and not the test directory as we need
+; to include the content/ files in what is packaged as test support files.
+;
+; Although the content/ files would normally be tested from within the browser,
+; the issue is that they are seen to be loaded in a "chrome" privilaged context,
+; and hence are not allowed to be loaded via the content files that run the
+; tests.
+;
+; Hence we duplicate the same files as support files, so that they can be loaded
+; in a content context.
+;
+; This might get messy if we start having pre-processed files, but for now it
+; seems to work.
+
+[DEFAULT]
+b2g = false
+browser = true
+qemu = false
+
+[test/shared/test_shared_all.py]
+[test/desktop-local/test_desktop_all.py]
+[test/standalone/test_standalone_all.py]
diff --git a/browser/components/loop/test/desktop-local/test_desktop_all.py b/browser/components/loop/test/desktop-local/test_desktop_all.py
index 877844d58ca0..0c38325f05d2 100644
--- a/browser/components/loop/test/desktop-local/test_desktop_all.py
+++ b/browser/components/loop/test/desktop-local/test_desktop_all.py
@@ -10,7 +10,7 @@ class TestDesktopUnits(BaseTestFrontendUnits):
 
     def setUp(self):
         super(TestDesktopUnits, self).setUp()
-        self.set_server_prefix("browser/components/loop/test/desktop-local/")
+        self.set_server_prefix("build/tests/marionette/tests/browser/components/loop/test/desktop-local/")
 
     def test_units(self):
         self.check_page("index.html")
diff --git a/browser/components/loop/test/manifest.ini b/browser/components/loop/test/manifest.ini
deleted file mode 100644
index 01e0c781fc35..000000000000
--- a/browser/components/loop/test/manifest.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-b2g = false
-browser = true
-qemu = false
-
-[shared/test_shared_all.py]
-[desktop-local/test_desktop_all.py]
-[standalone/test_standalone_all.py]
diff --git a/browser/components/loop/test/shared/frontend_tester.py b/browser/components/loop/test/shared/frontend_tester.py
index 6f2c48e22761..75430666ccc4 100644
--- a/browser/components/loop/test/shared/frontend_tester.py
+++ b/browser/components/loop/test/shared/frontend_tester.py
@@ -56,6 +56,11 @@ class BaseTestFrontendUnits(MarionetteTestCase):
     def setUp(self):
         super(BaseTestFrontendUnits, self).setUp()
 
+        # This extends the timeout for find_element to 10 seconds.
+        # We need this as the tests take an amount of time to run after loading,
+        # which we have to wait for.
+        self.marionette.set_search_timeout(10000)
+
     def set_server_prefix(self, srcdir_path=None):
         self.server_prefix = urlparse.urljoin("http://localhost:" + str(PORT),
                                               srcdir_path)
diff --git a/browser/components/loop/test/shared/test_shared_all.py b/browser/components/loop/test/shared/test_shared_all.py
index 771b8cb40d66..a272ecc1de18 100644
--- a/browser/components/loop/test/shared/test_shared_all.py
+++ b/browser/components/loop/test/shared/test_shared_all.py
@@ -10,7 +10,7 @@ class TestSharedUnits(BaseTestFrontendUnits):
 
     def setUp(self):
         super(TestSharedUnits, self).setUp()
-        self.set_server_prefix("browser/components/loop/test/shared/")
+        self.set_server_prefix("build/tests/marionette/tests/browser/components/loop/test/shared/")
 
     def test_units(self):
         self.check_page("index.html")
diff --git a/browser/components/loop/test/standalone/test_standalone_all.py b/browser/components/loop/test/standalone/test_standalone_all.py
index 8eae87443921..47d495852455 100644
--- a/browser/components/loop/test/standalone/test_standalone_all.py
+++ b/browser/components/loop/test/standalone/test_standalone_all.py
@@ -10,7 +10,7 @@ class TestDesktopUnits(BaseTestFrontendUnits):
 
     def setUp(self):
         super(TestDesktopUnits, self).setUp()
-        self.set_server_prefix("browser/components/loop/test/standalone/")
+        self.set_server_prefix("build/tests/marionette/tests/browser/components/loop/test/standalone/")
 
     def test_units(self):
         self.check_page("index.html")
diff --git a/testing/marionette/client/marionette/tests/unit-tests.ini b/testing/marionette/client/marionette/tests/unit-tests.ini
index 86c3b63398ec..d1c9e346e984 100644
--- a/testing/marionette/client/marionette/tests/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit-tests.ini
@@ -26,3 +26,6 @@ skip = false
 [include:../../../../../dom/system/tests/marionette/manifest.ini]
 [include:../../../../../dom/nfc/tests/marionette/manifest.ini]
 [include:../../../../../dom/events/test/marionette/manifest.ini]
+
+; loop tests
+[include:../../../../../browser/components/loop/manifest.ini]

From 9b3c57757adaef8ed419ba2ff53e5efd6cbd74e6 Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Thu, 5 Jun 2014 10:51:37 -0500
Subject: [PATCH 081/117] Bug 1021036 - Change default button color from grey
 to purple r=NiKo`

---
 browser/components/loop/content/shared/css/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index a1917badefed..a23dc66b59cb 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -61,7 +61,7 @@ img {
 
 .btn {
   display: inline-block;
-  background: #aaa;
+  background: #a5a;
   border: none;
   color: #fff;
   text-decoration: none;

From c4630b9ff713625b0c7c71fb239a71727b7ff89d Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Thu, 5 Jun 2014 17:01:18 +0100
Subject: [PATCH 082/117] Bug 1003029 Use local versions of OT assets.
 r=Standard8,rs=gijs,r=abr

---
 .../test/general/browser_parsable_css.js      |   1 +
 .../libs/otcdn/webrtc/v2.2.5/css/ot.min.css   |  12 ++++++++
 .../images/rtc/access-denied-chrome.png       | Bin 0 -> 10531 bytes
 .../images/rtc/access-denied-copy-firefox.png | Bin 0 -> 6556 bytes
 .../images/rtc/access-denied-firefox.png      | Bin 0 -> 7871 bytes
 .../images/rtc/access-predenied-chrome.png    | Bin 0 -> 9563 bytes
 .../images/rtc/access-prompt-chrome.png       | Bin 0 -> 19523 bytes
 .../v2.2.5/images/rtc/audioonly-publisher.png | Bin 0 -> 1389 bytes
 .../images/rtc/audioonly-subscriber.png       | Bin 0 -> 2464 bytes
 .../webrtc/v2.2.5/images/rtc/buttons.png      | Bin 0 -> 2908 bytes
 .../otcdn/webrtc/v2.2.5/images/rtc/loader.gif | Bin 0 -> 8787 bytes
 .../webrtc/v2.2.5/images/rtc/mic-off.png      | Bin 0 -> 1047 bytes
 .../otcdn/webrtc/v2.2.5/images/rtc/mic-on.png | Bin 0 -> 734 bytes
 .../webrtc/v2.2.5/images/rtc/speaker-off.png  | Bin 0 -> 861 bytes
 .../webrtc/v2.2.5/images/rtc/speaker-on.png   | Bin 0 -> 622 bytes
 .../webrtc/v2.2.5/js/dynamic_config.min.js    |  28 ++++++++++++++++++
 .../loop/content/shared/libs/sdk.js           |   6 ++--
 browser/components/loop/jar.mn                |  18 ++++++++++-
 18 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/css/ot.min.css
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png
 create mode 100644 browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js

diff --git a/browser/base/content/test/general/browser_parsable_css.js b/browser/base/content/test/general/browser_parsable_css.js
index 556e92cc2f77..9726231e7877 100644
--- a/browser/base/content/test/general/browser_parsable_css.js
+++ b/browser/base/content/test/general/browser_parsable_css.js
@@ -14,6 +14,7 @@ const kWhitelist = [
   {sourceName: /codemirror\.css/i}, /* CodeMirror is imported as-is, see bug 1004423 */
   {sourceName: /web\/viewer\.css/i, errorMessage: /Unknown pseudo-class.*(fullscreen|selection)/i }, /* PDFjs is futureproofing its pseudoselectors, and those rules are dropped. */
   {sourceName: /aboutaccounts\/(main|normalize)\.css/i}, /* Tracked in bug 1004428 */
+  {sourceName: /otcdn\/webrtc\/.*\.css$/i /* TokBox SDK assets, see bug 1003029 */}
 ];
 
 /**
diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/css/ot.min.css b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/css/ot.min.css
new file mode 100644
index 000000000000..8655a14903ec
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/css/ot.min.css
@@ -0,0 +1,12 @@
+/**
+ * @license  OpenTok JavaScript Library v2.2.5
+ * http://www.tokbox.com/
+ *
+ * Copyright (c) 2014 TokBox, Inc.
+ * Released under the MIT license
+ * http://opensource.org/licenses/MIT
+ *
+ * Date: May 22 07:14:18 2014
+ */
+
+.OT_root,.OT_root *{color:#fff;margin:0;padding:0;border:0;font-size:100%;font-family:Arial,Helvetica,sans-serif;vertical-align:baseline}.OT_root h1,.OT_root h2,.OT_root h3,.OT_root h4,.OT_root h5,.OT_root h6{color:#fff;font-family:Arial,Helvetica,sans-serif;font-size:100%;font-weight:bold}.OT_root strong{font-weight:bold}.OT_root em{font-style:italic}.OT_root a,.OT_root a:link,.OT_root a:visited,.OT_root a:hover,.OT_root a:active{font-family:Arial,Helvetica,sans-serif}.OT_root ul,.OT_root ol{margin:1em 1em 1em 2em}.OT_root ol{list-style:decimal outside}.OT_root ul{list-style:disc outside}.OT_root dl{margin:4px}.OT_root dl dt,.OT_root dl dd{float:left;margin:0;padding:0}.OT_root dl dt{clear:left;text-align:right;width:50px}.OT_root dl dd{margin-left:10px}.OT_root img{border:0 none}.OT_dialog{border:0;border-radius:0;top:50%;left:50%;position:absolute;position:fixed;padding:0;background-color:#363636;color:#fff;z-index:9999;box-shadow:2px 4px 6px #999;font-family:'Didact Gothic',sans-serif}.OT_dialog-blackout{position:absolute;position:fixed;top:0;right:0;bottom:0;left:0;background-color:#363636}.OT_dialog-blackout .OT_dialog{box-shadow:0 0 0 transparent}.OT_dialog *{font-family:'Didact Gothic',sans-serif}.OT_dialog-plugin-prompt{margin-left:-350px;margin-top:-141px;width:650px;height:282px}.OT_dialog-plugin-reinstall{margin-left:-271px;margin-top:-117px;width:542px;height:234px}.OT_dialog-plugin-upgrading{margin-left:-267px;margin-top:-94px;width:514px;height:188px}.OT_dialog-allow-deny-chrome-first{margin-left:-227px;margin-top:-122px;width:453px;height:244px}.OT_dialog-allow-deny-chrome-pre-denied{margin-left:-263px;margin-top:-135px;width:526px;height:270px}.OT_dialog-allow-deny-chrome-now-denied{margin-left:-120px;margin-top:-85px;width:256px;height:170px}.OT_dialog-allow-deny-firefox-denied{margin-left:-160px;margin-top:-105px;width:320px;height:190px}.OT_dialog-allow-deny-firefox-maybe-denied{margin-left:-281px;margin-top:-126px;width:562px;height:252px}.OT_dialog-allow-highlight-chrome{display:inline-block;margin-top:20px;width:227px;height:94px;background-image:url(../images/rtc/access-prompt-chrome.png)}.OT_closeButton{top:15px;right:15px;position:absolute;font-size:18px;cursor:pointer}.OT_dialog-messages{position:absolute;top:32px;left:32px;right:32px;text-align:center}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-messages{top:45px}.OT_dialog-messages-main{font-weight:300;font-size:18pt;line-height:24px}.OT_dialog-messages-minor{font-weight:300;margin-top:12px;font-size:13px;line-height:18px;color:#a4a4a4}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-messages-minor{margin-top:4px}.OT_dialog-messages-minor strong{font-weight:300;color:#fff}.OT_dialog-single-button{position:absolute;bottom:41px;left:50%;margin-left:-97px;height:47px;width:193px}.OT_dialog-button-pair{position:absolute;bottom:45px;left:5px;right:0;height:94px}.OT_dialog-button-with-title{padding-left:30px;padding-right:30px;width:260px;float:left}.OT_dialog-button-pair-seperator{border-right:1px solid #555;height:112px;width:1px;float:left}.OT_dialog-button-title{font-weight:300;text-align:center;margin-bottom:15px;font-size:12px;line-height:150%;color:#a4a4a4}.OT_dialog-button-title strong{color:#fff;font-weight:100;display:block}.OT_dialog-button{font-weight:100;display:block;line-height:50px;height:47px;background-color:#29a4da;text-align:center;font-size:16pt;cursor:pointer}.OT_dialog-button.OT_dialog-button-large{line-height:60px;height:58px}.OT_dialog-progress-bar{border:1px solid #4e4e4e;height:8px}.OT_dialog-progress-bar-fill{background-color:#29a4da;height:10px;margin-top:-1px;margin-left:-1px;margin-right:-1px}.OT_dialog-plugin-upgrading .OT_dialog-plugin-upgrade-percentage{font-size:36pt;font-weight:100}.OT_dialog-plugin-upgrading .OT_dialog-progress-bar{margin-top:25px;margin-bottom:25px}.OT_dialog-3steps{margin-top:24px}.OT_dialog-allow-deny-firefox-maybe-denied .OT_dialog-3steps{margin-top:21px}.OT_dialog-3steps-step{float:left;-moz-box-sizing:border-box;box-sizing:border-box;width:33%;height:140px;padding:0 10px;color:#a4a4a4}.OT_dialog-3steps-seperator{float:left;-moz-box-sizing:border-box;box-sizing:border-box;margin-top:10px;width:1px;height:68px;background-color:#555}.OT_dialog-allow-deny-chrome-pre-denied .OT_dialog-3steps-seperator{margin-top:16px}.OT_dialog-3steps-step-num{font-size:20px;background-color:#2aa3d8;border-radius:20px;line-height:33px;height:33px;width:33px;margin:0 auto 17px}.OT_dialog-allow-deny-chrome-pre-denied .OT_dialog-3steps-step-num{margin-bottom:10px}.OT_dialog-allow-camera-icon{background-color:#000;width:113px;height:48px;margin:10px auto 0;background-image:url(../images/rtc/access-predenied-chrome.png)}.OT_publisher-denied-firefox{background-color:#fff}.OT_publisher-denied-firefox p{width:232px;height:103px;top:50%;left:50%;display:block;position:absolute;margin-top:-52px;margin-left:-116px;background-image:url(../images/rtc/access-denied-firefox.png);background-position:50% 0;background-repeat:no-repeat}.OT_publisher-denied-firefox span{display:block;position:absolute;bottom:0;right:0;left:0;margin:0 auto;width:232px;height:31px;background-image:url(../images/rtc/access-denied-copy-firefox.png);text-indent:100%;white-space:nowrap;overflow:hidden}.OT_centered{position:fixed;left:50%;top:50%;margin:0}.OT_publisher,.OT_subscriber{position:relative;min-width:48px;min-height:48px}.OT_publisher video,.OT_subscriber video{width:100%;height:100%}.OT_publisher.OT_mirrored video{-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1)}.OT_subscriber_error{background-color:#000;color:#fff;text-align:center}.OT_subscriber_error>p{padding:20px}.OT_publisher .OT_bar,.OT_subscriber .OT_bar,.OT_publisher .OT_name,.OT_subscriber .OT_name,.OT_publisher .OT_archiving,.OT_subscriber .OT_archiving,.OT_publisher .OT_archiving-status,.OT_subscriber .OT_archiving-status,.OT_publihser .OT_archiving-light-box,.OT_subscriber .OT_archiving-light-box{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;top:0;left:0;right:0;display:block;height:34px;position:absolute}.OT_publisher .OT_bar,.OT_subscriber .OT_bar{background:rgba(0,0,0,0.4)}.OT_publisher .OT_name,.OT_subscriber .OT_name{background-color:transparent;color:#fff;font-size:15px;line-height:34px;font-weight:normal;padding:0 4px 0 36px}.OT_publisher .OT_archiving-status,.OT_subscriber .OT_archiving-status{background:rgba(0,0,0,0.4);top:auto;bottom:0;left:34px;padding:0 4px;color:rgba(255,255,255,0.8);font-size:15px;line-height:34px;font-weight:normal}.OT_micro .OT_archiving-status,.OT_micro:hover .OT_archiving-status,.OT_mini .OT_archiving-status,.OT_mini:hover .OT_archiving-status{display:none}.OT_publisher .OT_archiving-light-box,.OT_subscriber .OT_archiving-light-box{background:rgba(0,0,0,0.4);top:auto;bottom:0;right:auto;width:34px;height:34px}.OT_archiving-light{width:7px;height:7px;-webkit-border-radius:30px;-moz-border-radius:30px;border-radius:30px;position:absolute;top:14px;left:14px;background-color:#575757;-webkit-box-shadow:0 0 5px 1px #575757;-moz-box-shadow:0 0 5px 1px #575757;box-shadow:0 0 5px 1px #575757}.OT_archiving-light.OT_active{background-color:#970d13;-webkit-animation:OT_pulse 1.3s ease-in;-moz-animation:OT_pulse 1.3s ease-in;-webkit-animation:OT_pulse 1.3s ease-in;-webkit-animation-iteration-count:infinite;-moz-animation-iteration-count:infinite;-webkit-animation-iteration-count:infinite}@-moz-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-webkit-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-o-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-ms-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}@-webkit-keyframes OT_pulse{0%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}30%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}50%{-webkit-box-shadow:0 0 5px 1px #c70019;-moz-box-shadow:0 0 5px 1px #c70019;box-shadow:0 0 5px 1px #c70019}80%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}100%{-webkit-box-shadow:0 0 0 0 #c70019;-moz-box-shadow:0 0 0 0 #c70019;box-shadow:0 0 0 0 #c70019}}.OT_mini .OT_bar,.OT_bar.OT_mode-mini,.OT_bar.OT_mode-mini-auto{bottom:0;height:auto}.OT_mini .OT_name.OT_mode-off,.OT_mini .OT_name.OT_mode-on,.OT_mini .OT_name.OT_mode-auto,.OT_mini:hover .OT_name.OT_mode-auto{display:none}.OT_publisher .OT_name,.OT_subscriber .OT_name{left:24px;right:37px;height:34px}.OT_publisher .OT_name-no-bug,.OT_subscriber .OT_name-no-bug{left:10px;padding-left:0}.OT_publisher .OT_mute,.OT_subscriber .OT_mute,.OT_publisher .OT_opentok,.OT_subscriber .OT_opentok{border:0;cursor:pointer;display:block;position:absolute;text-align:center;text-indent:-9999em;background-color:transparent;background-repeat:no-repeat}.OT_publisher .OT_opentok,.OT_subscriber .OT_opentok{background:url(../images/rtc/buttons.png) 0 -32px no-repeat;cursor:default;height:18px;left:8px;line-height:18px;top:8px;width:16px}.OT_micro .OT_opentok{display:none!important}.OT_publisher .OT_mute,.OT_subscriber .OT_mute{right:0;top:0;border-left:1px solid rgba(255,255,255,0.2);height:36px;width:37px}.OT_mini .OT_mute,.OT_mute.OT_mode-mini,.OT_mute.OT_mode-mini-auto{top:50%;left:50%;right:auto;margin-top:-18px;margin-left:-18.5px;border-left:none}.OT_publisher .OT_mute{background-image:url(../images/rtc/mic-on.png);background-position:9px 5px}.OT_publisher .OT_mute.OT_active{background-image:url(../images/rtc/mic-off.png);background-position:9px 4px}.OT_subscriber .OT_mute{background-image:url(../images/rtc/speaker-on.png);background-position:8px 7px}.OT_subscriber .OT_mute.OT_active{background-image:url(../images/rtc/speaker-off.png);background-position:7px 7px}.OT_publisher .OT_edge-bar-item,.OT_subscriber .OT_edge-bar-item{-ms-transition-property:top,bottom,opacity;-ms-transition-duration:.5s;-moz-transition-property:top,bottom,opacity;-moz-transition-duration:.5s;-webkit-transition-property:top,bottom,opacity;-webkit-transition-duration:.5s;-o-transition-property:top,bottom,opacity;-o-transition-duration:.5s;transition-property:top,bottom,opacity;transition-duration:.5s;transition-timing-function:ease-in}.OT_publisher .OT_edge-bar-item.OT_mode-off,.OT_subscriber .OT_edge-bar-item.OT_mode-off,.OT_publisher .OT_edge-bar-item.OT_mode-auto,.OT_subscriber .OT_edge-bar-item.OT_mode-auto,.OT_publisher .OT_edge-bar-item.OT_mode-mini-auto,.OT_subscriber .OT_edge-bar-item.OT_mode-mini-auto{top:-25px;opacity:0}.OT_mini .OT_mute.OT_mode-auto,.OT_publisher .OT_mute.OT_mode-mini-auto,.OT_subscriber .OT_mute.OT_mode-mini-auto{top:50%}.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-off,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-off,.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-mini-auto,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-mini-auto{top:auto;bottom:-25px}.OT_publisher .OT_edge-bar-item.OT_mode-on,.OT_subscriber .OT_edge-bar-item.OT_mode-on,.OT_publisher:hover .OT_edge-bar-item.OT_mode-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_mode-auto,.OT_publisher:hover .OT_edge-bar-item.OT_mode-mini-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_mode-mini-auto{top:0;opacity:1}.OT_mini .OT_mute.OT_mode-on,.OT_mini:hover .OT_mute.OT_mode-auto,.OT_mute.OT_mode-mini,.OT_root:hover .OT_mute.OT_mode-mini-auto{top:50%}.OT_publisher .OT_edge-bar-item.OT_edge-bottom.OT_mode-on,.OT_subscriber .OT_edge-bar-item.OT_edge-bottom.OT_mode-on,.OT_publisher:hover .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto,.OT_subscriber:hover .OT_edge-bar-item.OT_edge-bottom.OT_mode-auto{top:auto;bottom:0;opacity:1}.OT_publisher .OT_opentok.OT_mode-off,.OT_publisher .OT_opentok.OT_mode-auto,.OT_subscriber .OT_opentok.OT_mode-off,.OT_subscriber .OT_opentok.OT_mode-auto{top:-17px}.OT_publisher .OT_opentok.OT_mode-on,.OT_publisher:hover .OT_opentok.OT_mode-auto,.OT_subscriber .OT_opentok.OT_mode-on,.OT_subscriber:hover .OT_opentok.OT_mode-auto{top:8px}.OT_video-container{position:absolute;background-color:#000;overflow:hidden}.OT_hidden-audio{position:absolute!important;height:1px!important;width:1px!important}.OT_root .OT_video-loading{background:url('../images/rtc/loader.gif') no-repeat;display:none;position:absolute;width:32px;height:32px;left:50%;top:50%;margin-left:-16px;margin-top:-16px}.OT_publisher.OT_loading .OT_video-loading,.OT_subscriber.OT_loading .OT_video-loading{display:block}.OT_publisher.OT_loading video,.OT_subscriber.OT_loading video{display:none}.OT_video-poster{width:100%;height:100%;background-position:50% 50%;background-repeat:no-repeat;display:none}.OT_publisher .OT_video-poster{background-image:url(../images/rtc/audioonly-publisher.png)}.OT_subscriber .OT_video-poster{background-image:url(../images/rtc/audioonly-subscriber.png)}
diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png
new file mode 100644
index 0000000000000000000000000000000000000000..777e02f1a8b329949b9661b20190274a46c3f178
GIT binary patch
literal 10531
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png
new file mode 100644
index 0000000000000000000000000000000000000000..18b494e7e672e43f4c244411606ea973bff9b53a
GIT binary patch
literal 6556
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
O0000<MNUMnLSTX&q651C

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc6bebe9632ecba852e800f7c6e6f3eea0953d01
GIT binary patch
literal 7871
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e23411986733d0a982cf334608ed951ea6af1c7
GIT binary patch
literal 9563
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%0A6{1Jvkvn5+0=g`GXip$%
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
FV1mIKt7iZJ

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png
new file mode 100644
index 0000000000000000000000000000000000000000..6728fe807f59bf4f41c29da27887256caba86d02
GIT binary patch
literal 19523
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png
new file mode 100644
index 0000000000000000000000000000000000000000..24c9a7cb90e105f636fc0ba658cd6bc29b1425fc
GIT binary patch
literal 1389
zcmV-z1(N!SP)<h;3K|Lk000e1NJLTq000yK001Ef1^@s6**=RC00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6m&&cbVG7wVRUJ4ZXi@?ZDjy6FE=kS
zGffYRzW@LL9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gHF34$HUIzw$4Nv%
zR7i=Pm0N5TRTPH5J=b%;&<h1DK}|^TfgqS5Aqrjs0wN897a$D=0uK@^SP2jw5YZMy
z0<j^fnxGH~MUlo73JHmq;ENg&F)>6)Fe*VxdwQKSGv~}~ALg_iN@-J9GPC#0?Ejy&
z{<ZdAf>GM0Iy7D9Mkq>J)%eZ#IPN%nP*+1YfEX=dzwJFrBphXy^x5b-Ott!0w0#Yi
zMon0|hnZ%WCD9m{jSwelU#7RAnXN+M^_~n5DWfG60!!1#sXD8G%e#*-b3+w%exC0V
zX}16GkO3M_vKGNxRxgu%j~THPNAF3vsh(0*rN%H>tQ*{~s@M{K_B=k#yEMJ?8WLdt
z7hKSFcJ*{|RyXdUVeM{aYX&D1Y08pmh{i!P010*$dOA7PmEnaQ>#=rz#EN8^-)oj}
z0fxx(8}(EgVJ?-Fkt`n%i8L4{s9Hdn&x2(_rj5_mJ;SQO_`8y#YHUrWNLExrNd-h=
zpc^0r2ql;&l2AU5m5ryEHX@;J@@%ps@Ju&~Vi314As`ZkR0)elBs5GWMB|{FL#Z2t
z-H$XQl#Lv+ilQ5!h}&Q(gSqJUv@j?`q;$x_76f74kunkR_rH>Np#sx3)}g2>YZQeG
zdusVf6l=zyxdb`LtH#qP*RQeOw)lQ`Ex&52#^G3kmC-mCfoTZRFU_L!9uC}LhrcD2
zwV0`!9E`;A>px|l77FuX**F+eh6<o4WZrLra1`*1Jd}5iQbJb;2kb1(kr<SYMM1Ds
z(+yhV2^Pnb0oDvbJQdX1fKJ6^MH0C7?fQ%)keW)XmUnsHviKwB1peqcemsGaE(?GI
z@)eU6eqi@O&IQ*6>9MbBIxWiE8_0FFbJOa@1n?z)%OV0P3;4lF3cj~V0;zH?m!VKL
zc9wr!hssaBMn%$+bHE=|ce0qM@H1a>%F8iPO7QahH9+X)Iq!Kygy3o4=iO`{9j;Rp
zrYx$WLVZe~BUMxR#m=%=KwiQR1B9;2G26mc6?SMk*L%BJ(B00zIrnyyvi~MQdNgOV
ztZO{Y^qfnTVbWYZhYl#jfBp<Ta~5Jo6Rgw>;;%l(p~n{Tu@E?lN<t_YNIHRUT!$^a
zJ?w11NxHM0v!+Qjo?_{jhsYEu1lt?XEAFE;RmxL+T^!A{Q?sR-TMS|QKWDDh%V9Ij
zgpzVrtbUTFVnqgQ=ZBbMD`|+vSZnpt*PY?G>u?Ui4FLv%Dbi<&qB18Or6W0pS5`m4
zSH&Ddwt#~zJQ|C!S;BnVBI0C&lUgWXnEYvmIAj<csGfWG79F<hHMSB8hq-8mnXKvH
zOExc`!F$7DhV9Gi7hvDINfrsQID|s94Yz(oLV%u5aO|Ma^SO~$gI4^osh+5!Fj-M~
zKoLw5DseN!ctxYXmn=Kj!o;@gv}G->_#Rh%pKE*H95|N(4Qux>U(?xUhMBD!sD>G|
zPE8Arv2-a!W03ctt0VB*&VrYRoJ+>FIpH{L+qHo<4M0_?PL=R@X+;3k3{VwN)Sw^h
z1_%{20m(E(6X55;_rc4Pb{$rAw$lWh8_4p$V?10wfq9V_Q*@IDRh3DKAT9(kp`sR!
vEK5pkeA;}t>U&(t=lIceIJ5kbU=#cYq}!}^Q*#`X00000NkvXXu0mjfDh+5e

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png
new file mode 100644
index 0000000000000000000000000000000000000000..c023ecdae077423f6a506f820160f47b5f72f571
GIT binary patch
literal 2464
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png
new file mode 100644
index 0000000000000000000000000000000000000000..94053ac8553747047b6988707544ce07aba48fb4
GIT binary patch
literal 2908
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

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a1a30c0c0e566b123cea88066c32b9fd1c10df9
GIT binary patch
literal 8787
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
Vdg(4YZw9%Qd*k<?Q2gih{{Xx=OTYjC

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b35a72829d9820c873a4357735f81d57d4ef623
GIT binary patch
literal 1047
zcmV+y1nB#TP)<h;3K|Lk000e1NJLTq000#L0012b1^@s6MMNk200004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q18_-1
zK~zYIrIlT1TtyVef3r<@W`ngtj3PAYgNvUOi=t5JgAr-8RxQ<H715}OAVMB2SdmhS
z4}PHNQz<G)MMaDt5-ZwDZJ{>cQ>rM$D2R<8wc<w!ng47x$A_KW-fnj{QvYzdch1cG
z=A1J#=Q=YR2UY>MI_C~iP?S7yEwBuj1tuyX{K7&qvvI3y&dja{n2XUx>9HvN5hZJR
z-j34w-I&hIdVvpsAwa;LN~r|A*Ja)jU{xiAAKP`7oO5%)I$#_Kz`Mcw#lW*&paa0m
z9X)M)m{}Qk6SxDI2S$|Ag}}Bh@M<N5?@sfyNq4RWY|7vg@Otq6D6qwyT)S0Qw=<TC
z4W(38O3wp3vuQ{0e%`Q0viGeD3qmnGa6l=&1-y{0&js)MfqNb9L?@R!L+eqV4ScMW
zJ_Vl2J==r#D-7ERL~H?Qlm?=-H%j+s+X3KnU{oo+13Z!Kj|cB>1a5K8?a$+Wi_*nW
z+83quP2Zw430wh8Qa`KLwJiKo@ct@bM{e&*wc2JgTMbNM4C8o_dd{z`gmAbAxa5@J
zPe1hYO6lR?{R6<Oz<s`4_Dbn{;GDw2C}q~+67Wp-3{e7JQA!s8_W&n=O~L!iOQq88
z!nkSR!)7Z=Uqxv$O1{lqFFr4s*==T4%k^TPQW}cVXHhz@!RyKISzt*egcPM89B$Cs
zZ}F&7S{l5+8F(KU^5ybkV6AiRuVQFWFA&RfsT=D6Y-mI&Jp`-;jsvTKJ!aO|3jGA=
z1#SYK&Wm)A1K6mP0M-D%1J?li&8)vUEJ}S*`ZG#jM5&z5-q#)Sswh3!m}_P$%<Nds
z@wAyOD}qP!q}QUfD8omhG!~_aDD95Y)+i0+@i#>2c$C(e*+phHlfhF>Xs-5eWbmFS
zRoew0r4XfUQL060CQ5_Z<Eoi`X=W3yWx^t0JFq32_ENu&KU1#>D}W6^A8-)3s}jOY
z+pM?orV4BZ)&s@=(cc-i6Bw(6(5@VIS5C>1!X~ZxFY`*>I(sV>1O6$PYX2L0rs^p+
z^8LLOr~-q)QtF%1(4$cr27U#;1*XhwI!Dx$%dic=R$%2BICc!!1w2^^p#~?zzr7CZ
z_}A>Fe&BB4+*3Tw-mV0Ofy;m@#&R5I0ZR&t&jJxRN<I8<fJ4AXl@L;c^)GlT80X{8
RuiXFu002ovPDHLkV1lo_*TMh*

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff0f369cdd064675a902a931c896672aaf916658
GIT binary patch
literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq000vJ000~a1^@s6g9d~d00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0yjxS
zK~zYIm6Shd6j2bye|wzxo&o<frqG;NDB6S+1|*H3A|Z`7CRQm^rnJx$!NN)i>8&h+
zgcJ&?LJ%wz1A>j9XdxJzB#8eY^MyNIi<?b0ce}Z}fn}L_-}k+lVctNAnKWe5qDkLP
zO8viR(oh+vOlZoahKsa*4U?vdcu9fK72pL>IpDs3z||PS%Y3ki@SrfB?z_9<xbn<Q
zIt*-g$SN-%V+cECne}%mlqJ%i53~{w5Nd008@}5t@TMJT6_cta-8E^jd*MAZY0&xA
zDzF6H1a1JgffMD_q&33?cnn+vMykM=A5?*3z?X8dwo=bJ4`8eUEO#!ZD_gDr<G_{&
z8a)bR_$^?(5<_UXa|qaI6-<gpA`{wh-c}5uk&VVWa3+RO2UhZow0tC19A9((?wq{>
zPWgDu0QC;#)qxqupLYJP*aGkun2jO4114y`(IVRhCLA~GyoG%TljeP2O}k$+Y0jkg
zCT;qE&ZL^3Pdk3T?K+d9X=lv=k4)+-O3S1^KTl0sGwDcn*1Cd@0#9hZhz;N=@EX_z
zP68vq9Z32ieGW{<5Pp}mV^?(4q*asZEi1e3@zEk)=@7Z-0Pr;zs>Kl2%kZ66(4P)|
zPhve;HSd^o9Jm0S0|v;gqlAQ%^u9?yXiofR;A0Ho=N_ghatpWzT%toCTPy|M0uN&d
z&$2Qnf#Dv7vSfyxzehIdGH@NZ2%M++<|567nb|MEfN#Jj-~+H4LwE!5A1YriKdi`M
Q82|tP07*qoM6N<$f@$zE$p8QV

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..58c3c5ef3d051c447175d4e426ad9da6a5a7cfcb
GIT binary patch
literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq000;O000yS1^@s6m$m(a00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0=7v+
zK~y-6os~(5lt&cDfA7=u*FA|E!MTi*n2Q%tPhu3o1rZcMya>rHL?Y%YA|CXTarEYb
zptxKF^<;<(xRK-_CYnG93L|JhP!#vkxYVn*+rNjdk#e-#(Rcakt-tr`E2@xmNzye*
zljtD9{k!0PGq^Y0<Jl1W(@yb&QUC@_1kOpC(x&)4U=J`BST59q@#Am+Na{{gNYVpI
zGlmrJ4(_*uyMp_nWLpv3FAWQjK`tc7V@b0!z%Qw|g8S-Z`!eYh-dDQ-FtdBWLf}te
zG;mtd{NVmAur!Omni{$e1YqW{0Kt8X$7nAajb*^^Kn*xiRw^%nzq0uI0A0135^Qq2
z!ji@T6z=hJU;r3sHk!9%z5Xk345*md{<2cpnL!2y3mA4Ec;^;LnhV^JG^-GrO6w$n
zfnKWDW4r(y20k&fePyMxH%<1sW1%O&_%;Jv1V#c&3gC-3TrE^@jP-wjgFs<syQ^h+
z1elXWKBu*ndFRU|%`~%zz<FSLLF=c!Jto@dG4=zyl4)zTEN=z(GU@fyWiG3LZ_@fQ
z&{F`FHe&+xdW_eBElKaImgSnv-xw1A2&krY6I!QefX>qAG2R9GlKzvV&A>C@{~@uX
zfc~`p3b<JSH{JsP*yJ%j0oEmbZM7^5;7}f9W($BFl4`(g;13J#qk(_ZG`VyE-LI1|
zgr-%?at^RPnfC!J&8(RxN?HJ%0j9NWIk<lo-2cn22?h5>slX4Cn(1meAZf(Vd`Uf>
zH>CynI=DA7!1n;|aa^<6T%SRXO6qi2Izl#NfNjaP%st+bv{X_(K~75Q`WQeF+)pP!
ze+XU#k4J+0&j6AZOM0FlzeyVPF_7-yel0<+r0>E(zohw+o+iktJl8$|G7(q-i~%mz
ns?|NYKRr~(fxpdc@u2+`NX+Ca%_PBT00000NkvXXu0mjf-}`<7

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc4da4fe74cc30d632cd28f96174ab172fd2e245
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq000*N000vR1^@s6d%Kpl00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5G%q$U
zF*Bej{!ah^0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0mn&1
zK~y-6rIf#q4N(||pL30vD>vDYUE9cQ)(Wy@2?g6+r9wd>N}ZmDkmV0hXcTIyRnlmM
zf{5(KkHpFqHV8sk!G7;1%TeqnId|MKW4+1bJm<XUd(W4dlYtsCX|G8yOo}GGHfc+p
zx=<sy4NL>;fn&fSV5ynsN9r8#x8TgAJKpiEuZ@|sXwpDceWSvk1SXtk0GfIJ7?=n4
zuQ=SK-N4yoshjXDu%{|KGieMM?BiVmRweUK2|ok2^$UzK4g;rv3mI?)*x9>-exLeF
zfp?TNybd@4%r$_Gf7t!+(1C=%0vie)uZ}Seh7g_tkAO}C7%J(YsKX|0b^Z>t3jP#u
z&iNiNT6J5B8uxJt$O_&YpzZt_X#H#WoR0&53f?B*t@9A@J_8njwKamD19z7(<Pg6V
z{NunH=Y7Dfh8NY*)n=amT*lY}KBQ&{;Z+Es8)F;?HUrl);IvPA_5x?<z5j~|w}F=>
zO>}{yz|GP&O*-iRl;6+A#Cu}WWNERh^n*6@{04A2SsL-+92f=euQ=Rw5_ssmYr!l4
z9pDFWyDGd=CXJXh@2}>(Ne@iA_TRzD0UeXx`2inI+Fqyb7iMF@9wFe*z5oCK07*qo
IM6N<$g8JwS0RR91

literal 0
HcmV?d00001

diff --git a/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js
new file mode 100644
index 000000000000..1f8968994217
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js
@@ -0,0 +1,28 @@
+/**
+ * @license  OpenTok JavaScript Library v2.2.5
+ * http://www.tokbox.com/
+ *
+ * Copyright (c) 2014 TokBox, Inc.
+ * Released under the MIT license
+ * http://opensource.org/licenses/MIT
+ *
+ * Date: May 22 07:14:18 2014
+ */
+
+!(function() {
+  TB.Config.replaceWith({
+    global: {
+      exceptionLogging: {
+        enabled: true,
+        messageLimitPerPartner: 100
+      },
+
+      iceServers: {
+        enabled: false
+      },
+    },
+
+    partners: {
+    }
+  });
+})(TB);
diff --git a/browser/components/loop/content/shared/libs/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
index 72be279b4d18..59df0cfca06f 100644
--- a/browser/components/loop/content/shared/libs/sdk.js
+++ b/browser/components/loop/content/shared/libs/sdk.js
@@ -22,7 +22,8 @@
     websiteURL: 'http://www.tokbox.com',
 
     // The URL of the CDN
-    cdnURL: 'http://static.opentok.com',
+    // XXX: patched for loop so we use local files
+    cdnURL: 'loop/otcdn',
     // The URL to use for logging
     loggingURL: 'http://hlg.tokbox.com/prod',
     // The anvil API URL
@@ -36,7 +37,8 @@
     // If this environment supports SSL
     supportSSL: 'true',
     // The CDN to use if we're using SSL
-    cdnURLSSL: 'https://static.opentok.com',
+    // XXX: patched for loop so we use local files
+    cdnURLSSL: 'loop/otcdn',
     // The loggging URL to use if we're using SSL
     loggingURLSSL: 'https://hlg.tokbox.com/prod',
     // The anvil API URL to use if we're using SSL
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index b67887b2eaf1..6463b5eaf6ca 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -15,7 +15,6 @@ browser.jar:
   content/browser/loop/shared/js/models.js           (content/shared/js/models.js)
   content/browser/loop/shared/js/router.js           (content/shared/js/router.js)
   content/browser/loop/shared/js/views.js            (content/shared/js/views.js)
-  content/browser/loop/shared/libs/sdk.js            (content/shared/libs/sdk.js)
   content/browser/loop/shared/libs/lodash-2.4.1.js   (content/shared/libs/lodash-2.4.1.js)
   content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
@@ -26,3 +25,20 @@ browser.jar:
   content/browser/loop/js/desktopRouter.js           (content/js/desktopRouter.js)
   content/browser/loop/js/conversation.js            (content/js/conversation.js)
   content/browser/loop/js/panel.js                   (content/js/panel.js)
+  # Partner SDK assets
+  content/browser/loop/shared/libs/sdk.js                                             (content/shared/libs/sdk.js)
+  content/browser/loop/otcdn/webrtc/v2.2.5/css/ot.min.css                             (content/shared/libs/otcdn/webrtc/v2.2.5/css/ot.min.css)
+  content/browser/loop/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js                   (content/shared/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png        (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png  (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png       (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png     (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png        (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png         (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png        (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/buttons.png                     (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/loader.gif                      (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png                     (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png                      (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png                 (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png)
+  content/browser/loop/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png                  (content/shared/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png)

From 9c6e239c1a97d24cc6b190e9c7453d5a7b7b7aae Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Thu, 5 Jun 2014 12:42:01 -0500
Subject: [PATCH 083/117] Bug 994131 - Change URLs in OT.properties to use
 https r=Standard8

---
 browser/components/loop/content/shared/libs/sdk.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/loop/content/shared/libs/sdk.js b/browser/components/loop/content/shared/libs/sdk.js
index 59df0cfca06f..e37948af4ce8 100644
--- a/browser/components/loop/content/shared/libs/sdk.js
+++ b/browser/components/loop/content/shared/libs/sdk.js
@@ -25,9 +25,9 @@
     // XXX: patched for loop so we use local files
     cdnURL: 'loop/otcdn',
     // The URL to use for logging
-    loggingURL: 'http://hlg.tokbox.com/prod',
+    loggingURL: 'https://hlg.tokbox.com/prod',
     // The anvil API URL
-    apiURL: 'http://anvil.opentok.com',
+    apiURL: 'https://anvil.opentok.com',
 
     // What protocol to use when connecting to the rumor web socket
     messagingProtocol: 'wss',

From 479cea6ac1afd60a68ddaccaa51bc7d7e7168bc5 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Thu, 5 Jun 2014 19:57:42 +0200
Subject: [PATCH 084/117] Bug 1020451 Implement basic accept/reject call
 buttons so that video isn't shown before the call is accepted. r=Standard8

---
 browser/components/loop/MozLoopService.jsm    |  2 +-
 .../loop/content/js/conversation.js           | 63 +++++++++++++++++--
 .../loop/content/shared/css/conversation.css  | 16 +++++
 .../loop/content/shared/css/readme.html       | 10 +++
 .../test/desktop-local/conversation_test.js   | 46 +++++++++++++-
 .../en-US/chrome/browser/loop/loop.properties |  3 +
 6 files changed, 130 insertions(+), 10 deletions(-)

diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index ba6931b95904..ec336e14e819 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -350,7 +350,7 @@ let MozLoopServiceInternal = {
       return;
     }
 
-    this.openChatWindow(null, "LooP", "about:loopconversation#start/" + version);
+    this.openChatWindow(null, "LooP", "about:loopconversation#incoming/" + version);
   },
 
   /**
diff --git a/browser/components/loop/content/js/conversation.js b/browser/components/loop/content/js/conversation.js
index a5d857e50252..3d48967218f7 100644
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -18,6 +18,48 @@ loop.conversation = (function(OT, mozL10n) {
    */
   var router;
 
+  /**
+   * Incoming call view.
+   * @type {loop.shared.views.BaseView}
+   */
+  var IncomingCallView = sharedViews.BaseView.extend({
+    template: _.template([
+      '<h2 data-l10n-id="incoming_call"></h2>',
+      '<p>',
+      '  <button class="btn btn-success btn-accept"',
+      '           data-l10n-id="accept_button"></button>',
+      '  <button class="btn btn-error btn-decline"',
+      '           data-l10n-id="decline_button"></button>',
+      '</p>'
+    ].join("")),
+
+    className: "incoming-call",
+
+    events: {
+      "click .btn-accept": "handleAccept",
+      "click .btn-decline": "handleDecline"
+    },
+
+    /**
+     * User clicked on the "accept" button.
+     * @param  {MouseEvent} event
+     */
+    handleAccept: function(event) {
+      event.preventDefault();
+      this.model.trigger("accept");
+    },
+
+    /**
+     * User clicked on the "decline" button.
+     * @param  {MouseEvent} event
+     */
+    handleDecline: function(event) {
+      event.preventDefault();
+      // XXX For now, we just close the window.
+      window.close();
+    }
+  });
+
   /**
    * Call ended view.
    * @type {loop.shared.views.BaseView}
@@ -53,7 +95,8 @@ loop.conversation = (function(OT, mozL10n) {
    */
   var ConversationRouter = loop.desktopRouter.DesktopConversationRouter.extend({
     routes: {
-      "start/:version": "start",
+      "incoming/:version": "incoming",
+      "call/accept": "accept",
       "call/ongoing": "conversation",
       "call/ended": "ended"
     },
@@ -73,16 +116,23 @@ loop.conversation = (function(OT, mozL10n) {
     },
 
     /**
-     * start is the initial route that does any necessary prompting and set
-     * up for the call.
+     * Incoming call route.
      *
      * @param {String} loopVersion The version from the push notification, set
      *                             by the router from the URL.
      */
-    start: function(loopVersion) {
-      // XXX For now, we just kick the conversation straight away, bug 990678
-      // will implement the follow-ups.
+    incoming: function(loopVersion) {
       this._conversation.set({loopVersion: loopVersion});
+      this._conversation.once("accept", function() {
+        this.navigate("call/accept", {trigger: true});
+      }.bind(this));
+      this.loadView(new IncomingCallView({model: this._conversation}));
+    },
+
+    /**
+     * Accepts an incoming call.
+     */
+    accept: function() {
       this._conversation.initiate({
         baseServerUrl: window.navigator.mozLoop.serverUrl,
         outgoing: false
@@ -134,6 +184,7 @@ loop.conversation = (function(OT, mozL10n) {
   return {
     ConversationRouter: ConversationRouter,
     EndedCallView: EndedCallView,
+    IncomingCallView: IncomingCallView,
     init: init
   };
 })(window.OT, document.mozL10n);
diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
index c7f00617f0ef..cf62590e0a36 100644
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -55,3 +55,19 @@
 .call-ended p {
   text-align: center;
 }
+
+/* Incoming call */
+.incoming-call {
+  text-align: center;
+  min-height: 200px;
+}
+
+.incoming-call h2 {
+  font-size: 1.5em;
+  font-weight: normal;
+  margin-top: 3em;
+}
+
+.incoming-call button {
+  margin-right: .2em;
+}
diff --git a/browser/components/loop/content/shared/css/readme.html b/browser/components/loop/content/shared/css/readme.html
index 70cbd2c70cb2..ff607aa10ffd 100644
--- a/browser/components/loop/content/shared/css/readme.html
+++ b/browser/components/loop/content/shared/css/readme.html
@@ -166,6 +166,16 @@
     <p class="message">Oops! This is a warning.</p>
   </div>
 
+  <h2>Incoming call</h2>
+
+  <div class="incoming-call">
+    <h2>Incoming call</h2>
+    <p>
+      <button class="btn btn-success btn-accept">Accept</button>
+      <button class="btn btn-error btn-decline">Decline</button>
+    </p>
+  </div>
+
   <script>
   window.onload = function() {
     [].forEach.call(document.querySelectorAll("video"), function(video) {
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index a7f04e7c9c70..cb44268fec55 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -54,15 +54,25 @@ describe("loop.conversation", function() {
         sandbox.stub(router, "loadView");
       });
 
-      describe("#start", function() {
+      describe("#incoming", function() {
         it("should set the loopVersion on the conversation model", function() {
-          router.start("fakeVersion");
+          router.incoming("fakeVersion");
 
           expect(conversation.get("loopVersion")).to.equal("fakeVersion");
         });
 
+        it("should display the incoming call view", function() {
+          router.incoming("fakeVersion");
+
+          sinon.assert.calledOnce(router.loadView);
+          sinon.assert.calledWithExactly(router.loadView,
+            sinon.match.instanceOf(loop.conversation.IncomingCallView));
+        });
+      });
+
+      describe("#accept", function() {
         it("should initiate the conversation", function() {
-          router.start("fakeVersion");
+          router.accept();
 
           sinon.assert.calledOnce(conversation.initiate);
           sinon.assert.calledWithExactly(conversation.initiate, {
@@ -172,4 +182,34 @@ describe("loop.conversation", function() {
       });
     });
   });
+
+  describe("IncomingCallView", function() {
+    var conversation, view;
+
+    beforeEach(function() {
+      conversation = new loop.shared.models.ConversationModel({}, {sdk: {}});
+      view = new loop.conversation.IncomingCallView({model: conversation});
+    });
+
+    describe("#handleAccept", function() {
+      it("should trigger an 'accept' conversation model event" ,
+        function(done) {
+          conversation.once("accept", function() {
+            done();
+          });
+
+          view.handleAccept({preventDefault: sandbox.spy()});
+        });
+    });
+
+    describe("#handleDecline", function() {
+      it("should close the window", function() {
+        sandbox.stub(window, "close");
+
+        view.handleDecline({preventDefault: sandbox.spy()});
+
+        sinon.assert.calledOnce(window.close);
+      });
+    });
+  });
 });
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 492f38d4bb0f..d0d9abc5f340 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -11,3 +11,6 @@ stop=Stop
 call_has_ended=Your call has ended.
 close_window=Close this window
 do_not_disturb=Do not disturb
+incoming_call=Incoming call
+accept_button=Accept
+decline_button=Decline

From 5737965ad244fdd55ca6b28d73199f1cd7de2cae Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Fri, 6 Jun 2014 20:57:00 +0100
Subject: [PATCH 085/117] Bug 994483 Fix running marionette tests locally and
 bug 1021573 Fix intermittent failure due to the server trying to bind to a
 socket that hasn't been released yet. r=jgriffin

---
 .../test/desktop-local/test_desktop_all.py    |  2 +-
 .../loop/test/shared/frontend_tester.py       | 28 +++++++++++++++----
 .../loop/test/shared/test_shared_all.py       |  2 +-
 .../test/standalone/test_standalone_all.py    |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/browser/components/loop/test/desktop-local/test_desktop_all.py b/browser/components/loop/test/desktop-local/test_desktop_all.py
index 0c38325f05d2..450fb27563ac 100644
--- a/browser/components/loop/test/desktop-local/test_desktop_all.py
+++ b/browser/components/loop/test/desktop-local/test_desktop_all.py
@@ -10,7 +10,7 @@ class TestDesktopUnits(BaseTestFrontendUnits):
 
     def setUp(self):
         super(TestDesktopUnits, self).setUp()
-        self.set_server_prefix("build/tests/marionette/tests/browser/components/loop/test/desktop-local/")
+        self.set_server_prefix("../desktop-local/")
 
     def test_units(self):
         self.check_page("index.html")
diff --git a/browser/components/loop/test/shared/frontend_tester.py b/browser/components/loop/test/shared/frontend_tester.py
index 75430666ccc4..e61cabfd45e8 100644
--- a/browser/components/loop/test/shared/frontend_tester.py
+++ b/browser/components/loop/test/shared/frontend_tester.py
@@ -3,9 +3,11 @@ import threading
 import SimpleHTTPServer
 import SocketServer
 import BaseHTTPServer
+import socket
+import urllib
 import urlparse
+import os
 
-PORT = 2222
 DEBUG = False
 
 
@@ -36,7 +38,9 @@ class BaseTestFrontendUnits(MarionetteTestCase):
         else:
             handler = QuietHttpRequestHandler
 
-        cls.server = ThreadingSimpleServer(('', PORT), handler)
+        # Port 0 means to select an arbitrary unused port
+        cls.server = ThreadingSimpleServer(('', 0), handler)
+        cls.ip, cls.port = cls.server.server_address
 
         cls.server_thread = threading.Thread(target=cls.server.serve_forever)
         cls.server_thread.daemon = False
@@ -61,9 +65,23 @@ class BaseTestFrontendUnits(MarionetteTestCase):
         # which we have to wait for.
         self.marionette.set_search_timeout(10000)
 
-    def set_server_prefix(self, srcdir_path=None):
-        self.server_prefix = urlparse.urljoin("http://localhost:" + str(PORT),
-                                              srcdir_path)
+    # srcdir_path should be the directory relative to this file.
+    def set_server_prefix(self, srcdir_path):
+        # We may be run from a different path than topsrcdir, e.g. in the case
+        # of packaged tests. If so, then we have to work out the right directory
+        # for the local server.
+
+        # First find the top of the working directory.
+        commonPath = os.path.commonprefix([__file__, os.getcwd()])
+
+        # Now get the relative path between the two
+        relPath = os.path.relpath(os.path.dirname(__file__), commonPath)
+
+        relPath = urllib.pathname2url(os.path.join(relPath, srcdir_path))
+
+        # Finally join the relative path with the given src path
+        self.server_prefix = urlparse.urljoin("http://localhost:" + str(self.port),
+                                              relPath)
 
     def check_page(self, page):
 
diff --git a/browser/components/loop/test/shared/test_shared_all.py b/browser/components/loop/test/shared/test_shared_all.py
index a272ecc1de18..72e236ca0293 100644
--- a/browser/components/loop/test/shared/test_shared_all.py
+++ b/browser/components/loop/test/shared/test_shared_all.py
@@ -10,7 +10,7 @@ class TestSharedUnits(BaseTestFrontendUnits):
 
     def setUp(self):
         super(TestSharedUnits, self).setUp()
-        self.set_server_prefix("build/tests/marionette/tests/browser/components/loop/test/shared/")
+        self.set_server_prefix(".")
 
     def test_units(self):
         self.check_page("index.html")
diff --git a/browser/components/loop/test/standalone/test_standalone_all.py b/browser/components/loop/test/standalone/test_standalone_all.py
index 47d495852455..93b8b0a3f854 100644
--- a/browser/components/loop/test/standalone/test_standalone_all.py
+++ b/browser/components/loop/test/standalone/test_standalone_all.py
@@ -10,7 +10,7 @@ class TestDesktopUnits(BaseTestFrontendUnits):
 
     def setUp(self):
         super(TestDesktopUnits, self).setUp()
-        self.set_server_prefix("build/tests/marionette/tests/browser/components/loop/test/standalone/")
+        self.set_server_prefix("../standalone/")
 
     def test_units(self):
         self.check_page("index.html")

From 7e8f8dbf597a233ef4599089a05a6e7e858fe901 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 9 Jun 2014 12:13:21 +0100
Subject: [PATCH 086/117] Backed out changeset 6cc9ac1f57fa (bug 1022212)

---
 modules/libpref/src/init/all.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 04c1a9e8542c..b7dccbe16de1 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -250,7 +250,7 @@ pref("media.apple.mp3.enabled", true);
 #ifdef MOZ_WEBRTC
 pref("media.navigator.enabled", true);
 pref("media.navigator.video.enabled", true);
-pref("media.navigator.load_adapt", true);
+pref("media.navigator.load_adapt", false);
 pref("media.navigator.load_adapt.measure_interval",1000);
 pref("media.navigator.load_adapt.avg_seconds",3);
 pref("media.navigator.load_adapt.high_load","0.90");

From f9cec5e762e0057fcb51547ce1c5173cd15a1943 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 9 Jun 2014 12:14:27 +0100
Subject: [PATCH 087/117] Backed out changeset b5067fbd502e (bug 1022376) for
 Android crashes during 408431-1.html

---
 content/media/webrtc/LoadManager.cpp |  1 -
 content/media/webrtc/LoadMonitor.cpp | 36 +++++-----------------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/content/media/webrtc/LoadManager.cpp b/content/media/webrtc/LoadManager.cpp
index 494190c20900..b2d604c4f228 100644
--- a/content/media/webrtc/LoadManager.cpp
+++ b/content/media/webrtc/LoadManager.cpp
@@ -58,7 +58,6 @@ LoadManager::LoadManager(int aLoadMeasurementInterval,
 
 LoadManager::~LoadManager()
 {
-  LOG(("LoadManager: shutting down LoadMonitor"));
   mLoadMonitor->Shutdown();
 }
 
diff --git a/content/media/webrtc/LoadMonitor.cpp b/content/media/webrtc/LoadMonitor.cpp
index 37733de14fa8..2a39ad88cce9 100644
--- a/content/media/webrtc/LoadMonitor.cpp
+++ b/content/media/webrtc/LoadMonitor.cpp
@@ -149,17 +149,11 @@ private:
 
 void LoadMonitor::Shutdown()
 {
+  MutexAutoLock lock(mLock);
   if (mLoadInfoThread) {
-    {
-      MutexAutoLock lock(mLock);
-      LOG(("LoadMonitor: shutting down"));
-      mShutdownPending = true;
-      mCondVar.Notify();
-    }
+    mShutdownPending = true;
+    mCondVar.Notify();
 
-    // Note: can't just call ->Shutdown() from here; that spins the event
-    // loop here, causing re-entrancy issues if we're invoked from cycle
-    // collection.  Argh.
     mLoadInfoThread = nullptr;
 
     nsRefPtr<LoadMonitorRemoveObserver> remObsRunner = new LoadMonitorRemoveObserver(this);
@@ -522,10 +516,8 @@ class LoadInfoCollectRunner : public nsRunnable
 {
 public:
   LoadInfoCollectRunner(nsRefPtr<LoadMonitor> loadMonitor,
-                        RefPtr<LoadInfo> loadInfo,
-                        nsIThread *loadInfoThread)
-    : mThread(loadInfoThread),
-      mLoadUpdateInterval(loadMonitor->mLoadUpdateInterval),
+                        RefPtr<LoadInfo> loadInfo)
+    : mLoadUpdateInterval(loadMonitor->mLoadUpdateInterval),
       mLoadNoiseCounter(0)
   {
     mLoadMonitor = loadMonitor;
@@ -534,19 +526,6 @@ public:
 
   NS_IMETHOD Run()
   {
-    if (NS_IsMainThread()) {
-      if (mThread) {
-        // Don't leak threads!
-        mThread->Shutdown(); // can't Shutdown from the thread itself, darn
-        // Don't null out mThread!
-        // See bug 999104.  We must hold a ref to the thread across Dispatch()
-        // since the internal mThread ref could be released while processing
-        // the Dispatch(), and Dispatch/PutEvent itself doesn't hold a ref; it
-        // assumes the caller does.
-      }
-      return NS_OK;
-    }
-
     MutexAutoLock lock(mLoadMonitor->mLock);
     while (!mLoadMonitor->mShutdownPending) {
       mLoadInfo->UpdateSystemLoad();
@@ -564,13 +543,10 @@ public:
 
       mLoadMonitor->mCondVar.Wait(PR_MillisecondsToInterval(mLoadUpdateInterval));
     }
-    // ok, we need to exit safely and can't shut ourselves down (DARN)
-    NS_DispatchToMainThread(this);
     return NS_OK;
   }
 
 private:
-  nsCOMPtr<nsIThread> mThread;
   RefPtr<LoadInfo> mLoadInfo;
   nsRefPtr<LoadMonitor> mLoadMonitor;
   int mLoadUpdateInterval;
@@ -629,7 +605,7 @@ LoadMonitor::Init(nsRefPtr<LoadMonitor> &self)
   NS_NewNamedThread("Sys Load Info", getter_AddRefs(mLoadInfoThread));
 
   nsRefPtr<LoadInfoCollectRunner> runner =
-    new LoadInfoCollectRunner(self, load_info, mLoadInfoThread);
+    new LoadInfoCollectRunner(self, load_info);
   mLoadInfoThread->Dispatch(runner, NS_DISPATCH_NORMAL);
 
   return NS_OK;

From 5478be066e5a9c2324d654e0cd7f4229f038e7d3 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Mon, 9 Jun 2014 13:42:33 +0200
Subject: [PATCH 088/117] Bug 1009603 - Tracelogger: Part 2: Fix throw
 statements, r=bbouvier

---
 js/src/jit/IonFrames.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/js/src/jit/IonFrames.cpp b/js/src/jit/IonFrames.cpp
index f1ea645ea491..329d3a603254 100644
--- a/js/src/jit/IonFrames.cpp
+++ b/js/src/jit/IonFrames.cpp
@@ -583,6 +583,7 @@ void
 HandleException(ResumeFromException *rfe)
 {
     JSContext *cx = GetJSContextFromJitCode();
+    TraceLogger *logger = TraceLoggerForMainThread(cx->runtime());
 
     rfe->kind = ResumeFromException::RESUME_ENTRY_FRAME;
 
@@ -633,10 +634,14 @@ HandleException(ResumeFromException *rfe)
                 // When profiling, each frame popped needs a notification that
                 // the function has exited, so invoke the probe that a function
                 // is exiting.
+
                 JSScript *script = frames.script();
                 probes::ExitScript(cx, script, script->functionNonDelazifying(), popSPSFrame);
-                if (!frames.more())
+                if (!frames.more()) {
+                    TraceLogStopEvent(logger, TraceLogger::IonMonkey);
+                    TraceLogStopEvent(logger);
                     break;
+                }
                 ++frames;
             }
 
@@ -664,6 +669,9 @@ HandleException(ResumeFromException *rfe)
             if (rfe->kind != ResumeFromException::RESUME_ENTRY_FRAME)
                 return;
 
+            TraceLogStopEvent(logger, TraceLogger::Baseline);
+            TraceLogStopEvent(logger);
+
             // Unwind profiler pseudo-stack
             JSScript *script = iter.script();
             probes::ExitScript(cx, script, script->functionNonDelazifying(),

From 0105001fe8440cd87f41612aef4b1cf75d9990a7 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Mon, 9 Jun 2014 13:42:33 +0200
Subject: [PATCH 089/117] Bug 1009603 - Tracelogger: Part 3: Fix empty
 filenames, r=bbouvier

---
 js/src/vm/TraceLogging.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
index cc62ff0c4fe6..d28232ef8d36 100644
--- a/js/src/vm/TraceLogging.cpp
+++ b/js/src/vm/TraceLogging.cpp
@@ -378,6 +378,9 @@ TraceLogger::createTextId(const char *text)
 uint32_t
 TraceLogger::createTextId(JSScript *script)
 {
+    if (!script->filename())
+        return createTextId("");
+
     assertNoQuotes(script->filename());
 
     PointerHashMap::AddPtr p = pointerMap.lookupForAdd(script);
@@ -406,6 +409,9 @@ TraceLogger::createTextId(JSScript *script)
 uint32_t
 TraceLogger::createTextId(const JS::ReadOnlyCompileOptions &compileOptions)
 {
+    if (!compileOptions.filename())
+        return createTextId("");
+
     assertNoQuotes(compileOptions.filename());
 
     PointerHashMap::AddPtr p = pointerMap.lookupForAdd(&compileOptions);

From 58dc14962bb2bc0124189d57085574be998f180e Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Mon, 9 Jun 2014 13:42:33 +0200
Subject: [PATCH 090/117] Bug 1009603 - Tracelogger: Part 4: Handle debugger
 resumption value in Baseline, r=jandem

---
 js/src/jit/BaselineCompiler.cpp |  6 +++---
 js/src/jit/VMFunctions.cpp      | 16 ++++++++++++++++
 js/src/jit/VMFunctions.h        |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index 0c5f5d14dd3b..062438e35281 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -2861,8 +2861,9 @@ BaselineCompiler::emit_JSOP_DEBUGGER()
     return true;
 }
 
-typedef bool (*DebugEpilogueFn)(JSContext *, BaselineFrame *, jsbytecode *, bool);
-static const VMFunction DebugEpilogueInfo = FunctionInfo<DebugEpilogueFn>(jit::DebugEpilogue);
+typedef bool (*DebugEpilogueFn)(JSContext *, BaselineFrame *, jsbytecode *);
+static const VMFunction DebugEpilogueInfo =
+    FunctionInfo<DebugEpilogueFn>(jit::DebugEpilogueOnBaselineReturn);
 
 bool
 BaselineCompiler::emitReturn()
@@ -2877,7 +2878,6 @@ BaselineCompiler::emitReturn()
         masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
 
         prepareVMCall();
-        pushArg(Imm32(1));
         pushArg(ImmPtr(pc));
         pushArg(R0.scratchReg());
         if (!callVM(DebugEpilogueInfo))
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index 3b65d9530867..80f25ec9743b 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -16,6 +16,7 @@
 #include "vm/ArrayObject.h"
 #include "vm/Debugger.h"
 #include "vm/Interpreter.h"
+#include "vm/TraceLogging.h"
 
 #include "jsinferinlines.h"
 
@@ -762,6 +763,21 @@ DebugPrologue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool *mustRet
     }
 }
 
+bool
+DebugEpilogueOnBaselineReturn(JSContext *cx, BaselineFrame *frame, jsbytecode *pc)
+{
+    if (!DebugEpilogue(cx, frame, pc, true)) {
+        // DebugEpilogue popped the frame by updating jitTop, so run the stop event
+        // here before we enter the exception handler.
+        TraceLogger *logger = TraceLoggerForMainThread(cx->runtime());
+        TraceLogStopEvent(logger, TraceLogger::Baseline);
+        TraceLogStopEvent(logger); // Leave script.
+        return false;
+    }
+
+    return true;
+}
+
 bool
 DebugEpilogue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool ok)
 {
diff --git a/js/src/jit/VMFunctions.h b/js/src/jit/VMFunctions.h
index 3d0bd4b1e741..a2199ff2925a 100644
--- a/js/src/jit/VMFunctions.h
+++ b/js/src/jit/VMFunctions.h
@@ -647,6 +647,7 @@ uint32_t GetIndexFromString(JSString *str);
 
 bool DebugPrologue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool *mustReturn);
 bool DebugEpilogue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool ok);
+bool DebugEpilogueOnBaselineReturn(JSContext *cx, BaselineFrame *frame, jsbytecode *pc);
 
 bool StrictEvalPrologue(JSContext *cx, BaselineFrame *frame);
 bool HeavyweightFunPrologue(JSContext *cx, BaselineFrame *frame);

From c171ccdd6c3c4c2dfb8fa990435630985d3f047a Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Mon, 9 Jun 2014 13:42:34 +0200
Subject: [PATCH 091/117] Bug 1009603 - Tracelogger: Part 5: Handle stack
 mismatch gracefully (for release builds), r=bbouvier

---
 js/src/vm/TraceLogging.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
index d28232ef8d36..48b4f0497aaa 100644
--- a/js/src/vm/TraceLogging.cpp
+++ b/js/src/vm/TraceLogging.cpp
@@ -328,7 +328,7 @@ TraceLogger::~TraceLogger()
         // We temporary enable logging for this. Stop doesn't need any extra data,
         // so is safe to do, even when we encountered OOM.
         enabled = true;
-        while (stack.size() > 0)
+        while (stack.currentId() > 0)
             stopEvent();
         enabled = false;
     }
@@ -707,6 +707,7 @@ TraceLogger::stopEvent()
             return;
         }
     }
+    JS_ASSERT(stack.currentId() > 0);
     stack.pop();
 }
 

From 0db6ab210d8afe21809edfe97d8599f0a2e34255 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Mon, 9 Jun 2014 07:50:12 -0400
Subject: [PATCH 092/117] Bug 1022235: Disable crashtest until underlying cause
 is backed out (bug 1022509) rs=edmorely

---
 dom/src/offline/crashtests/crashtests.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/src/offline/crashtests/crashtests.list b/dom/src/offline/crashtests/crashtests.list
index a185168c2634..39d23a72d734 100644
--- a/dom/src/offline/crashtests/crashtests.list
+++ b/dom/src/offline/crashtests/crashtests.list
@@ -1 +1 @@
-load 408431-1.html
+skip load 408431-1.html # bug 1022509 - renable when the cause of that is backed out

From dab181fc1f4b2e88cc02e0c1a9bd4721050bccb6 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 9 Jun 2014 07:57:10 -0400
Subject: [PATCH 093/117] Bug 1022420 - Disable NS_NO_VTABLE on clang-cl in
 order to avoid the compiler warning; r=froydnj

---
 xpcom/base/nscore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h
index 9e8b4c5b10c2..31c924ca0a7e 100644
--- a/xpcom/base/nscore.h
+++ b/xpcom/base/nscore.h
@@ -256,7 +256,7 @@
 #ifdef NS_NO_VTABLE
 #undef NS_NO_VTABLE
 #endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 #define NS_NO_VTABLE __declspec(novtable)
 #else
 #define NS_NO_VTABLE

From f07137fd9ad7695cc1ae67ca40357a26b8789605 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Sun, 8 Jun 2014 18:37:14 -0400
Subject: [PATCH 094/117] Bug 1022376: Properly shut down LoadMonitor threads
 r=jib

---
 content/media/webrtc/LoadManager.cpp |  1 +
 content/media/webrtc/LoadMonitor.cpp | 36 +++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/content/media/webrtc/LoadManager.cpp b/content/media/webrtc/LoadManager.cpp
index b2d604c4f228..494190c20900 100644
--- a/content/media/webrtc/LoadManager.cpp
+++ b/content/media/webrtc/LoadManager.cpp
@@ -58,6 +58,7 @@ LoadManager::LoadManager(int aLoadMeasurementInterval,
 
 LoadManager::~LoadManager()
 {
+  LOG(("LoadManager: shutting down LoadMonitor"));
   mLoadMonitor->Shutdown();
 }
 
diff --git a/content/media/webrtc/LoadMonitor.cpp b/content/media/webrtc/LoadMonitor.cpp
index 2a39ad88cce9..37733de14fa8 100644
--- a/content/media/webrtc/LoadMonitor.cpp
+++ b/content/media/webrtc/LoadMonitor.cpp
@@ -149,11 +149,17 @@ private:
 
 void LoadMonitor::Shutdown()
 {
-  MutexAutoLock lock(mLock);
   if (mLoadInfoThread) {
-    mShutdownPending = true;
-    mCondVar.Notify();
+    {
+      MutexAutoLock lock(mLock);
+      LOG(("LoadMonitor: shutting down"));
+      mShutdownPending = true;
+      mCondVar.Notify();
+    }
 
+    // Note: can't just call ->Shutdown() from here; that spins the event
+    // loop here, causing re-entrancy issues if we're invoked from cycle
+    // collection.  Argh.
     mLoadInfoThread = nullptr;
 
     nsRefPtr<LoadMonitorRemoveObserver> remObsRunner = new LoadMonitorRemoveObserver(this);
@@ -516,8 +522,10 @@ class LoadInfoCollectRunner : public nsRunnable
 {
 public:
   LoadInfoCollectRunner(nsRefPtr<LoadMonitor> loadMonitor,
-                        RefPtr<LoadInfo> loadInfo)
-    : mLoadUpdateInterval(loadMonitor->mLoadUpdateInterval),
+                        RefPtr<LoadInfo> loadInfo,
+                        nsIThread *loadInfoThread)
+    : mThread(loadInfoThread),
+      mLoadUpdateInterval(loadMonitor->mLoadUpdateInterval),
       mLoadNoiseCounter(0)
   {
     mLoadMonitor = loadMonitor;
@@ -526,6 +534,19 @@ public:
 
   NS_IMETHOD Run()
   {
+    if (NS_IsMainThread()) {
+      if (mThread) {
+        // Don't leak threads!
+        mThread->Shutdown(); // can't Shutdown from the thread itself, darn
+        // Don't null out mThread!
+        // See bug 999104.  We must hold a ref to the thread across Dispatch()
+        // since the internal mThread ref could be released while processing
+        // the Dispatch(), and Dispatch/PutEvent itself doesn't hold a ref; it
+        // assumes the caller does.
+      }
+      return NS_OK;
+    }
+
     MutexAutoLock lock(mLoadMonitor->mLock);
     while (!mLoadMonitor->mShutdownPending) {
       mLoadInfo->UpdateSystemLoad();
@@ -543,10 +564,13 @@ public:
 
       mLoadMonitor->mCondVar.Wait(PR_MillisecondsToInterval(mLoadUpdateInterval));
     }
+    // ok, we need to exit safely and can't shut ourselves down (DARN)
+    NS_DispatchToMainThread(this);
     return NS_OK;
   }
 
 private:
+  nsCOMPtr<nsIThread> mThread;
   RefPtr<LoadInfo> mLoadInfo;
   nsRefPtr<LoadMonitor> mLoadMonitor;
   int mLoadUpdateInterval;
@@ -605,7 +629,7 @@ LoadMonitor::Init(nsRefPtr<LoadMonitor> &self)
   NS_NewNamedThread("Sys Load Info", getter_AddRefs(mLoadInfoThread));
 
   nsRefPtr<LoadInfoCollectRunner> runner =
-    new LoadInfoCollectRunner(self, load_info);
+    new LoadInfoCollectRunner(self, load_info, mLoadInfoThread);
   mLoadInfoThread->Dispatch(runner, NS_DISPATCH_NORMAL);
 
   return NS_OK;

From d6dc3bf601ce4d6e0f8f428c713270908dfc9ae1 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Sat, 7 Jun 2014 13:19:12 -0400
Subject: [PATCH 095/117] Bug 1022212: enable WebRTC load adaptation by default
 rs=jesup,gcp

---
 modules/libpref/src/init/all.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index b7dccbe16de1..04c1a9e8542c 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -250,7 +250,7 @@ pref("media.apple.mp3.enabled", true);
 #ifdef MOZ_WEBRTC
 pref("media.navigator.enabled", true);
 pref("media.navigator.video.enabled", true);
-pref("media.navigator.load_adapt", false);
+pref("media.navigator.load_adapt", true);
 pref("media.navigator.load_adapt.measure_interval",1000);
 pref("media.navigator.load_adapt.avg_seconds",3);
 pref("media.navigator.load_adapt.high_load","0.90");

From f4f4b816a567d205122bbf865eb3df7c6bd31663 Mon Sep 17 00:00:00 2001
From: Mark Banner <mbanner@mozilla.com>
Date: Mon, 9 Jun 2014 10:03:00 +0100
Subject: [PATCH 096/117] Bug 1019733 Update loop.server preference to the
 production server. r=abr

---
 browser/app/profile/firefox.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 4fb543bcfda8..d47d00d90dfd 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1502,9 +1502,7 @@ pref("shumway.disabled", true);
 pref("image.mem.max_decoded_image_kb", 256000);
 
 #ifdef MOZ_LOOP
-// XXX This is a temporary development server. The production one will be
-// coming soon.
-pref("loop.server", "http://loop.dev.mozaws.net");
+pref("loop.server", "https://loop.services.mozilla.com");
 pref("loop.do_not_disturb", false);
 #endif
 

From d545069052aaedf505f25f01230362cbf10c7269 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Mon, 9 Jun 2014 10:29:54 +0100
Subject: [PATCH 097/117] Bug 1018208 - Write missing tests for Loop "do not
 disturb" feature. r=Standard8

---
 browser/components/loop/test/xpcshell/head.js | 10 +++
 .../test/xpcshell/test_loopservice_dnd.js     | 81 ++++++++++++++++---
 2 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/browser/components/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
index 474d0645f67d..c2cb53db09b3 100644
--- a/browser/components/loop/test/xpcshell/head.js
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -57,6 +57,16 @@ MockWebSocketChannel.prototype = {
     this.listener.onStart(this.context);
   },
 
+  notify: function(version) {
+    this.listener.onMessageAvailable(this.context,
+      JSON.stringify({
+        messageType: "notification", updates: [{
+          channelID: "8b1081ce-9b35-42b5-b8f5-3ff8cb813a50",
+          version: version
+        }]
+    }));
+  },
+
   sendMsg: function(aMsg) {
     var message = JSON.parse(aMsg);
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
index a633e1388197..a22c0e93cca4 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
@@ -2,11 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-do_register_cleanup(function() {
-  Services.prefs.clearUserPref("loop.do_not_disturb");
-});
+XPCOMUtils.defineLazyModuleGetter(this, "Chat",
+                                  "resource:///modules/Chat.jsm");
 
-function test_get_do_not_disturb() {
+var openChatOrig = Chat.open;
+
+add_test(function test_get_do_not_disturb() {
   Services.prefs.setBoolPref("loop.do_not_disturb", false);
 
   do_check_false(MozLoopService.doNotDisturb);
@@ -14,18 +15,80 @@ function test_get_do_not_disturb() {
   Services.prefs.setBoolPref("loop.do_not_disturb", true);
 
   do_check_true(MozLoopService.doNotDisturb);
-}
 
-function test_set_do_not_disturb() {
+  run_next_test();
+});
+
+add_test(function test_set_do_not_disturb() {
   Services.prefs.setBoolPref("loop.do_not_disturb", false);
 
   MozLoopService.doNotDisturb = true;
 
   do_check_true(Services.prefs.getBoolPref("loop.do_not_disturb"));
-}
+
+  run_next_test();
+});
+
+add_test(function test_do_not_disturb_disabled_should_open_chat_window() {
+  MozLoopService.doNotDisturb = false;
+
+  MozLoopService.register().then(() => {
+    let webSocket = gMockWebSocketChannelFactory.createdInstances[0];
+
+    let opened = false;
+    Chat.open = function() {
+      opened = true;
+    };
+
+    webSocket.notify(1);
+
+    do_check_true(opened, "should open a chat window");
+
+    run_next_test();
+  });
+});
+
+add_test(function test_do_not_disturb_enabled_shouldnt_open_chat_window() {
+  MozLoopService.doNotDisturb = true;
+
+  MozLoopService.register().then(() => {
+    let webSocket = gMockWebSocketChannelFactory.createdInstances[0];
+
+    let opened = false;
+    Chat.open = function() {
+      opened = true;
+    };
+
+    webSocket.notify(1);
+
+    do_check_false(opened, "should not open a chat window");
+
+    run_next_test();
+  });
+});
 
 function run_test()
 {
-  test_get_do_not_disturb();
-  test_set_do_not_disturb();
+  setupFakeLoopServer();
+
+  loopServer.registerPathHandler("/registration", (request, response) => {
+    response.setStatusLine(null, 200, "OK");
+    response.processAsync();
+    response.finish();
+  });
+
+  // Registrations and pref settings.
+  gMockWebSocketChannelFactory.register();
+
+  do_register_cleanup(function() {
+    gMockWebSocketChannelFactory.unregister();
+
+    // Revert original Chat.open implementation
+    Chat.open = openChatOrig;
+
+    // clear test pref
+    Services.prefs.clearUserPref("loop.do_not_disturb");
+  });
+
+  run_next_test();
 }

From 3faeb6a2edd81f4fb7bd1d36269622b5ba049a4b Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Mon, 9 Jun 2014 08:04:18 -0500
Subject: [PATCH 098/117] Bug 1018955: Get rid of pause/resume button flicker
 when setting breakpoint;r=fitzgen

---
 .../devtools/debugger/debugger-controller.js  | 14 +--
 browser/devtools/debugger/debugger-toolbar.js |  1 +
 browser/devtools/debugger/test/browser.ini    |  1 +
 .../debugger/test/browser_dbg_interrupts.js   | 86 +++++++++++++++++++
 4 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 browser/devtools/debugger/test/browser_dbg_interrupts.js

diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index 498c7ef20117..c8e98450b747 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -430,6 +430,7 @@ let DebuggerController = {
  */
 function ThreadState() {
   this._update = this._update.bind(this);
+  this.interruptedByResumeButton = false;
 }
 
 ThreadState.prototype = {
@@ -472,14 +473,17 @@ ThreadState.prototype = {
   /**
    * Update the UI after a thread state change.
    */
-  _update: function(aEvent) {
-    // Ignore "interrupted" events, which are generated by the slow script
-    // dialog and internal events such as setting breakpoints, to avoid UI
-    // flicker.
-    if (aEvent == "interrupted") {
+  _update: function(aEvent, aPacket) {
+    // Ignore "interrupted" events, to avoid UI flicker. These are generated
+    // by the slow script dialog and internal events such as setting
+    // breakpoints. Pressing the resume button does need to be shown, though.
+    if (aEvent == "paused" &&
+        aPacket.why.type == "interrupted" &&
+        !this.interruptedByResumeButton) {
       return;
     }
 
+    this.interruptedByResumeButton = false;
     DebuggerView.Toolbar.toggleResumeButtonState(this.activeThread.state);
 
     if (gTarget && (aEvent == "paused" || aEvent == "resumed")) {
diff --git a/browser/devtools/debugger/debugger-toolbar.js b/browser/devtools/debugger/debugger-toolbar.js
index 230fdbe25cf4..3f4c2e484b5e 100644
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -129,6 +129,7 @@ ToolbarView.prototype = {
       DebuggerController.StackFrames.currentFrameDepth = -1;
       DebuggerController.activeThread.resume(warn);
     } else {
+      DebuggerController.ThreadState.interruptedByResumeButton = true;
       DebuggerController.activeThread.interrupt();
     }
   },
diff --git a/browser/devtools/debugger/test/browser.ini b/browser/devtools/debugger/test/browser.ini
index 13278b524f6f..d997b3728c32 100644
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -156,6 +156,7 @@ skip-if = true # Bug 933950 (leaky test)
 [browser_dbg_host-layout.js]
 [browser_dbg_iframes.js]
 [browser_dbg_instruments-pane-collapse.js]
+[browser_dbg_interrupts.js]
 [browser_dbg_listaddons.js]
 [browser_dbg_listtabs-01.js]
 [browser_dbg_listtabs-02.js]
diff --git a/browser/devtools/debugger/test/browser_dbg_interrupts.js b/browser/devtools/debugger/test/browser_dbg_interrupts.js
new file mode 100644
index 000000000000..53c40a199960
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_interrupts.js
@@ -0,0 +1,86 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test if the breakpoints toggle button works as advertised.
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
+
+function test() {
+  let gTab, gDebuggee, gPanel, gDebugger;
+  let gSources, gBreakpoints, gTarget, gResumeButton, gResumeKey, gThreadClient;
+
+  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+    gTab = aTab;
+    gDebuggee = aDebuggee;
+    gPanel = aPanel;
+    gDebugger = gPanel.panelWin;
+    gSources = gDebugger.DebuggerView.Sources;
+    gBreakpoints = gDebugger.DebuggerController.Breakpoints;
+    gTarget = gDebugger.gTarget;
+    gThreadClient = gDebugger.gThreadClient;
+    gResumeButton = gDebugger.document.getElementById("resume");
+    gResumeKey = gDebugger.document.getElementById("resumeKey");
+
+    waitForSourceShown(gPanel, "-01.js")
+      .then(() => { gTarget.on("thread-paused", failOnPause); })
+      .then(addBreakpoints)
+      .then(() => { gTarget.off("thread-paused", failOnPause); })
+      .then(testResumeButton)
+      .then(testResumeKeyboard)
+      .then(() => closeDebuggerAndFinish(gPanel))
+      .then(null, aError => {
+        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
+      });
+  });
+
+  function failOnPause() {
+    ok (false, "A pause was sent, but it shouldn't have been");
+  }
+
+  function addBreakpoints() {
+    return promise.resolve(null)
+      .then(() => gPanel.addBreakpoint({ url: gSources.values[0], line: 5 }))
+      .then(() => gPanel.addBreakpoint({ url: gSources.values[1], line: 6 }))
+      .then(() => gPanel.addBreakpoint({ url: gSources.values[1], line: 7 }))
+      .then(() => ensureThreadClientState(gPanel, "resumed"));
+  }
+
+  function resume() {
+    let onceResumed = gTarget.once("thread-resumed");
+    gThreadClient.resume();
+    return onceResumed;
+  }
+
+  function testResumeButton() {
+    info ("Pressing the resume button, expecting a thread-paused");
+
+    ok (!gResumeButton.hasAttribute("checked"), "Resume button is not checked");
+    let oncePaused = gTarget.once("thread-paused");
+    EventUtils.sendMouseEvent({ type: "mousedown" }, gResumeButton, gDebugger);
+
+    return oncePaused
+      .then(() => {
+        is (gResumeButton.getAttribute("checked"), "true", "Resume button is checked");
+      })
+      .then(() => gThreadClient.resume())
+      .then(() => ensureThreadClientState(gPanel, "resumed"))
+  }
+
+  function testResumeKeyboard() {
+    let key = gResumeKey.getAttribute("keycode");
+    info ("Triggering a pause with keyboard (" + key +  "), expecting a thread-paused");
+
+    ok (!gResumeButton.hasAttribute("checked"), "Resume button is not checked");
+    let oncePaused = gTarget.once("thread-paused");
+    EventUtils.synthesizeKey(key, { }, gDebugger);
+
+    return oncePaused
+      .then(() => {
+        is (gResumeButton.getAttribute("checked"), "true", "Resume button is checked");
+      })
+      .then(() => gThreadClient.resume())
+      .then(() => ensureThreadClientState(gPanel, "resumed"))
+  }
+}

From bb287a89297e9160a99e3356ca145c438a9d2632 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Mon, 9 Jun 2014 15:16:26 +0100
Subject: [PATCH 099/117] Bug 992309 - Don't leak gcli promise to other tests;
 r=mratcliffe

---
 .../test/browser_cmd_appcache_invalid.js      |  14 ++
 .../commandline/test/browser_cmd_jsb.js       | 115 ++++++-----
 .../test/browser_cmd_pagemod_export.js        |   6 +-
 .../test/browser_cmd_screenshot.js            |  20 +-
 .../commandline/test/browser_gcli_resource.js |   4 +-
 .../commandline/test/browser_gcli_types.js    |   6 +-
 browser/devtools/commandline/test/head.js     |  16 +-
 browser/devtools/commandline/test/helpers.js  | 101 +++++-----
 .../devtools/commandline/test/mockCommands.js |  51 +++--
 browser/devtools/debugger/test/head.js        |   2 +-
 browser/devtools/eyedropper/test/head.js      |   1 +
 browser/devtools/framework/toolbox.js         |  25 ++-
 browser/devtools/inspector/test/head.js       |   3 +
 .../devtools/responsivedesign/test/head.js    |   2 +
 browser/devtools/shared/DeveloperToolbar.jsm  | 179 ++++++++----------
 .../shared/test/browser_toolbar_tooltip.js    |  31 ++-
 toolkit/devtools/gcli/source/lib/gcli/api.js  |  24 ++-
 toolkit/devtools/gcli/source/lib/gcli/cli.js  |  39 ++--
 .../gcli/source/lib/gcli/commands/help.js     |   6 +-
 .../gcli/source/lib/gcli/commands/preflist.js |  23 ++-
 .../source/lib/gcli/connectors/connectors.js  |   6 +-
 .../gcli/source/lib/gcli/connectors/rdp.js    |  56 +++---
 .../source/lib/gcli/connectors/remoted.js     |   4 +-
 .../source/lib/gcli/converters/converters.js  |   4 +-
 .../gcli/source/lib/gcli/languages/command.js |  12 +-
 .../source/lib/gcli/languages/languages.js    |  14 +-
 .../gcli/source/lib/gcli/mozui/completer.js   |   7 +-
 .../gcli/source/lib/gcli/mozui/inputter.js    |   4 +-
 .../gcli/source/lib/gcli/mozui/tooltip.js     |   3 +-
 .../gcli/source/lib/gcli/types/array.js       |   4 +-
 .../gcli/source/lib/gcli/types/boolean.js     |   8 +-
 .../gcli/source/lib/gcli/types/command.js     |   6 +-
 .../gcli/source/lib/gcli/types/date.js        |   8 +-
 .../gcli/source/lib/gcli/types/delegate.js    |   6 +-
 .../gcli/source/lib/gcli/types/javascript.js  |  36 ++--
 .../gcli/source/lib/gcli/types/node.js        |   6 +-
 .../gcli/source/lib/gcli/types/number.js      |  14 +-
 .../gcli/source/lib/gcli/types/resource.js    |  53 +++---
 .../gcli/source/lib/gcli/types/selection.js   |  14 +-
 .../gcli/source/lib/gcli/types/string.js      |   6 +-
 .../gcli/source/lib/gcli/types/types.js       |   6 +-
 .../devtools/gcli/source/lib/gcli/ui/menu.js  |   6 +-
 .../devtools/gcli/source/lib/gcli/ui/view.js  |   3 +-
 .../gcli/source/lib/gcli/util/filesystem.js   |   4 +-
 .../gcli/source/lib/gcli/util/host.js         | 178 ++++++++---------
 .../gcli/source/lib/gcli/util/promise.js      |  95 +++++++++-
 .../gcli/source/lib/gcli/util/util.js         |  56 +++---
 47 files changed, 698 insertions(+), 589 deletions(-)

diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js b/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js
index a7e58abf0ed4..15cade68a6d8 100644
--- a/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js
+++ b/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js
@@ -118,3 +118,17 @@ function spawnTest() {
   yield helpers.closeToolbar(options);
   yield helpers.closeTab(options);
 }
+
+/**
+ * Creates a regular expression that matches a string. This greatly simplifies
+ * matching and debugging long strings.
+ *
+ * @param {String} text
+ *        Text to convert
+ * @return {RegExp}
+ *         Regular expression matching text
+ */
+function getRegexForString(str) {
+  str = str.replace(/(\.|\\|\/|\(|\)|\[|\]|\*|\+|\?|\$|\^|\|)/g, "\\$1");
+  return new RegExp(str);
+}
diff --git a/browser/devtools/commandline/test/browser_cmd_jsb.js b/browser/devtools/commandline/test/browser_cmd_jsb.js
index c51558ed0aa9..3cfae700befe 100644
--- a/browser/devtools/commandline/test/browser_cmd_jsb.js
+++ b/browser/devtools/commandline/test/browser_cmd_jsb.js
@@ -14,53 +14,7 @@ function testTask() {
   let options = yield helpers.openTab("about:blank");
   yield helpers.openToolbar(options);
 
-  let deferred = promise.defer();
-  let scratchpadWin = null;
-  let scratchpad = null;
-
-  let observer = {
-    onReady: function() {
-      scratchpad.removeObserver(observer);
-
-      let result = scratchpad.getText();
-      result = result.replace(/[\r\n]]*/g, "\n");
-      let correct = "function somefunc() {\n" +
-                "  if (true) // Some comment\n" +
-                "  doSomething();\n" +
-                "  for (let n = 0; n < 500; n++) {\n" +
-                "    if (n % 2 == 1) {\n" +
-                "      console.log(n);\n" +
-                "      console.log(n + 1);\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-      is(result, correct, "JS has been correctly prettified");
-
-      if (scratchpadWin) {
-        scratchpadWin.close();
-        scratchpadWin = null;
-      }
-      deferred.resolve();
-    },
-  };
-
-  let onLoad = function GDT_onLoad() {
-    scratchpadWin.removeEventListener("load", onLoad, false);
-    scratchpad = scratchpadWin.Scratchpad;
-
-    scratchpad.addObserver(observer);
-  };
-
-  let onNotify = function(subject, topic, data) {
-    if (topic == "domwindowopened") {
-      Services.ww.unregisterNotification(onNotify);
-
-      scratchpadWin = subject.QueryInterface(Ci.nsIDOMWindow);
-      scratchpadWin.addEventListener("load", onLoad, false);
-    }
-  };
-
-  Services.ww.registerNotification(onNotify);
+  let notifyPromise = wwNotifyOnce();
 
   helpers.audit(options, [
     {
@@ -74,14 +28,73 @@ function testTask() {
     },
     {
       setup: 'jsb ' + TEST_URI,
-      // Should result in a new window, which should fire onReady (eventually)
-      exec: {
-      }
+      // Should result in a new scratchpad window
+      exec: { }
     }
   ]);
 
-  yield deferred.promise;
+  let { subject } = yield notifyPromise;
+  let scratchpadWin = subject.QueryInterface(Ci.nsIDOMWindow);
+  yield helpers.listenOnce(scratchpadWin, "load");
+
+  let scratchpad = scratchpadWin.Scratchpad;
+
+  yield observeOnce(scratchpad);
+
+  let result = scratchpad.getText();
+  result = result.replace(/[\r\n]]*/g, "\n");
+  let correct = "function somefunc() {\n" +
+            "  if (true) // Some comment\n" +
+            "  doSomething();\n" +
+            "  for (let n = 0; n < 500; n++) {\n" +
+            "    if (n % 2 == 1) {\n" +
+            "      console.log(n);\n" +
+            "      console.log(n + 1);\n" +
+            "    }\n" +
+            "  }\n" +
+            "}";
+  is(result, correct, "JS has been correctly prettified");
+
+  if (scratchpadWin) {
+    scratchpadWin.close();
+    scratchpadWin = null;
+  }
 
   yield helpers.closeToolbar(options);
   yield helpers.closeTab(options);
 }
+
+/**
+ * A wrapper for calling Services.ww.[un]registerNotification using promises.
+ * @return a promise that resolves when the notification service first notifies
+ * with topic == "domwindowopened".
+ * The value of the promise is { subject: subject, topic: topic, data: data }
+ */
+function wwNotifyOnce() {
+  return new Promise(resolve => {
+    let onNotify = (subject, topic, data) => {
+      if (topic == "domwindowopened") {
+        Services.ww.unregisterNotification(onNotify);
+        resolve({ subject: subject, topic: topic, data: data });
+      }
+    };
+
+    Services.ww.registerNotification(onNotify);
+  });
+}
+
+/**
+ * YET ANOTHER WRAPPER for a place where we are using events as poor-man's
+ * promises. Perhaps this should be promoted to scratchpad?
+ */
+function observeOnce(scratchpad) {
+  return new Promise(resolve => {
+    let observer = {
+      onReady: function() {
+        scratchpad.removeObserver(observer);
+        resolve();
+      },
+    };
+    scratchpad.addObserver(observer);
+  });
+}
diff --git a/browser/devtools/commandline/test/browser_cmd_pagemod_export.js b/browser/devtools/commandline/test/browser_cmd_pagemod_export.js
index 4c8df22a76c2..c405a29c72d7 100644
--- a/browser/devtools/commandline/test/browser_cmd_pagemod_export.js
+++ b/browser/devtools/commandline/test/browser_cmd_pagemod_export.js
@@ -322,11 +322,9 @@ function spawnTest() {
         }
       },
       post: function() {
-        let deferred = promise.defer();
-        executeSoon(function() {
-          deferred.resolve();
+        return new Promise(resolve => {
+          executeSoon(resolve);
         });
-        return deferred.promise;
       }
     },
     {
diff --git a/browser/devtools/commandline/test/browser_cmd_screenshot.js b/browser/devtools/commandline/test/browser_cmd_screenshot.js
index 2f9d7c1e86a1..437daa99f83c 100644
--- a/browser/devtools/commandline/test/browser_cmd_screenshot.js
+++ b/browser/devtools/commandline/test/browser_cmd_screenshot.js
@@ -166,18 +166,16 @@ function addTabWithToolbarRunTests(win) {
 }
 
 function addWindow(windowOptions) {
-  let deferred = promise.defer();
+  return new Promise(resolve => {
+    let win = OpenBrowserWindow(windowOptions);
 
-  let win = OpenBrowserWindow(windowOptions);
-
-  // This feels hacky, we should refactor it
-  whenDelayedStartupFinished(win, function() {
-    // Would like to get rid of this executeSoon, but without it the url
-    // (TEST_URI) provided in addTabWithToolbarRunTests hasn't loaded
-    executeSoon(function() {
-      deferred.resolve(win);
+    // This feels hacky, we should refactor it
+    whenDelayedStartupFinished(win, () => {
+      // Would like to get rid of this executeSoon, but without it the url
+      // (TEST_URI) provided in addTabWithToolbarRunTests hasn't loaded
+      executeSoon(() => {
+        resolve(win);
+      });
     });
   });
-
-  return deferred.promise;
 }
diff --git a/browser/devtools/commandline/test/browser_gcli_resource.js b/browser/devtools/commandline/test/browser_gcli_resource.js
index 68a2692add33..5f7185564191 100644
--- a/browser/devtools/commandline/test/browser_gcli_resource.js
+++ b/browser/devtools/commandline/test/browser_gcli_resource.js
@@ -42,7 +42,7 @@ function test() {
 
 // var assert = require('../testharness/assert');
 
-var promise = require('gcli/util/promise');
+var Promise = require('gcli/util/promise').Promise;
 var util = require('gcli/util/util');
 var resource = require('gcli/types/resource');
 var Status = require('gcli/types/types').Status;
@@ -162,7 +162,7 @@ function checkPrediction(res, prediction) {
     assert.is(typeof value.loadContents, 'function', 'resource for ' + name);
     assert.is(typeof value.element, 'object', 'resource for ' + name);
 
-    return promise.resolve(res.stringify(value, context)).then(function(strung) {
+    return Promise.resolve(res.stringify(value, context)).then(function(strung) {
       assert.is(strung, name, 'stringify for ' + name);
     });
   });
diff --git a/browser/devtools/commandline/test/browser_gcli_types.js b/browser/devtools/commandline/test/browser_gcli_types.js
index ed0f8f1a288a..0561875a1cbf 100644
--- a/browser/devtools/commandline/test/browser_gcli_types.js
+++ b/browser/devtools/commandline/test/browser_gcli_types.js
@@ -42,7 +42,7 @@ function test() {
 
 // var assert = require('../testharness/assert');
 var util = require('gcli/util/util');
-var promise = require('gcli/util/promise');
+var Promise = require('gcli/util/promise').Promise;
 var nodetype = require('gcli/types/node');
 
 exports.setup = function(options) {
@@ -79,7 +79,7 @@ function forEachType(options, typeSpec, callback) {
 
     var type = types.createType(typeSpec);
     var reply = callback(type);
-    return promise.resolve(reply).then(function(value) {
+    return Promise.resolve(reply).then(function(value) {
       // Clean up
       delete typeSpec.name;
       delete typeSpec.requisition;
@@ -125,7 +125,7 @@ exports.testNullDefault = function(options) {
 
   return forEachType(options, { defaultValue: null }, function(type) {
     var reply = type.stringify(null, context);
-    return promise.resolve(reply).then(function(str) {
+    return Promise.resolve(reply).then(function(str) {
       assert.is(str, '', 'stringify(null) for ' + type.name);
     });
   });
diff --git a/browser/devtools/commandline/test/head.js b/browser/devtools/commandline/test/head.js
index fbe0d1a7997c..4868ddcb4778 100644
--- a/browser/devtools/commandline/test/head.js
+++ b/browser/devtools/commandline/test/head.js
@@ -27,20 +27,6 @@ function whenDelayedStartupFinished(aWindow, aCallback) {
   }, "browser-delayed-startup-finished", false);
 }
 
-/**
- * Creates a regular expression that matches a string. This greatly simplifies
- * matching and debugging long strings.
- *
- * @param {String} text
- *        Text to convert
- * @return {RegExp}
- *         Regular expression matching text
- */
-function getRegexForString(str) {
-  str = str.replace(/(\.|\\|\/|\(|\)|\[|\]|\*|\+|\?|\$|\^|\|)/g, "\\$1");
-  return new RegExp(str);
-}
-
 /**
  * Force GC on shutdown, because it seems that GCLI can outrun the garbage
  * collector in some situations, which causes test failures in later tests
@@ -53,5 +39,5 @@ registerCleanupFunction(function tearDown() {
 });
 
 function asyncTest(generator) {
-  return () => Task.spawn(generator).then(null, ok.bind(null, false)).then(finish);
+  return () => Task.spawn(generator).catch(ok.bind(null, false)).then(finish);
 }
diff --git a/browser/devtools/commandline/test/helpers.js b/browser/devtools/commandline/test/helpers.js
index 0f44f5bd68a6..7c72194b6c6c 100644
--- a/browser/devtools/commandline/test/helpers.js
+++ b/browser/devtools/commandline/test/helpers.js
@@ -18,16 +18,16 @@
 
 // A copy of this code exists in firefox mochitests. They should be kept
 // in sync. Hence the exports synonym for non AMD contexts.
-this.EXPORTED_SYMBOLS = [ 'helpers' ];
+var { helpers, gcli, assert } = (function() {
+
 var helpers = {};
-this.helpers = helpers;
 
 var TargetFactory = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.TargetFactory;
 var require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
 
 var assert = { ok: ok, is: is, log: info };
 var util = require('gcli/util/util');
-var promise = require('gcli/util/promise');
+var Promise = require('gcli/util/promise').Promise;
 var cli = require('gcli/cli');
 var KeyEvent = require('gcli/util/util').KeyEvent;
 var gcli = require('gcli/index');
@@ -137,7 +137,7 @@ helpers.addTab = function(url, callback, options) {
 
     var reply = callback.call(null, options);
 
-    return promise.resolve(reply).then(null, function(error) {
+    return Promise.resolve(reply).then(null, function(error) {
       ok(false, error);
     }).then(function() {
       tabbrowser.removeTab(options.tab);
@@ -206,7 +206,7 @@ helpers.closeTab = function(options) {
   delete options.chromeWindow;
   delete options.isFirefox;
 
-  return promise.resolve(undefined);
+  return Promise.resolve(undefined);
 };
 
 /**
@@ -283,13 +283,13 @@ helpers.handleError = function(ex) {
  * @return A promise resolved with the event object when the event first happens
  */
 helpers.listenOnce = function(element, event, useCapture) {
-  var deferred = promise.defer();
-  var onEvent = function(ev) {
-    element.removeEventListener(event, onEvent, useCapture);
-    deferred.resolve(ev);
-  };
-  element.addEventListener(event, onEvent, useCapture);
-  return deferred.promise;
+  return new Promise(function(resolve, reject) {
+    var onEvent = function(ev) {
+      element.removeEventListener(event, onEvent, useCapture);
+      resolve(ev);
+    };
+    element.addEventListener(event, onEvent, useCapture);
+  }.bind(this));
 };
 
 /**
@@ -302,13 +302,13 @@ helpers.listenOnce = function(element, event, useCapture) {
  * function other parameters are dropped.
  */
 helpers.observeOnce = function(topic, ownsWeak=false) {
-  let deferred = promise.defer();
-  let resolver = function(subject) {
-    Services.obs.removeObserver(resolver, topic);
-    deferred.resolve(subject);
-  };
-  Services.obs.addObserver(resolver, topic, ownsWeak);
-  return deferred.promise;
+  return new Promise(function(resolve, reject) {
+    let resolver = function(subject) {
+      Services.obs.removeObserver(resolver, topic);
+      resolve(subject);
+    };
+    Services.obs.addObserver(resolver, topic, ownsWeak);
+  }.bind(this));
 };
 
 /**
@@ -317,22 +317,14 @@ helpers.observeOnce = function(topic, ownsWeak=false) {
  */
 helpers.promiseify = function(functionWithLastParamCallback, scope) {
   return function() {
-    let deferred = promise.defer();
-
     let args = [].slice.call(arguments);
-    args.push(function(callbackParam) {
-      deferred.resolve(callbackParam);
-    });
-
-    try {
+    return new Promise(resolve => {
+      args.push((...results) => {
+        resolve(results.length > 1 ? results : results[0]);
+      });
       functionWithLastParamCallback.apply(scope, args);
-    }
-    catch (ex) {
-      deferred.resolve(ex);
-    }
-
-    return deferred.promise;
-  }
+    });
+  };
 };
 
 /**
@@ -353,7 +345,7 @@ helpers.addTabWithToolbar = function(url, callback, options) {
 
       var reply = callback.call(null, innerOptions);
 
-      return promise.resolve(reply).then(null, function(error) {
+      return Promise.resolve(reply).then(null, function(error) {
         ok(false, error);
         console.error(error);
       }).then(function() {
@@ -389,8 +381,8 @@ helpers.runTests = function(options, tests) {
 
   info("SETUP");
   var setupDone = (tests.setup != null) ?
-      promise.resolve(tests.setup(options)) :
-      promise.resolve();
+      Promise.resolve(tests.setup(options)) :
+      Promise.resolve();
 
   var testDone = setupDone.then(function() {
     return util.promiseEach(testNames, function(testName) {
@@ -399,13 +391,13 @@ helpers.runTests = function(options, tests) {
 
       if (typeof action === "function") {
         var reply = action.call(tests, options);
-        return promise.resolve(reply);
+        return Promise.resolve(reply);
       }
       else if (Array.isArray(action)) {
         return helpers.audit(options, action);
       }
 
-      return promise.reject("test action '" + testName +
+      return Promise.reject("test action '" + testName +
                             "' is not a function or helpers.audit() object");
     });
   }, recover);
@@ -413,8 +405,8 @@ helpers.runTests = function(options, tests) {
   return testDone.then(function() {
     info("SHUTDOWN");
     return (tests.shutdown != null) ?
-        promise.resolve(tests.shutdown(options)) :
-        promise.resolve();
+        Promise.resolve(tests.shutdown(options)) :
+        Promise.resolve();
   }, recover);
 };
 
@@ -548,7 +540,7 @@ helpers._createDebugCheck = function(options) {
   var hintsPromise = helpers._actual.hints(options);
   var predictionsPromise = helpers._actual.predictions(options);
 
-  return promise.all(hintsPromise, predictionsPromise).then(function(values) {
+  return Promise.all(hintsPromise, predictionsPromise).then(function(values) {
     var hints = values[0];
     var predictions = values[1];
     var output = '';
@@ -761,7 +753,7 @@ helpers._check = function(options, name, checks) {
   });
 
   if (checks == null) {
-    return promise.resolve();
+    return Promise.resolve();
   }
 
   var outstanding = [];
@@ -916,7 +908,7 @@ helpers._check = function(options, name, checks) {
     });
   }
 
-  return promise.all(outstanding).then(function() {
+  return Promise.all(outstanding).then(function() {
     // Ensure the promise resolves to nothing
     return undefined;
   });
@@ -932,7 +924,7 @@ helpers._check = function(options, name, checks) {
 helpers._exec = function(options, name, expected) {
   var requisition = options.requisition;
   if (expected == null) {
-    return promise.resolve({});
+    return Promise.resolve({});
   }
 
   var origLogErrors = cli.logErrors;
@@ -1016,7 +1008,7 @@ helpers._exec = function(options, name, expected) {
     if (expected.error) {
       cli.logErrors = origLogErrors;
     }
-    return promise.resolve({});
+    return Promise.resolve({});
   }
 };
 
@@ -1029,10 +1021,10 @@ helpers._setup = function(options, name, audit) {
   }
 
   if (typeof audit.setup === 'function') {
-    return promise.resolve(audit.setup.call(audit));
+    return Promise.resolve(audit.setup.call(audit));
   }
 
-  return promise.reject('\'setup\' property must be a string or a function. Is ' + audit.setup);
+  return Promise.reject('\'setup\' property must be a string or a function. Is ' + audit.setup);
 };
 
 /**
@@ -1040,9 +1032,9 @@ helpers._setup = function(options, name, audit) {
  */
 helpers._post = function(name, audit, data) {
   if (typeof audit.post === 'function') {
-    return promise.resolve(audit.post.call(audit, data.output, data.text));
+    return Promise.resolve(audit.post.call(audit, data.output, data.text));
   }
-  return promise.resolve(audit.post);
+  return Promise.resolve(audit.post);
 };
 
 /*
@@ -1178,7 +1170,7 @@ helpers.audit = function(options, audits) {
             'due to ' + audit.skipRemainingIf.name :
             '';
         assert.log('Skipped ' + name + ' ' + skipReason);
-        return promise.resolve(undefined);
+        return Promise.resolve(undefined);
       }
     }
 
@@ -1189,13 +1181,13 @@ helpers.audit = function(options, audits) {
       if (skip) {
         var reason = audit.skipIf.name ? 'due to ' + audit.skipIf.name : '';
         assert.log('Skipped ' + name + ' ' + reason);
-        return promise.resolve(undefined);
+        return Promise.resolve(undefined);
       }
     }
 
     if (skipReason != null) {
       assert.log('Skipped ' + name + ' ' + skipReason);
-      return promise.resolve(undefined);
+      return Promise.resolve(undefined);
     }
 
     var start = new Date().getTime();
@@ -1210,7 +1202,7 @@ helpers.audit = function(options, audits) {
       // a key-sequence (i.e. targeting terminal.js) when there is no terminal
       if (chunkLen === -1) {
         assert.log('Skipped ' + name + ' ' + skipReason);
-        return promise.resolve(undefined);
+        return Promise.resolve(undefined);
       }
 
       if (assert.currentTest) {
@@ -1269,3 +1261,6 @@ function log(message) {
     console.log(message);
   }
 }
+
+return { helpers: helpers, gcli: gcli, assert: assert };
+})();
diff --git a/browser/devtools/commandline/test/mockCommands.js b/browser/devtools/commandline/test/mockCommands.js
index b0352075541b..74dfa74e060d 100644
--- a/browser/devtools/commandline/test/mockCommands.js
+++ b/browser/devtools/commandline/test/mockCommands.js
@@ -23,6 +23,7 @@
 // <INJECTED SOURCE:END>
 
 
+var Promise = require('gcli/util/promise').Promise;
 var mockCommands = {};
 
 // We use an alias for exports here because this module is used in Firefox
@@ -506,29 +507,28 @@ mockCommands.items = [
       }
     ],
     exec: function(args, context) {
-      var deferred;
       if (args.method === 'reject') {
-        deferred = context.defer();
-        setTimeout(function() {
-          deferred.reject('rejected promise');
-        }, 10);
-        return deferred.promise;
+        return new Promise(function(resolve, reject) {
+          setTimeout(function() {
+            reject('rejected promise');
+          }, 10);
+        });
       }
 
       if (args.method === 'rejecttyped') {
-        deferred = context.defer();
-        setTimeout(function() {
-          deferred.reject(context.typedData('number', 54));
-        }, 10);
-        return deferred.promise;
+        return new Promise(function(resolve, reject) {
+          setTimeout(function() {
+            reject(context.typedData('number', 54));
+          }, 10);
+        });
       }
 
       if (args.method === 'throwinpromise') {
-        deferred = context.defer();
-        setTimeout(function() {
-          deferred.resolve('should be lost');
-        }, 10);
-        return deferred.promise.then(function() {
+        return new Promise(function(resolve, reject) {
+          setTimeout(function() {
+            resolve('should be lost');
+          }, 10);
+        }).then(function() {
           var t = null;
           return t.foo;
         });
@@ -655,17 +655,14 @@ mockCommands.items = [
         type: {
           name: 'selection',
           data: function(context) {
-            var deferred = context.defer();
-
-            var resolve = function() {
-              deferred.resolve([
-                'Shalom', 'Namasté', 'Hallo', 'Dydd-da',
-                'Chào', 'Hej', 'Saluton', 'Sawubona'
-              ]);
-            };
-
-            setTimeout(resolve, 10);
-            return deferred.promise;
+            return new Promise(function(resolve, reject) {
+              setTimeout(function() {
+                resolve([
+                  'Shalom', 'Namasté', 'Hallo', 'Dydd-da',
+                  'Chào', 'Hej', 'Saluton', 'Sawubona'
+                ]);
+              }, 10);
+            });
           }
         }
       }
diff --git a/browser/devtools/debugger/test/head.js b/browser/devtools/debugger/test/head.js
index 4852b805f52a..9d62971afe81 100644
--- a/browser/devtools/debugger/test/head.js
+++ b/browser/devtools/debugger/test/head.js
@@ -13,7 +13,7 @@ let gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
 Services.prefs.setBoolPref("devtools.debugger.log", false);
 
 let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+let { Promise: promise } = Cu.import("resource://gre/modules/devtools/deprecated-sync-thenables.js", {});
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { require } = devtools;
diff --git a/browser/devtools/eyedropper/test/head.js b/browser/devtools/eyedropper/test/head.js
index ed0dd1bffaba..8d92042d2356 100644
--- a/browser/devtools/eyedropper/test/head.js
+++ b/browser/devtools/eyedropper/test/head.js
@@ -6,6 +6,7 @@ const TEST_HOST = 'mochi.test:8888';
 
 let { devtools } = Components.utils.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { Eyedropper, EyedropperManager } = devtools.require("devtools/eyedropper/eyedropper");
+const { Promise: promise } = devtools.require("resource://gre/modules/Promise.jsm");
 
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "../../../commandline/test/helpers.js", this);
diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index 7c16db3789ab..b85fcdf397cb 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -245,7 +245,7 @@ Toolbox.prototype = {
         this._buildDockButtons();
         this._buildOptions();
         this._buildTabs();
-        this._buildButtons();
+        let buttonsPromise = this._buildButtons();
         this._addKeysToWindow();
         this._addReloadKeys();
         this._addToolSwitchingKeys();
@@ -255,8 +255,10 @@ Toolbox.prototype = {
         this._telemetry.toolOpened("toolbox");
 
         this.selectTool(this._defaultToolId).then(panel => {
-          this.emit("ready");
-          deferred.resolve();
+          buttonsPromise.then(() => {
+            this.emit("ready");
+            deferred.resolve();
+          }, deferred.reject);
         });
       };
 
@@ -546,17 +548,20 @@ Toolbox.prototype = {
     }
 
     if (!this.target.isLocalTab) {
-      return;
+      return Promise.resolve();
     }
 
     let spec = CommandUtils.getCommandbarSpec("devtools.toolbox.toolbarSpec");
     let environment = CommandUtils.createEnvironment(this, '_target');
-    this._requisition = CommandUtils.createRequisition(environment);
-    let buttons = CommandUtils.createButtons(spec, this._target,
-                                             this.doc, this._requisition);
-    let container = this.doc.getElementById("toolbox-buttons");
-    buttons.forEach(container.appendChild.bind(container));
-    this.setToolboxButtonsVisibility();
+    return CommandUtils.createRequisition(environment).then(requisition => {
+      this._requisition = requisition;
+      return CommandUtils.createButtons(spec, this.target, this.doc,
+                                        requisition).then(buttons => {
+        let container = this.doc.getElementById("toolbox-buttons");
+        buttons.forEach(container.appendChild.bind(container));
+        this.setToolboxButtonsVisibility();
+      });
+    });
   },
 
   /**
diff --git a/browser/devtools/inspector/test/head.js b/browser/devtools/inspector/test/head.js
index cf3a10469c18..0e7d6c5f53e0 100644
--- a/browser/devtools/inspector/test/head.js
+++ b/browser/devtools/inspector/test/head.js
@@ -13,6 +13,9 @@ const Cc = Components.classes;
 
 //Services.prefs.setBoolPref("devtools.dump.emit", true);
 
+const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+
 let tempScope = {};
 Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm", tempScope);
 let LayoutHelpers = tempScope.LayoutHelpers;
diff --git a/browser/devtools/responsivedesign/test/head.js b/browser/devtools/responsivedesign/test/head.js
index b93100300994..da875faa9df4 100644
--- a/browser/devtools/responsivedesign/test/head.js
+++ b/browser/devtools/responsivedesign/test/head.js
@@ -3,6 +3,8 @@
 
 "use strict";
 
+const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+
 let {devtools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let TargetFactory = devtools.TargetFactory;
 
diff --git a/browser/devtools/shared/DeveloperToolbar.jsm b/browser/devtools/shared/DeveloperToolbar.jsm
index e942584f52d8..5d2119672d8e 100644
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -41,10 +41,17 @@ const Telemetry = require("devtools/shared/telemetry");
 
 // This lazy getter is needed to prevent a require loop
 XPCOMUtils.defineLazyGetter(this, "gcli", () => {
-  let gcli = require("gcli/index");
-  require("devtools/commandline/commands-index");
-  gcli.load();
-  return gcli;
+  try {
+    require("devtools/commandline/commands-index");
+    return require("gcli/index");
+  }
+  catch (ex) {
+    console.error(ex);
+  }
+});
+
+XPCOMUtils.defineLazyGetter(this, "util", () => {
+  return require("gcli/util/util");
 });
 
 Object.defineProperty(this, "ConsoleServiceListener", {
@@ -65,9 +72,10 @@ let CommandUtils = {
    * Utility to ensure that things are loaded in the correct order
    */
   createRequisition: function(environment) {
-    let temp = gcli.createDisplay; // Ensure GCLI is loaded
-    let Requisition = require("gcli/cli").Requisition
-    return new Requisition({ environment: environment });
+    return gcli.load().then(() => {
+      let Requisition = require("gcli/cli").Requisition
+      return new Requisition({ environment: environment });
+    });
   },
 
   /**
@@ -80,36 +88,23 @@ let CommandUtils = {
   },
 
   /**
-   * A toolbarSpec is an array of buttonSpecs. A buttonSpec is an array of
-   * strings each of which is a GCLI command (including args if needed).
+   * A toolbarSpec is an array of strings each of which is a GCLI command.
    *
    * Warning: this method uses the unload event of the window that owns the
    * buttons that are of type checkbox. this means that we don't properly
    * unregister event handlers until the window is destroyed.
    */
   createButtons: function(toolbarSpec, target, document, requisition) {
-    let reply = [];
-
-    toolbarSpec.forEach(function(buttonSpec) {
-      let button = document.createElement("toolbarbutton");
-      reply.push(button);
-
-      if (typeof buttonSpec == "string") {
-        buttonSpec = { typed: buttonSpec };
-      }
+    return util.promiseEach(toolbarSpec, typed => {
       // Ask GCLI to parse the typed string (doesn't execute it)
-      requisition.update(buttonSpec.typed);
+      return requisition.update(typed).then(() => {
+        let button = document.createElement("toolbarbutton");
 
-      // Ignore invalid commands
-      let command = requisition.commandAssignment.value;
-      if (command == null) {
-        // TODO: Have a broken icon
-        // button.icon = 'Broken';
-        button.setAttribute("label", "X");
-        button.setAttribute("tooltip", "Unknown command: " + buttonSpec.typed);
-        button.setAttribute("disabled", "true");
-      }
-      else {
+        // Ignore invalid commands
+        let command = requisition.commandAssignment.value;
+        if (command == null) {
+          throw new Error("No command '" + typed + "'");
+        }
         if (command.buttonId != null) {
           button.id = command.buttonId;
         }
@@ -123,22 +118,14 @@ let CommandUtils = {
           button.setAttribute("tooltiptext", command.description);
         }
 
-        button.addEventListener("click", function() {
-          requisition.update(buttonSpec.typed);
-          //if (requisition.getStatus() == Status.VALID) {
-            requisition.exec();
-          /*
-          }
-          else {
-            console.error('incomplete commands not yet supported');
-          }
-          */
+        button.addEventListener("click", () => {
+          requisition.updateExec(typed);
         }, false);
 
         // Allow the command button to be toggleable
         if (command.state) {
           button.setAttribute("autocheck", false);
-          let onChange = function(event, eventTab) {
+          let onChange = (event, eventTab) => {
             if (eventTab == target.tab) {
               if (command.state.isChecked(target)) {
                 button.setAttribute("checked", true);
@@ -150,16 +137,16 @@ let CommandUtils = {
           };
           command.state.onChange(target, onChange);
           onChange(null, target.tab);
-          document.defaultView.addEventListener("unload", function() {
+          document.defaultView.addEventListener("unload", () => {
             command.state.offChange(target, onChange);
           }, false);
         }
-      }
+
+        requisition.clear();
+
+        return button;
+      });
     });
-
-    requisition.update('');
-
-    return reply;
   },
 
   /**
@@ -382,56 +369,58 @@ DeveloperToolbar.prototype.show = function(focus) {
 
       this._doc.getElementById("Tools:DevToolbar").setAttribute("checked", "true");
 
-      this.display = gcli.createDisplay({
-        contentDocument: this._chromeWindow.getBrowser().contentDocument,
-        chromeDocument: this._doc,
-        chromeWindow: this._chromeWindow,
-        hintElement: this.tooltipPanel.hintElement,
-        inputElement: this._input,
-        completeElement: this._doc.querySelector(".gclitoolbar-complete-node"),
-        backgroundElement: this._doc.querySelector(".gclitoolbar-stack-node"),
-        outputDocument: this.outputPanel.document,
-        environment: CommandUtils.createEnvironment(this, "target"),
-        tooltipClass: "gcliterm-tooltip",
-        eval: null,
-        scratchpad: null
+      return gcli.load().then(() => {
+        this.display = gcli.createDisplay({
+          contentDocument: this._chromeWindow.getBrowser().contentDocument,
+          chromeDocument: this._doc,
+          chromeWindow: this._chromeWindow,
+          hintElement: this.tooltipPanel.hintElement,
+          inputElement: this._input,
+          completeElement: this._doc.querySelector(".gclitoolbar-complete-node"),
+          backgroundElement: this._doc.querySelector(".gclitoolbar-stack-node"),
+          outputDocument: this.outputPanel.document,
+          environment: CommandUtils.createEnvironment(this, "target"),
+          tooltipClass: "gcliterm-tooltip",
+          eval: null,
+          scratchpad: null
+        });
+
+        this.display.focusManager.addMonitoredElement(this.outputPanel._frame);
+        this.display.focusManager.addMonitoredElement(this._element);
+
+        this.display.onVisibilityChange.add(this.outputPanel._visibilityChanged,
+                                            this.outputPanel);
+        this.display.onVisibilityChange.add(this.tooltipPanel._visibilityChanged,
+                                            this.tooltipPanel);
+        this.display.onOutput.add(this.outputPanel._outputChanged, this.outputPanel);
+
+        let tabbrowser = this._chromeWindow.getBrowser();
+        tabbrowser.tabContainer.addEventListener("TabSelect", this, false);
+        tabbrowser.tabContainer.addEventListener("TabClose", this, false);
+        tabbrowser.addEventListener("load", this, true);
+        tabbrowser.addEventListener("beforeunload", this, true);
+
+        this._initErrorsCount(tabbrowser.selectedTab);
+        this._devtoolsUnloaded = this._devtoolsUnloaded.bind(this);
+        this._devtoolsLoaded = this._devtoolsLoaded.bind(this);
+        Services.obs.addObserver(this._devtoolsUnloaded, "devtools-unloaded", false);
+        Services.obs.addObserver(this._devtoolsLoaded, "devtools-loaded", false);
+
+        this._element.hidden = false;
+
+        if (focus) {
+          this._input.focus();
+        }
+
+        this._notify(NOTIFICATIONS.SHOW);
+
+        if (!DeveloperToolbar.introShownThisSession) {
+          this.display.maybeShowIntro();
+          DeveloperToolbar.introShownThisSession = true;
+        }
+
+        this._showPromise = null;
       });
-
-      this.display.focusManager.addMonitoredElement(this.outputPanel._frame);
-      this.display.focusManager.addMonitoredElement(this._element);
-
-      this.display.onVisibilityChange.add(this.outputPanel._visibilityChanged,
-                                          this.outputPanel);
-      this.display.onVisibilityChange.add(this.tooltipPanel._visibilityChanged,
-                                          this.tooltipPanel);
-      this.display.onOutput.add(this.outputPanel._outputChanged, this.outputPanel);
-
-      let tabbrowser = this._chromeWindow.getBrowser();
-      tabbrowser.tabContainer.addEventListener("TabSelect", this, false);
-      tabbrowser.tabContainer.addEventListener("TabClose", this, false);
-      tabbrowser.addEventListener("load", this, true);
-      tabbrowser.addEventListener("beforeunload", this, true);
-
-      this._initErrorsCount(tabbrowser.selectedTab);
-      this._devtoolsUnloaded = this._devtoolsUnloaded.bind(this);
-      this._devtoolsLoaded = this._devtoolsLoaded.bind(this);
-      Services.obs.addObserver(this._devtoolsUnloaded, "devtools-unloaded", false);
-      Services.obs.addObserver(this._devtoolsLoaded, "devtools-loaded", false);
-
-      this._element.hidden = false;
-
-      if (focus) {
-        this._input.focus();
-      }
-
-      this._notify(NOTIFICATIONS.SHOW);
-
-      if (!DeveloperToolbar.introShownThisSession) {
-        this.display.maybeShowIntro();
-        DeveloperToolbar.introShownThisSession = true;
-      }
-
-      this._showPromise = null;
     });
   });
 
diff --git a/browser/devtools/shared/test/browser_toolbar_tooltip.js b/browser/devtools/shared/test/browser_toolbar_tooltip.js
index fa86b2fcb0c1..2f2a6bcb4148 100644
--- a/browser/devtools/shared/test/browser_toolbar_tooltip.js
+++ b/browser/devtools/shared/test/browser_toolbar_tooltip.js
@@ -6,24 +6,27 @@
 const TEST_URI = "data:text/html;charset=utf-8,<p>Tooltip Tests</p>";
 
 function test() {
-  addTab(TEST_URI, function(browser, tab) {
-    info("Starting browser_toolbar_tooltip.js");
-    openTest();
+  addTab(TEST_URI, function() {
+    Task.spawn(runTest).catch(err => {
+      ok(false, ex);
+      console.error(ex);
+    }).then(finish);
   });
 }
 
-function openTest() {
+function* runTest() {
+  info("Starting browser_toolbar_tooltip.js");
+
   ok(!DeveloperToolbar.visible, "DeveloperToolbar is not visible in runTest");
 
-  oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.SHOW, catchFail(runTest));
+  let showPromise = observeOnce(DeveloperToolbar.NOTIFICATIONS.SHOW);
   document.getElementById("Tools:DevToolbar").doCommand();
-}
+  yield showPromise;
 
-function runTest() {
   let tooltipPanel = DeveloperToolbar.tooltipPanel;
 
   DeveloperToolbar.display.focusManager.helpRequest();
-  DeveloperToolbar.display.inputter.setInput('help help');
+  yield DeveloperToolbar.display.inputter.setInput('help help');
 
   DeveloperToolbar.display.inputter.setCursor({ start: 'help help'.length });
   is(tooltipPanel._dimensions.start, 'help '.length,
@@ -44,11 +47,19 @@ function runTest() {
   is(tooltipPanel._dimensions.start, 0,
           'search param start, when cursor at start');
   ok(getLeftMargin() > 9, 'tooltip offset, when cursor at start')
-
-  finish();
 }
 
 function getLeftMargin() {
   let style = DeveloperToolbar.tooltipPanel._panel.style.marginLeft;
   return parseInt(style.slice(0, -2), 10);
 }
+
+function observeOnce(topic, ownsWeak=false) {
+  return new Promise(function(resolve, reject) {
+    let resolver = function(subject) {
+      Services.obs.removeObserver(resolver, topic);
+      resolve(subject);
+    };
+    Services.obs.addObserver(resolver, topic, ownsWeak);
+  }.bind(this));
+}
diff --git a/toolkit/devtools/gcli/source/lib/gcli/api.js b/toolkit/devtools/gcli/source/lib/gcli/api.js
index f965e4f1799a..ca9ca7d84076 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/api.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/api.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('./util/promise');
+var Promise = require('./util/promise').Promise;
 var centralCanon = require('./commands/commands').centralCanon;
 var connectors = require('./connectors/connectors');
 var converters = require('./converters/converters');
@@ -117,7 +117,7 @@ exports.getApi = function() {
     // And load the new items
     try {
       var loader = loadableModules[name];
-      return promise.resolve(loader(name)).then(function(newModule) {
+      return Promise.resolve(loader(name)).then(function(newModule) {
         if (existingModule === newModule) {
           return;
         }
@@ -138,10 +138,12 @@ exports.getApi = function() {
     }
     catch (ex) {
       console.error(ex);
-      return promise.reject('Failure when loading \'' + name + '\'');
+      return Promise.reject('Failure when loading \'' + name + '\'');
     }
   };
 
+  var pendingChanges = false;
+
   var api = {
     addCommand: function(item) { return canon.addCommand(item); },
     removeCommand: function(item) { return canon.removeCommand(item); },
@@ -175,7 +177,10 @@ exports.getApi = function() {
         }
         loadableModules[name] = options.loader;
 
-        if (!options.delayedLoad) {
+        if (options.delayedLoad) {
+          pendingChanges = true;
+        }
+        else {
           loadModule(name).then(null, console.error);
         }
       });
@@ -187,17 +192,24 @@ exports.getApi = function() {
     },
 
     load: function() {
+      if (!pendingChanges) {
+        return Promise.resolve();
+      }
+
       // clone loadedModules, so we can remove what is left at the end
       var modules = Object.keys(loadedModules).map(function(name) {
         return loadedModules[name];
       });
 
-      Object.keys(loadableModules).forEach(function(name) {
+      var promises = Object.keys(loadableModules).map(function(name) {
         delete modules[name];
-        loadModule(name).then(null, console.error);
+        return loadModule(name);
       });
 
       Object.keys(modules).forEach(unloadModule);
+      pendingChanges = false;
+
+      return Promise.all(promises);
     }
   };
 
diff --git a/toolkit/devtools/gcli/source/lib/gcli/cli.js b/toolkit/devtools/gcli/source/lib/gcli/cli.js
index 30adc3763212..40cd7c7e0c75 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/cli.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/cli.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('./util/promise');
+var Promise = require('./util/promise').Promise;
 var util = require('./util/util');
 var host = require('./util/host');
 var l10n = require('./util/l10n');
@@ -40,7 +40,7 @@ var TrueNamedArgument = require('./types/types').TrueNamedArgument;
 var MergedArgument = require('./types/types').MergedArgument;
 var ScriptArgument = require('./types/types').ScriptArgument;
 
-var RESOLVED = promise.resolve(undefined);
+var RESOLVED = Promise.resolve(undefined);
 
 /**
  * This is a list of the known command line components to enable certain
@@ -196,7 +196,7 @@ Assignment.prototype.getPredictionRanked = function(context, rank) {
   }
 
   if (this.isInName()) {
-    return promise.resolve(undefined);
+    return Promise.resolve(undefined);
   }
 
   return this.getPredictions(context).then(function(predictions) {
@@ -550,7 +550,7 @@ Object.defineProperty(Requisition.prototype, 'executionContext', {
     if (this._executionContext == null) {
       this._executionContext = {
         defer: function() {
-          return promise.defer();
+          return Promise.defer();
         },
         typedData: function(type, data) {
           return {
@@ -607,7 +607,7 @@ Object.defineProperty(Requisition.prototype, 'conversionContext', {
     if (this._conversionContext == null) {
       this._conversionContext = {
         defer: function() {
-          return promise.defer();
+          return Promise.defer();
         },
 
         createView: view.createView,
@@ -861,7 +861,7 @@ Requisition.prototype.toCanonicalString = function() {
     }
 
     var val = assignment.param.type.stringify(assignment.value, ctx);
-    return promise.resolve(val).then(function(str) {
+    return Promise.resolve(val).then(function(str) {
       return ' ' + str;
     }.bind(this));
   }.bind(this));
@@ -1017,7 +1017,7 @@ Requisition.prototype.setAssignment = function(assignment, arg, options) {
       this._endChangeCheckOrder(updateId);
     }
 
-    return promise.resolve(undefined);
+    return Promise.resolve(undefined);
   }.bind(this);
 
   if (arg == null) {
@@ -1210,7 +1210,7 @@ Requisition.prototype.getStateData = function(start, rank) {
   var context = this.executionContext;
   var predictionPromise = (typed.trim().length !== 0) ?
                           current.getPredictionRanked(context, rank) :
-                          promise.resolve(null);
+                          Promise.resolve(null);
 
   return predictionPromise.then(function(prediction) {
     // directTabText is for when the current input is a prefix of the completion
@@ -1349,7 +1349,7 @@ Requisition.prototype._addSpace = function(assignment) {
     return this.setAssignment(assignment, arg);
   }
   else {
-    return promise.resolve(undefined);
+    return Promise.resolve(undefined);
   }
 };
 
@@ -1426,7 +1426,7 @@ Requisition.prototype.complete = function(cursor, rank) {
       outstanding.push(assignPromise);
     }
 
-    return promise.all(outstanding).then(function() {
+    return Promise.all(outstanding).then(function() {
       return true;
     }.bind(this));
   }.bind(this));
@@ -1438,10 +1438,10 @@ Requisition.prototype.complete = function(cursor, rank) {
 Requisition.prototype.decrement = function(assignment) {
   var ctx = this.executionContext;
   var val = assignment.param.type.decrement(assignment.value, ctx);
-  return promise.resolve(val).then(function(replacement) {
+  return Promise.resolve(val).then(function(replacement) {
     if (replacement != null) {
       var val = assignment.param.type.stringify(replacement, ctx);
-      return promise.resolve(val).then(function(str) {
+      return Promise.resolve(val).then(function(str) {
         var arg = assignment.arg.beget({ text: str });
         return this.setAssignment(assignment, arg);
       }.bind(this));
@@ -1455,10 +1455,10 @@ Requisition.prototype.decrement = function(assignment) {
 Requisition.prototype.increment = function(assignment) {
   var ctx = this.executionContext;
   var val = assignment.param.type.increment(assignment.value, ctx);
-  return promise.resolve(val).then(function(replacement) {
+  return Promise.resolve(val).then(function(replacement) {
     if (replacement != null) {
       var val = assignment.param.type.stringify(replacement, ctx);
-      return promise.resolve(val).then(function(str) {
+      return Promise.resolve(val).then(function(str) {
         var arg = assignment.arg.beget({ text: str });
         return this.setAssignment(assignment, arg);
       }.bind(this));
@@ -2046,7 +2046,7 @@ Requisition.prototype.exec = function(options) {
     var ex = new Error(this.getStatusMessage());
     // We only reject a call to exec if GCLI breaks. Errors with commands are
     // exposed in the 'error' status of the Output object
-    return promise.resolve(onError(ex)).then(function(output) {
+    return Promise.resolve(onError(ex)).then(function(output) {
       this.clear();
       return output;
     }.bind(this));
@@ -2060,7 +2060,7 @@ Requisition.prototype.exec = function(options) {
     catch (ex) {
       var data = (typeof ex.message === 'string' && ex.stack != null) ?
                  ex.message : ex;
-      return promise.resolve(onError(data, ex));
+      return Promise.resolve(onError(data, ex));
     }
     finally {
       this.clear();
@@ -2099,8 +2099,9 @@ function Output(options) {
   this.error = false;
   this.start = new Date();
 
-  this._deferred = promise.defer();
-  this.promise = this._deferred.promise;
+  this.promise = new Promise(function(resolve, reject) {
+    this._resolve = resolve;
+  }.bind(this));
 }
 
 /**
@@ -2128,7 +2129,7 @@ Output.prototype.complete = function(data, error) {
     throw new Error('No type from output of ' + this.typed);
   }
 
-  this._deferred.resolve();
+  this._resolve();
 };
 
 /**
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/help.js b/toolkit/devtools/gcli/source/lib/gcli/commands/help.js
index c656b138e68f..7bc044a271fd 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/commands/help.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/commands/help.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var l10n = require('../util/l10n');
 var cli = require('../cli');
 
@@ -68,13 +68,13 @@ function getHelpManData(commandData, context) {
         input = l10n.lookupFormat('helpManOptional');
         /*
         var val = param.type.stringify(param.defaultValue);
-        input = promise.resolve(val).then(function(defaultValue) {
+        input = Promise.resolve(val).then(function(defaultValue) {
           return l10n.lookupFormat('helpManDefault', [ defaultValue ]);
         }.bind(this));
         */
       }
 
-      return promise.resolve(input).then(function(defaultDescr) {
+      return Promise.resolve(input).then(function(defaultDescr) {
         return '(' + (param.type.name || param.type) + ', ' + defaultDescr + ')';
       }.bind(this));
     },
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js b/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js
index 3fe41c4b5334..8a7e97e0e4cd 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js
@@ -18,6 +18,7 @@
 
 var l10n = require('../util/l10n');
 var settings = require('../settings');
+var Promise = require('../util/promise').Promise;
 
 /**
  * Format a list of settings for display
@@ -116,18 +117,16 @@ var prefList = {
   ],
   returnType: 'prefsData',
   exec: function(args, context) {
-    var deferred = context.defer();
-
-    // This can be slow, get out of the way of the main thread
-    setTimeout(function() {
-      var prefsData = {
-        settings: settings.getAll(args.search),
-        search: args.search
-      };
-      deferred.resolve(prefsData);
-    }.bind(this), 10);
-
-    return deferred.promise;
+    return new Promise(function(resolve, reject) {
+      // This can be slow, get out of the way of the main thread
+      setTimeout(function() {
+        var prefsData = {
+          settings: settings.getAll(args.search),
+          search: args.search
+        };
+        resolve(prefsData);
+      }.bind(this), 10);
+    });
   }
 };
 
diff --git a/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js b/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js
index ec1b0052e140..8bd52f3a2b5c 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 
 /**
  * This is where we cache the connectors that we know about
@@ -30,7 +30,7 @@ var connectors = {};
  *    name: 'foo',
  *
  *    connect: function(url) {
- *      return promise.resolve(new FooConnection(url));
+ *      return Promise.resolve(new FooConnection(url));
  *    }
  *  };
  */
@@ -106,7 +106,7 @@ Connection.prototype.call = function(feature, data) {
  * common route back to being connected once this has been called
  */
 Connection.prototype.disconnect = function() {
-  return promise.resolve();
+  return Promise.resolve();
 };
 
 exports.Connection = Connection;
diff --git a/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js b/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js
index bd98fe5e1e0a..cde7a8e12589 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/connectors/rdp.js
@@ -21,7 +21,7 @@ var Cu = require('chrome').Cu;
 var debuggerSocketConnect = Cu.import('resource://gre/modules/devtools/dbg-client.jsm', {}).debuggerSocketConnect;
 var DebuggerClient = Cu.import('resource://gre/modules/devtools/dbg-client.jsm', {}).DebuggerClient;
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var Connection = require('./connectors').Connection;
 
 /**
@@ -71,45 +71,38 @@ RdpConnection.create = function(url) {
 
   this._emit = this._emit.bind(this);
 
-  var deferred = promise.defer();
-
-  this.transport = debuggerSocketConnect(this.host, this.port);
-  this.client = new DebuggerClient(this.transport);
-
-  this.client.connect(function() {
-    this.client.listTabs(function(response) {
-      this.actor = response.gcliActor;
-      deferred.resolve();
+  return new Promise(function(resolve, reject) {
+    this.transport = debuggerSocketConnect(this.host, this.port);
+    this.client = new DebuggerClient(this.transport);
+    this.client.connect(function() {
+      this.client.listTabs(function(response) {
+        this.actor = response.gcliActor;
+        resolve();
+      }.bind(this));
     }.bind(this));
   }.bind(this));
-
-  return deferred.promise;
 };
 
 RdpConnection.prototype = Object.create(Connection.prototype);
 
 RdpConnection.prototype.call = function(command, data) {
-  var deferred = promise.defer();
+  return new Promise(function(resolve, reject) {
+    var request = { to: this.actor, type: command, data: data };
 
-  var request = { to: this.actor, type: command, data: data };
-
-  this.client.request(request, function(response) {
-    deferred.resolve(response.commandSpecs);
-  });
-
-  return deferred.promise;
+    this.client.request(request, function(response) {
+      resolve(response.commandSpecs);
+    });
+  }.bind(this));
 };
 
 RdpConnection.prototype.disconnect = function() {
-  var deferred = promise.defer();
+  return new Promise(function(resolve, reject) {
+    this.client.close(function() {
+      resolve();
+    });
 
-  this.client.close(function() {
-    deferred.resolve();
-  });
-
-  delete this._emit;
-
-  return deferred.promise;
+    delete this._emit;
+  }.bind(this));
 };
 
 
@@ -126,8 +119,9 @@ function Request(actor, typed, args) {
     requestId: 'id-' + Request._nextRequestId++,
   };
 
-  this._deferred = promise.defer();
-  this.promise = this._deferred.promise;
+  this.promise = new Promise(function(resolve, reject) {
+    this._resolve = resolve;
+  }.bind(this));
 }
 
 Request._nextRequestId = 0;
@@ -139,7 +133,7 @@ Request._nextRequestId = 0;
  * @param data the data itself
  */
 Request.prototype.complete = function(error, type, data) {
-  this._deferred.resolve({
+  this._resolve({
     error: error,
     type: type,
     data: data
diff --git a/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js b/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js
index 4ba64d058725..993367c6fac4 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/connectors/remoted.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var host = require('../util/host');
 var fileparser = require('../util/fileparser');
 
@@ -130,7 +130,7 @@ Remoter.prototype.exposed = {
     return this.requisition.update(typed).then(function() {
       var assignment = this.requisition.getAssignment(param);
 
-      return promise.resolve(assignment.predictions).then(function(predictions) {
+      return Promise.resolve(assignment.predictions).then(function(predictions) {
         return {
           status: assignment.getStatus().toString(),
           message: assignment.message,
diff --git a/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js b/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js
index b277bcc149be..88c0ac44c813 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var util = require('../util/util');
 var host = require('../util/host');
 
@@ -233,7 +233,7 @@ function getFallbackConverter(from, to) {
 exports.convert = function(data, from, to, conversionContext) {
   try {
     if (from === to) {
-      return promise.resolve(data);
+      return Promise.resolve(data);
     }
 
     var converter = getConverter(from, to);
diff --git a/toolkit/devtools/gcli/source/lib/gcli/languages/command.js b/toolkit/devtools/gcli/source/lib/gcli/languages/command.js
index ec7b997ceed3..3e20d1f760fb 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/languages/command.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/languages/command.js
@@ -17,7 +17,7 @@
 'use strict';
 
 var util = require('../util/util');
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var domtemplate = require('../util/domtemplate');
 var host = require('../util/host');
 
@@ -28,7 +28,7 @@ var CommandAssignment = require('../cli').CommandAssignment;
 var fields = require('../fields/fields');
 var intro = require('../ui/intro');
 
-var RESOLVED = promise.resolve(true);
+var RESOLVED = Promise.resolve(true);
 
 /**
  * Various ways in which we need to manipulate the caret/selection position.
@@ -100,7 +100,7 @@ var commandLanguage = exports.commandLanguage = {
     }
 
     return commandHtmlPromise.then(function(commandHtml) {
-      this.commandDom = util.toDom(this.document, commandHtml);
+      this.commandDom = host.toDom(this.document, commandHtml);
 
       this.requisition.commandOutputManager.onOutput.add(this.outputted, this);
       var mapping = cli.getMapping(this.requisition.executionContext);
@@ -248,7 +248,7 @@ var commandLanguage = exports.commandLanguage = {
       }.bind(this));
     }
 
-    return promise.resolve(false);
+    return Promise.resolve(false);
   },
 
   /**
@@ -263,7 +263,7 @@ var commandLanguage = exports.commandLanguage = {
       }.bind(this));
     }
 
-    return promise.resolve(false);
+    return Promise.resolve(false);
   },
 
   /**
@@ -272,7 +272,7 @@ var commandLanguage = exports.commandLanguage = {
   handleReturn: function(input) {
     // Deny RETURN unless the command might work
     if (this.requisition.status !== Status.VALID) {
-      return promise.resolve(false);
+      return Promise.resolve(false);
     }
 
     this.terminal.history.add(input);
diff --git a/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js b/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js
index 767a7c0762ae..15113ba6c0f9 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js
@@ -17,9 +17,9 @@
 'use strict';
 
 var util = require('../util/util');
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 
-var RESOLVED = promise.resolve(true);
+var RESOLVED = Promise.resolve(true);
 
 /**
  * This is where we cache the languages that we know about
@@ -48,11 +48,11 @@ var baseLanguage = {
   caretMoved: function() {},
 
   handleUpArrow: function() {
-    return promise.resolve(false);
+    return Promise.resolve(false);
   },
 
   handleDownArrow: function() {
-    return promise.resolve(false);
+    return Promise.resolve(false);
   },
 
   handleTab: function() {
@@ -96,7 +96,7 @@ var baseLanguage = {
   },
 
   getCompleterTemplateData: function() {
-    return promise.resolve({
+    return Promise.resolve({
       statusMarkup: [
         {
           string: this.terminal.inputElement.value.replace(/ /g, '\u00a0'), // i.e. &nbsp;
@@ -163,11 +163,11 @@ exports.createLanguage = function(name, terminal) {
 
   if (typeof newInstance.constructor === 'function') {
     var reply = newInstance.constructor(terminal);
-    return promise.resolve(reply).then(function() {
+    return Promise.resolve(reply).then(function() {
       return newInstance;
     });
   }
   else {
-    return promise.resolve(newInstance);
+    return Promise.resolve(newInstance);
   }
 };
diff --git a/toolkit/devtools/gcli/source/lib/gcli/mozui/completer.js b/toolkit/devtools/gcli/source/lib/gcli/mozui/completer.js
index 3e5e4f2cdc72..fd9a747323b9 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/mozui/completer.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/mozui/completer.js
@@ -17,6 +17,7 @@
 'use strict';
 
 var util = require('../util/util');
+var host = require('../util/host');
 var domtemplate = require('../util/domtemplate');
 
 var completerHtml =
@@ -68,7 +69,7 @@ function Completer(components) {
     }
   }
 
-  this.template = util.toDom(this.document, completerHtml);
+  this.template = host.toDom(this.document, completerHtml);
   // We want the spans to line up without the spaces in the template
   util.removeWhitespace(this.template, true);
 
@@ -111,6 +112,10 @@ Completer.prototype.update = function(ev) {
   this.choice = (ev && ev.choice != null) ? ev.choice : 0;
 
   this._getCompleterTemplateData().then(function(data) {
+    if (this.template == null) {
+      return; // destroy() has been called
+    }
+
     var template = this.template.cloneNode(true);
     domtemplate.template(template, data, { stack: 'completer.html' });
 
diff --git a/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js b/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js
index 5e579f63e676..fba5ef31cc8f 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js
@@ -16,14 +16,14 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var util = require('../util/util');
 var KeyEvent = require('../util/util').KeyEvent;
 
 var Status = require('../types/types').Status;
 var History = require('../ui/history').History;
 
-var RESOLVED = promise.resolve(true);
+var RESOLVED = Promise.resolve(true);
 
 /**
  * A wrapper to take care of the functions concerning an input element
diff --git a/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js b/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js
index 94c275a985ad..7359d2928d80 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js
@@ -17,6 +17,7 @@
 'use strict';
 
 var util = require('../util/util');
+var host = require('../util/host');
 var domtemplate = require('../util/domtemplate');
 
 var CommandAssignment = require('../cli').CommandAssignment;
@@ -62,7 +63,7 @@ function Tooltip(options, components) {
   // We cache the fields we create so we can destroy them later
   this.fields = [];
 
-  this.template = util.toDom(this.document, tooltipHtml);
+  this.template = host.toDom(this.document, tooltipHtml);
   this.templateOptions = { blankNullUndefined: true, stack: 'tooltip.html' };
 
   this.inputter.onChoiceChange.add(this.choiceChanged, this);
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/array.js b/toolkit/devtools/gcli/source/lib/gcli/types/array.js
index b40d759ce304..84074b3d9c53 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/array.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/array.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var ArrayConversion = require('./types').ArrayConversion;
 var ArrayArgument = require('./types').ArrayArgument;
 
@@ -69,7 +69,7 @@ exports.items = [
       }.bind(this);
 
       var conversionPromises = arg.getArguments().map(subArgParse);
-      return promise.all(conversionPromises).then(function(conversions) {
+      return Promise.all(conversionPromises).then(function(conversions) {
         return new ArrayConversion(conversions, arg);
       });
     },
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/boolean.js b/toolkit/devtools/gcli/source/lib/gcli/types/boolean.js
index e9557545bdd1..70d0897d5a30 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/boolean.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/boolean.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var Status = require('./types').Status;
 var Conversion = require('./types').Conversion;
 var BlankArgument = require('./types').BlankArgument;
@@ -40,10 +40,10 @@ exports.items = [
 
     parse: function(arg, context) {
       if (arg.type === 'TrueNamedArgument') {
-        return promise.resolve(new Conversion(true, arg));
+        return Promise.resolve(new Conversion(true, arg));
       }
       if (arg.type === 'FalseNamedArgument') {
-        return promise.resolve(new Conversion(false, arg));
+        return Promise.resolve(new Conversion(false, arg));
       }
       return SelectionType.prototype.parse.call(this, arg, context);
     },
@@ -57,7 +57,7 @@ exports.items = [
 
     getBlank: function(context) {
       return new Conversion(false, new BlankArgument(), Status.VALID, '',
-                            promise.resolve(this.lookup));
+                            Promise.resolve(this.lookup));
     }
   }
 ];
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/command.js b/toolkit/devtools/gcli/source/lib/gcli/types/command.js
index b925d195a389..9e4080bae6fb 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/command.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/command.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var l10n = require('../util/l10n');
 var spell = require('../util/spell');
 var SelectionType = require('./selection').SelectionType;
@@ -48,7 +48,7 @@ exports.items = [
       }
       else {
         var message = l10n.lookup('cliUnusedArg');
-        return promise.resolve(new Conversion(undefined, arg, Status.ERROR, message));
+        return Promise.resolve(new Conversion(undefined, arg, Status.ERROR, message));
       }
     }
   },
@@ -78,7 +78,7 @@ exports.items = [
 
     parse: function(arg, context) {
       var conversion = exports.parse(context, arg, this.allowNonExec);
-      return promise.resolve(conversion);
+      return Promise.resolve(conversion);
     }
   }
 ];
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/date.js b/toolkit/devtools/gcli/source/lib/gcli/types/date.js
index 69964e8f1ee0..99a77faecfea 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/date.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/date.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var l10n = require('../util/l10n');
 var Status = require('./types').Status;
 var Conversion = require('./types').Conversion;
@@ -174,7 +174,7 @@ exports.items = [
       var value;
 
       if (arg.text.replace(/\s/g, '').length === 0) {
-        return promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE, ''));
+        return Promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE, ''));
       }
 
       // Lots of room for improvement here: 1h ago, in two days, etc.
@@ -220,11 +220,11 @@ exports.items = [
 
         if (isNaN(value.getTime())) {
           var msg = l10n.lookupFormat('typesDateNan', [ arg.text ]);
-          return promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
+          return Promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
         }
       }
 
-      return promise.resolve(new Conversion(value, arg));
+      return Promise.resolve(new Conversion(value, arg));
     },
 
     decrement: function(value, context) {
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js b/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js
index 0aeb5bed4834..2ea7b880ba7e 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var Conversion = require('./types').Conversion;
 var Status = require('./types').Status;
 
@@ -84,7 +84,7 @@ exports.items = [
       if (typeof type.parse !== 'function') {
         type = this.types.createType(type);
       }
-      return promise.resolve(type);
+      return Promise.resolve(type);
     },
 
     // DelegateType is designed to be inherited from, so DelegateField needs a way
@@ -147,7 +147,7 @@ exports.items = [
     },
 
     parse: function(arg, context) {
-      return promise.resolve(new Conversion(undefined, arg));
+      return Promise.resolve(new Conversion(undefined, arg));
     }
   }
 ];
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js b/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js
index f8f260e9eb75..a62d49ccd413 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var l10n = require('../util/l10n');
 
 var Conversion = require('./types').Conversion;
@@ -86,15 +86,15 @@ JavascriptType.prototype.parse = function(arg, context) {
 
   // No input is undefined
   if (typed === '') {
-    return promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE));
+    return Promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE));
   }
   // Just accept numbers
   if (!isNaN(parseFloat(typed)) && isFinite(typed)) {
-    return promise.resolve(new Conversion(typed, arg));
+    return Promise.resolve(new Conversion(typed, arg));
   }
   // Just accept constants like true/false/null/etc
   if (typed.trim().match(/(null|undefined|NaN|Infinity|true|false)/)) {
-    return promise.resolve(new Conversion(typed, arg));
+    return Promise.resolve(new Conversion(typed, arg));
   }
 
   // Analyze the input text and find the beginning of the last part that
@@ -103,19 +103,19 @@ JavascriptType.prototype.parse = function(arg, context) {
 
   // There was an error analyzing the string.
   if (beginning.err) {
-    return promise.resolve(new Conversion(typed, arg, Status.ERROR, beginning.err));
+    return Promise.resolve(new Conversion(typed, arg, Status.ERROR, beginning.err));
   }
 
   // If the current state is ParseState.COMPLEX, then we can't do completion.
   // so bail out now
   if (beginning.state === ParseState.COMPLEX) {
-    return promise.resolve(new Conversion(typed, arg));
+    return Promise.resolve(new Conversion(typed, arg));
   }
 
   // If the current state is not ParseState.NORMAL, then we are inside of a
   // string which means that no completion is possible.
   if (beginning.state !== ParseState.NORMAL) {
-    return promise.resolve(new Conversion(typed, arg, Status.INCOMPLETE, ''));
+    return Promise.resolve(new Conversion(typed, arg, Status.INCOMPLETE, ''));
   }
 
   var completionPart = typed.substring(beginning.startPos);
@@ -130,18 +130,18 @@ JavascriptType.prototype.parse = function(arg, context) {
 
       // We can't complete on null.foo, so bail out
       if (scope == null) {
-        return promise.resolve(new Conversion(typed, arg, Status.ERROR,
+        return Promise.resolve(new Conversion(typed, arg, Status.ERROR,
                                         l10n.lookup('jstypeParseScope')));
       }
 
       if (prop === '') {
-        return promise.resolve(new Conversion(typed, arg, Status.INCOMPLETE, ''));
+        return Promise.resolve(new Conversion(typed, arg, Status.INCOMPLETE, ''));
       }
 
       // Check if prop is a getter function on 'scope'. Functions can change
       // other stuff so we can't execute them to get the next object. Stop here.
       if (this._isSafeProperty(scope, prop)) {
-        return promise.resolve(new Conversion(typed, arg));
+        return Promise.resolve(new Conversion(typed, arg));
       }
 
       try {
@@ -151,7 +151,7 @@ JavascriptType.prototype.parse = function(arg, context) {
         // It would be nice to be able to report this error in some way but
         // as it can happen just when someone types '{sessionStorage.', it
         // almost doesn't really count as an error, so we ignore it
-        return promise.resolve(new Conversion(typed, arg, Status.VALID, ''));
+        return Promise.resolve(new Conversion(typed, arg, Status.VALID, ''));
       }
     }
   }
@@ -162,24 +162,24 @@ JavascriptType.prototype.parse = function(arg, context) {
   // If the reason we just stopped adjusting the scope was a non-simple string,
   // then we're not sure if the input is valid or invalid, so accept it
   if (prop && !prop.match(/^[0-9A-Za-z]*$/)) {
-    return promise.resolve(new Conversion(typed, arg));
+    return Promise.resolve(new Conversion(typed, arg));
   }
 
   // However if the prop was a simple string, it is an error
   if (scope == null) {
     var msg = l10n.lookupFormat('jstypeParseMissing', [ prop ]);
-    return promise.resolve(new Conversion(typed, arg, Status.ERROR, msg));
+    return Promise.resolve(new Conversion(typed, arg, Status.ERROR, msg));
   }
 
   // If the thing we're looking for isn't a simple string, then we're not going
   // to find it, but we're not sure if it's valid or invalid, so accept it
   if (!matchProp.match(/^[0-9A-Za-z]*$/)) {
-    return promise.resolve(new Conversion(typed, arg));
+    return Promise.resolve(new Conversion(typed, arg));
   }
 
   // Skip Iterators and Generators.
   if (this._isIteratorOrGenerator(scope)) {
-    return promise.resolve(new Conversion(typed, arg));
+    return Promise.resolve(new Conversion(typed, arg));
   }
 
   var matchLen = matchProp.length;
@@ -219,7 +219,7 @@ JavascriptType.prototype.parse = function(arg, context) {
     }
   }
   catch (ex) {
-    return promise.resolve(new Conversion(typed, arg, Status.INCOMPLETE, ''));
+    return Promise.resolve(new Conversion(typed, arg, Status.INCOMPLETE, ''));
   }
 
   // Convert to an array for sorting, and while we're at it, note if we got
@@ -313,8 +313,8 @@ JavascriptType.prototype.parse = function(arg, context) {
     predictions = [];
   }
 
-  return promise.resolve(new Conversion(typed, arg, status, message,
-                                  promise.resolve(predictions)));
+  return Promise.resolve(new Conversion(typed, arg, status, message,
+                                  Promise.resolve(predictions)));
 };
 
 /**
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/node.js b/toolkit/devtools/gcli/source/lib/gcli/types/node.js
index 11f7850ee2e7..f195abe77535 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/node.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/node.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var Highlighter = require('../util/host').Highlighter;
 var l10n = require('../util/l10n');
 var util = require('../util/util');
@@ -151,7 +151,7 @@ exports.items = [
         }
       }
 
-      return promise.resolve(reply);
+      return Promise.resolve(reply);
     },
 
     onEnter: onEnter,
@@ -223,7 +223,7 @@ exports.items = [
         reply.matches = util.createEmptyNodeList(doc);
       }
 
-      return promise.resolve(reply);
+      return Promise.resolve(reply);
     },
 
     onEnter: onEnter,
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/number.js b/toolkit/devtools/gcli/source/lib/gcli/types/number.js
index d65981160375..bec67b18b4c5 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/number.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/number.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var l10n = require('../util/l10n');
 var Status = require('./types').Status;
 var Conversion = require('./types').Conversion;
@@ -96,12 +96,12 @@ exports.items = [
     parse: function(arg, context) {
       var msg;
       if (arg.text.replace(/^\s*-?/, '').length === 0) {
-        return promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE, ''));
+        return Promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE, ''));
       }
 
       if (!this.allowFloat && (arg.text.indexOf('.') !== -1)) {
         msg = l10n.lookupFormat('typesNumberNotInt2', [ arg.text ]);
-        return promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
+        return Promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
       }
 
       var value;
@@ -114,22 +114,22 @@ exports.items = [
 
       if (isNaN(value)) {
         msg = l10n.lookupFormat('typesNumberNan', [ arg.text ]);
-        return promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
+        return Promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
       }
 
       var max = this.getMax(context);
       if (max != null && value > max) {
         msg = l10n.lookupFormat('typesNumberMax', [ value, max ]);
-        return promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
+        return Promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
       }
 
       var min = this.getMin(context);
       if (min != null && value < min) {
         msg = l10n.lookupFormat('typesNumberMin', [ value, min ]);
-        return promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
+        return Promise.resolve(new Conversion(undefined, arg, Status.ERROR, msg));
       }
 
-      return promise.resolve(new Conversion(value, arg));
+      return Promise.resolve(new Conversion(value, arg));
     },
 
     decrement: function(value, context) {
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/resource.js b/toolkit/devtools/gcli/source/lib/gcli/types/resource.js
index ad2f1f9f88d1..fc939bf83ed8 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/resource.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/resource.js
@@ -16,8 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
-
+var Promise = require('../util/promise').Promise;
 
 exports.clearResourceCache = function() {
   ResourceCache.clear();
@@ -72,7 +71,7 @@ function Resource(name, type, inline, element) {
  * Get the contents of the given resource as a string.
  * The base Resource leaves this unimplemented.
  */
-Resource.prototype.getContents = function() {
+Resource.prototype.loadContents = function() {
   throw new Error('not implemented');
 };
 
@@ -98,8 +97,10 @@ function CssResource(domSheet) {
 
 CssResource.prototype = Object.create(Resource.prototype);
 
-CssResource.prototype.loadContents = function(callback) {
-  callback(this.element.ownerNode.innerHTML);
+CssResource.prototype.loadContents = function() {
+  return new Promise(function(resolve, reject) {
+    resolve(this.element.ownerNode.innerHTML);
+  }.bind(this));
 };
 
 CssResource._getAllStyles = function() {
@@ -161,22 +162,24 @@ function ScriptResource(scriptNode) {
 
 ScriptResource.prototype = Object.create(Resource.prototype);
 
-ScriptResource.prototype.loadContents = function(callback) {
-  if (this.inline) {
-    callback(this.element.innerHTML);
-  }
-  else {
-    // It would be good if there was a better way to get the script source
-    var xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState !== xhr.DONE) {
-        return;
-      }
-      callback(xhr.responseText);
-    };
-    xhr.open('GET', this.element.src, true);
-    xhr.send();
-  }
+ScriptResource.prototype.loadContents = function() {
+  return new Promise(function(resolve, reject) {
+    if (this.inline) {
+      resolve(this.element.innerHTML);
+    }
+    else {
+      // It would be good if there was a better way to get the script source
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState !== xhr.DONE) {
+          return;
+        }
+        resolve(xhr.responseText);
+      };
+      xhr.open('GET', this.element.src, true);
+      xhr.send();
+    }
+  }.bind(this));
 };
 
 ScriptResource._getAllScripts = function() {
@@ -289,9 +292,11 @@ exports.items = [
         Array.prototype.push.apply(resources, ScriptResource._getAllScripts());
       }
 
-      return promise.resolve(resources.map(function(resource) {
-        return { name: resource.name, value: resource };
-      }));
+      return new Promise(function(resolve, reject) {
+        resolve(resources.map(function(resource) {
+          return { name: resource.name, value: resource };
+        }));
+      }.bind(this));
     }
   }
 ];
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/selection.js b/toolkit/devtools/gcli/source/lib/gcli/types/selection.js
index ebee800d1af8..cd5873828296 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/selection.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/selection.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var l10n = require('../util/l10n');
 var spell = require('../util/spell');
 var Type = require('./types').Type;
@@ -171,7 +171,7 @@ SelectionType.prototype.getLookup = function(context) {
  * returns a promise of actual values.
  */
 function resolve(thing, context) {
-  return promise.resolve(thing).then(function(resolved) {
+  return Promise.resolve(thing).then(function(resolved) {
     if (typeof resolved === 'function') {
       return resolve(resolved(context), context);
     }
@@ -279,7 +279,7 @@ exports.findPredictions = function(arg, lookup) {
 };
 
 SelectionType.prototype.parse = function(arg, context) {
-  return promise.resolve(this.getLookup(context)).then(function(lookup) {
+  return Promise.resolve(this.getLookup(context)).then(function(lookup) {
     var predictions = exports.findPredictions(arg, lookup);
     return exports.convertPredictions(arg, predictions);
   }.bind(this));
@@ -293,22 +293,22 @@ exports.convertPredictions = function(arg, predictions) {
   if (predictions.length === 0) {
     var msg = l10n.lookupFormat('typesSelectionNomatch', [ arg.text ]);
     return new Conversion(undefined, arg, Status.ERROR, msg,
-                          promise.resolve(predictions));
+                          Promise.resolve(predictions));
   }
 
   if (predictions[0].name === arg.text) {
     var value = predictions[0].value;
     return new Conversion(value, arg, Status.VALID, '',
-                          promise.resolve(predictions));
+                          Promise.resolve(predictions));
   }
 
   return new Conversion(undefined, arg, Status.INCOMPLETE, '',
-                        promise.resolve(predictions));
+                        Promise.resolve(predictions));
 };
 
 SelectionType.prototype.getBlank = function(context) {
   var predictFunc = function(context2) {
-    return promise.resolve(this.getLookup(context2)).then(function(lookup) {
+    return Promise.resolve(this.getLookup(context2)).then(function(lookup) {
       return lookup.filter(function(option) {
         return !option.value.hidden;
       }).slice(0, Conversion.maxPredictions - 1);
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/string.js b/toolkit/devtools/gcli/source/lib/gcli/types/string.js
index 81c8f52c6624..fb1852e512d3 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/string.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/string.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 var Status = require('./types').Status;
 var Conversion = require('./types').Conversion;
 
@@ -64,7 +64,7 @@ exports.items = [
 
     parse: function(arg, context) {
       if (!this.allowBlank && (arg.text == null || arg.text === '')) {
-        return promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE, ''));
+        return Promise.resolve(new Conversion(undefined, arg, Status.INCOMPLETE, ''));
       }
 
       // The string '\\' (i.e. an escaped \ (represented here as '\\\\' because it
@@ -87,7 +87,7 @@ exports.items = [
            .replace(/\\}/g, '}')
            .replace(/\uF000/g, '\\');
 
-      return promise.resolve(new Conversion(value, arg));
+      return Promise.resolve(new Conversion(value, arg));
     }
   }
 ];
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/types.js b/toolkit/devtools/gcli/source/lib/gcli/types/types.js
index 968aff5b2932..4f833bebfe78 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/types/types.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/types/types.js
@@ -17,7 +17,7 @@
 'use strict';
 
 var util = require('../util/util');
-var promise = require('../util/promise');
+var Promise = require('../util/promise').Promise;
 
 /**
  * We record where in the input string an argument comes so we can report
@@ -814,7 +814,7 @@ Conversion.prototype.getPredictions = function(context) {
   if (typeof this.predictions === 'function') {
     return this.predictions(context);
   }
-  return promise.resolve(this.predictions || []);
+  return Promise.resolve(this.predictions || []);
 };
 
 /**
@@ -825,7 +825,7 @@ Conversion.prototype.getPredictions = function(context) {
  */
 Conversion.prototype.constrainPredictionIndex = function(context, index) {
   if (index == null) {
-    return promise.resolve();
+    return Promise.resolve();
   }
 
   return this.getPredictions(context).then(function(value) {
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js b/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js
index 6fca74fc02d9..fef02103b37e 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js
@@ -67,7 +67,11 @@ function Menu(options) {
     menuHtmlPromise = host.staticRequire(module, './menu.html');
   }
   menuHtmlPromise.then(function(menuHtml) {
-    this.template = util.toDom(this.document, menuHtml);
+    if (this.document == null) {
+      return; // destroy() has been called
+    }
+
+    this.template = host.toDom(this.document, menuHtml);
   }.bind(this), console.error);
 
   // Contains the items that should be displayed
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/view.js b/toolkit/devtools/gcli/source/lib/gcli/ui/view.js
index 47be184b4048..193fb2d96645 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/ui/view.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/ui/view.js
@@ -17,6 +17,7 @@
 'use strict';
 
 var util = require('../util/util');
+var host = require('../util/host');
 var domtemplate = require('../util/domtemplate');
 
 
@@ -78,7 +79,7 @@ exports.createView = function(options) {
         util.importCss(options.css, document, options.cssId);
       }
 
-      var child = util.toDom(document, options.html);
+      var child = host.toDom(document, options.html);
       domtemplate.template(child, options.data || {}, options.options || {});
       return child;
     }
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/filesystem.js b/toolkit/devtools/gcli/source/lib/gcli/util/filesystem.js
index f62c2c3381a0..1c6d871a6aed 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/util/filesystem.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/util/filesystem.js
@@ -21,7 +21,7 @@ var Cc = require('chrome').Cc;
 var Ci = require('chrome').Ci;
 
 var OS = Cu.import('resource://gre/modules/osfile.jsm', {}).OS;
-var promise = require('./promise');
+var Promise = require('../util/promise').Promise;
 
 /**
  * A set of functions that don't really belong in 'fs' (because they're not
@@ -122,5 +122,5 @@ exports.stat = function(pathname) {
  * Right now, however, we do nothing.
  */
 exports.describe = function(pathname) {
-  return promise.resolve('');
+  return Promise.resolve('');
 };
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/host.js b/toolkit/devtools/gcli/source/lib/gcli/util/host.js
index 91c870a6897e..349f67a9b5dc 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/util/host.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/util/host.js
@@ -21,7 +21,7 @@ var Ci = require('chrome').Ci;
 
 var Task = require('resource://gre/modules/Task.jsm').Task;
 
-var promise = require('./promise');
+var Promise = require('../util/promise').Promise;
 var util = require('./util');
 
 function Highlighter(document) {
@@ -71,17 +71,27 @@ exports.exec = function(task) {
   return Task.spawn(task);
 };
 
+/**
+ * Load some HTML into the given document and return a DOM element.
+ * This utility assumes that the html has a single root (other than whitespace)
+ */
+exports.toDom = function(document, html) {
+  var div = util.createElement(document, 'div');
+  util.setContents(div, html);
+  return div.children[0];
+};
+
 /**
  * When dealing with module paths on windows we want to use the unix
  * directory separator rather than the windows one, so we avoid using
  * OS.Path.dirname, and use unix version on all platforms.
  */
-let resourceDirName = function(path) {
-  let index = path.lastIndexOf("/");
+var resourceDirName = function(path) {
+  var index = path.lastIndexOf('/');
   if (index == -1) {
-    return ".";
+    return '.';
   }
-  while (index >= 0 && path[index] == "/") {
+  while (index >= 0 && path[index] == '/') {
     --index;
   }
   return path.slice(0, index + 1);
@@ -92,37 +102,30 @@ let resourceDirName = function(path) {
  * @see lib/gcli/util/host.js
  */
 exports.staticRequire = function(requistingModule, name) {
-  var deferred = promise.defer();
-
   if (name.match(/\.css$/)) {
-    deferred.resolve('');
+    return Promise.resolve('');
   }
   else {
-    var filename = resourceDirName(requistingModule.id) + '/' + name;
-    filename = filename.replace(/\/\.\//g, '/');
-    filename = 'resource://gre/modules/devtools/' + filename;
+    return new Promise(function(resolve, reject) {
+      var filename = resourceDirName(requistingModule.id) + '/' + name;
+      filename = filename.replace(/\/\.\//g, '/');
+      filename = 'resource://gre/modules/devtools/' + filename;
 
-    var xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
-                .createInstance(Ci.nsIXMLHttpRequest);
+      var xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
+                  .createInstance(Ci.nsIXMLHttpRequest);
 
-    xhr.onload = function onload() {
-      deferred.resolve(xhr.responseText);
-    }.bind(this);
+      xhr.onload = function onload() {
+        resolve(xhr.responseText);
+      }.bind(this);
 
-    xhr.onabort = xhr.onerror = xhr.ontimeout = function(err) {
-      deferred.reject(err);
-    }.bind(this);
+      xhr.onabort = xhr.onerror = xhr.ontimeout = function(err) {
+        reject(err);
+      }.bind(this);
 
-    try {
       xhr.open('GET', filename);
       xhr.send();
-    }
-    catch (ex) {
-      deferred.reject(ex);
-    }
+    }.bind(this));
   }
-
-  return deferred.promise;
 };
 
 /**
@@ -146,64 +149,62 @@ exports.script.useTarget = function(tgt) {
 
   // Local debugging needs to make the target remote.
   var targetPromise = target.isRemote ?
-                      promise.resolve(target) :
+                      Promise.resolve(target) :
                       target.makeRemote();
 
   return targetPromise.then(function() {
-    var deferred = promise.defer();
+    return new Promise(function(resolve, reject) {
+      client = target._client;
 
-    client = target._client;
+      client.addListener('pageError', function(packet) {
+        if (packet.from === consoleActor) {
+          // console.log('pageError', packet.pageError);
+          exports.script.onOutput({
+            level: 'exception',
+            message: packet.exception.class
+          });
+        }
+      });
 
-    client.addListener('pageError', function(packet) {
-      if (packet.from === consoleActor) {
-        // console.log('pageError', packet.pageError);
-        exports.script.onOutput({
-          level: 'exception',
-          message: packet.exception.class
-        });
-      }
-    });
+      client.addListener('consoleAPICall', function(type, packet) {
+        if (packet.from === consoleActor) {
+          var data = packet.message;
 
-    client.addListener('consoleAPICall', function(type, packet) {
-      if (packet.from === consoleActor) {
-        var data = packet.message;
-
-        var ev = {
-          level: data.level,
-          arguments: data.arguments,
-        };
-
-        if (data.filename !== 'debugger eval code') {
-          ev.source = {
-            filename: data.filename,
-            lineNumber: data.lineNumber,
-            functionName: data.functionName
+          var ev = {
+            level: data.level,
+            arguments: data.arguments,
           };
+
+          if (data.filename !== 'debugger eval code') {
+            ev.source = {
+              filename: data.filename,
+              lineNumber: data.lineNumber,
+              functionName: data.functionName
+            };
+          }
+
+          exports.script.onOutput(ev);
+        }
+      });
+
+      consoleActor = target._form.consoleActor;
+
+      var onAttach = function(response, wcc) {
+        webConsoleClient = wcc;
+
+        if (response.error != null) {
+          reject(response);
+        }
+        else {
+          resolve(response);
         }
 
-        exports.script.onOutput(ev);
-      }
-    });
+        // TODO: add _onTabNavigated code?
+      };
 
-    consoleActor = target._form.consoleActor;
-
-    var onAttach = function(response, wcc) {
-      webConsoleClient = wcc;
-
-      if (response.error != null) {
-        deferred.reject(response);
-      }
-      else {
-        deferred.resolve(response);
-      }
-
-      // TODO: add _onTabNavigated code?
-    };
-
-    var listeners = [ 'PageError', 'ConsoleAPI' ];
-    client.attachConsole(consoleActor, listeners, onAttach);
-
-    return deferred.promise;
+      var listeners = [ 'PageError', 'ConsoleAPI' ];
+      client.attachConsole(consoleActor, listeners, onAttach);
+    }.bind(this));
   });
 };
 
@@ -211,21 +212,20 @@ exports.script.useTarget = function(tgt) {
  * Execute some JavaScript
  */
 exports.script.eval = function(javascript) {
-  var deferred = promise.defer();
+  return new Promise(function(resolve, reject) {
+    var onResult = function(response) {
+      var output = response.result;
+      if (typeof output === 'object' && output.type === 'undefined') {
+        output = undefined;
+      }
 
-  var onResult = function(response) {
-    var output = response.result;
-    if (typeof output === 'object' && output.type === 'undefined') {
-      output = undefined;
-    }
+      resolve({
+        input: response.input,
+        output: output,
+        exception: response.exception
+      });
+    };
 
-    deferred.resolve({
-      input: response.input,
-      output: output,
-      exception: response.exception
-    });
-  };
-
-  webConsoleClient.evaluateJS(javascript, onResult, {});
-  return deferred.promise;
+    webConsoleClient.evaluateJS(javascript, onResult, {});
+  }.bind(this));
 };
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/promise.js b/toolkit/devtools/gcli/source/lib/gcli/util/promise.js
index 2c972bfd83e8..7550e5b28034 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/util/promise.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/util/promise.js
@@ -17,9 +17,94 @@
 'use strict';
 
 var Cu = require('chrome').Cu;
-module.exports = exports =
-    Cu.import('resource://gre/modules/devtools/deprecated-sync-thenables.js', {}).Promise;
+var Cc = require('chrome').Cc;
+var Ci = require('chrome').Ci;
 
-// When we've solved the debugger/sdk/promise/gcli/helpers/overlap problem then
-// we should use this instead:
-// module.exports = exports = require('resource://gre/modules/Promise.jsm').Promise;
+/*
+ * Minimalist implementation of ES6 promises built on SDK promises. 2 things to
+ * know:
+ * - There is a hack in .then() to be async which matches A+ and toolkit
+ *   promises. GCLI code works with either sync or async promises, but async
+ *   is more correct
+ * - There is an additional Promise.defer function which to matches the call
+ *   in toolkit promises, which in turn matches the call in SDK promises
+ *
+ * Why not use toolkit promises directly? Because there is a strange bug that
+ * we are investigating where thread executions vanish.
+ * 
+ * When we've solved the debugger/sdk/promise/gcli/helpers/overlap problem then
+ * we should use this instead:
+ * module.exports = exports = require('resource://gre/modules/Promise.jsm');
+ */
+
+var promise = require('resource://gre/modules/devtools/deprecated-sync-thenables.js', {});
+
+/**
+ * An implementation of ES6 promises in terms of SDK promises
+ */
+var Promise = function(executor) {
+  this.deferred = promise.defer();
+  try {
+    executor.call(null, this.deferred.resolve, this.deferred.reject);
+  }
+  catch (ex) {
+    this.deferred.reject(ex);
+  }
+}
+
+var async = true;
+
+/**
+ * The sync version of this would look like
+ *     Promise.prototype.then = function(onResolve, onReject) {
+ *      return this.deferred.promise.then(onResolve, onReject);
+ *    };
+ */
+Promise.prototype.then = function(onResolve, onReject) {
+  return new Promise(function(resolve, reject) {
+    setTimeout(function() {
+      try {
+        resolve(this.deferred.promise.then(onResolve, onReject));
+      }
+      catch (ex) {
+        reject(ex);
+      }
+    }.bind(this), 0);
+  }.bind(this));
+};
+
+Promise.all = promise.all;
+Promise.resolve = promise.resolve;
+Promise.defer = promise.defer;
+
+exports.Promise = Promise;
+
+
+/**
+ * Implementation of the setTimeout/clearTimeout web APIs taken from the old
+ * Timer.jsm module
+ */
+
+// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
+var nextTimeoutId = 1; // setTimeout must return a positive integer
+
+var timeoutTable = new Map(); // int -> nsITimer
+
+var setTimeout = function(callback, millis) {
+  let id = nextTimeoutId++;
+  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer.initWithCallback(function setTimeout_timer() {
+    timeoutTable.delete(id);
+    callback.call(undefined);
+  }, millis, timer.TYPE_ONE_SHOT);
+
+  timeoutTable.set(id, timer);
+  return id;
+}
+
+var clearTimeout = function(aId) {
+  if (timeoutTable.has(aId)) {
+    timeoutTable.get(aId).cancel();
+    timeoutTable.delete(aId);
+  }
+}
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/util.js b/toolkit/devtools/gcli/source/lib/gcli/util/util.js
index ae8ac8b0a893..800e416c3dd3 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/util/util.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/util/util.js
@@ -236,7 +236,7 @@ exports.createEvent = function(name) {
 
 //------------------------------------------------------------------------------
 
-var promise = require('./promise');
+var Promise = require('../util/promise').Promise;
 
 /**
  * promiseEach is roughly like Array.forEach except that the action is taken to
@@ -252,34 +252,34 @@ var promise = require('./promise');
  */
 exports.promiseEach = function(array, action, scope) {
   if (array.length === 0) {
-    return promise.resolve([]);
+    return Promise.resolve([]);
   }
 
-  var deferred = promise.defer();
-  var replies = [];
+  return new Promise(function(resolve, reject) {
+    var replies = [];
 
-  var callNext = function(index) {
-    var onSuccess = function(reply) {
-      replies[index] = reply;
+    var callNext = function(index) {
+      var onSuccess = function(reply) {
+        replies[index] = reply;
 
-      if (index + 1 >= array.length) {
-        deferred.resolve(replies);
-      }
-      else {
-        callNext(index + 1);
-      }
+        if (index + 1 >= array.length) {
+          resolve(replies);
+        }
+        else {
+          callNext(index + 1);
+        }
+      };
+
+      var onFailure = function(ex) {
+        reject(ex);
+      };
+
+      var reply = action.call(scope, array[index], index, array);
+      Promise.resolve(reply).then(onSuccess).then(null, onFailure);
     };
 
-    var onFailure = function(ex) {
-      deferred.reject(ex);
-    };
-
-    var reply = action.call(scope, array[index], index, array);
-    promise.resolve(reply).then(onSuccess).then(null, onFailure);
-  };
-
-  callNext(0);
-  return deferred.promise;
+    callNext(0);
+  });
 };
 
 /**
@@ -517,16 +517,6 @@ exports.setContents = function(elem, contents) {
   }
 };
 
-/**
- * Load some HTML into the given document and return a DOM element.
- * This utility assumes that the html has a single root (other than whitespace)
- */
-exports.toDom = function(document, html) {
-  var div = exports.createElement(document, 'div');
-  exports.setContents(div, html);
-  return div.children[0];
-};
-
 /**
  * How to detect if we're in an XML document.
  * In a Mozilla we check that document.xmlVersion = null, however in Chrome

From f12bada15dded7f8e387c7a16b66acc5da6fac1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Mon, 9 Jun 2014 16:50:58 +0200
Subject: [PATCH 100/117] Bug 1015527 - Back/Forward navigation shouldn't break
 the Translation UI, r=felipe.

---
 browser/base/content/browser.js               |  4 +-
 .../components/translation/Translation.jsm    | 61 +++++++++++--------
 .../translation/TranslationContentHandler.jsm | 59 +++++++++++++++++-
 .../translation/TranslationDocument.jsm       |  7 +++
 .../test/browser_translation_exceptions.js    | 10 ++-
 .../test/browser_translation_infobar.js       | 28 +++++----
 .../translation/translation-infobar.xml       |  6 +-
 7 files changed, 127 insertions(+), 48 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d6eea6080df8..bdff8b342326 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5311,8 +5311,8 @@ function setStyleDisabled(disabled) {
 
 var LanguageDetectionListener = {
   init: function() {
-    window.messageManager.addMessageListener("LanguageDetection:Result", msg => {
-      Translation.languageDetected(msg.target, msg.data);
+    window.messageManager.addMessageListener("Translation:DocumentState", msg => {
+      Translation.documentStateReceived(msg.target, msg.data);
     });
   }
 };
diff --git a/browser/components/translation/Translation.jsm b/browser/components/translation/Translation.jsm
index e8feb06cec74..fb595e3a5ad7 100644
--- a/browser/components/translation/Translation.jsm
+++ b/browser/components/translation/Translation.jsm
@@ -24,6 +24,11 @@ const DAILY_LAST_NUMERIC_FIELD = {type: Metrics.Storage.FIELD_DAILY_LAST_NUMERIC
 
 
 this.Translation = {
+  STATE_OFFER: 0,
+  STATE_TRANSLATING: 1,
+  STATE_TRANSLATED: 2,
+  STATE_ERROR: 3,
+
   supportedSourceLanguages: ["en", "zh", "ja", "es", "de", "fr", "ru", "ar", "ko", "pt"],
   supportedTargetLanguages: ["en", "pl", "tr", "vi"],
 
@@ -38,21 +43,33 @@ this.Translation = {
     return this._defaultTargetLanguage;
   },
 
-  languageDetected: function(aBrowser, aDetectedLanguage) {
-    if (this.supportedSourceLanguages.indexOf(aDetectedLanguage) == -1 ||
-        aDetectedLanguage == this.defaultTargetLanguage)
-      return;
+  documentStateReceived: function(aBrowser, aData) {
+    if (aData.state == this.STATE_OFFER) {
+      if (this.supportedSourceLanguages.indexOf(aData.detectedLanguage) == -1 ||
+          aData.detectedLanguage == this.defaultTargetLanguage)
+        return;
 
-    TranslationHealthReport.recordTranslationOpportunity(aDetectedLanguage);
+      TranslationHealthReport.recordTranslationOpportunity(aData.detectedLanguage);
+    }
 
     if (!Services.prefs.getBoolPref(TRANSLATION_PREF_SHOWUI))
       return;
 
     if (!aBrowser.translationUI)
       aBrowser.translationUI = new TranslationUI(aBrowser);
+    let trUI = aBrowser.translationUI;
 
+    // Set all values before showing a new translation infobar.
+    trUI._state = aData.state;
+    trUI.detectedLanguage = aData.detectedLanguage;
+    trUI.translatedFrom = aData.translatedFrom;
+    trUI.translatedTo = aData.translatedTo;
+    trUI.originalShown = aData.originalShown;
 
-    aBrowser.translationUI.showTranslationUI(aDetectedLanguage);
+    trUI.showURLBarIcon();
+
+    if (trUI.shouldShowInfoBar(aBrowser.currentURI))
+      trUI.showTranslationInfoBar();
   }
 };
 
@@ -62,7 +79,6 @@ this.Translation = {
  * the infobar are:
  * - detectedLanguage, code of the language detected on the web page.
  * - state, the state in which the infobar should be displayed
- * - STATE_{OFFER,TRANSLATING,TRANSLATED,ERROR} constants.
  * - translatedFrom, if already translated, source language code.
  * - translatedTo, if already translated, target language code.
  * - translate, method starting the translation of the current page.
@@ -78,20 +94,15 @@ function TranslationUI(aBrowser) {
 }
 
 TranslationUI.prototype = {
-  STATE_OFFER: 0,
-  STATE_TRANSLATING: 1,
-  STATE_TRANSLATED: 2,
-  STATE_ERROR: 3,
-
   translate: function(aFrom, aTo) {
     if (aFrom == aTo ||
-        (this.state == this.STATE_TRANSLATED &&
+        (this.state == Translation.STATE_TRANSLATED &&
          this.translatedFrom == aFrom && this.translatedTo == aTo)) {
       // Nothing to do.
       return;
     }
 
-    this.state = this.STATE_TRANSLATING;
+    this.state = Translation.STATE_TRANSLATING;
     this.translatedFrom = aFrom;
     this.translatedTo = aTo;
 
@@ -101,10 +112,10 @@ TranslationUI.prototype = {
     );
   },
 
-  showURLBarIcon: function(aTranslated) {
+  showURLBarIcon: function() {
     let chromeWin = this.browser.ownerGlobal;
     let PopupNotifications = chromeWin.PopupNotifications;
-    let removeId = aTranslated ? "translate" : "translated";
+    let removeId = this.originalShown ? "translated" : "translate";
     let notification =
       PopupNotifications.getNotification(removeId, this.browser);
     if (notification)
@@ -121,7 +132,7 @@ TranslationUI.prototype = {
       return true;
     };
 
-    let addId = aTranslated ? "translated" : "translate";
+    let addId = this.originalShown ? "translate" : "translated";
     PopupNotifications.show(this.browser, addId, null,
                             addId + "-notification-icon", null, null,
                             {dismissed: true, eventCallback: callback});
@@ -138,14 +149,14 @@ TranslationUI.prototype = {
 
   originalShown: true,
   showOriginalContent: function() {
-    this.showURLBarIcon();
     this.originalShown = true;
+    this.showURLBarIcon();
     this.browser.messageManager.sendAsyncMessage("Translation:ShowOriginal");
   },
 
   showTranslatedContent: function() {
-    this.showURLBarIcon(true);
     this.originalShown = false;
+    this.showURLBarIcon();
     this.browser.messageManager.sendAsyncMessage("Translation:ShowTranslation");
   },
 
@@ -159,11 +170,11 @@ TranslationUI.prototype = {
     return notif;
   },
 
-  shouldShowInfoBar: function(aURI, aDetectedLanguage) {
+  shouldShowInfoBar: function(aURI) {
     // Check if we should never show the infobar for this language.
     let neverForLangs =
       Services.prefs.getCharPref("browser.translation.neverForLanguages");
-    if (neverForLangs.split(",").indexOf(aDetectedLanguage) != -1)
+    if (neverForLangs.split(",").indexOf(this.detectedLanguage) != -1)
       return false;
 
     // or if we should never show the infobar for this domain.
@@ -182,7 +193,7 @@ TranslationUI.prototype = {
 
     this.showURLBarIcon();
 
-    if (!this.shouldShowInfoBar(this.browser.currentURI, aDetectedLanguage))
+    if (!this.shouldShowInfoBar(this.browser.currentURI))
       return null;
 
     return this.showTranslationInfoBar();
@@ -192,11 +203,11 @@ TranslationUI.prototype = {
     switch (msg.name) {
       case "Translation:Finished":
         if (msg.data.success) {
-          this.state = this.STATE_TRANSLATED;
-          this.showURLBarIcon(true);
+          this.state = Translation.STATE_TRANSLATED;
           this.originalShown = false;
+          this.showURLBarIcon();
         } else {
-          this.state = this.STATE_ERROR;
+          this.state = Translation.STATE_ERROR;
         }
         break;
     }
diff --git a/browser/components/translation/TranslationContentHandler.jsm b/browser/components/translation/TranslationContentHandler.jsm
index 8ff40158f21c..a3159913c7c8 100644
--- a/browser/components/translation/TranslationContentHandler.jsm
+++ b/browser/components/translation/TranslationContentHandler.jsm
@@ -12,11 +12,17 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "LanguageDetector",
   "resource:///modules/translation/LanguageDetector.jsm");
 
+const STATE_OFFER = 0;
+const STATE_TRANSLATED = 2;
+const STATE_ERROR = 3;
+
 this.TranslationContentHandler = function(global, docShell) {
   let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
                             .getInterface(Ci.nsIWebProgress);
   webProgress.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
 
+  global.addEventListener("pageshow", this);
+
   global.addMessageListener("Translation:TranslateDocument", this);
   global.addMessageListener("Translation:ShowTranslation", this);
   global.addMessageListener("Translation:ShowOriginal", this);
@@ -24,6 +30,35 @@ this.TranslationContentHandler = function(global, docShell) {
 }
 
 TranslationContentHandler.prototype = {
+  handleEvent: function(aEvent) {
+    // We are only listening to pageshow events.
+    let target = aEvent.target;
+
+    // Only handle top-level frames.
+    let win = target.defaultView;
+    if (win.parent !== win)
+      return;
+
+    let content = this.global.content;
+    if (!content.detectedLanguage)
+      return;
+
+    let data = {};
+    let trDoc = content.translationDocument;
+    if (trDoc) {
+      data.state = trDoc.translationError ? STATE_ERROR : STATE_TRANSLATED;
+      data.translatedFrom = trDoc.translatedFrom;
+      data.translatedTo = trDoc.translatedTo;
+      data.originalShown = trDoc.originalShown;
+    } else {
+      data.state = STATE_OFFER;
+      data.originalShown = true;
+    }
+    data.detectedLanguage = content.detectedLanguage;
+
+    this.global.sendAsyncMessage("Translation:DocumentState", data);
+  },
+
   /* nsIWebProgressListener implementation */
   onStateChange: function(aWebProgress, aRequest, aStateFlags, aStatus) {
     if (!aWebProgress.isTopLevel ||
@@ -35,10 +70,14 @@ TranslationContentHandler.prototype = {
     if (!url.startsWith("http://") && !url.startsWith("https://"))
       return;
 
+    let content = this.global.content;
+    if (content.detectedLanguage)
+      return;
+
     // Grab a 60k sample of text from the page.
     let encoder = Cc["@mozilla.org/layout/documentEncoder;1?type=text/plain"]
                     .createInstance(Ci.nsIDocumentEncoder);
-    encoder.init(this.global.content.document, "text/plain", encoder.SkipInvisibleContent);
+    encoder.init(content.document, "text/plain", encoder.SkipInvisibleContent);
     let string = encoder.encodeToStringWithMaxLength(60 * 1024);
 
     // Language detection isn't reliable on very short strings.
@@ -46,8 +85,17 @@ TranslationContentHandler.prototype = {
       return;
 
     LanguageDetector.detectLanguage(string).then(result => {
-      if (result.confident)
-        this.global.sendAsyncMessage("LanguageDetection:Result", result.language);
+      if (!result.confident)
+        return;
+
+      content.detectedLanguage = result.language;
+
+      let data = {
+        state: STATE_OFFER,
+        originalShown: true,
+        detectedLanguage: result.language
+      };
+      this.global.sendAsyncMessage("Translation:DocumentState", data);
     });
   },
 
@@ -78,12 +126,17 @@ TranslationContentHandler.prototype = {
                                                   msg.data.to);
 
         this.global.content.translationDocument = translationDocument;
+        translationDocument.translatedFrom = msg.data.from;
+        translationDocument.translatedTo = msg.data.to;
+        translationDocument.translationError = false;
+
         bingTranslation.translate().then(
           success => {
             this.global.sendAsyncMessage("Translation:Finished", {success: true});
             translationDocument.showTranslation();
           },
           error => {
+            translationDocument.translationError = true;
             this.global.sendAsyncMessage("Translation:Finished", {success: false});
           }
         );
diff --git a/browser/components/translation/TranslationDocument.jsm b/browser/components/translation/TranslationDocument.jsm
index eff9cac53c03..a47af78af8fe 100644
--- a/browser/components/translation/TranslationDocument.jsm
+++ b/browser/components/translation/TranslationDocument.jsm
@@ -31,6 +31,11 @@ this.TranslationDocument = function(document) {
 };
 
 this.TranslationDocument.prototype = {
+  translatedFrom: "",
+  translatedTo: "",
+  translationError: false,
+  originalShown: true,
+
   /**
    * Initializes the object and populates
    * the roots lists.
@@ -185,6 +190,7 @@ this.TranslationDocument.prototype = {
    * content.
    */
   showTranslation: function() {
+    this.originalShown = false;
     this._swapDocumentContent("translation");
   },
 
@@ -193,6 +199,7 @@ this.TranslationDocument.prototype = {
    * content.
    */
   showOriginal: function() {
+    this.originalShown = true;
     this._swapDocumentContent("original");
   },
 
diff --git a/browser/components/translation/test/browser_translation_exceptions.js b/browser/components/translation/test/browser_translation_exceptions.js
index 620e8b36a8fb..d0c7ba4551a8 100644
--- a/browser/components/translation/test/browser_translation_exceptions.js
+++ b/browser/components/translation/test/browser_translation_exceptions.js
@@ -104,7 +104,10 @@ let gTests = [
   desc: "never for language",
   run: function* checkNeverForLanguage() {
     // Show the infobar for example.com and fr.
-    Translation.languageDetected(gBrowser.selectedBrowser, "fr");
+    Translation.documentStateReceived(gBrowser.selectedBrowser,
+                                      {state: Translation.STATE_OFFER,
+                                       originalShown: true,
+                                       detectedLanguage: "fr"});
     let notif = getInfoBar();
     ok(notif, "the infobar is visible");
     let ui = gBrowser.selectedBrowser.translationUI;
@@ -150,7 +153,10 @@ let gTests = [
   desc: "never for site",
   run: function* checkNeverForSite() {
     // Show the infobar for example.com and fr.
-    Translation.languageDetected(gBrowser.selectedBrowser, "fr");
+    Translation.documentStateReceived(gBrowser.selectedBrowser,
+                                      {state: Translation.STATE_OFFER,
+                                       originalShown: true,
+                                       detectedLanguage: "fr"});
     let notif = getInfoBar();
     ok(notif, "the infobar is visible");
     let ui = gBrowser.selectedBrowser.translationUI;
diff --git a/browser/components/translation/test/browser_translation_infobar.js b/browser/components/translation/test/browser_translation_infobar.js
index 13d562999976..87744162d90c 100644
--- a/browser/components/translation/test/browser_translation_infobar.js
+++ b/browser/components/translation/test/browser_translation_infobar.js
@@ -34,7 +34,7 @@ function waitForCondition(condition, nextTest, errorMsg) {
 
 var TranslationStub = {
   translate: function(aFrom, aTo) {
-    this.state = this.STATE_TRANSLATING;
+    this.state = Translation.STATE_TRANSLATING;
     this.translatedFrom = aFrom;
     this.translatedTo = aTo;
   },
@@ -45,20 +45,22 @@ var TranslationStub = {
   },
 
   failTranslation: function() {
-    this.state = this.STATE_ERROR;
+    this.state = Translation.STATE_ERROR;
     this._reset();
   },
 
   finishTranslation: function() {
     this.showTranslatedContent();
-    this.state = this.STATE_TRANSLATED;
+    this.state = Translation.STATE_TRANSLATED;
     this._reset();
   }
 };
 
 function showTranslationUI(aDetectedLanguage) {
   let browser = gBrowser.selectedBrowser;
-  Translation.languageDetected(browser, aDetectedLanguage);
+  Translation.documentStateReceived(browser, {state: Translation.STATE_OFFER,
+                                              originalShown: true,
+                                              detectedLanguage: aDetectedLanguage});
   let ui = browser.translationUI;
   for (let name of ["translate", "_reset", "failTranslation", "finishTranslation"])
     ui[name] = TranslationStub[name];
@@ -100,13 +102,13 @@ function checkURLBarIcon(aExpectTranslated = false) {
 function run_tests(aFinishCallback) {
   info("Show an info bar saying the current page is in French");
   let notif = showTranslationUI("fr");
-  is(notif.state, notif.translation.STATE_OFFER, "the infobar is offering translation");
+  is(notif.state, Translation.STATE_OFFER, "the infobar is offering translation");
   is(notif._getAnonElt("detectedLanguage").value, "fr", "The detected language is displayed");
   checkURLBarIcon();
 
   info("Click the 'Translate' button");
   notif._getAnonElt("translate").click();
-  is(notif.state, notif.translation.STATE_TRANSLATING, "the infobar is in the translating state");
+  is(notif.state, Translation.STATE_TRANSLATING, "the infobar is in the translating state");
   ok(!!notif.translation.translatedFrom, "Translation.translate has been called");
   is(notif.translation.translatedFrom, "fr", "from language correct");
   is(notif.translation.translatedTo, Translation.defaultTargetLanguage, "from language correct");
@@ -114,12 +116,12 @@ function run_tests(aFinishCallback) {
 
   info("Make the translation fail and check we are in the error state.");
   notif.translation.failTranslation();
-  is(notif.state, notif.translation.STATE_ERROR, "infobar in the error state");
+  is(notif.state, Translation.STATE_ERROR, "infobar in the error state");
   checkURLBarIcon();
 
   info("Click the try again button");
   notif._getAnonElt("tryAgain").click();
-  is(notif.state, notif.translation.STATE_TRANSLATING, "infobar in the translating state");
+  is(notif.state, Translation.STATE_TRANSLATING, "infobar in the translating state");
   ok(!!notif.translation.translatedFrom, "Translation.translate has been called");
   is(notif.translation.translatedFrom, "fr", "from language correct");
   is(notif.translation.translatedTo, Translation.defaultTargetLanguage, "from language correct");
@@ -127,7 +129,7 @@ function run_tests(aFinishCallback) {
 
   info("Make the translation succeed and check we are in the 'translated' state.");
   notif.translation.finishTranslation();
-  is(notif.state, notif.translation.STATE_TRANSLATED, "infobar in the translated state");
+  is(notif.state, Translation.STATE_TRANSLATED, "infobar in the translated state");
   checkURLBarIcon(true);
 
   info("Test 'Show original' / 'Show Translation' buttons.");
@@ -153,7 +155,7 @@ function run_tests(aFinishCallback) {
   let from = notif._getAnonElt("fromLanguage");
   from.value = "es";
   from.doCommand();
-  is(notif.state, notif.translation.STATE_TRANSLATING, "infobar in the translating state");
+  is(notif.state, Translation.STATE_TRANSLATING, "infobar in the translating state");
   ok(!!notif.translation.translatedFrom, "Translation.translate has been called");
   is(notif.translation.translatedFrom, "es", "from language correct");
   is(notif.translation.translatedTo, Translation.defaultTargetLanguage, "to language correct");
@@ -167,7 +169,7 @@ function run_tests(aFinishCallback) {
   let to = notif._getAnonElt("toLanguage");
   to.value = "pl";
   to.doCommand();
-  is(notif.state, notif.translation.STATE_TRANSLATING, "infobar in the translating state");
+  is(notif.state, Translation.STATE_TRANSLATING, "infobar in the translating state");
   ok(!!notif.translation.translatedFrom, "Translation.translate has been called");
   is(notif.translation.translatedFrom, "es", "from language correct");
   is(notif.translation.translatedTo, "pl", "to language correct");
@@ -180,12 +182,12 @@ function run_tests(aFinishCallback) {
 
   info("Reopen the info bar to check that it's possible to override the detected language.");
   notif = showTranslationUI("fr");
-  is(notif.state, notif.translation.STATE_OFFER, "the infobar is offering translation");
+  is(notif.state, Translation.STATE_OFFER, "the infobar is offering translation");
   is(notif._getAnonElt("detectedLanguage").value, "fr", "The detected language is displayed");
   // Change the language and click 'Translate'
   notif._getAnonElt("detectedLanguage").value = "ja";
   notif._getAnonElt("translate").click();
-  is(notif.state, notif.translation.STATE_TRANSLATING, "the infobar is in the translating state");
+  is(notif.state, Translation.STATE_TRANSLATING, "the infobar is in the translating state");
   ok(!!notif.translation.translatedFrom, "Translation.translate has been called");
   is(notif.translation.translatedFrom, "ja", "from language correct");
   notif.close();
diff --git a/browser/components/translation/translation-infobar.xml b/browser/components/translation/translation-infobar.xml
index 79778f154835..5ea77fd8a0db 100644
--- a/browser/components/translation/translation-infobar.xml
+++ b/browser/components/translation/translation-infobar.xml
@@ -127,7 +127,7 @@
 
           let stateName;
           for (let name of ["OFFER", "TRANSLATING", "TRANSLATED", "ERROR"]) {
-            if (this.translation["STATE_" + name] == val) {
+            if (Translation["STATE_" + name] == val) {
               stateName = name.toLowerCase();
               break;
             }
@@ -188,7 +188,7 @@
       <method name="translate">
         <body>
           <![CDATA[
-            if (this.state == this.translation.STATE_OFFER) {
+            if (this.state == Translation.STATE_OFFER) {
               this._getAnonElt("fromLanguage").value =
                 this._getAnonElt("detectedLanguage").value;
               this._getAnonElt("toLanguage").value =
@@ -235,7 +235,7 @@
           <![CDATA[
             // Get the source language name.
             let lang;
-            if (this.state == this.translation.STATE_OFFER)
+            if (this.state == Translation.STATE_OFFER)
               lang = this._getAnonElt("detectedLanguage").value;
             else
               lang = this._getAnonElt("fromLanguage").value;

From 24d67cc9be281e508c6b4833cd080281a9459e8f Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 9 Jun 2014 13:17:21 +0100
Subject: [PATCH 101/117] Bug 1022616 - mochitest chrome template uses broken
 path to SimpleTest.js, r=jmaher DONTBUILD because NPOTB

--HG--
extra : rebase_source : 5924ce540737491b5ad1baef3dda1c8256b4675b
---
 testing/mochitest/static/xul.template.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/mochitest/static/xul.template.txt b/testing/mochitest/static/xul.template.txt
index d5eaa14a362e..5d42dd5552af 100644
--- a/testing/mochitest/static/xul.template.txt
+++ b/testing/mochitest/static/xul.template.txt
@@ -6,7 +6,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={BUGNUMBER}
 -->
 <window title="Mozilla Bug {BUGNUMBER}"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
   <!-- test code goes here -->
   <script type="application/javascript">

From d1b4c8dc019bdbdfc22b794d000d1ffcce20f610 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 9 Jun 2014 13:17:46 +0100
Subject: [PATCH 102/117] Backed out changeset 182986e4ab10 (bug 1009603)

---
 js/src/vm/TraceLogging.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
index 48b4f0497aaa..d28232ef8d36 100644
--- a/js/src/vm/TraceLogging.cpp
+++ b/js/src/vm/TraceLogging.cpp
@@ -328,7 +328,7 @@ TraceLogger::~TraceLogger()
         // We temporary enable logging for this. Stop doesn't need any extra data,
         // so is safe to do, even when we encountered OOM.
         enabled = true;
-        while (stack.currentId() > 0)
+        while (stack.size() > 0)
             stopEvent();
         enabled = false;
     }
@@ -707,7 +707,6 @@ TraceLogger::stopEvent()
             return;
         }
     }
-    JS_ASSERT(stack.currentId() > 0);
     stack.pop();
 }
 

From f1c8b7711533c8e772abd7c87ca27e9030ceec3a Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 9 Jun 2014 13:17:50 +0100
Subject: [PATCH 103/117] Backed out changeset e1bc74560a8a (bug 1009603)

---
 js/src/jit/BaselineCompiler.cpp |  6 +++---
 js/src/jit/VMFunctions.cpp      | 16 ----------------
 js/src/jit/VMFunctions.h        |  1 -
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index 062438e35281..0c5f5d14dd3b 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -2861,9 +2861,8 @@ BaselineCompiler::emit_JSOP_DEBUGGER()
     return true;
 }
 
-typedef bool (*DebugEpilogueFn)(JSContext *, BaselineFrame *, jsbytecode *);
-static const VMFunction DebugEpilogueInfo =
-    FunctionInfo<DebugEpilogueFn>(jit::DebugEpilogueOnBaselineReturn);
+typedef bool (*DebugEpilogueFn)(JSContext *, BaselineFrame *, jsbytecode *, bool);
+static const VMFunction DebugEpilogueInfo = FunctionInfo<DebugEpilogueFn>(jit::DebugEpilogue);
 
 bool
 BaselineCompiler::emitReturn()
@@ -2878,6 +2877,7 @@ BaselineCompiler::emitReturn()
         masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
 
         prepareVMCall();
+        pushArg(Imm32(1));
         pushArg(ImmPtr(pc));
         pushArg(R0.scratchReg());
         if (!callVM(DebugEpilogueInfo))
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index 80f25ec9743b..3b65d9530867 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -16,7 +16,6 @@
 #include "vm/ArrayObject.h"
 #include "vm/Debugger.h"
 #include "vm/Interpreter.h"
-#include "vm/TraceLogging.h"
 
 #include "jsinferinlines.h"
 
@@ -763,21 +762,6 @@ DebugPrologue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool *mustRet
     }
 }
 
-bool
-DebugEpilogueOnBaselineReturn(JSContext *cx, BaselineFrame *frame, jsbytecode *pc)
-{
-    if (!DebugEpilogue(cx, frame, pc, true)) {
-        // DebugEpilogue popped the frame by updating jitTop, so run the stop event
-        // here before we enter the exception handler.
-        TraceLogger *logger = TraceLoggerForMainThread(cx->runtime());
-        TraceLogStopEvent(logger, TraceLogger::Baseline);
-        TraceLogStopEvent(logger); // Leave script.
-        return false;
-    }
-
-    return true;
-}
-
 bool
 DebugEpilogue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool ok)
 {
diff --git a/js/src/jit/VMFunctions.h b/js/src/jit/VMFunctions.h
index a2199ff2925a..3d0bd4b1e741 100644
--- a/js/src/jit/VMFunctions.h
+++ b/js/src/jit/VMFunctions.h
@@ -647,7 +647,6 @@ uint32_t GetIndexFromString(JSString *str);
 
 bool DebugPrologue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool *mustReturn);
 bool DebugEpilogue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool ok);
-bool DebugEpilogueOnBaselineReturn(JSContext *cx, BaselineFrame *frame, jsbytecode *pc);
 
 bool StrictEvalPrologue(JSContext *cx, BaselineFrame *frame);
 bool HeavyweightFunPrologue(JSContext *cx, BaselineFrame *frame);

From 45409b6f2c00d6f5ebefc9609a14023165c17a9a Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 9 Jun 2014 13:17:53 +0100
Subject: [PATCH 104/117] Backed out changeset dcccbc732972 (bug 1009603)

---
 js/src/vm/TraceLogging.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
index d28232ef8d36..cc62ff0c4fe6 100644
--- a/js/src/vm/TraceLogging.cpp
+++ b/js/src/vm/TraceLogging.cpp
@@ -378,9 +378,6 @@ TraceLogger::createTextId(const char *text)
 uint32_t
 TraceLogger::createTextId(JSScript *script)
 {
-    if (!script->filename())
-        return createTextId("");
-
     assertNoQuotes(script->filename());
 
     PointerHashMap::AddPtr p = pointerMap.lookupForAdd(script);
@@ -409,9 +406,6 @@ TraceLogger::createTextId(JSScript *script)
 uint32_t
 TraceLogger::createTextId(const JS::ReadOnlyCompileOptions &compileOptions)
 {
-    if (!compileOptions.filename())
-        return createTextId("");
-
     assertNoQuotes(compileOptions.filename());
 
     PointerHashMap::AddPtr p = pointerMap.lookupForAdd(&compileOptions);

From e01863a58ffca28bb58b7b4106eae5104836e565 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 9 Jun 2014 13:18:43 +0100
Subject: [PATCH 105/117] Backed out changeset 008243793ef8 (bug 1009603) for
 compilation errors; CLOSED TREE

---
 js/src/jit/IonFrames.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/js/src/jit/IonFrames.cpp b/js/src/jit/IonFrames.cpp
index 329d3a603254..f1ea645ea491 100644
--- a/js/src/jit/IonFrames.cpp
+++ b/js/src/jit/IonFrames.cpp
@@ -583,7 +583,6 @@ void
 HandleException(ResumeFromException *rfe)
 {
     JSContext *cx = GetJSContextFromJitCode();
-    TraceLogger *logger = TraceLoggerForMainThread(cx->runtime());
 
     rfe->kind = ResumeFromException::RESUME_ENTRY_FRAME;
 
@@ -634,14 +633,10 @@ HandleException(ResumeFromException *rfe)
                 // When profiling, each frame popped needs a notification that
                 // the function has exited, so invoke the probe that a function
                 // is exiting.
-
                 JSScript *script = frames.script();
                 probes::ExitScript(cx, script, script->functionNonDelazifying(), popSPSFrame);
-                if (!frames.more()) {
-                    TraceLogStopEvent(logger, TraceLogger::IonMonkey);
-                    TraceLogStopEvent(logger);
+                if (!frames.more())
                     break;
-                }
                 ++frames;
             }
 
@@ -669,9 +664,6 @@ HandleException(ResumeFromException *rfe)
             if (rfe->kind != ResumeFromException::RESUME_ENTRY_FRAME)
                 return;
 
-            TraceLogStopEvent(logger, TraceLogger::Baseline);
-            TraceLogStopEvent(logger);
-
             // Unwind profiler pseudo-stack
             JSScript *script = iter.script();
             probes::ExitScript(cx, script, script->functionNonDelazifying(),

From de1b12e91e3df694c632c7f79b1886910597f991 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Mon, 9 Jun 2014 22:42:02 +0900
Subject: [PATCH 106/117] Bug 1020832 tabbrowser's constructor shouldn't use Cc
 and Ci since using it sometimes causes undefined error r=enndeakin

---
 browser/base/content/tabbrowser.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index f7ce49aa2f26..1c9d2accf96a 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -3067,7 +3067,10 @@
           this.mCurrentBrowser = document.getAnonymousElementByAttribute(this, "anonid", "initialBrowser");
 
           this.mCurrentTab = this.tabContainer.firstChild;
-          let els = Cc["@mozilla.org/eventlistenerservice;1"].getService(Ci.nsIEventListenerService);
+          const nsIEventListenerService =
+            Components.interfaces.nsIEventListenerService;
+          let els = Components.classes["@mozilla.org/eventlistenerservice;1"]
+                              .getService(nsIEventListenerService);
           els.addSystemEventListener(document, "keydown", this, false);
           els.addSystemEventListener(document, "keypress", this, false);
           window.addEventListener("sizemodechange", this, false);
@@ -3147,7 +3150,10 @@
             this.mTabListeners[i].destroy();
             this.mTabListeners[i] = null;
           }
-          let els = Cc["@mozilla.org/eventlistenerservice;1"].getService(Ci.nsIEventListenerService);
+          const nsIEventListenerService =
+            Components.interfaces.nsIEventListenerService;
+          let els = Components.classes["@mozilla.org/eventlistenerservice;1"]
+                              .getService(nsIEventListenerService);
           els.removeSystemEventListener(document, "keydown", this, false);
           els.removeSystemEventListener(document, "keypress", this, false);
           window.removeEventListener("sizemodechange", this, false);

From fe6adc9f5762a4de6035a4dcb40ebfcc4946729c Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nsilva@mozilla.com>
Date: Mon, 9 Jun 2014 10:57:30 -0400
Subject: [PATCH 107/117] Bug 1008211 - Don't use BufferTextureClient with 2D
 canvases with D3D11 OMTC. r=bas

---
 gfx/layers/client/CanvasClient.cpp | 34 ++++++++++++++++++++----------
 gfx/layers/client/CanvasClient.h   |  4 ++++
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/gfx/layers/client/CanvasClient.cpp b/gfx/layers/client/CanvasClient.cpp
index 16861d2f6b2e..c26538364ee2 100644
--- a/gfx/layers/client/CanvasClient.cpp
+++ b/gfx/layers/client/CanvasClient.cpp
@@ -74,17 +74,7 @@ CanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer)
     }
 
     gfx::SurfaceFormat surfaceFormat = gfx::ImageFormatToSurfaceFormat(format);
-    if (aLayer->IsGLLayer()) {
-      // We want a cairo backend here as we don't want to be copying into
-      // an accelerated backend and we like LockBits to work. This is currently
-      // the most effective way to make this work.
-      mBuffer = CreateBufferTextureClient(surfaceFormat, flags, BackendType::CAIRO);
-    } else {
-      // XXX - We should use CreateTextureClientForDrawing, but we first need
-      // to use double buffering.
-      mBuffer = CreateBufferTextureClient(surfaceFormat, flags,
-        gfxPlatform::GetPlatform()->GetPreferredCanvasBackend());
-    }
+    mBuffer = CreateTextureClientForCanvas(surfaceFormat, flags, aLayer);
     MOZ_ASSERT(mBuffer->CanExposeDrawTarget());
     mBuffer->AllocateForSurface(aSize);
 
@@ -119,6 +109,28 @@ CanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer)
   }
 }
 
+TemporaryRef<TextureClient>
+CanvasClient2D::CreateTextureClientForCanvas(gfx::SurfaceFormat aFormat,
+                                             TextureFlags aFlags,
+                                             ClientCanvasLayer* aLayer)
+{
+  if (aLayer->IsGLLayer()) {
+    // We want a cairo backend here as we don't want to be copying into
+    // an accelerated backend and we like LockBits to work. This is currently
+    // the most effective way to make this work.
+    return CreateBufferTextureClient(aFormat, aFlags, BackendType::CAIRO);
+  }
+
+  gfx::BackendType backend = gfxPlatform::GetPlatform()->GetPreferredCanvasBackend();
+#ifdef XP_WIN
+  return CreateTextureClientForDrawing(aFormat, aFlags, backend, aSize);
+#else
+  // XXX - We should use CreateTextureClientForDrawing, but we first need
+  // to use double buffering.
+  return CreateBufferTextureClient(aFormat, aFlags, backend);
+#endif
+}
+
 CanvasClientSurfaceStream::CanvasClientSurfaceStream(CompositableForwarder* aLayerForwarder,
                                                      TextureFlags aFlags)
   : CanvasClient(aLayerForwarder, aFlags)
diff --git a/gfx/layers/client/CanvasClient.h b/gfx/layers/client/CanvasClient.h
index b3e22bfc2574..58100eefd926 100644
--- a/gfx/layers/client/CanvasClient.h
+++ b/gfx/layers/client/CanvasClient.h
@@ -101,6 +101,10 @@ public:
   }
 
 private:
+  TemporaryRef<TextureClient> CreateTextureClientForCanvas(gfx::SurfaceFormat aFormat,
+                                                           TextureFlags aFlags,
+                                                           ClientCanvasLayer* aLayer);
+
   RefPtr<TextureClient> mBuffer;
 };
 

From d9c7b7c290e97275af55d91cdca566346871f224 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 9 Jun 2014 10:59:36 -0400
Subject: [PATCH 108/117] Bug 1021378 follow-up: take up my debugging stuff,
 and typos

---
 build/autoconf/toolchain.m4 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4
index 0c122ce9b0e9..4aa8aded86d5 100644
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -36,9 +36,6 @@ if test "$compiler" != "$cxxcompiler"; then
 fi
 CC_VERSION=`echo "$CC_VERSION" | sed 's/ //g'`
 CXX_VERSION=`echo "$CXX_VERSION" | sed 's/ //g'`
-echo "$CC_VERSION"
-echo "$CXX_VERSION"
-ecit 1
 if test "$compiler" = "gcc"; then
     GNU_CC=1
     GNU_CXX=1

From 29f271516a30ecb8a6139d3eca27e8a7a38838cc Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Mon, 9 Jun 2014 10:26:58 -0500
Subject: [PATCH 109/117] Bug 1019924 - Update license.html for Loop-related
 third-party licenses r=gerv

---
 toolkit/content/license.html | 179 +++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)

diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index deee149688e8..7ddcae58041c 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -71,6 +71,7 @@
       <li><a href="about:license#apple">Apple License</a></li>
       <li><a href="about:license#apple-mozilla">Apple/Mozilla NPRuntime License</a></li>
       <li><a href="about:license#apple-torch">Apple/Torch Mobile License</a></li>
+      <li><a href="about:license#backbone">Backbone License</a></li>
       <li><a href="about:license#bspatch">bspatch License</a></li>
       <li><a href="about:license#cairo">Cairo Component Licenses</a></li>
       <li><a href="about:license#chromium">Chromium License</a></li>
@@ -90,6 +91,7 @@
       <li><a href="about:license#gyp">gyp License</a></li>
       <li><a href="about:license#halloc">halloc License</a></li>
       <li><a href="about:license#harfbuzz">HarfBuzz License</a></li>
+      <li><a href="about:license#hawk-browser">Hawk Browser License</a></li>
       <li><a href="about:license#icu">ICU License</a></li>
       <li><a href="about:license#jpnic">Japan Network Information Center License</a></li>
       <li><a href="about:license#jemalloc">jemalloc License</a></li>
@@ -104,11 +106,13 @@
       <li><a href="about:license#libsrtp">libsrtp License</a></li>
       <li><a href="about:license#libyuv">libyuv License</a></li>
       <li><a href="about:license#hunspell-lt">Lithuanian Spellchecking Dictionary License</a></li>
+      <li><a href="about:license#lodash">Lodash License</a></li>
       <li><a href="about:license#maattachedwindow">MAAttachedWindow License</a></li>
       <li><a href="about:license#msinttypes">msinttypes License</a></li>
       <li><a href="about:license#myspell">MySpell License</a></li>
       <li><a href="about:license#nicer">nICEr License</a></li>
       <li><a href="about:license#nrappkit">nrappkit License</a></li>
+      <li><a href="about:license#opentok">OpenTok License</a></li>
       <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#pbkdf2-sha256">pbkdf2_sha256 License</a></li>
       <li><a href="about:license#praton">praton License</a></li>
@@ -117,6 +121,7 @@
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#hunspell-ru">Russian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#sctp">SCTP Licenses</a></li>
+      <li><a href="about:license#sjcl">SJCL License</a></li>
       <li><a href="about:license#skia">Skia License</a></li>
       <li><a href="about:license#snappy">Snappy License</a></li>
       <li><a href="about:license#sparkle">Sparkle License</a></li>
@@ -1810,6 +1815,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
+    <hr>
+
+    <h1><a id="backbone"></a>Backbone License</h1>
+
+    <p>This license applies to the file
+    <span class="path">browser/components/loop/content/shared/libs/backbone-*.js</span>.</p>
+
+<pre>
+Copyright (c) 2010-2014 Jeremy Ashkenas, DocumentCloud
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+</pre>
+
     <hr>
 
     <h1><a id="bspatch"></a>bspatch License</h1>
@@ -2572,6 +2609,41 @@ ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 </pre>
 
+
+    <hr>
+
+    <h1><a id="hawk-browser"></a>Hawk Browser License</h1>
+
+    <p>This license applies to the file
+    <span class="path">browser/components/loop/content/shared/libs/hawk-browser-*.js</span>.</p>
+
+<pre>
+Copyright (c) 2012-2014, Eran Hammer.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Eran Hammer nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL ERAN HAMMER BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</pre>
+
     <hr>
 
     <h1><a id="icu"></a>ICU License</h1>
@@ -3082,6 +3154,38 @@ SUCH DAMAGE.
 </pre>
 
 
+    <hr>
+
+    <h1><a id="lodash"></a>Lodash License</h1>
+
+    <p>This license applies to the file
+    <span class="path">browser/components/loop/content/shared/libs/lodash-*.js</span>.</p>
+
+<pre>
+Copyright 2012-2014 The Dojo Foundation &lt;http://dojofoundation.org/&gt;
+Based on Underscore.js 1.5.2, copyright 2009-2014 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters &amp; Editors &lt;http://underscorejs.org/&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</pre>
+
 
     <hr>
 
@@ -3258,6 +3362,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
+    <hr>
+
+    <h1><a id="opentok"></a>OpenTok License</h1>
+
+    <p>This license applies to the file
+    <span class="path">browser/components/loop/content/shared/libs/sdk.js</span>
+    and the files in
+    <span class="path">browser/components/loop/content/shared/libs/otcdn</span>
+    and its subdirectories.</p>
+
+<pre>
+Copyright (c) 2014 TokBox, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</pre>
+
+
     <hr>
 
     <h1><a id="openvision"></a>OpenVision License</h1>
@@ -3746,6 +3883,48 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
+
+    <hr>
+
+    <h1><a id="sjcl"></a>SJCL License</h1>
+
+    <p>This license applies to the file
+    <span class="path">browser/components/loop/content/shared/libs/sjcl*.js</span>.</p>
+
+<pre>
+Copyright 2009-2010 Emily Stark, Mike Hamburg, Dan Boneh.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt;<!-- sic --> OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation
+are those of the authors and should not be interpreted as representing
+official policies, either expressed or implied, of the authors.
+</pre>
+
+
     <hr>
 
     <h1><a id="skia"></a>Skia License</h1>

From 05944d30622adde32c76187117713786b5112fbf Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nsilva@mozilla.com>
Date: Mon, 9 Jun 2014 11:43:20 -0400
Subject: [PATCH 110/117] =?UTF-8?q?b711bc06d9ae=20Nicolas=20Silva=20?=
 =?UTF-8?q?=E2=80=93=20Bug=201008211=20-=20Backout=20changeset=20b711bc06d?=
 =?UTF-8?q?9ae=20for=20build=20bustage=20on=20a=20CLOSED=20TREE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gfx/layers/client/CanvasClient.cpp | 34 ++++++++++--------------------
 gfx/layers/client/CanvasClient.h   |  4 ----
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/gfx/layers/client/CanvasClient.cpp b/gfx/layers/client/CanvasClient.cpp
index c26538364ee2..16861d2f6b2e 100644
--- a/gfx/layers/client/CanvasClient.cpp
+++ b/gfx/layers/client/CanvasClient.cpp
@@ -74,7 +74,17 @@ CanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer)
     }
 
     gfx::SurfaceFormat surfaceFormat = gfx::ImageFormatToSurfaceFormat(format);
-    mBuffer = CreateTextureClientForCanvas(surfaceFormat, flags, aLayer);
+    if (aLayer->IsGLLayer()) {
+      // We want a cairo backend here as we don't want to be copying into
+      // an accelerated backend and we like LockBits to work. This is currently
+      // the most effective way to make this work.
+      mBuffer = CreateBufferTextureClient(surfaceFormat, flags, BackendType::CAIRO);
+    } else {
+      // XXX - We should use CreateTextureClientForDrawing, but we first need
+      // to use double buffering.
+      mBuffer = CreateBufferTextureClient(surfaceFormat, flags,
+        gfxPlatform::GetPlatform()->GetPreferredCanvasBackend());
+    }
     MOZ_ASSERT(mBuffer->CanExposeDrawTarget());
     mBuffer->AllocateForSurface(aSize);
 
@@ -109,28 +119,6 @@ CanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer)
   }
 }
 
-TemporaryRef<TextureClient>
-CanvasClient2D::CreateTextureClientForCanvas(gfx::SurfaceFormat aFormat,
-                                             TextureFlags aFlags,
-                                             ClientCanvasLayer* aLayer)
-{
-  if (aLayer->IsGLLayer()) {
-    // We want a cairo backend here as we don't want to be copying into
-    // an accelerated backend and we like LockBits to work. This is currently
-    // the most effective way to make this work.
-    return CreateBufferTextureClient(aFormat, aFlags, BackendType::CAIRO);
-  }
-
-  gfx::BackendType backend = gfxPlatform::GetPlatform()->GetPreferredCanvasBackend();
-#ifdef XP_WIN
-  return CreateTextureClientForDrawing(aFormat, aFlags, backend, aSize);
-#else
-  // XXX - We should use CreateTextureClientForDrawing, but we first need
-  // to use double buffering.
-  return CreateBufferTextureClient(aFormat, aFlags, backend);
-#endif
-}
-
 CanvasClientSurfaceStream::CanvasClientSurfaceStream(CompositableForwarder* aLayerForwarder,
                                                      TextureFlags aFlags)
   : CanvasClient(aLayerForwarder, aFlags)
diff --git a/gfx/layers/client/CanvasClient.h b/gfx/layers/client/CanvasClient.h
index 58100eefd926..b3e22bfc2574 100644
--- a/gfx/layers/client/CanvasClient.h
+++ b/gfx/layers/client/CanvasClient.h
@@ -101,10 +101,6 @@ public:
   }
 
 private:
-  TemporaryRef<TextureClient> CreateTextureClientForCanvas(gfx::SurfaceFormat aFormat,
-                                                           TextureFlags aFlags,
-                                                           ClientCanvasLayer* aLayer);
-
   RefPtr<TextureClient> mBuffer;
 };
 

From 0c3504655df15b704002aa4b9f07841d0fe41051 Mon Sep 17 00:00:00 2001
From: Chris Lord <chrislord.net@gmail.com>
Date: Mon, 9 Jun 2014 16:53:35 +0100
Subject: [PATCH 111/117] Bug 1017427 - Fix CompositorOGL RenderOffset not
 offsetting clipping rect. r=nical

---
 gfx/layers/opengl/CompositorOGL.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
index e6ef98e59fd0..6eb693edfcd1 100644
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -1008,6 +1008,9 @@ CompositorOGL::DrawQuad(const Rect& aRect,
 
   IntRect intClipRect;
   aClipRect.ToIntRect(&intClipRect);
+  if (!mTarget) {
+    intClipRect.MoveBy(mRenderOffset.x, mRenderOffset.y);
+  }
 
   gl()->fScissor(intClipRect.x, FlipY(intClipRect.y + intClipRect.height),
                  intClipRect.width, intClipRect.height);

From 2befea780dc784b21c7e2c49df534238fe3127f4 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 9 Jun 2014 17:20:19 +0100
Subject: [PATCH 112/117] Bug 1018682 - URL API - SetProtocol should serialize
 and reparse the URL, r=bz

---
 content/base/src/Link.cpp        |  3 +++
 dom/base/URL.cpp                 | 30 +++++++++++++++++++++++++-
 dom/base/test/mochitest.ini      |  1 +
 dom/base/test/test_url_data.html | 37 ++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 dom/base/test/test_url_data.html

diff --git a/content/base/src/Link.cpp b/content/base/src/Link.cpp
index 9912d5f314a6..f5b7fdb38442 100644
--- a/content/base/src/Link.cpp
+++ b/content/base/src/Link.cpp
@@ -546,6 +546,9 @@ Link::SetHrefAttribute(nsIURI *aURI)
 {
   NS_ASSERTION(aURI, "Null URI is illegal!");
 
+  // if we change this code to not reserialize we need to do something smarter
+  // in SetProtocol because changing the protocol of an URI can change the
+  // "nature" of the nsIURL/nsIURI implementation.
   nsAutoCString href;
   (void)aURI->GetSpec(href);
   (void)mElement->SetAttr(kNameSpaceID_None, nsGkAtoms::href,
diff --git a/dom/base/URL.cpp b/dom/base/URL.cpp
index cffd0ac1a04c..b086e2f16b0d 100644
--- a/dom/base/URL.cpp
+++ b/dom/base/URL.cpp
@@ -15,6 +15,7 @@
 #include "nsIIOService.h"
 #include "nsEscape.h"
 #include "nsNetCID.h"
+#include "nsNetUtil.h"
 #include "nsIURL.h"
 
 namespace mozilla {
@@ -262,7 +263,34 @@ URL::SetProtocol(const nsAString& aProtocol)
   nsAString::const_iterator iter(start);
 
   FindCharInReadable(':', iter, end);
-  mURI->SetScheme(NS_ConvertUTF16toUTF8(Substring(start, iter)));
+
+  // Changing the protocol of a URL, changes the "nature" of the URI
+  // implementation. In order to do this properly, we have to serialize the
+  // existing URL and reparse it in a new object.
+  nsCOMPtr<nsIURI> clone;
+  nsresult rv = mURI->Clone(getter_AddRefs(clone));
+  if (NS_WARN_IF(NS_FAILED(rv)) || !clone) {
+    return;
+  }
+
+  rv = clone->SetScheme(NS_ConvertUTF16toUTF8(Substring(start, iter)));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  nsAutoCString href;
+  rv = clone->GetSpec(href);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  nsCOMPtr<nsIURI> uri;
+  rv = NS_NewURI(getter_AddRefs(uri), href);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  mURI = uri;
 }
 
 #define URL_GETTER( value, func ) \
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index 6b91fc6cc3a7..a30e7b08b401 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -60,6 +60,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Fails on b2g-desktop, track
 [test_setting_opener.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_url.html]
+[test_url_data.html]
 [test_url_empty_port.html]
 [test_urlExceptions.html]
 [test_urlSearchParams.html]
diff --git a/dom/base/test/test_url_data.html b/dom/base/test/test_url_data.html
new file mode 100644
index 000000000000..082128f6d9fb
--- /dev/null
+++ b/dom/base/test/test_url_data.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Test URL API - data:plain</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1018682">Mozilla Bug 1018682</a>
+
+<script type="application/javascript">
+
+var base = new URL("data:text/plain,");
+
+base.protocol = "chrome:";
+is(base.protocol, 'data:', "The protocol should not change from data to chrome.");
+
+try {
+  var relative = new URL("a", base);
+  ok(false, "Relative URL from a data:text/plain should not work.");
+} catch(e) {
+  ok(true, "Relative URL from a data:text/plain should not work.");
+}
+
+base.protocol = "http:";
+ok(true, "Protocol: http changed");
+is(base.href, "http://text/plain,", "Base URL is correct");
+
+var relative = new URL("a", base);
+ok(relative, "This works.");
+is(relative.href, "http://text/a", "Relative URL is correct");
+
+</script>
+
+</body>
+</html>

From 160716596ef2e887c9d84eeb6cf9b6e15cb6b520 Mon Sep 17 00:00:00 2001
From: Malini Das <mdas@mozilla.com>
Date: Mon, 9 Jun 2014 12:37:11 -0400
Subject: [PATCH 113/117] Bug 932804 - compensate for statusbar in APZ touch,
 r=dburns

---
 .../marionette/marionette-frame-manager.js    |  4 ++
 testing/marionette/marionette-listener.js     | 58 +++++++++++--------
 testing/marionette/marionette-server.js       | 14 ++++-
 3 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/testing/marionette/marionette-frame-manager.js b/testing/marionette/marionette-frame-manager.js
index aacb86ed13c1..84b66b71b3cd 100644
--- a/testing/marionette/marionette-frame-manager.js
+++ b/testing/marionette/marionette-frame-manager.js
@@ -166,6 +166,8 @@ FrameManager.prototype = {
     messageManager.addWeakMessageListener("Marionette:emitTouchEvent", this.server);
     messageManager.addWeakMessageListener("Marionette:log", this.server);
     messageManager.addWeakMessageListener("Marionette:register", this.server);
+    messageManager.addWeakMessageListener("Marionette:setStatusbarHeight", this.server);
+    messageManager.addWeakMessageListener("Marionette:getStatusbarHeight", this.server);
     messageManager.addWeakMessageListener("Marionette:runEmulatorCmd", this.server);
     messageManager.addWeakMessageListener("Marionette:runEmulatorShell", this.server);
     messageManager.addWeakMessageListener("Marionette:shareData", this.server);
@@ -196,6 +198,8 @@ FrameManager.prototype = {
     messageManager.removeWeakMessageListener("Marionette:log", this.server);
     messageManager.removeWeakMessageListener("Marionette:shareData", this.server);
     messageManager.removeWeakMessageListener("Marionette:register", this.server);
+    messageManager.removeWeakMessageListener("Marionette:setStatusbarHeight", this.server);
+    messageManager.removeWeakMessageListener("Marionette:getStatusbarHeight", this.server);
     messageManager.removeWeakMessageListener("Marionette:runEmulatorCmd", this.server);
     messageManager.removeWeakMessageListener("Marionette:runEmulatorShell", this.server);
     messageManager.removeWeakMessageListener("Marionette:switchToFrame", this.server);
diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index 8aef2d8d0468..6a3f0e68ba86 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -72,7 +72,6 @@ let touchIds = {};
 let multiLast = {};
 let lastCoordinates = null;
 let isTap = false;
-let scrolling = false;
 // whether to send mouse event
 let mouseEventsOnly = false;
 
@@ -105,6 +104,10 @@ function registerSelf() {
     // check if we're the main process
     if (register[0][1] == true) {
       addMessageListener("MarionetteMainListener:emitTouchEvent", emitTouchEventForIFrame);
+      let height = getStatusbarHeight();
+      if (height) {
+        sendSyncMessage("Marionette:setStatusbarHeight", { height: height });
+      }
     }
     importedScripts = FileUtils.getDir('TmpD', [], false);
     importedScripts.append('marionetteContentScripts');
@@ -125,6 +128,14 @@ function emitTouchEventForIFrame(message) {
                              1, 0);
 }
 
+function getStatusbarHeight(message) {
+  let statusbar = curFrame.document.getElementById("statusbar");
+  if (statusbar) {
+    //Yes, clientHeight. This statusbar affects screens where it isn't even visible, like FTU
+    return statusbar.clientHeight;
+  }
+}
+
 /**
  * Add a message listener that's tied to our listenerId.
  */
@@ -679,24 +690,31 @@ function executeWithCallback(msg, useFinish) {
 /**
  * This function creates a touch event given a touch type and a touch
  */
-function emitTouchEvent(type, touch) {
+function emitTouchEvent(type, target, x, y, touchId) {
   if (!wasInterrupted()) {
-    let loggingInfo = "emitting Touch event of type " + type + " to element with id: " + touch.target.id + " and tag name: " + touch.target.tagName + " at coordinates (" + touch.clientX + ", " + touch.clientY + ") relative to the viewport";
-    dumpLog(loggingInfo);
     var docShell = curFrame.document.defaultView.
                    QueryInterface(Components.interfaces.nsIInterfaceRequestor).
                    getInterface(Components.interfaces.nsIWebNavigation).
                    QueryInterface(Components.interfaces.nsIDocShell);
-    if (docShell.asyncPanZoomEnabled && scrolling) {
+    if (docShell.asyncPanZoomEnabled) {
       // if we're in APZ and we're scrolling, we must use injectTouchEvent to dispatch our touchmove events
+      // NOTE: This is an internal frame, below the statusbar. The coordinates we get here must be offset by
+      // the coordinates of the statusbar
+      let statusbarHeight = sendSyncMessage("Marionette:getStatusbarHeight");
+      if (statusbarHeight) {
+        y += parseInt(statusbarHeight, 10);
+      }
+      let touch = createATouch(target, x, y, touchId);
       let index = sendSyncMessage("MarionetteFrame:getCurrentFrameId");
       // only call emitTouchEventForIFrame if we're inside an iframe.
       if (index != null) {
+        let loggingInfo = "emitting Touch event of type " + type + " to element with id: " + touch.target.id + " and tag name: " + touch.target.tagName + " at coordinates (" + touch.clientX + ", " + touch.clientY + ") relative to the viewport";
+        dumpLog(loggingInfo);
         sendSyncMessage("Marionette:emitTouchEvent", {index: index, type: type, id: touch.identifier,
                                                       clientX: touch.clientX, clientY: touch.clientY,
                                                       radiusX: touch.radiusX, radiusY: touch.radiusY,
                                                       rotation: touch.rotationAngle, force: touch.force});
-        return;
+        return touch;
       }
     }
     // we get here if we're not in asyncPacZoomEnabled land, or if we're the main process
@@ -707,8 +725,12 @@ function emitTouchEvent(type, touch) {
                     {log: elementManager.wrapValue(marionetteLogObj.getLogs())});
     marionetteLogObj.clearLogs();
     */
+    let touch = createATouch(target, x, y, touchId);
+    let loggingInfo = "emitting Touch event of type " + type + " to element with id: " + touch.target.id + " and tag name: " + touch.target.tagName + " at coordinates (" + touch.clientX + ", " + touch.clientY + ") relative to the viewport";
+    dumpLog(loggingInfo);
     let domWindowUtils = curFrame.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindowUtils);
     domWindowUtils.sendTouchEvent(type, [touch.identifier], [touch.clientX], [touch.clientY], [touch.radiusX], [touch.radiusY], [touch.rotationAngle], [touch.force], 1, 0);
+    return touch;
   }
 }
 
@@ -819,9 +841,8 @@ function generateEvents(type, x, y, touchId, target) {
       }
       else {
         let touchId = nextTouchId++;
-        let touch = createATouch(target, x, y, touchId);
-        emitTouchEvent('touchstart', touch);
-        emitTouchEvent('touchend', touch);
+        emitTouchEvent('touchstart', target, x, y, touchId);
+        emitTouchEvent('touchend', target, x, y, touchId);
         mousetap(target.ownerDocument, x, y);
       }
       lastCoordinates = null;
@@ -834,9 +855,7 @@ function generateEvents(type, x, y, touchId, target) {
       }
       else {
         let touchId = nextTouchId++;
-        let touch = createATouch(target, x, y, touchId);
-        emitTouchEvent('touchstart', touch);
-        touchIds[touchId] = touch;
+        touchIds[touchId] = emitTouchEvent('touchstart', target, x, y, touchId);
         return touchId;
       }
       break;
@@ -846,8 +865,7 @@ function generateEvents(type, x, y, touchId, target) {
       }
       else {
         let touch = touchIds[touchId];
-        touch = createATouch(touch.target, lastCoordinates[0], lastCoordinates[1], touchId);
-        emitTouchEvent('touchend', touch);
+        emitTouchEvent('touchend', touch.target, lastCoordinates[0], lastCoordinates[1], touchId);
         if (isTap) {
           mousetap(touch.target.ownerDocument, touch.clientX, touch.clientY);
         }
@@ -862,7 +880,8 @@ function generateEvents(type, x, y, touchId, target) {
         emitMouseEvent(doc, 'mouseup', lastCoordinates[0], lastCoordinates[1]);
       }
       else {
-        emitTouchEvent('touchcancel', touchIds[touchId]);
+        let touch = touchIds[touchId];
+        emitTouchEvent('touchcancel', touch.target, x, y, touchId);
         delete touchIds[touchId];
       }
       lastCoordinates = null;
@@ -873,9 +892,7 @@ function generateEvents(type, x, y, touchId, target) {
         emitMouseEvent(doc, 'mousemove', x, y);
       }
       else {
-        touch = createATouch(touchIds[touchId].target, x, y, touchId);
-        touchIds[touchId] = touch;
-        emitTouchEvent('touchmove', touch);
+        touchIds[touchId] = emitTouchEvent('touchmove', touchIds[touchId].target, x, y, touchId);
       }
       break;
     case 'contextmenu':
@@ -981,9 +998,6 @@ function actions(chain, touchId, command_id, i) {
         return;
       }
       // look ahead to check if we're scrolling. Needed for APZ touch dispatching.
-      if ((i != chain.length) && (chain[i][0].indexOf('move') !== -1)) {
-        scrolling = true;
-      }
       el = elementManager.getKnownElement(pack[1], curFrame);
       c = coordinates(el, pack[2], pack[3]);
       touchId = generateEvents('press', c.x, c.y, null, el);
@@ -992,7 +1006,6 @@ function actions(chain, touchId, command_id, i) {
     case 'release':
       generateEvents('release', lastCoordinates[0], lastCoordinates[1], touchId);
       actions(chain, null, command_id, i);
-      scrolling =  false;
       break;
     case 'move':
       el = elementManager.getKnownElement(pack[1], curFrame);
@@ -1026,7 +1039,6 @@ function actions(chain, touchId, command_id, i) {
     case 'cancel':
       generateEvents('cancel', lastCoordinates[0], lastCoordinates[1], touchId);
       actions(chain, touchId, command_id, i);
-      scrolling = false;
       break;
     case 'longPress':
       generateEvents('contextmenu', lastCoordinates[0], lastCoordinates[1], touchId);
diff --git a/testing/marionette/marionette-server.js b/testing/marionette/marionette-server.js
index 30d71d8e8893..6adc2ffd4f59 100644
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -138,6 +138,7 @@ function MarionetteServerConnection(aPrefix, aTransport, aServer)
   this.currentFrameElement = null;
   this.testName = null;
   this.mozBrowserClose = null;
+  this.statusbarHeight = null;
 }
 
 MarionetteServerConnection.prototype = {
@@ -424,7 +425,12 @@ MarionetteServerConnection.prototype = {
   whenBrowserStarted: function MDA_whenBrowserStarted(win, newSession) {
     try {
       if (!Services.prefs.getBoolPref("marionette.contentListener") || !newSession) {
-        this.curBrowser.loadFrameScript(FRAME_SCRIPT, win);
+        try {
+          this.curBrowser.loadFrameScript(FRAME_SCRIPT, win);
+        } catch (e) {
+          logger.info("failed loading frame script due to" + e.toString());
+          throw e;
+        }
       }
     }
     catch (e) {
@@ -2436,6 +2442,12 @@ MarionetteServerConnection.prototype = {
         globalMessageManager.broadcastAsyncMessage(
           "MarionetteMainListener:emitTouchEvent", message.json);
         return;
+      case "Marionette:setStatusbarHeight":
+        //NOTE: If we had content<->content communication, this wouldn't be needed
+        this.statusbarHeight = message.json.height;
+        return;
+      case "Marionette:getStatusbarHeight":
+        return [this.statusbarHeight];
     }
   }
 };

From cbe641f3bad67ace981fbc1603ee09955a2ae007 Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Mon, 9 Jun 2014 13:24:24 -0500
Subject: [PATCH 114/117] Bug 1022772 - SJCL should be unminified, versioned
 r=Standard8

---
 .../components/loop/content/conversation.html |   2 +-
 browser/components/loop/content/panel.html    |   2 +-
 .../content/shared/libs/sjcl-dev20140604.js   | 606 ++++++++++++++++++
 .../loop/content/shared/libs/sjcl.min.js      |  12 -
 browser/components/loop/jar.mn                |   2 +-
 .../components/loop/test/shared/index.html    |   2 +-
 6 files changed, 610 insertions(+), 16 deletions(-)
 create mode 100644 browser/components/loop/content/shared/libs/sjcl-dev20140604.js
 delete mode 100644 browser/components/loop/content/shared/libs/sjcl.min.js

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index 104f03b4d380..707090acceac 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -20,7 +20,7 @@
     <script type="text/javascript" src="loop/shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="loop/shared/libs/lodash-2.4.1.js"></script>
     <script type="text/javascript" src="loop/shared/libs/backbone-1.1.2.js"></script>
-    <script type="text/javascript" src="loop/shared/libs/sjcl.min.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/sjcl-dev20140604.js"></script>
     <script type="text/javascript" src="loop/shared/libs/token.js"></script>
     <script type="text/javascript" src="loop/shared/libs/hawk-browser-2.2.1.js"></script>
 
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index 5aedec510e52..448a5d14ce79 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -19,7 +19,7 @@
     <script type="text/javascript" src="loop/shared/libs/jquery-2.1.0.js"></script>
     <script type="text/javascript" src="loop/shared/libs/lodash-2.4.1.js"></script>
     <script type="text/javascript" src="loop/shared/libs/backbone-1.1.2.js"></script>
-    <script type="text/javascript" src="loop/shared/libs/sjcl.min.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/sjcl-dev20140604.js"></script>
     <script type="text/javascript" src="loop/shared/libs/token.js"></script>
     <script type="text/javascript" src="loop/shared/libs/hawk-browser-2.2.1.js"></script>
 
diff --git a/browser/components/loop/content/shared/libs/sjcl-dev20140604.js b/browser/components/loop/content/shared/libs/sjcl-dev20140604.js
new file mode 100644
index 000000000000..62847e6057dc
--- /dev/null
+++ b/browser/components/loop/content/shared/libs/sjcl-dev20140604.js
@@ -0,0 +1,606 @@
+/** @fileOverview Javascript cryptography implementation.
+ *
+ * Crush to remove comments, shorten variable names and
+ * generally reduce transmission size.
+ *
+ * @author Emily Stark
+ * @author Mike Hamburg
+ * @author Dan Boneh
+ */
+
+"use strict";
+/*jslint indent: 2, bitwise: false, nomen: false, plusplus: false, white: false, regexp: false */
+/*global document, window, escape, unescape, module, require, Uint32Array */
+
+/** @namespace The Stanford Javascript Crypto Library, top-level namespace. */
+var sjcl = {
+  /** @namespace Symmetric ciphers. */
+  cipher: {},
+
+  /** @namespace Hash functions.  Right now only SHA256 is implemented. */
+  hash: {},
+
+  /** @namespace Key exchange functions.  Right now only SRP is implemented. */
+  keyexchange: {},
+  
+  /** @namespace Block cipher modes of operation. */
+  mode: {},
+
+  /** @namespace Miscellaneous.  HMAC and PBKDF2. */
+  misc: {},
+  
+  /**
+   * @namespace Bit array encoders and decoders.
+   *
+   * @description
+   * The members of this namespace are functions which translate between
+   * SJCL's bitArrays and other objects (usually strings).  Because it
+   * isn't always clear which direction is encoding and which is decoding,
+   * the method names are "fromBits" and "toBits".
+   */
+  codec: {},
+  
+  /** @namespace Exceptions. */
+  exception: {
+    /** @constructor Ciphertext is corrupt. */
+    corrupt: function(message) {
+      this.toString = function() { return "CORRUPT: "+this.message; };
+      this.message = message;
+    },
+    
+    /** @constructor Invalid parameter. */
+    invalid: function(message) {
+      this.toString = function() { return "INVALID: "+this.message; };
+      this.message = message;
+    },
+    
+    /** @constructor Bug or missing feature in SJCL. @constructor */
+    bug: function(message) {
+      this.toString = function() { return "BUG: "+this.message; };
+      this.message = message;
+    },
+
+    /** @constructor Something isn't ready. */
+    notReady: function(message) {
+      this.toString = function() { return "NOT READY: "+this.message; };
+      this.message = message;
+    }
+  }
+};
+
+if(typeof module !== 'undefined' && module.exports){
+  module.exports = sjcl;
+}
+/** @fileOverview Arrays of bits, encoded as arrays of Numbers.
+ *
+ * @author Emily Stark
+ * @author Mike Hamburg
+ * @author Dan Boneh
+ */
+
+/** @namespace Arrays of bits, encoded as arrays of Numbers.
+ *
+ * @description
+ * <p>
+ * These objects are the currency accepted by SJCL's crypto functions.
+ * </p>
+ *
+ * <p>
+ * Most of our crypto primitives operate on arrays of 4-byte words internally,
+ * but many of them can take arguments that are not a multiple of 4 bytes.
+ * This library encodes arrays of bits (whose size need not be a multiple of 8
+ * bits) as arrays of 32-bit words.  The bits are packed, big-endian, into an
+ * array of words, 32 bits at a time.  Since the words are double-precision
+ * floating point numbers, they fit some extra data.  We use this (in a private,
+ * possibly-changing manner) to encode the number of bits actually  present
+ * in the last word of the array.
+ * </p>
+ *
+ * <p>
+ * Because bitwise ops clear this out-of-band data, these arrays can be passed
+ * to ciphers like AES which want arrays of words.
+ * </p>
+ */
+sjcl.bitArray = {
+  /**
+   * Array slices in units of bits.
+   * @param {bitArray} a The array to slice.
+   * @param {Number} bstart The offset to the start of the slice, in bits.
+   * @param {Number} bend The offset to the end of the slice, in bits.  If this is undefined,
+   * slice until the end of the array.
+   * @return {bitArray} The requested slice.
+   */
+  bitSlice: function (a, bstart, bend) {
+    a = sjcl.bitArray._shiftRight(a.slice(bstart/32), 32 - (bstart & 31)).slice(1);
+    return (bend === undefined) ? a : sjcl.bitArray.clamp(a, bend-bstart);
+  },
+
+  /**
+   * Extract a number packed into a bit array.
+   * @param {bitArray} a The array to slice.
+   * @param {Number} bstart The offset to the start of the slice, in bits.
+   * @param {Number} length The length of the number to extract.
+   * @return {Number} The requested slice.
+   */
+  extract: function(a, bstart, blength) {
+    // FIXME: this Math.floor is not necessary at all, but for some reason
+    // seems to suppress a bug in the Chromium JIT.
+    var x, sh = Math.floor((-bstart-blength) & 31);
+    if ((bstart + blength - 1 ^ bstart) & -32) {
+      // it crosses a boundary
+      x = (a[bstart/32|0] << (32 - sh)) ^ (a[bstart/32+1|0] >>> sh);
+    } else {
+      // within a single word
+      x = a[bstart/32|0] >>> sh;
+    }
+    return x & ((1<<blength) - 1);
+  },
+
+  /**
+   * Concatenate two bit arrays.
+   * @param {bitArray} a1 The first array.
+   * @param {bitArray} a2 The second array.
+   * @return {bitArray} The concatenation of a1 and a2.
+   */
+  concat: function (a1, a2) {
+    if (a1.length === 0 || a2.length === 0) {
+      return a1.concat(a2);
+    }
+    
+    var last = a1[a1.length-1], shift = sjcl.bitArray.getPartial(last);
+    if (shift === 32) {
+      return a1.concat(a2);
+    } else {
+      return sjcl.bitArray._shiftRight(a2, shift, last|0, a1.slice(0,a1.length-1));
+    }
+  },
+
+  /**
+   * Find the length of an array of bits.
+   * @param {bitArray} a The array.
+   * @return {Number} The length of a, in bits.
+   */
+  bitLength: function (a) {
+    var l = a.length, x;
+    if (l === 0) { return 0; }
+    x = a[l - 1];
+    return (l-1) * 32 + sjcl.bitArray.getPartial(x);
+  },
+
+  /**
+   * Truncate an array.
+   * @param {bitArray} a The array.
+   * @param {Number} len The length to truncate to, in bits.
+   * @return {bitArray} A new array, truncated to len bits.
+   */
+  clamp: function (a, len) {
+    if (a.length * 32 < len) { return a; }
+    a = a.slice(0, Math.ceil(len / 32));
+    var l = a.length;
+    len = len & 31;
+    if (l > 0 && len) {
+      a[l-1] = sjcl.bitArray.partial(len, a[l-1] & 0x80000000 >> (len-1), 1);
+    }
+    return a;
+  },
+
+  /**
+   * Make a partial word for a bit array.
+   * @param {Number} len The number of bits in the word.
+   * @param {Number} x The bits.
+   * @param {Number} [0] _end Pass 1 if x has already been shifted to the high side.
+   * @return {Number} The partial word.
+   */
+  partial: function (len, x, _end) {
+    if (len === 32) { return x; }
+    return (_end ? x|0 : x << (32-len)) + len * 0x10000000000;
+  },
+
+  /**
+   * Get the number of bits used by a partial word.
+   * @param {Number} x The partial word.
+   * @return {Number} The number of bits used by the partial word.
+   */
+  getPartial: function (x) {
+    return Math.round(x/0x10000000000) || 32;
+  },
+
+  /**
+   * Compare two arrays for equality in a predictable amount of time.
+   * @param {bitArray} a The first array.
+   * @param {bitArray} b The second array.
+   * @return {boolean} true if a == b; false otherwise.
+   */
+  equal: function (a, b) {
+    if (sjcl.bitArray.bitLength(a) !== sjcl.bitArray.bitLength(b)) {
+      return false;
+    }
+    var x = 0, i;
+    for (i=0; i<a.length; i++) {
+      x |= a[i]^b[i];
+    }
+    return (x === 0);
+  },
+
+  /** Shift an array right.
+   * @param {bitArray} a The array to shift.
+   * @param {Number} shift The number of bits to shift.
+   * @param {Number} [carry=0] A byte to carry in
+   * @param {bitArray} [out=[]] An array to prepend to the output.
+   * @private
+   */
+  _shiftRight: function (a, shift, carry, out) {
+    var i, last2=0, shift2;
+    if (out === undefined) { out = []; }
+    
+    for (; shift >= 32; shift -= 32) {
+      out.push(carry);
+      carry = 0;
+    }
+    if (shift === 0) {
+      return out.concat(a);
+    }
+    
+    for (i=0; i<a.length; i++) {
+      out.push(carry | a[i]>>>shift);
+      carry = a[i] << (32-shift);
+    }
+    last2 = a.length ? a[a.length-1] : 0;
+    shift2 = sjcl.bitArray.getPartial(last2);
+    out.push(sjcl.bitArray.partial(shift+shift2 & 31, (shift + shift2 > 32) ? carry : out.pop(),1));
+    return out;
+  },
+  
+  /** xor a block of 4 words together.
+   * @private
+   */
+  _xor4: function(x,y) {
+    return [x[0]^y[0],x[1]^y[1],x[2]^y[2],x[3]^y[3]];
+  }
+};
+/** @fileOverview Bit array codec implementations.
+ *
+ * @author Emily Stark
+ * @author Mike Hamburg
+ * @author Dan Boneh
+ */
+ 
+/** @namespace UTF-8 strings */
+sjcl.codec.utf8String = {
+  /** Convert from a bitArray to a UTF-8 string. */
+  fromBits: function (arr) {
+    var out = "", bl = sjcl.bitArray.bitLength(arr), i, tmp;
+    for (i=0; i<bl/8; i++) {
+      if ((i&3) === 0) {
+        tmp = arr[i/4];
+      }
+      out += String.fromCharCode(tmp >>> 24);
+      tmp <<= 8;
+    }
+    return decodeURIComponent(escape(out));
+  },
+  
+  /** Convert from a UTF-8 string to a bitArray. */
+  toBits: function (str) {
+    str = unescape(encodeURIComponent(str));
+    var out = [], i, tmp=0;
+    for (i=0; i<str.length; i++) {
+      tmp = tmp << 8 | str.charCodeAt(i);
+      if ((i&3) === 3) {
+        out.push(tmp);
+        tmp = 0;
+      }
+    }
+    if (i&3) {
+      out.push(sjcl.bitArray.partial(8*(i&3), tmp));
+    }
+    return out;
+  }
+};
+/** @fileOverview Bit array codec implementations.
+ *
+ * @author Emily Stark
+ * @author Mike Hamburg
+ * @author Dan Boneh
+ */
+
+/** @namespace Hexadecimal */
+sjcl.codec.hex = {
+  /** Convert from a bitArray to a hex string. */
+  fromBits: function (arr) {
+    var out = "", i;
+    for (i=0; i<arr.length; i++) {
+      out += ((arr[i]|0)+0xF00000000000).toString(16).substr(4);
+    }
+    return out.substr(0, sjcl.bitArray.bitLength(arr)/4);//.replace(/(.{8})/g, "$1 ");
+  },
+  /** Convert from a hex string to a bitArray. */
+  toBits: function (str) {
+    var i, out=[], len;
+    str = str.replace(/\s|0x/g, "");
+    len = str.length;
+    str = str + "00000000";
+    for (i=0; i<str.length; i+=8) {
+      out.push(parseInt(str.substr(i,8),16)^0);
+    }
+    return sjcl.bitArray.clamp(out, len*4);
+  }
+};
+
+/** @fileOverview Javascript SHA-256 implementation.
+ *
+ * An older version of this implementation is available in the public
+ * domain, but this one is (c) Emily Stark, Mike Hamburg, Dan Boneh,
+ * Stanford University 2008-2010 and BSD-licensed for liability
+ * reasons.
+ *
+ * Special thanks to Aldo Cortesi for pointing out several bugs in
+ * this code.
+ *
+ * @author Emily Stark
+ * @author Mike Hamburg
+ * @author Dan Boneh
+ */
+
+/**
+ * Context for a SHA-256 operation in progress.
+ * @constructor
+ * @class Secure Hash Algorithm, 256 bits.
+ */
+sjcl.hash.sha256 = function (hash) {
+  if (!this._key[0]) { this._precompute(); }
+  if (hash) {
+    this._h = hash._h.slice(0);
+    this._buffer = hash._buffer.slice(0);
+    this._length = hash._length;
+  } else {
+    this.reset();
+  }
+};
+
+/**
+ * Hash a string or an array of words.
+ * @static
+ * @param {bitArray|String} data the data to hash.
+ * @return {bitArray} The hash value, an array of 16 big-endian words.
+ */
+sjcl.hash.sha256.hash = function (data) {
+  return (new sjcl.hash.sha256()).update(data).finalize();
+};
+
+sjcl.hash.sha256.prototype = {
+  /**
+   * The hash's block size, in bits.
+   * @constant
+   */
+  blockSize: 512,
+   
+  /**
+   * Reset the hash state.
+   * @return this
+   */
+  reset:function () {
+    this._h = this._init.slice(0);
+    this._buffer = [];
+    this._length = 0;
+    return this;
+  },
+  
+  /**
+   * Input several words to the hash.
+   * @param {bitArray|String} data the data to hash.
+   * @return this
+   */
+  update: function (data) {
+    if (typeof data === "string") {
+      data = sjcl.codec.utf8String.toBits(data);
+    }
+    var i, b = this._buffer = sjcl.bitArray.concat(this._buffer, data),
+        ol = this._length,
+        nl = this._length = ol + sjcl.bitArray.bitLength(data);
+    for (i = 512+ol & -512; i <= nl; i+= 512) {
+      this._block(b.splice(0,16));
+    }
+    return this;
+  },
+  
+  /**
+   * Complete hashing and output the hash value.
+   * @return {bitArray} The hash value, an array of 8 big-endian words.
+   */
+  finalize:function () {
+    var i, b = this._buffer, h = this._h;
+
+    // Round out and push the buffer
+    b = sjcl.bitArray.concat(b, [sjcl.bitArray.partial(1,1)]);
+    
+    // Round out the buffer to a multiple of 16 words, less the 2 length words.
+    for (i = b.length + 2; i & 15; i++) {
+      b.push(0);
+    }
+    
+    // append the length
+    b.push(Math.floor(this._length / 0x100000000));
+    b.push(this._length | 0);
+
+    while (b.length) {
+      this._block(b.splice(0,16));
+    }
+
+    this.reset();
+    return h;
+  },
+
+  /**
+   * The SHA-256 initialization vector, to be precomputed.
+   * @private
+   */
+  _init:[],
+  /*
+  _init:[0x6a09e667,0xbb67ae85,0x3c6ef372,0xa54ff53a,0x510e527f,0x9b05688c,0x1f83d9ab,0x5be0cd19],
+  */
+  
+  /**
+   * The SHA-256 hash key, to be precomputed.
+   * @private
+   */
+  _key:[],
+  /*
+  _key:
+    [0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+     0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+     0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+     0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+     0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+     0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+     0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+     0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2],
+  */
+
+
+  /**
+   * Function to precompute _init and _key.
+   * @private
+   */
+  _precompute: function () {
+    var i = 0, prime = 2, factor;
+
+    function frac(x) { return (x-Math.floor(x)) * 0x100000000 | 0; }
+
+    outer: for (; i<64; prime++) {
+      for (factor=2; factor*factor <= prime; factor++) {
+        if (prime % factor === 0) {
+          // not a prime
+          continue outer;
+        }
+      }
+      
+      if (i<8) {
+        this._init[i] = frac(Math.pow(prime, 1/2));
+      }
+      this._key[i] = frac(Math.pow(prime, 1/3));
+      i++;
+    }
+  },
+  
+  /**
+   * Perform one cycle of SHA-256.
+   * @param {bitArray} words one block of words.
+   * @private
+   */
+  _block:function (words) {  
+    var i, tmp, a, b,
+      w = words.slice(0),
+      h = this._h,
+      k = this._key,
+      h0 = h[0], h1 = h[1], h2 = h[2], h3 = h[3],
+      h4 = h[4], h5 = h[5], h6 = h[6], h7 = h[7];
+
+    /* Rationale for placement of |0 :
+     * If a value can overflow is original 32 bits by a factor of more than a few
+     * million (2^23 ish), there is a possibility that it might overflow the
+     * 53-bit mantissa and lose precision.
+     *
+     * To avoid this, we clamp back to 32 bits by |'ing with 0 on any value that
+     * propagates around the loop, and on the hash state h[].  I don't believe
+     * that the clamps on h4 and on h0 are strictly necessary, but it's close
+     * (for h4 anyway), and better safe than sorry.
+     *
+     * The clamps on h[] are necessary for the output to be correct even in the
+     * common case and for short inputs.
+     */
+    for (i=0; i<64; i++) {
+      // load up the input word for this round
+      if (i<16) {
+        tmp = w[i];
+      } else {
+        a   = w[(i+1 ) & 15];
+        b   = w[(i+14) & 15];
+        tmp = w[i&15] = ((a>>>7  ^ a>>>18 ^ a>>>3  ^ a<<25 ^ a<<14) + 
+                         (b>>>17 ^ b>>>19 ^ b>>>10 ^ b<<15 ^ b<<13) +
+                         w[i&15] + w[(i+9) & 15]) | 0;
+      }
+      
+      tmp = (tmp + h7 + (h4>>>6 ^ h4>>>11 ^ h4>>>25 ^ h4<<26 ^ h4<<21 ^ h4<<7) +  (h6 ^ h4&(h5^h6)) + k[i]); // | 0;
+      
+      // shift register
+      h7 = h6; h6 = h5; h5 = h4;
+      h4 = h3 + tmp | 0;
+      h3 = h2; h2 = h1; h1 = h0;
+
+      h0 = (tmp +  ((h1&h2) ^ (h3&(h1^h2))) + (h1>>>2 ^ h1>>>13 ^ h1>>>22 ^ h1<<30 ^ h1<<19 ^ h1<<10)) | 0;
+    }
+
+    h[0] = h[0]+h0 | 0;
+    h[1] = h[1]+h1 | 0;
+    h[2] = h[2]+h2 | 0;
+    h[3] = h[3]+h3 | 0;
+    h[4] = h[4]+h4 | 0;
+    h[5] = h[5]+h5 | 0;
+    h[6] = h[6]+h6 | 0;
+    h[7] = h[7]+h7 | 0;
+  }
+};
+
+
+/** @fileOverview HMAC implementation.
+ *
+ * @author Emily Stark
+ * @author Mike Hamburg
+ * @author Dan Boneh
+ */
+
+/** HMAC with the specified hash function.
+ * @constructor
+ * @param {bitArray} key the key for HMAC.
+ * @param {Object} [hash=sjcl.hash.sha256] The hash function to use.
+ */
+sjcl.misc.hmac = function (key, Hash) {
+  this._hash = Hash = Hash || sjcl.hash.sha256;
+  var exKey = [[],[]], i,
+      bs = Hash.prototype.blockSize / 32;
+  this._baseHash = [new Hash(), new Hash()];
+
+  if (key.length > bs) {
+    key = Hash.hash(key);
+  }
+  
+  for (i=0; i<bs; i++) {
+    exKey[0][i] = key[i]^0x36363636;
+    exKey[1][i] = key[i]^0x5C5C5C5C;
+  }
+  
+  this._baseHash[0].update(exKey[0]);
+  this._baseHash[1].update(exKey[1]);
+  this._resultHash = new Hash(this._baseHash[0]);
+};
+
+/** HMAC with the specified hash function.  Also called encrypt since it's a prf.
+ * @param {bitArray|String} data The data to mac.
+ */
+sjcl.misc.hmac.prototype.encrypt = sjcl.misc.hmac.prototype.mac = function (data) {
+  if (!this._updated) {
+    this.update(data);
+    return this.digest(data);
+  } else {
+    throw new sjcl.exception.invalid("encrypt on already updated hmac called!");
+  }
+};
+
+sjcl.misc.hmac.prototype.reset = function () {
+  this._resultHash = new this._hash(this._baseHash[0]);
+  this._updated = false;
+};
+
+sjcl.misc.hmac.prototype.update = function (data) {
+  this._updated = true;
+  this._resultHash.update(data);
+};
+
+sjcl.misc.hmac.prototype.digest = function () {
+  var w = this._resultHash.finalize(), result = new (this._hash)(this._baseHash[1]).update(w).finalize();
+
+  this.reset();
+
+  return result;
+};
\ No newline at end of file
diff --git a/browser/components/loop/content/shared/libs/sjcl.min.js b/browser/components/loop/content/shared/libs/sjcl.min.js
deleted file mode 100644
index a31261640931..000000000000
--- a/browser/components/loop/content/shared/libs/sjcl.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};
-"undefined"!==typeof module&&module.exports&&(module.exports=sjcl);
-sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.i(a.slice(b/32),32-(b&31)).slice(1);return void 0===c?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<<c)-1},concat:function(a,b){if(0===a.length||0===b.length)return a.concat(b);var c=a[a.length-1],d=sjcl.bitArray.getPartial(c);return 32===d?a.concat(b):sjcl.bitArray.i(b,d,c|0,a.slice(0,a.length-1))},bitLength:function(a){var b=a.length;return 0===
-b?0:32*(b-1)+sjcl.bitArray.getPartial(a[b-1])},clamp:function(a,b){if(32*a.length<b)return a;a=a.slice(0,Math.ceil(b/32));var c=a.length;b&=31;0<c&&b&&(a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return!1;var c=0,d;for(d=0;d<a.length;d++)c|=a[d]^b[d];return 0===
-c},i:function(a,b,c,d){var e;e=0;for(void 0===d&&(d=[]);32<=b;b-=32)d.push(c),c=0;if(0===b)return d.concat(a);for(e=0;e<a.length;e++)d.push(c|a[e]>>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32<b+a?c:d.pop(),1));return d},k:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]}};
-sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d<c/8;d++)0===(d&3)&&(e=a[d/4]),b+=String.fromCharCode(e>>>24),e<<=8;return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c<a.length;c++)d=d<<8|a.charCodeAt(c),3===(c&3)&&(b.push(d),d=0);c&3&&b.push(sjcl.bitArray.partial(8*(c&3),d));return b}};
-sjcl.codec.hex={fromBits:function(a){var b="",c;for(c=0;c<a.length;c++)b+=((a[c]|0)+0xf00000000000).toString(16).substr(4);return b.substr(0,sjcl.bitArray.bitLength(a)/4)},toBits:function(a){var b,c=[],d;a=a.replace(/\s|0x/g,"");d=a.length;a+="00000000";for(b=0;b<a.length;b+=8)c.push(parseInt(a.substr(b,8),16)^0);return sjcl.bitArray.clamp(c,4*d)}};sjcl.hash.sha256=function(a){this.e[0]||s(this);a?(this.d=a.d.slice(0),this.c=a.c.slice(0),this.a=a.a):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()};
-sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.d=this.h.slice(0);this.c=[];this.a=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.c=sjcl.bitArray.concat(this.c,a);b=this.a;a=this.a=b+sjcl.bitArray.bitLength(a);for(b=512+b&-512;b<=a;b+=512)t(this,c.splice(0,16));return this},finalize:function(){var a,b=this.c,c=this.d,b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.a/
-4294967296));for(b.push(this.a|0);b.length;)t(this,b.splice(0,16));this.reset();return c},h:[],e:[]};
-function t(a,b){var c,d,e,k=b.slice(0),f=a.d,u=a.e,q=f[0],g=f[1],l=f[2],n=f[3],h=f[4],p=f[5],m=f[6],r=f[7];for(c=0;64>c;c++)16>c?d=k[c]:(d=k[c+1&15],e=k[c+14&15],d=k[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+k[c&15]+k[c+9&15]|0),d=d+r+(h>>>6^h>>>11^h>>>25^h<<26^h<<21^h<<7)+(m^h&(p^m))+u[c],r=m,m=p,p=h,h=n+d|0,n=l,l=g,g=q,q=d+(g&l^n&(g^l))+(g>>>2^g>>>13^g>>>22^g<<30^g<<19^g<<10)|0;f[0]=f[0]+q|0;f[1]=f[1]+g|0;f[2]=f[2]+l|0;f[3]=f[3]+n|0;f[4]=f[4]+h|0;f[5]=f[5]+p|0;f[6]=
-f[6]+m|0;f[7]=f[7]+r|0}function s(a){function b(a){return 0x100000000*(a-Math.floor(a))|0}var c=0,d=2,e;a:for(;64>c;d++){for(e=2;e*e<=d;e++)if(0===d%e)continue a;8>c&&(a.h[c]=b(Math.pow(d,0.5)));a.e[c]=b(Math.pow(d,1/3));c++}}sjcl.misc.hmac=function(a,b){this.g=b=b||sjcl.hash.sha256;var c=[[],[]],d,e=b.prototype.blockSize/32;this.b=[new b,new b];a.length>e&&(a=b.hash(a));for(d=0;d<e;d++)c[0][d]=a[d]^909522486,c[1][d]=a[d]^1549556828;this.b[0].update(c[0]);this.b[1].update(c[1]);this.f=new b(this.b[0])};
-sjcl.misc.hmac.prototype.encrypt=sjcl.misc.hmac.prototype.mac=function(a){if(this.j)throw new sjcl.exception.invalid("encrypt on already updated hmac called!");this.update(a);return this.digest(a)};sjcl.misc.hmac.prototype.reset=function(){this.f=new this.g(this.b[0]);this.j=!1};sjcl.misc.hmac.prototype.update=function(a){this.j=!0;this.f.update(a)};sjcl.misc.hmac.prototype.digest=function(){var a=this.f.finalize(),a=(new this.g(this.b[1])).update(a).finalize();this.reset();return a};
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 6463b5eaf6ca..ccacb43cec6e 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -18,7 +18,7 @@ browser.jar:
   content/browser/loop/shared/libs/lodash-2.4.1.js   (content/shared/libs/lodash-2.4.1.js)
   content/browser/loop/shared/libs/jquery-2.1.0.js   (content/shared/libs/jquery-2.1.0.js)
   content/browser/loop/shared/libs/backbone-1.1.2.js (content/shared/libs/backbone-1.1.2.js)
-  content/browser/loop/shared/libs/sjcl.min.js       (content/shared/libs/sjcl.min.js)
+  content/browser/loop/shared/libs/sjcl-dev20140604.js        (content/shared/libs/sjcl-dev20140604.js)
   content/browser/loop/shared/libs/token.js          (content/shared/libs/token.js)
   content/browser/loop/shared/libs/hawk-browser-2.2.1.js      (content/shared/libs/hawk-browser-2.2.1.js)
   content/browser/loop/libs/l10n.js                  (content/libs/l10n.js)
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index fe7a67b3a2a6..c2ea8a46fd7c 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -20,7 +20,7 @@
   <script src="../../content/shared/libs/jquery-2.1.0.js"></script>
   <script src="../../content/shared/libs/lodash-2.4.1.js"></script>
   <script src="../../content/shared/libs/backbone-1.1.2.js"></script>
-  <script src="../../content/shared/libs/sjcl.min.js"></script>
+  <script src="../../content/shared/libs/sjcl-dev20140604.js"></script>
   <script src="../../content/shared/libs/token.js"></script>
   <script src="../../content/shared/libs/hawk-browser-2.2.1.js"></script>
 

From fd337b7846fa140ad4991cdd90badcf19c1a7b63 Mon Sep 17 00:00:00 2001
From: ffxbld <release@mozilla.com>
Date: Mon, 9 Jun 2014 11:44:47 -0700
Subject: [PATCH 115/117] Added FIREFOX_AURORA_32_BASE tag for changeset
 16f3cac5e8fe. IGNORE BROKEN CHANGESETS  DONTBUILD CLOSED TREE NO BUG
 a=release

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b0608425cab7..3a937e47a5f6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -101,3 +101,4 @@ ad0ae007aa9e03cd74e9005cd6652e544139b3b5 FIREFOX_AURORA_25_BASE
 ba2cc1eda988a1614d8986ae145d28e1268409b9 FIREFOX_AURORA_29_BASE
 83c9853e136451474dfa6d1aaa60a7fca7d2d83a FIREFOX_AURORA_30_BASE
 cfde3603b0206e119abea76fdd6e134b634348f1 FIREFOX_AURORA_31_BASE
+16f3cac5e8fe471e12f76d6a94a477b14e78df7c FIREFOX_AURORA_32_BASE

From 5d6165c8416ad488d77f00f7c27732a49d73f7b5 Mon Sep 17 00:00:00 2001
From: ffxbld <release@mozilla.com>
Date: Mon, 9 Jun 2014 11:50:02 -0700
Subject: [PATCH 116/117] Version bump. IGNORE BROKEN CHANGESETS CLOSED TREE NO
 BUG a=release

---
 b2g/confvars.sh            | 2 +-
 browser/config/version.txt | 2 +-
 config/milestone.txt       | 2 +-
 mobile/android/confvars.sh | 2 +-
 services/sync/Makefile.in  | 2 +-
 xpcom/components/Module.h  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index d6830bc5ccfb..174cc164d1c4 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=32.0a1
+MOZ_APP_VERSION=33.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_UA_OS_AGNOSTIC=1
diff --git a/browser/config/version.txt b/browser/config/version.txt
index 832202a158c4..540ef4dda304 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-32.0a1
+33.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
index 38f02de76e93..a4cfd2e6b3f5 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-32.0a1
+33.0a1
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index b6ce94ebdd79..78e22835ae1a 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=32.0a1
+MOZ_APP_VERSION=33.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in
index 3bc68a9c1dd4..43bca4964187 100644
--- a/services/sync/Makefile.in
+++ b/services/sync/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Definitions used by constants.js.
-weave_version := 1.34.0
+weave_version := 1.35.0
 weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
 
 # Preprocess files.
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index 4e563b92ae78..81025d7f1cba 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -21,7 +21,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 32;
+  static const unsigned int kVersion = 33;
 
   struct CIDEntry;
 

From dc6b9d18e5f6d92408bd8f865be2f383406cdd8c Mon Sep 17 00:00:00 2001
From: ffxbld <release@mozilla.com>
Date: Mon, 9 Jun 2014 11:53:45 -0700
Subject: [PATCH 117/117] Version bump. IGNORE BROKEN CHANGESETS CLOSED TREE NO
 BUG a=release

---
 b2g/confvars.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 174cc164d1c4..928beacb4035 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -10,7 +10,7 @@ MOZ_APP_UA_NAME=Firefox
 
 MOZ_UA_OS_AGNOSTIC=1
 
-MOZ_B2G_VERSION=2.0.0.0-prerelease
+MOZ_B2G_VERSION=2.1.0.0-prerelease
 MOZ_B2G_OS_NAME=Boot2Gecko
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial