merge master into interface

diff --cc apps/media/css/player.css
index a8c978514d1680d3de7bdb76c1a9845bf7b9ec85,a21b82d1f4a69ee6d4ae16406d0a87f7d283dcc0..7acb9f34c1b29acde795274065164f962c2862d6
--- 1/apps/media/css/player.css
--- 2/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 2dac6907d961337545698f29f1ca870b2e79d088,593a637137c37fa76b107de24d3463679503b4f6..3a820544b78de552455602f88b1ba58f7d7f9795
--- 1/core/js/js.js
--- 2/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;
        };
  }