summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-06-02 15:59:06 +0200
committerVincent Petry <pvince81@owncloud.com>2014-06-02 15:59:06 +0200
commitd677e3860d22e3a779c0f01af1adc4e193127d1c (patch)
treee666f6a708b95e25ec13e25971cc0c1b15a71a07 /core/js
parent7961d4a87e8734bbcfda98309e6b64797fc0bb42 (diff)
downloadnextcloud-server-d677e3860d22e3a779c0f01af1adc4e193127d1c.tar.gz
nextcloud-server-d677e3860d22e3a779c0f01af1adc4e193127d1c.zip
Added unit tests for share.js and share icon
Diffstat (limited to 'core/js')
-rw-r--r--core/js/share.js16
1 files changed, 3 insertions, 13 deletions
diff --git a/core/js/share.js b/core/js/share.js
index d8020531763..c4ca63908a9 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -48,7 +48,7 @@ OC.Share={
currentDir = fileList.getCurrentDirectory();
}
for (item in OC.Share.statuses){
- var image = OC.imagePath('core', 'actions/shared');
+ var image = OC.imagePath('core', 'actions/share');
var data = OC.Share.statuses[item];
var hasLink = data.link;
// Links override shared in terms of icon display
@@ -113,7 +113,7 @@ OC.Share={
}
} else if (OC.Share.itemShares[index].length > 0) {
shares = true;
- image = OC.imagePath('core', 'actions/shared');
+ image = OC.imagePath('core', 'actions/share');
}
}
});
@@ -165,17 +165,7 @@ OC.Share={
image = image || OC.imagePath('core', 'actions/share');
}
if (recipients) {
- image = image || OC.imagePath('core', 'actions/shared');
- if (owner) {
- message = ' ' + t(
- 'files_sharing',
- 'Shared by {owner} with You, {recipients}',
- {owner: owner, recipients: recipients}
- );
- }
- else {
- message = t('core', 'Shared with {recipients}', {recipients: recipients});
- }
+ message = t('core', 'Shared with {recipients}', {recipients: recipients});
}
action.html(' <span>'+ message + '</span>').prepend(img);
}