replace tipsys with tooltips
This commit is contained in:
parent
326de6f9b4
commit
e5444a1a5d
|
@ -409,6 +409,7 @@
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
$actionEl.tooltip({placement:'top'});
|
||||||
return $actionEl;
|
return $actionEl;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -243,6 +243,8 @@
|
||||||
this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
|
this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
|
||||||
this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this));
|
this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this));
|
||||||
|
|
||||||
|
this.$el.find('.selectedActions a').tooltip({placement:'top'});
|
||||||
|
|
||||||
this.setupUploadEvents();
|
this.setupUploadEvents();
|
||||||
|
|
||||||
this.$container.on('scroll', _.bind(this._onScroll, this));
|
this.$container.on('scroll', _.bind(this._onScroll, this));
|
||||||
|
@ -854,6 +856,7 @@
|
||||||
fileData.extraData = fileData.extraData.substr(1);
|
fileData.extraData = fileData.extraData.substr(1);
|
||||||
}
|
}
|
||||||
nameSpan.addClass('extra-data').attr('title', fileData.extraData);
|
nameSpan.addClass('extra-data').attr('title', fileData.extraData);
|
||||||
|
nameSpan.tooltip({placement: 'right'});
|
||||||
}
|
}
|
||||||
// dirs can show the number of uploaded files
|
// dirs can show the number of uploaded files
|
||||||
if (type === 'dir') {
|
if (type === 'dir') {
|
||||||
|
@ -1532,7 +1535,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
function restore() {
|
function restore() {
|
||||||
input.tipsy('hide');
|
input.tooltip('hide');
|
||||||
tr.data('renaming',false);
|
tr.data('renaming',false);
|
||||||
form.remove();
|
form.remove();
|
||||||
td.children('a.name').show();
|
td.children('a.name').show();
|
||||||
|
@ -1547,7 +1550,7 @@
|
||||||
|
|
||||||
try {
|
try {
|
||||||
var newName = input.val();
|
var newName = input.val();
|
||||||
input.tipsy('hide');
|
input.tooltip('hide');
|
||||||
form.remove();
|
form.remove();
|
||||||
|
|
||||||
if (newName !== oldname) {
|
if (newName !== oldname) {
|
||||||
|
@ -1599,8 +1602,8 @@
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
input.attr('title', error);
|
input.attr('title', error);
|
||||||
input.tipsy({gravity: 'w', trigger: 'manual'});
|
input.tooltip({placement: 'left', trigger: 'manual'});
|
||||||
input.tipsy('show');
|
input.tooltip('show');
|
||||||
input.addClass('error');
|
input.addClass('error');
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -1609,12 +1612,12 @@
|
||||||
// verify filename on typing
|
// verify filename on typing
|
||||||
try {
|
try {
|
||||||
checkInput();
|
checkInput();
|
||||||
input.tipsy('hide');
|
input.tooltip('hide');
|
||||||
input.removeClass('error');
|
input.removeClass('error');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
input.attr('title', error);
|
input.attr('title', error);
|
||||||
input.tipsy({gravity: 'w', trigger: 'manual'});
|
input.tooltip({placement: 'left', trigger: 'manual'});
|
||||||
input.tipsy('show');
|
input.tooltip('show');
|
||||||
input.addClass('error');
|
input.addClass('error');
|
||||||
}
|
}
|
||||||
if (event.keyCode === 27) {
|
if (event.keyCode === 27) {
|
||||||
|
|
|
@ -265,6 +265,8 @@
|
||||||
$('#webdavurl').select();
|
$('#webdavurl').select();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#upload').tooltip({placement:'right'});
|
||||||
|
|
||||||
//FIXME scroll to and highlight preselected file
|
//FIXME scroll to and highlight preselected file
|
||||||
/*
|
/*
|
||||||
if (getURLParameter('scrollto')) {
|
if (getURLParameter('scrollto')) {
|
||||||
|
|
|
@ -1278,17 +1278,6 @@ function initCore() {
|
||||||
$('#settings #expanddiv').slideUp(OC.menuSpeed);
|
$('#settings #expanddiv').slideUp(OC.menuSpeed);
|
||||||
});
|
});
|
||||||
|
|
||||||
// all the tipsy stuff needs to be here (in reverse order) to work
|
|
||||||
$('.displayName .action').tipsy({gravity:'se', live:true});
|
|
||||||
$('.password .action').tipsy({gravity:'se', live:true});
|
|
||||||
$('#upload').tipsy({gravity:'w'});
|
|
||||||
$('.selectedActions a').tipsy({gravity:'s', live:true});
|
|
||||||
$('a.action.delete').tipsy({gravity:'e', live:true});
|
|
||||||
$('a.action').tipsy({gravity:'s', live:true});
|
|
||||||
$('td.lastLogin').tipsy({gravity:'s', html:true});
|
|
||||||
$('input').tipsy({gravity:'w'});
|
|
||||||
$('.extra-data').tipsy({gravity:'w', live:true});
|
|
||||||
|
|
||||||
// toggle for menus
|
// toggle for menus
|
||||||
$(document).on('mouseup.closemenus', function(event) {
|
$(document).on('mouseup.closemenus', function(event) {
|
||||||
var $el = $(event.target);
|
var $el = $(event.target);
|
||||||
|
|
|
@ -77,6 +77,9 @@ var UserList = {
|
||||||
$tr.find('.name').text(user.name);
|
$tr.find('.name').text(user.name);
|
||||||
$tr.find('td.displayName > span').text(user.displayname);
|
$tr.find('td.displayName > span').text(user.displayname);
|
||||||
$tr.find('td.mailAddress > span').text(user.email);
|
$tr.find('td.mailAddress > span').text(user.email);
|
||||||
|
$tr.find('td.displayName > .action').tooltip({placement: 'top'});
|
||||||
|
$tr.find('td.mailAddress > .action').tooltip({placement: 'top'});
|
||||||
|
$tr.find('td.password > .action').tooltip({placement: 'top'});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* groups and subadmins
|
* groups and subadmins
|
||||||
|
@ -158,12 +161,9 @@ var UserList = {
|
||||||
}
|
}
|
||||||
var $tdLastLogin = $tr.find('td.lastLogin');
|
var $tdLastLogin = $tr.find('td.lastLogin');
|
||||||
$tdLastLogin.text(lastLoginRel);
|
$tdLastLogin.text(lastLoginRel);
|
||||||
//tooltip makes it complicated … to not insert new HTML, we adjust the
|
$tdLastLogin.attr('title', lastLoginAbs);
|
||||||
//original title. We use a temporary div to get back the html that we
|
// setup tooltip with #app-content as container to prevent the td to resize on hover
|
||||||
//can pass later. It is also required to initialise tipsy.
|
$tdLastLogin.tooltip({placement: 'top', container: '#app-content'});
|
||||||
var tooltip = $('<div>').html($($tdLastLogin.attr('original-title')).text(lastLoginAbs)).html();
|
|
||||||
$tdLastLogin.tipsy({gravity:'s', html:true});
|
|
||||||
$tdLastLogin.attr('title', tooltip);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* append generated row to user list
|
* append generated row to user list
|
||||||
|
|
Loading…
Reference in New Issue