From 3b5f16b23cfbdb316dd7e02e0547077135bc95d4 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Sat, 13 Aug 2011 06:05:00 +0200
Subject: [PATCH] NEEDS MORE FADING
---
apps/media/templates/music.php | 12 ++++++------
core/js/js.js | 6 +++---
files/js/files.js | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index d3917ac813..73a4954c62 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 c5d1916304..52cbd2ffc6 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 50acd7ba58..23ea0fd279 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) {
--
GitLab