From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 27 Jul 2011 14:42:58 +0000 (+0200)
Subject: merge master into interface
X-Git-Tag: v3.0~267^2~364^2~21^2~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0dad1f8ccb01f5c60ef919bdc347d8a22cb728f8;p=nextcloud-server.git

merge master into interface
---

0dad1f8ccb01f5c60ef919bdc347d8a22cb728f8
diff --cc apps/media/css/player.css
index a8c978514d1,a21b82d1f4a..7acb9f34c1b
--- a/apps/media/css/player.css
+++ b/apps/media/css/player.css
@@@ -1,5 -1,5 +1,5 @@@
 -#jp-interface{position:fixed;z-index:100;width:25em;left:201px;top:-10px;height:80px;border-bottom:none;}
 +#jp-interface{position:fixed;z-index:100;width:25em;left:201px;top:-20px;height:80px;border-bottom:none;}
- #jp-interface.player{display:hidden;}
+ #jp-interface div.player{height:0px}
  #jp-interface ul.jp-controls{list-style-type:none;padding:0;}
  #jp-interface ul.jp-controls li{display:inline;}
  #jp-interface ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;}
diff --cc core/js/js.js
index 2dac6907d96,593a637137c..3a820544b78
--- a/core/js/js.js
+++ b/core/js/js.js
@@@ -56,21 -57,24 +57,40 @@@ OC=
  	}
  }
  
 +if (!Array.prototype.filter) {
 +	Array.prototype.filter = function(fun /*, thisp*/) {
 +		var len = this.length >>> 0;
 +		if (typeof fun != "function")
 +			throw new TypeError();
 +		
 +		var res = [];
 +		var thisp = arguments[1];
 +		for (var i = 0; i < len; i++) {
 +			if (i in this) {
 +				var val = this[i]; // in case fun mutates this
 +				if (fun.call(thisp, val, i, this))
 +					res.push(val);
 +			}
 +		}
 +		return res;
+ if (!Array.prototype.indexOf){
+ 	Array.prototype.indexOf = function(elt /*, from*/)
+ 	{
+ 		var len = this.length;
+ 		
+ 		var from = Number(arguments[1]) || 0;
+ 		from = (from < 0)
+ 		? Math.ceil(from)
+ 		: Math.floor(from);
+ 		if (from < 0)
+ 			from += len;
+ 		
+ 		for (; from < len; from++)
+ 		{
+ 			if (from in this &&
+ 				this[from] === elt)
+ 				return from;
+ 		}
+ 		return -1;
  	};
  }