From dac878f909b38ab97a9d6b160d55873a291805a5 Mon Sep 17 00:00:00 2001 From: unkelpehr Date: Wed, 24 Sep 2014 19:59:43 +0200 Subject: [PATCH] Updated fandango, minor style fixes --- public/js/cryptalk_modules/cryptalk.js | 2 +- public/js/cryptalk_modules/notifications.js | 3 +-- public/js/cryptalk_modules/win.js | 1 - public/js/vendor/fandango.v20140923.min.js | 21 --------------------- public/js/vendor/fandango.v20140924.min.js | 21 +++++++++++++++++++++ 5 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 public/js/vendor/fandango.v20140923.min.js create mode 100644 public/js/vendor/fandango.v20140924.min.js diff --git a/public/js/cryptalk_modules/cryptalk.js b/public/js/cryptalk_modules/cryptalk.js index 817c304..3be0932 100644 --- a/public/js/cryptalk_modules/cryptalk.js +++ b/public/js/cryptalk_modules/cryptalk.js @@ -1,7 +1,7 @@ // Main cryptalk module define({ compiles: ['$'], - requires: ['mediator','hosts', 'templates', 'audio', 'fandango','notifications', 'sounds', 'win'] + requires: ['mediator', 'hosts', 'templates', 'audio', 'fandango','notifications', 'sounds', 'win'] }, function ($, requires, data) { var socket, key, diff --git a/public/js/cryptalk_modules/notifications.js b/public/js/cryptalk_modules/notifications.js index 017b78a..11d941e 100644 --- a/public/js/cryptalk_modules/notifications.js +++ b/public/js/cryptalk_modules/notifications.js @@ -15,8 +15,7 @@ Usage mediator.emit('notification:off'); */ -define(['mediator','win'],function (mediator, win){ - +define(['mediator','win'], function (mediator, win) { var enabled = true, native_supported = false, diff --git a/public/js/cryptalk_modules/win.js b/public/js/cryptalk_modules/win.js index 161f9c5..76a6a25 100644 --- a/public/js/cryptalk_modules/win.js +++ b/public/js/cryptalk_modules/win.js @@ -36,5 +36,4 @@ define(['mediator'],function (mediator){ } return exports; - }); \ No newline at end of file diff --git a/public/js/vendor/fandango.v20140923.min.js b/public/js/vendor/fandango.v20140923.min.js deleted file mode 100644 index 89b6a05..0000000 --- a/public/js/vendor/fandango.v20140923.min.js +++ /dev/null @@ -1,21 +0,0 @@ -(function(q){function A(f){this.name="TimeoutError";this.message=f||""}function B(f){this.name="RejectedError";this.message=f||""}function F(f,d,e,k){var c,a,b=[],g,h,r,l=function(a,c){f.length===b.push(n[a].exports)&&(c||k&&clearTimeout(g),d&&d(b))};k=k||v.timeout;for(r=0;h=f[r++];)if((c=n[h])&&1!==c.state)if(2===c.state)if(a=new B('Could resolve all dependencies; dependency "'+h+'" has been rejected.'),e)e(a);else throw a;else 3===c.state&&l(h,1);else(u[h]=u[h]||[]).push(l);k&&f.lengtha&&Math.floor(a)===a},iterable:function(a){try{1 in -obj}catch(b){return!1}return!0},nan:function(a){return e.number(a)&&a!=+a},number:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},object:function(a){return a===Object(a)},primitive:function(a){return!0===a||!1===a||null==a||!!{string:1,number:1}[typeof a]},string:function(a){return"string"==typeof a||a instanceof String},undefined:function(a){return void 0===a},untyped:function(a){if(!a||a.nodeType||"[object Object]"!==d.call(a)||e.window(a))return!1;try{if(a.constructor&&!f.call(a,"constructor")&& -!f.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(b){return!1}for(var g in a);return void 0===g||f.call(a,g)},window:function(a){return null!=a&&a==a.window},empty:function(a){if(a){if(l.is(a,"array"))return 0===a.length;for(var b in a)if(f.call(a,b))return!1}return!0}},k=0,c=["Arguments","Date","Function","RegExp"];for(;4>k;k++)e[c[k].toLowerCase()]=function(a){a="[object "+a+"]";return function(b){return d.call(b)==a}}(c[k]);e.args=e.arguments;e.bool=e["boolean"];e.plain=e.untyped; -return function(a,b){if(e["function"](b))return a===b(a);if(!e.string(b))return a===b;if((b=b.toLowerCase())&&e[b])return e[b](a);throw'Unknown type "'+b+'"';}}();l.each=function(){var f=Array.prototype.some;return function(d,e,k){var c,a;if(void 0===d)return obj;k=k||l;if(f&&d.some===f)return d.some(e,k),d;if(l.is(d,"array")||l.is(d,"arraylike")){c=0;for(a=d.length;cs.length&&s.push(c.data?l.merge(c.deepCopy,{},c.data,b.data):b.data),h>s.length&&s.push(l.merge(c.deepCopy, -{},c,b))),c.exports=g?b.factory.apply(c.context,s)||{}:b.factory,void 0===b.exports&&(b.exports=k?c.exports?l.merge(!0,{},k,c.exports):k:c.exports);b.state=3;if(u[d])for(;u[d].length;)u[d].pop()(d)}return function e(k,c,a){var b,g;g=n[k];var h,r,s=[],p,q,t;b=[];var m;if(g){h=l.is(g.factory,"function")?g.factory.length:0;r=g.amdStyle;if(!c&&(g.requires||g.compiles||g.inherits)){g.requires&&z.apply(b,g.requires);g.inherits&&z.apply(b,g.inherits);g.compiles&&z.apply(b,g.compiles);for(c=0;m=b[c++];)if(n[m])if(3=== -n[m].state)b.splice(--c,1);else if(2===n[m].state)throw Error('Could not instantiate "'+UID+'"; dependency "'+dependency+'" has been rejected.');if(0c.attachEvent.toString().indexOf("[native code")||e);buildUrl=function(){var a={"http://":1,"https://":1,"file://":1};return function(b){var c=b.toLowerCase(),d=c[0]||c.slice(0,1);"/"===d||"\\"===d||"h"===d&&(a[c.slice(0,7)]||a[c.slice(0,8)])||"f"===d&&a[c.slice(0,7)]||(b=v.baseUrl+b);".js"!==b.slice(-3)&&(b+=".js");return b}}();onErrorEvent=function(a,b,c,d){return function(e){f[b]=0;a.error=e||!0;d.parentElement.removeChild(d); -if(a.onError)a.onError(e,c,b)}};onLoadEvent=function(a,b,c,d,e){return function(){if((!e||"loaded"===d.readyState||"complete"===d.readyState)&&2===f[b]){f[b]=3;if(a.onPartial)a.onPartial(b,c,d);e?d.detachEvent("onreadystatechange",a.loadListener):(d.removeEventListener("load",a.loadListener),d.removeEventListener("error",a.errorListener));if(a.loaded.push(b)===a.paths.length&&a.onDone)a.onDone(a.load)}}};get=function(a){for(var b=0,g,h,e;!a.error&&(g=a.paths[b++]);)h=a.names[b-1],f[g]=2,e=k(g),c? -e.attachEvent("onreadystatechange",onLoadEvent(a,g,h,e,!0)):(a.loadListener=onLoadEvent(a,g,h,e),a.errorListener=onErrorEvent(a,g,h,e),e.addEventListener("load",a.loadListener,!1),e.addEventListener("error",a.errorListener,!1)),e.src=g,d.appendChild(e)};return function(a,b,c,d){var e=[],k=[],p={paths:[],names:[],loaded:[],error:null,loadListener:null,errorListener:null},u,t,m,w,x;p.onError=function(a,b,d){a instanceof Error||(a=Error('Could require "'+b+'"; an error occurred while trying to load "'+ -d+'".'));if(c)c(a);else throw a;};for(x=0;t=a[x++];)if(n[t])if(3===n[t].state)k.push(n[t].exports);else{if(2===n[t].state)throw Error("require(): Rejected dependency. Cannot continue.");E(t,null,p.onError);e.push(t)}else f[u]||(u=buildUrl(v.paths[t]||t),p.paths.push(u),p.names.push(t)),e.push(t);e.length?(p.paths&&(p.onPartial=function(a,b,c){n[b]||((m=v.shim[b])?(w=l.is(m.exports,"function")?m.exports:function(){return q[m.exports]},y(b,w,p.onError)):y(C,b,p.onError));E(b,null,p.onError);d&&d(a, -c)},get(p)),F(e,function(a){b.apply(null,a)},p.onError)):b&&b.apply(null,k)}}();y("fandango",l);var H=q.fandango,I=q.define,J=q.require,w={fn:l,define:y,require:x,noConflict:function(f){q.define===y&&(q.define=I);q.require===x&&(q.require=J);f&&q.fandango===w&&(q.fandango=H);return w},defaults:function(f){return f?l.merge(v,f):v}};q.define||(q.define=w.define);q.require||(q.require=w.require);q.fandango=w})(this); \ No newline at end of file diff --git a/public/js/vendor/fandango.v20140924.min.js b/public/js/vendor/fandango.v20140924.min.js new file mode 100644 index 0000000..5c060b2 --- /dev/null +++ b/public/js/vendor/fandango.v20140924.min.js @@ -0,0 +1,21 @@ +(function(q){function C(e){this.name="TimeoutError";this.message=e||""}function D(e){this.name="RejectedError";this.message=e||""}function G(e,d,g,h){var c,a,b=[],f=0,m,l,p,s=function(a){return function(c,l){b[a]=n[c].exports;e.length===++f&&(!l&&h&&clearTimeout(m),d&&d(b))}};h=h||x.timeout;for(p=0;l=e[p++];)if((c=n[l])&&1!==c.state)if(2===c.state)if(a=new D('Could resolve all dependencies; dependency "'+l+'" has been rejected.'),g)g(a);else throw a;else 3===c.state&&s(p-1)(l,1);else v[l]||(v[l]= +[]),v[l].unshift(s(p-1));h&&e.lengtha&&Math.floor(a)===a},iterable:function(a){try{1 in obj}catch(b){return!1}return!0},nan:function(a){return g.number(a)&&a!=+a},number:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},object:function(a){return a===Object(a)},primitive:function(a){return!0===a||!1===a||null==a||!!{string:1,number:1}[typeof a]},string:function(a){return"string"==typeof a||a instanceof String},undefined:function(a){return void 0===a},untyped:function(a){if(!a|| +a.nodeType||"[object Object]"!==d.call(a)||g.window(a))return!1;try{if(a.constructor&&!e.call(a,"constructor")&&!e.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(b){return!1}for(var c in a);return void 0===c||e.call(a,c)},window:function(a){return null!=a&&a==a.window},empty:function(a){if(a){if(k.is(a,"array"))return 0===a.length;for(var b in a)if(e.call(a,b))return!1}return!0}},h=0,c=["Arguments","Date","Function","RegExp"];for(;4>h;h++)g[c[h].toLowerCase()]=function(a){a="[object "+ +a+"]";return function(b){return d.call(b)==a}}(c[h]);g.args=g.arguments;g.bool=g["boolean"];g.plain=g.untyped;return function(a,b){if(g["function"](b))return a===b(a);if(!g.string(b))return a===b;if((b=b.toLowerCase())&&g[b])return g[b](a);throw'Unknown type "'+b+'"';}}();k.each=function(){var e=Array.prototype.some;return function(d,g,h){var c,a;if(void 0===d)return obj;h=h||k;if(e&&d.some===e)return d.some(g,h),d;if(k.is(d,"array")||k.is(d,"arraylike")){c=0;for(a=d.length;cp.length&&p.push(c.data?k.merge(c.deepCopy,{},c.data,b.data):b.data),m>p.length&&p.push(k.merge(c.deepCopy,{},c,b))),c.exports=f?b.factory.apply(c.context,p)||{}:b.factory,void 0===b.exports&&(b.exports=h?c.exports?k.merge(!0,{},h,c.exports):h:c.exports);b.state=3;if(e=v[d])for(;e.length;)e.pop()(d)}return function g(h,c,a){var b,f;f=n[h];var m,l,p,s;b=[];var r;if(f){a=k.is(f.factory,"function")?f.factory.length:0;m=f.amdStyle;if(!c&&(f.requires||f.compiles||f.inherits)){f.requires&&A.apply(b, +f.requires);f.inherits&&A.apply(b,f.inherits);f.compiles&&A.apply(b,f.compiles);for(c=0;r=b[c++];)if(n[r])if(3===n[r].state)b.splice(--c,1);else if(2===n[r].state)throw Error('Could not instantiate "'+UID+'"; dependency "'+dependency+'" has been rejected.');if(0c.attachEvent.toString().indexOf("[native code")||g),a=function(){var a={"http://":1,"https://":1,"file://":1};return function(b){var c=b.toLowerCase(),e=c[0]||c.slice(0,1);"/"===e||"\\"===e||"h"===e&&(a[c.slice(0,7)]||a[c.slice(0,8)])||"f"===e&&a[c.slice(0,7)]||(b=x.baseUrl+b);".js"!==b.slice(-3)&&(b+=".js");return b}}(),b=function(a,b,c,d){return function(f){e[b]= +0;a.error=f||!0;d.parentElement.removeChild(d);if(a.onError)a.onError(f,c,b)}},f=function(a,b,c,d,f){return function(){if((!f||"loaded"===d.readyState||"complete"===d.readyState)&&2===e[b]){e[b]=3;if(a.onPartial)a.onPartial(b,c,d);f?d.detachEvent("onreadystatechange",a.loadListener):(d.removeEventListener("load",a.loadListener),d.removeEventListener("error",a.errorListener));if(a.loaded.push(b)===a.paths.length&&a.onDone)a.onDone(a.load)}}},m=function(a){for(var g=0,k,m,n;!a.error&&(k=a.paths[g++]);)m= +a.names[g-1],e[k]=2,n=h(k),c?n.attachEvent("onreadystatechange",f(a,k,m,n,!0)):(a.loadListener=f(a,k,m,n),a.errorListener=b(a,k,m,n),n.addEventListener("load",a.loadListener,!1),n.addEventListener("error",a.errorListener,!1)),n.src=k,d.appendChild(n)};return function(b,c,d,f){var g=[],h=[],t={paths:[],names:[],loaded:[],error:null,loadListener:null,errorListener:null},v,u,w,z,A;t.onError=function(a,b,c){a instanceof Error||(a=Error('Could require "'+b+'"; an error occurred while trying to load "'+ +c+'".'));if(d)d(a);else throw a;};for(A=0;u=b[A++];)if(n[u])if(3===n[u].state)h.push(n[u].exports);else{if(2===n[u].state)throw Error("require(): Rejected dependency. Cannot continue.");F(u,null,t.onError);g.push(u)}else v=a(x.paths[u]||u),e[v]||(t.paths.push(v),t.names.push(u),e[v]=2),g.push(u);g.length?(t.paths&&(t.onPartial=function(a,b,c){n[b]||((w=x.shim[b])?(z=k.is(w.exports,"function")?w.exports:function(){return q[w.exports]},y(b,z,t.onError)):y(E,b,t.onError));F(b,null,t.onError);f&&f(a, +c)},m(t)),G(g,function(a){c.apply(null,a)},t.onError)):c&&c.apply(null,h)}}();y("fandango",k);var I=q.fandango,J=q.define,K=q.require,w={fn:k,define:y,require:B,noConflict:function(e){q.define===y&&(q.define=J);q.require===B&&(q.require=K);e&&q.fandango===w&&(q.fandango=I);return w},defaults:function(e){return e?k.merge(x,e):x}};q.define||(q.define=w.define);q.require||(q.require=w.require);q.fandango=w;q.modules=n;q.awaitingDependency=v;q.awaitingName=z})(this); \ No newline at end of file