From d6771502f21349d5393158eda6d2d16569fd60c3 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 17 Sep 2013 18:11:43 +0200 Subject: check only permission from link-share to decide if public upload is enabled or disabled --- core/js/share.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/share.js b/core/js/share.js index 5d34faf8a5d..250f410072c 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -177,7 +177,9 @@ OC.Share={ if (allowPublicUploadStatus) { return true; } - allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false; + if (value.share_type === OC.Share.SHARE_TYPE_LINK) { + allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false; + } }); html += ''; -- cgit v1.2.3 From 642b064c5b98990f6ac0e3ba344db8cd1fe4d1f8 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 17 Sep 2013 18:18:23 +0200 Subject: we can leave the loop if the permission of the link share was checked --- core/js/share.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/js') diff --git a/core/js/share.js b/core/js/share.js index 250f410072c..641252a4d78 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -174,11 +174,9 @@ OC.Share={ var allowPublicUploadStatus = false; $.each(data.shares, function(key, value) { - if (allowPublicUploadStatus) { - return true; - } if (value.share_type === OC.Share.SHARE_TYPE_LINK) { allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false; + return true; } }); -- cgit v1.2.3 From 24eb41548eb6fc08849619b9725cbb61679f04f6 Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 25 Sep 2013 12:57:41 +0200 Subject: Make it possible to have a different color than the username for placeholder --- core/js/placeholder.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'core/js') diff --git a/core/js/placeholder.js b/core/js/placeholder.js index d63730547d7..3c7b11ef468 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -36,10 +36,22 @@ * *
T
* + * You may also call it like this, to have a different background, than the seed: + * + * $('#albumart').placeholder('The Album Title', 'Album Title'); + * + * Resulting in: + * + *
A
+ * */ (function ($) { - $.fn.placeholder = function(seed) { + $.fn.placeholder = function(seed, text) { + if (typeof(text) === "undefined") { + text = seed; + } + var hash = md5(seed), maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16), hue = parseInt(hash, 16) / maxRange * 256, @@ -56,7 +68,7 @@ this.css('font-size', (height * 0.55) + 'px'); if(seed !== null && seed.length) { - this.html(seed[0].toUpperCase()); + this.html(text[0].toUpperCase()); } }; }(jQuery)); -- cgit v1.2.3 From 5e7a7b3f6187365c60e63dfed8699e525be45a0b Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 25 Sep 2013 17:19:38 +0200 Subject: Shorten optional text-argument processing --- core/js/placeholder.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'core/js') diff --git a/core/js/placeholder.js b/core/js/placeholder.js index 3c7b11ef468..ee2a8ce84c4 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -48,9 +48,8 @@ (function ($) { $.fn.placeholder = function(seed, text) { - if (typeof(text) === "undefined") { - text = seed; - } + // set optional argument "text" to value of "seed" if undefined + text = text || seed; var hash = md5(seed), maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16), -- cgit v1.2.3 From 4907685405ead5df56ef0a5ac0b9af7c86885487 Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 28 Sep 2013 16:46:53 +0200 Subject: Base defaultavatar text on displayname Fix #4876 --- core/avatar/controller.php | 2 +- core/js/jquery.avatar.js | 6 +++++- settings/js/personal.js | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'core/js') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 9f7c0517c4a..22693824461 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -33,7 +33,7 @@ class Controller { $image->show(); } else { // Signalizes $.avatar() to display a defaultavatar - \OC_JSON::success(); + \OC_JSON::success(array("data"=> array("displayname"=> \OC_User::getDisplayName($user)) )); } } diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index f1382fd7d2d..88a4c25d1ee 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -69,7 +69,11 @@ var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken; $.get(url, function(result) { if (typeof(result) === 'object') { - $div.placeholder(user); + if (result.data && result.data.displayname) { + $div.placeholder(user, result.data.displayname); + } else { + $div.placeholder(user); + } } else { if (ie8fix === true) { $div.html(''); diff --git a/settings/js/personal.js b/settings/js/personal.js index eaaca32f5d8..8944a7afa3c 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -34,6 +34,7 @@ function changeDisplayName(){ $('#oldDisplayName').text($('#displayName').val()); // update displayName on the top right expand button $('#expandDisplayName').text($('#displayName').val()); + updateAvatar(); } else{ $('#newdisplayname').val(data.data.displayName); -- cgit v1.2.3