diff --git a/config/assets.yml b/config/assets.yml
index 77f3df4e3..3fc994bb2 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -24,7 +24,6 @@ javascripts:
- public/javascripts/vendor/jquery.autoresize.min.js
- public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js
- public/javascripts/vendor/jquery.charcount.js
- - public/javascripts/vendor/jquery-debounce.js
- public/javascripts/vendor/jquery.expander.js
- public/javascripts/vendor/timeago.js
- public/javascripts/vendor/facebox.js
diff --git a/public/javascripts/vendor/WebSocketMain.swf b/public/javascripts/vendor/WebSocketMain.swf
deleted file mode 100644
index 5eab4521a..000000000
Binary files a/public/javascripts/vendor/WebSocketMain.swf and /dev/null differ
diff --git a/public/javascripts/vendor/jquery-debounce.js b/public/javascripts/vendor/jquery-debounce.js
deleted file mode 100644
index 453882d5a..000000000
--- a/public/javascripts/vendor/jquery-debounce.js
+++ /dev/null
@@ -1,21 +0,0 @@
- (function($) {
- function debounce(callback, delay) {
- var self = this, timeout, _arguments;
- return function() {
- _arguments = Array.prototype.slice.call(arguments, 0),
- timeout = clearTimeout(timeout, _arguments),
- timeout = setTimeout(function() {
- callback.apply(self, _arguments);
- timeout = 0;
- }, delay);
-
- return this;
- };
- }
-
- $.extend($.fn, {
- debounce: function(event, callback, delay) {
- this.bind(event, debounce.apply(this, [callback, delay]));
- }
- });
-})(jQuery);
\ No newline at end of file
diff --git a/public/javascripts/vendor/swfobject.js b/public/javascripts/vendor/swfobject.js
deleted file mode 100644
index 8eafe9dd8..000000000
--- a/public/javascripts/vendor/swfobject.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SWFObject v2.2
- is released under the MIT License
-*/
-var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab
-// License: New BSD License
-// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol
-
-(function() {
-
- if (window.WebSocket) return;
-
- var console = window.console;
- if (!console) console = {log: function(){ }, error: function(){ }};
-
- if (!swfobject.hasFlashPlayerVersion("9.0.0")) {
- console.error("Flash Player is not installed.");
- return;
- }
- if (location.protocol == "file:") {
- console.error(
- "WARNING: web-socket-js doesn't work in file:///... URL " +
- "unless you set Flash Security Settings properly. " +
- "Open the page via Web server i.e. http://...");
- }
-
- WebSocket = function(url, protocol, proxyHost, proxyPort, headers) {
- var self = this;
- self.readyState = WebSocket.CONNECTING;
- self.bufferedAmount = 0;
- // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc.
- // Otherwise, when onopen fires immediately, onopen is called before it is set.
- setTimeout(function() {
- WebSocket.__addTask(function() {
- self.__createFlash(url, protocol, proxyHost, proxyPort, headers);
- });
- }, 1);
- }
-
- WebSocket.prototype.__createFlash = function(url, protocol, proxyHost, proxyPort, headers) {
- var self = this;
- self.__flash =
- WebSocket.__flash.create(url, protocol, proxyHost || null, proxyPort || 0, headers || null);
-
- self.__flash.addEventListener("open", function(fe) {
- try {
- self.readyState = self.__flash.getReadyState();
- if (self.__timer) clearInterval(self.__timer);
- if (window.opera) {
- // Workaround for weird behavior of Opera which sometimes drops events.
- self.__timer = setInterval(function () {
- self.__handleMessages();
- }, 500);
- }
- if (self.onopen) self.onopen();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- self.__flash.addEventListener("close", function(fe) {
- try {
- self.readyState = self.__flash.getReadyState();
- if (self.__timer) clearInterval(self.__timer);
- if (self.onclose) self.onclose();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- self.__flash.addEventListener("message", function() {
- try {
- self.__handleMessages();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- self.__flash.addEventListener("error", function(fe) {
- try {
- if (self.__timer) clearInterval(self.__timer);
- if (self.onerror) self.onerror();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- self.__flash.addEventListener("stateChange", function(fe) {
- try {
- self.readyState = self.__flash.getReadyState();
- self.bufferedAmount = fe.getBufferedAmount();
- } catch (e) {
- console.error(e.toString());
- }
- });
-
- //console.log("[WebSocket] Flash object is ready");
- };
-
- WebSocket.prototype.send = function(data) {
- if (this.__flash) {
- this.readyState = this.__flash.getReadyState();
- }
- if (!this.__flash || this.readyState == WebSocket.CONNECTING) {
- throw "INVALID_STATE_ERR: Web Socket connection has not been established";
- }
- // We use encodeURIComponent() here, because FABridge doesn't work if
- // the argument includes some characters. We don't use escape() here
- // because of this:
- // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions
- // But it looks decodeURIComponent(encodeURIComponent(s)) doesn't
- // preserve all Unicode characters either e.g. "\uffff" in Firefox.
- var result = this.__flash.send(encodeURIComponent(data));
- if (result < 0) { // success
- return true;
- } else {
- this.bufferedAmount = result;
- return false;
- }
- };
-
- WebSocket.prototype.close = function() {
- var self = this;
- if (!self.__flash) return;
- self.readyState = self.__flash.getReadyState();
- if (self.readyState == WebSocket.CLOSED || self.readyState == WebSocket.CLOSING) return;
- self.__flash.close();
- // Sets/calls them manually here because Flash WebSocketConnection.close cannot fire events
- // which causes weird error:
- // > You are trying to call recursively into the Flash Player which is not allowed.
- self.readyState = WebSocket.CLOSED;
- if (self.__timer) clearInterval(self.__timer);
- if (self.onclose) {
- // Make it asynchronous so that it looks more like an actual
- // close event
- setTimeout(self.onclose, 1);
- }
- };
-
- /**
- * Implementation of {@link DOM 2 EventTarget Interface}
- *
- * @param {string} type
- * @param {function} listener
- * @param {boolean} useCapture !NB Not implemented yet
- * @return void
- */
- WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
- if (!('__events' in this)) {
- this.__events = {};
- }
- if (!(type in this.__events)) {
- this.__events[type] = [];
- if ('function' == typeof this['on' + type]) {
- this.__events[type].defaultHandler = this['on' + type];
- this['on' + type] = this.__createEventHandler(this, type);
- }
- }
- this.__events[type].push(listener);
- };
-
- /**
- * Implementation of {@link DOM 2 EventTarget Interface}
- *
- * @param {string} type
- * @param {function} listener
- * @param {boolean} useCapture NB! Not implemented yet
- * @return void
- */
- WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
- if (!('__events' in this)) {
- this.__events = {};
- }
- if (!(type in this.__events)) return;
- for (var i = this.__events.length; i > -1; --i) {
- if (listener === this.__events[type][i]) {
- this.__events[type].splice(i, 1);
- break;
- }
- }
- };
-
- /**
- * Implementation of {@link DOM 2 EventTarget Interface}
- *
- * @param {WebSocketEvent} event
- * @return void
- */
- WebSocket.prototype.dispatchEvent = function(event) {
- if (!('__events' in this)) throw 'UNSPECIFIED_EVENT_TYPE_ERR';
- if (!(event.type in this.__events)) throw 'UNSPECIFIED_EVENT_TYPE_ERR';
-
- for (var i = 0, l = this.__events[event.type].length; i < l; ++ i) {
- this.__events[event.type][i](event);
- if (event.cancelBubble) break;
- }
-
- if (false !== event.returnValue &&
- 'function' == typeof this.__events[event.type].defaultHandler)
- {
- this.__events[event.type].defaultHandler(event);
- }
- };
-
- WebSocket.prototype.__handleMessages = function() {
- // Gets data using readSocketData() instead of getting it from event object
- // of Flash event. This is to make sure to keep message order.
- // It seems sometimes Flash events don't arrive in the same order as they are sent.
- var arr = this.__flash.readSocketData();
- for (var i = 0; i < arr.length; i++) {
- var data = decodeURIComponent(arr[i]);
- try {
- if (this.onmessage) {
- var e;
- if (window.MessageEvent && !window.opera) {
- e = document.createEvent("MessageEvent");
- e.initMessageEvent("message", false, false, data, null, null, window, null);
- } else { // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes
- e = {data: data};
- }
- this.onmessage(e);
- }
- } catch (e) {
- console.error(e.toString());
- }
- }
- };
-
- /**
- * @param {object} object
- * @param {string} type
- */
- WebSocket.prototype.__createEventHandler = function(object, type) {
- return function(data) {
- var event = new WebSocketEvent();
- event.initEvent(type, true, true);
- event.target = event.currentTarget = object;
- for (var key in data) {
- event[key] = data[key];
- }
- object.dispatchEvent(event, arguments);
- };
- }
-
- /**
- * Basic implementation of {@link DOM 2 EventInterface}
- *
- * @class
- * @constructor
- */
- function WebSocketEvent(){}
-
- /**
- *
- * @type boolean
- */
- WebSocketEvent.prototype.cancelable = true;
-
- /**
- *
- * @type boolean
- */
- WebSocketEvent.prototype.cancelBubble = false;
-
- /**
- *
- * @return void
- */
- WebSocketEvent.prototype.preventDefault = function() {
- if (this.cancelable) {
- this.returnValue = false;
- }
- };
-
- /**
- *
- * @return void
- */
- WebSocketEvent.prototype.stopPropagation = function() {
- this.cancelBubble = true;
- };
-
- /**
- *
- * @param {string} eventTypeArg
- * @param {boolean} canBubbleArg
- * @param {boolean} cancelableArg
- * @return void
- */
- WebSocketEvent.prototype.initEvent = function(eventTypeArg, canBubbleArg, cancelableArg) {
- this.type = eventTypeArg;
- this.cancelable = cancelableArg;
- this.timeStamp = new Date();
- };
-
-
- WebSocket.CONNECTING = 0;
- WebSocket.OPEN = 1;
- WebSocket.CLOSING = 2;
- WebSocket.CLOSED = 3;
-
- WebSocket.__tasks = [];
-
- WebSocket.__initialize = function() {
- if (WebSocket.__swfLocation) {
- // For backword compatibility.
- window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
- }
- if (!window.WEB_SOCKET_SWF_LOCATION) {
- console.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
- return;
- }
- var container = document.createElement("div");
- container.id = "webSocketContainer";
- // Hides Flash box. We cannot use display: none or visibility: hidden because it prevents
- // Flash from loading at least in IE. So we move it out of the screen at (-100, -100).
- // But this even doesn't work with Flash Lite (e.g. in Droid Incredible). So with Flash
- // Lite, we put it at (0, 0). This shows 1x1 box visible at left-top corner but this is
- // the best we can do as far as we know now.
- container.style.position = "absolute";
- if (WebSocket.__isFlashLite()) {
- container.style.left = "0px";
- container.style.top = "0px";
- } else {
- container.style.left = "-100px";
- container.style.top = "-100px";
- }
- var holder = document.createElement("div");
- holder.id = "webSocketFlash";
- container.appendChild(holder);
- document.body.appendChild(container);
- // See this article for hasPriority:
- // http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html
- swfobject.embedSWF(
- WEB_SOCKET_SWF_LOCATION, "webSocketFlash",
- "1" /* width */, "1" /* height */, "9.0.0" /* SWF version */,
- null, {bridgeName: "webSocket"}, {hasPriority: true, allowScriptAccess: "always"}, null,
- function(e) {
- if (!e.success) console.error("[WebSocket] swfobject.embedSWF failed");
- }
- );
- FABridge.addInitializationCallback("webSocket", function() {
- try {
- //console.log("[WebSocket] FABridge initializad");
- WebSocket.__flash = FABridge.webSocket.root();
- WebSocket.__flash.setCallerUrl(location.href);
- WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
- for (var i = 0; i < WebSocket.__tasks.length; ++i) {
- WebSocket.__tasks[i]();
- }
- WebSocket.__tasks = [];
- } catch (e) {
- console.error("[WebSocket] " + e.toString());
- }
- });
- };
-
- WebSocket.__addTask = function(task) {
- if (WebSocket.__flash) {
- task();
- } else {
- WebSocket.__tasks.push(task);
- }
- };
-
- WebSocket.__isFlashLite = function() {
- if (!window.navigator || !window.navigator.mimeTypes) return false;
- var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"];
- if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) return false;
- return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false;
- };
-
- // called from Flash
- window.webSocketLog = function(message) {
- console.log(decodeURIComponent(message));
- };
-
- // called from Flash
- window.webSocketError = function(message) {
- console.error(decodeURIComponent(message));
- };
-
- if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
- if (window.addEventListener) {
- window.addEventListener("load", WebSocket.__initialize, false);
- } else {
- window.attachEvent("onload", WebSocket.__initialize);
- }
- }
-
-})();
diff --git a/public/javascripts/widgets/back-to-top.js b/public/javascripts/widgets/back-to-top.js
index 403a70efd..b9b11bef4 100644
--- a/public/javascripts/widgets/back-to-top.js
+++ b/public/javascripts/widgets/back-to-top.js
@@ -10,7 +10,8 @@
});
self.button.click(self.backToTop);
- self.window.debounce("scroll", self.toggleVisibility, 250);
+ var debouncedScroll = _.debounce(self.toggleVisibility, 250);
+ $(window).scroll(debouncedScroll)
});
this.backToTop = function(evt) {
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 643513d10..bfbdc6c22 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -19,8 +19,6 @@ src_files:
- public/javascripts/vendor/jquery.infinitescroll.min.js
- public/javascripts/vendor/jquery.autoresize.min.js
- public/javascripts/vendor/jquery.expander.js
- - public/javascripts/vendor/jquery-debounce.js
- - public/javascripts/vendor/Mustache.js
- public/javascripts/vendor/jquery.charcount.js
- public/javascripts/vendor/timeago.js
- public/javascripts/vendor/facebox.js
@@ -46,7 +44,6 @@ src_files:
- public/javascripts/mobile.js
- public/javascripts/contact-list.js
- - public/javascripts/web-socket-receiver.js
- public/javascripts/view.js
- public/javascripts/publisher.js
- public/javascripts/stream.js
diff --git a/spec/javascripts/widgets/back-to-top-spec.js b/spec/javascripts/widgets/back-to-top-spec.js
index cadfa99a8..030139899 100644
--- a/spec/javascripts/widgets/back-to-top-spec.js
+++ b/spec/javascripts/widgets/back-to-top-spec.js
@@ -63,4 +63,4 @@ describe("Diaspora.Widgets.BackToTop", function() {
afterEach(function() {
$.fx.off = false;
});
-});
\ No newline at end of file
+});