replace tipsys with tooltips

3 files changed, 13 insertions, 7 deletions

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 43f74c5816d..2edbed7f3c4 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -409,6 +409,7 @@
 					);
 				}
 			);
+			$actionEl.tooltip({placement:'top'});
 			return $actionEl;
 		},
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e297edcf11b..f488325b0a6 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -243,6 +243,8 @@
 			this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
 			this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this));
 
+			this.$el.find('.selectedActions a').tooltip({placement:'top'});
+
 			this.setupUploadEvents();
 
 			this.$container.on('scroll', _.bind(this._onScroll, this));
@@ -854,6 +856,7 @@
 					fileData.extraData = fileData.extraData.substr(1);
 				}
 				nameSpan.addClass('extra-data').attr('title', fileData.extraData);
+				nameSpan.tooltip({placement: 'right'});
 			}
 			// dirs can show the number of uploaded files
 			if (type === 'dir') {
@@ -1532,7 +1535,7 @@
 			};
 
 			function restore() {
-				input.tipsy('hide');
+				input.tooltip('hide');
 				tr.data('renaming',false);
 				form.remove();
 				td.children('a.name').show();
@@ -1547,7 +1550,7 @@
 
 				try {
 					var newName = input.val();
-					input.tipsy('hide');
+					input.tooltip('hide');
 					form.remove();
 
 					if (newName !== oldname) {
@@ -1599,8 +1602,8 @@
 					}
 				} catch (error) {
 					input.attr('title', error);
-					input.tipsy({gravity: 'w', trigger: 'manual'});
-					input.tipsy('show');
+					input.tooltip({placement: 'left', trigger: 'manual'});
+					input.tooltip('show');
 					input.addClass('error');
 				}
 				return false;
@@ -1609,12 +1612,12 @@
 				// verify filename on typing
 				try {
 					checkInput();
-					input.tipsy('hide');
+					input.tooltip('hide');
 					input.removeClass('error');
 				} catch (error) {
 					input.attr('title', error);
-					input.tipsy({gravity: 'w', trigger: 'manual'});
-					input.tipsy('show');
+					input.tooltip({placement: 'left', trigger: 'manual'});
+					input.tooltip('show');
 					input.addClass('error');
 				}
 				if (event.keyCode === 27) {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 19cc3b26e44..f1de717c7d5 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -265,6 +265,8 @@
 				$('#webdavurl').select();
 			});
 
+			$('#upload').tooltip({placement:'right'});
+
 			//FIXME scroll to and highlight preselected file
 			/*
 			if (getURLParameter('scrollto')) {