[Pkg-owncloud-commits] [owncloud] 93/153: Fixed JS issues in public page
David Prévot
taffit at moszumanska.debian.org
Tue May 27 03:05:41 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 7d98bcf9a2eac2ec8fbba0a521078dea8e240d78
Author: Vincent Petry <pvince81 at owncloud.com>
Date: Tue May 20 13:37:58 2014 +0200
Fixed JS issues in public page
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
---
apps/files_sharing/js/public.js | 35 ++++++++++++++++++++---------------
apps/files_sharing/js/share.js | 18 ++++++++++--------
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index d3d4479..ce9a212 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -18,12 +18,15 @@ OCA.Sharing.PublicApp = {
_initialized: false,
initialize: function($el) {
+ var self = this;
if (this._initialized) {
return;
}
this._initialized = true;
+ this.initialDir = $('#dir').val();
+
// file list mode ?
- if ($el.find('#filestable')) {
+ if ($el.find('#filestable').length) {
this.fileList = new OCA.Files.FileList(
$el,
{
@@ -55,7 +58,7 @@ OCA.Sharing.PublicApp = {
var params = {
x: $(document).width() * window.devicePixelRatio,
a: 'true',
- file: encodeURIComponent($('#dir').val() + $('#filename').val()),
+ file: encodeURIComponent(this.initialDir + $('#filename').val()),
t: $('#sharingToken').val()
};
@@ -112,7 +115,7 @@ OCA.Sharing.PublicApp = {
data.formData = {
requesttoken: $('#publicUploadRequestToken').val(),
dirToken: $('#dirToken').val(),
- subdir: $('input#dir').val(),
+ subdir: self.fileList.getCurrentDirectory(),
file_directory: fileDirectory
};
});
@@ -122,7 +125,7 @@ OCA.Sharing.PublicApp = {
delete this.fileActions.actions.all.Share;
this.fileList.setFileActions(this.fileActions);
- this.fileList.changeDirectory($('#dir').val() || '/', false, true);
+ this.fileList.changeDirectory(this.initialDir || '/', false, true);
// URL history handling
this.fileList.$el.on('changeDirectory', _.bind(this._onDirectoryChanged, this));
@@ -156,16 +159,18 @@ $(document).ready(function() {
var App = OCA.Sharing.PublicApp;
App.initialize($('#preview'));
- // HACK: for oc-dialogs previews that depends on Files:
- Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
- return App.fileList.lazyLoadPreview({
- path: path,
- mime: mime,
- callback: ready,
- width: width,
- height: height,
- etag: etag
- });
- };
+ if (window.Files) {
+ // HACK: for oc-dialogs previews that depends on Files:
+ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
+ return App.fileList.lazyLoadPreview({
+ path: path,
+ mime: mime,
+ callback: ready,
+ width: width,
+ height: height,
+ etag: etag
+ });
+ };
+ }
});
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 973c63c..7d68a8d 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -15,14 +15,16 @@ $(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') {
// TODO: make a separate class for this or a hook or jQuery event ?
- var oldCreateRow = OCA.Files.FileList.prototype._createRow;
- OCA.Files.FileList.prototype._createRow = function(fileData) {
- var tr = oldCreateRow.apply(this, arguments);
- if (fileData.shareOwner) {
- tr.attr('data-share-owner', fileData.shareOwner);
- }
- return tr;
- };
+ if (OCA.Files.FileList) {
+ var oldCreateRow = OCA.Files.FileList.prototype._createRow;
+ OCA.Files.FileList.prototype._createRow = function(fileData) {
+ var tr = oldCreateRow.apply(this, arguments);
+ if (fileData.shareOwner) {
+ tr.attr('data-share-owner', fileData.shareOwner);
+ }
+ return tr;
+ };
+ }
$('#fileList').on('fileActionsReady',function(){
var $fileList = $(this);
--
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