[Pkg-owncloud-commits] [owncloud] 118/223: Fix prompting for password
David Prévot
taffit at moszumanska.debian.org
Sun Jun 22 01:54:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 2005c162bdfbe70f2690697eee82bcbd28ff57f5
Author: Robin Appelman <icewind at owncloud.com>
Date: Thu Jun 5 11:29:01 2014 +0200
Fix prompting for password
---
apps/files_sharing/js/public.js | 31 ++++++++++++++++---------------
apps/files_sharing/public.php | 1 +
apps/files_sharing/templates/public.php | 2 +-
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 48db895..359087c 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -19,7 +19,7 @@ if (!OCA.Files) {
OCA.Sharing.PublicApp = {
_initialized: false,
- initialize: function($el) {
+ initialize: function ($el) {
var self = this;
var fileActions;
if (this._initialized) {
@@ -65,7 +65,7 @@ OCA.Sharing.PublicApp = {
}
// dynamically load image previews
- if (mimetype.substr(0, mimetype.indexOf('/')) === 'image' ) {
+ if (mimetype.substr(0, mimetype.indexOf('/')) === 'image') {
var params = {
x: $(document).width() * window.devicePixelRatio,
@@ -82,7 +82,7 @@ OCA.Sharing.PublicApp = {
if (this.fileList) {
// TODO: move this to a separate PublicFileList class that extends OCA.Files.FileList (+ unit tests)
- this.fileList.getDownloadUrl = function(filename, dir) {
+ this.fileList.getDownloadUrl = function (filename, dir) {
if ($.isArray(filename)) {
filename = JSON.stringify(filename);
}
@@ -97,13 +97,13 @@ OCA.Sharing.PublicApp = {
return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
};
- this.fileList.getAjaxUrl = function(action, params) {
+ this.fileList.getAjaxUrl = function (action, params) {
params = params || {};
params.t = $('#sharingToken').val();
return OC.filePath('files_sharing', 'ajax', action + '.php') + '?' + OC.buildQueryString(params);
};
- this.fileList.linkTo = function(dir) {
+ this.fileList.linkTo = function (dir) {
var params = {
service: 'files',
t: $('#sharingToken').val(),
@@ -112,15 +112,15 @@ OCA.Sharing.PublicApp = {
return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
};
- this.fileList.generatePreviewUrl = function(urlSpec) {
+ this.fileList.generatePreviewUrl = function (urlSpec) {
urlSpec.t = $('#dirToken').val();
return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec);
};
var file_upload_start = $('#file_upload_start');
- file_upload_start.on('fileuploadadd', function(e, data) {
+ file_upload_start.on('fileuploadadd', function (e, data) {
var fileDirectory = '';
- if(typeof data.files[0].relativePath !== 'undefined') {
+ if (typeof data.files[0].relativePath !== 'undefined') {
fileDirectory = data.files[0].relativePath;
}
@@ -143,7 +143,7 @@ OCA.Sharing.PublicApp = {
OC.Util.History.addOnPopStateHandler(_.bind(this._onUrlChanged, this));
}
- $(document).on('click', '#directLink', function() {
+ $(document).on('click', '#directLink', function () {
$(this).focus();
$(this).select();
});
@@ -152,7 +152,7 @@ OCA.Sharing.PublicApp = {
window.FileList = this.fileList;
},
- _onDirectoryChanged: function(e) {
+ _onDirectoryChanged: function (e) {
OC.Util.History.pushState({
service: 'files',
t: $('#sharingToken').val(),
@@ -161,21 +161,21 @@ OCA.Sharing.PublicApp = {
});
},
- _onUrlChanged: function(params) {
+ _onUrlChanged: function (params) {
this.fileList.changeDirectory(params.path || params.dir, false, true);
}
};
-$(document).ready(function() {
+$(document).ready(function () {
var App = OCA.Sharing.PublicApp;
// defer app init, to give a chance to plugins to register file actions
- _.defer(function() {
+ _.defer(function () {
App.initialize($('#preview'));
});
if (window.Files) {
// HACK: for oc-dialogs previews that depends on Files:
- Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
+ Files.lazyLoadPreview = function (path, mime, ready, width, height, etag) {
return App.fileList.lazyLoadPreview({
path: path,
mime: mime,
@@ -195,9 +195,10 @@ $(document).ready(function() {
var location = window.location.protocol + '//' + window.location.host + OC.webroot;
var owner = $('#save').data('owner');
var name = $('#save').data('name');
+ var isProtected = $('#save').data('protected') ? 1 : 0;
var url = remote + '/index.php/apps/files#' + 'remote=' + encodeURIComponent(location) // our location is the remote for the other server
- + "&token=" + encodeURIComponent(token) + "&owner=" + encodeURIComponent(owner) + "&name=" + encodeURIComponent(name);
+ + "&token=" + encodeURIComponent(token) + "&owner=" + encodeURIComponent(owner) + "&name=" + encodeURIComponent(name) + "&protected=" + isProtected;
if (remote.indexOf('://') > 0) {
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 4782c4d..ec7c80f 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -128,6 +128,7 @@ if (isset($path)) {
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('dirToken', $linkItem['token']);
$tmpl->assign('sharingToken', $token);
+ $tmpl->assign('protected', isset($linkItem['share_with']) ? 'true' : 'false');
$urlLinkIdentifiers= (isset($token)?'&t='.$token:'')
.(isset($_GET['dir'])?'&dir='.$_GET['dir']:'')
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 92d561e..c053aaa 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -16,7 +16,7 @@
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div class="header-right">
<span id="details">
- <span id="save" data-owner="<?php p($_['displayName'])?>" data-name="<?php p($_['filename'])?>">
+ <span id="save" data-protected="<?php p($_['protected'])?>" data-owner="<?php p($_['displayName'])?>" data-name="<?php p($_['filename'])?>">
<button><?php p($l->t('Save to ownCloud')) ?></button>
<form class="save-form hidden" action="#">
<input type="text" id="remote_address" placeholder="<?php p($l->t('example.com/owncloud')) ?>"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list