summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-07-17 13:13:03 +0200
committerVincent Petry <pvince81@owncloud.com>2014-07-17 13:13:03 +0200
commit4d5ebe61c4f88f001fef1a6b1185a7856c086c7e (patch)
treedb41a1ae20f152f3d9013be1fb8cea95a5f2224d /settings/js
parentd58c8d72cf8c0f6784bdec1f054c24a78ff131b6 (diff)
downloadnextcloud-server-4d5ebe61c4f88f001fef1a6b1185a7856c086c7e.tar.gz
nextcloud-server-4d5ebe61c4f88f001fef1a6b1185a7856c086c7e.zip
Fixed JS and CSS issues in users page
- Renamed "delete" to "deleteEntry" to make IE8 happy. - Added missing "svg" class for the "+" button - Added height to "+" button but was unable to properly align it
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/users/deleteHandler.js4
-rw-r--r--settings/js/users/groups.js2
-rw-r--r--settings/js/users/users.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 56355317f8d..d4736d88701 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -116,7 +116,7 @@ DeleteHandler.prototype.hideNotification = function() {
*/
DeleteHandler.prototype.mark = function(oid) {
if(this.oidToDelete !== false) {
- this.delete();
+ this.deleteEntry();
}
this.oidToDelete = oid;
this.canceled = false;
@@ -138,7 +138,7 @@ DeleteHandler.prototype.cancel = function() {
* OC.dialogs.alert. On success, a callback is fired so that the client can
* update the web interface accordingly.
*/
-DeleteHandler.prototype.delete = function() {
+DeleteHandler.prototype.deleteEntry = function() {
if(this.canceled || this.oidToDelete === false) {
return false;
}
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index b4cf73c59f2..58f77705121 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -237,7 +237,7 @@ GroupList = {
//delete a marked user when leaving the page
$(window).on('beforeunload', function () {
- GroupDeleteHandler.delete();
+ GroupDeleteHandler.deleteEntry();
});
},
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index ba228905a8a..9eb8f91ac7c 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -306,7 +306,7 @@ var UserList = {
//delete a marked user when leaving the page
$(window).on('beforeunload', function () {
- UserDeleteHandler.delete();
+ UserDeleteHandler.deleteEntry();
});
},
update: function (gid) {