From 826cb2c650d9a9c1b8d826cba6863dbfacc8b8f4 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 24 Mar 2012 19:26:53 +0100
Subject: [PATCH] fix sharing address construction in opera and firefox
---
apps/gallery/js/album_cover.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 41a648bec57..061bbcd0b47 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -30,10 +30,14 @@ function albumClick(title) {
});
}
+function constructSharingPath() {
+ return document.location.protocol + '//' + document.location.host + OC.linkTo('gallery', 'sharing.php') + '?token=' + Albums.token;
+}
+
function shareGallery() {
var existing_token = '';
if (Albums.token)
- existing_token = document.location.origin + OC.linkTo('gallery', 'sharing.php') + '?token=' + Albums.token;
+ existing_token = constructSharingPath();
var form_fields = [{text: 'Share', name: 'share', type: 'checkbox', value: Albums.shared},
{text: 'Share recursive', name: 'recursive', type: 'checkbox', value: Albums.recursive},
{text: 'Shared gallery address', name: 'address', type: 'text', value: existing_token}];
@@ -53,7 +57,7 @@ function shareGallery() {
}
var actual_addr = '';
if (Albums.token)
- actual_addr = document.location.origin + OC.linkTo('gallery', 'sharing.php') + '?token=' + Albums.token;
+ actual_addr = constructSharingPath();
$('input[name="address"]').val(actual_addr);
} else {
OC.dialogs.alert(t('gallery', 'Error: ') + r.cause, t('gallery', 'Internal error'));