summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-13 06:05:00 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-13 06:05:00 +0200
commit3b5f16b23cfbdb316dd7e02e0547077135bc95d4 (patch)
treeca39c2b3416b1577efaa8440b6cb77570e6ad7e5
parent0c903c63d866766fe15360049ca4c84aed1d5f1a (diff)
downloadnextcloud-server-3b5f16b23cfbdb316dd7e02e0547077135bc95d4.tar.gz
nextcloud-server-3b5f16b23cfbdb316dd7e02e0547077135bc95d4.zip
NEEDS MORE FADING
-rw-r--r--apps/media/templates/music.php12
-rw-r--r--core/js/js.js6
-rw-r--r--files/js/files.js6
3 files changed, 12 insertions, 12 deletions
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index d3917ac8137..73a4954c624 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -1,11 +1,11 @@
<div id="controls">
<ul class="jp-controls">
- <li><a href="#" class="jp-play"><img class="svg action" src="<?php echo image_path('core', 'actions/play-big'); ?>" /></a></li>
- <li><a href="#" class="jp-pause"><img class="svg action" src="<?php echo image_path('core', 'actions/pause-big'); ?>" /></a></li>
- <li><a href="#" class="jp-mute"><img class="svg action" src="<?php echo image_path('core', 'actions/sound'); ?>" /></a></li>
- <li><a href="#" class="jp-unmute"><img class="svg action" src="<?php echo image_path('core', 'actions/sound-off'); ?>" /></a></li>
- <li><a href="#" class="jp-previous"><img class="svg action" src="<?php echo image_path('core', 'actions/play-previous'); ?>" /></a></li>
- <li><a href="#" class="jp-next"><img class="svg action" src="<?php echo image_path('core', 'actions/play-next'); ?>" /></a></li>
+ <li><a href="#" class="jp-play"><img class="svg action" title="" src="<?php echo image_path('core', 'actions/play-big'); ?>" /></a></li>
+ <li><a href="#" class="jp-pause"><img class="svg action" title="" src="<?php echo image_path('core', 'actions/pause-big'); ?>" /></a></li>
+ <li><a href="#" class="jp-mute"><img class="svg action" title="" src="<?php echo image_path('core', 'actions/sound'); ?>" /></a></li>
+ <li><a href="#" class="jp-unmute"><img class="svg action" title="" src="<?php echo image_path('core', 'actions/sound-off'); ?>" /></a></li>
+ <li><a href="#" class="jp-previous"><img class="svg action" title="" src="<?php echo image_path('core', 'actions/play-previous'); ?>" /></a></li>
+ <li><a href="#" class="jp-next"><img class="svg action" title="" src="<?php echo image_path('core', 'actions/play-next'); ?>" /></a></li>
</ul>
<div class="jp-progress">
<div class="jp-seek-bar">
diff --git a/core/js/js.js b/core/js/js.js
index c5d19163048..52cbd2ffc6d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -299,9 +299,9 @@ $(document).ready(function(){
}
});
- $('.action').tipsy({gravity:'s', live:true});
- $('.selectedActions a').tipsy({gravity:'n', live:true});
- $('.selectedActions a.delete').tipsy({gravity: 'ne', live:true});
+ if($('.action').attr('title')!='') $('.action').tipsy({gravity:'s', fade:true, live:true});
+ $('.selectedActions a').tipsy({gravity:'n', fade:true, live:true});
+ $('.selectedActions a.delete').tipsy({gravity: 'ne', fade:true, live:true});
});
if (!Array.prototype.map){
diff --git a/files/js/files.js b/files/js/files.js
index 50acd7ba581..23ea0fd2792 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -18,9 +18,9 @@ $(document).ready(function() {
return false;
});
- $('.file_upload_button_wrapper').tipsy({gravity:'e'});
- $('td.filesize').tipsy({gravity:'se', live:true});
- $('td .modified').tipsy({gravity:'s', live:true});
+ $('.file_upload_button_wrapper').tipsy({gravity:'e', fade:true});
+ $('td.filesize').tipsy({gravity:'se', fade:true, live:true});
+ $('td .modified').tipsy({gravity:'s', fade:true, live:true});
// Sets the file-action buttons behaviour :
$('tr').live('mouseenter',function(event) {