' +
+ '
' +
' ' +
' ' +
' ' +
'
' +
- ' {{/if}}' +
' {{#if publicUpload}}' +
'
' +
' ' +
@@ -86,11 +84,42 @@
view.render();
});
+ this.model.on('change:linkShare', function() {
+ view.render();
+ });
+
if(!_.isUndefined(options.configModel)) {
this.configModel = options.configModel;
} else {
throw 'missing OC.Share.ShareConfigModel';
}
+
+ _.bindAll(this, 'onLinkCheckBoxChange');
+ },
+
+ onLinkCheckBoxChange: function() {
+ var $checkBox = this.$el.find('#linkCheckbox');
+ var $loading = $checkBox.siblings('.icon-loading-small');
+ if(!$loading.hasClass('hidden')) {
+ return false;
+ }
+
+ if($checkBox.is(':checked')) {
+ if(this.configModel.get('enforcePasswordForPublicLink') === false) {
+ $loading.removeClass('hidden');
+ this.model.addLinkShare();
+ } else {
+ this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
+ // TODO drop with IE8 drop
+ if($('html').hasClass('ie8')) {
+ this.$el.find('#linkPassText').attr('placeholder', null);
+ this.$el.find('#linkPassText').val('');
+ }
+ this.$el.find('#linkPassText').focus();
+ }
+ } else {
+ this.model.removeLinkShare();
+ }
},
render: function() {
@@ -142,6 +171,8 @@
mailButtonText: t('core', 'Send')
}));
+ this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+
return this;
},
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index f7de90e264..f6b927c08c 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -96,6 +96,13 @@
sharedByText: sharedByText
}));
+ if(this.configModel.areAvatarsEnabled()) {
+ this.$el.find('.avatar').each(function() {
+ var $this = $(this);
+ $this.avatar($this.data('username'), 32);
+ });
+ }
+
return this;
},
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 4ac669ee2b..895f14508d 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -201,6 +201,17 @@
sharees: this.getShareeList()
}));
+ if(this.configModel.areAvatarsEnabled()) {
+ this.$el.find('.avatar').each(function() {
+ var $this = $(this);
+ $this.avatar($this.data('username'), 32);
+ });
+ this.$el.find('.avatar.imageplaceholderseed').each(function() {
+ var $this = $(this);
+ $this.imageplaceholder($this.data('seed'));
+ });
+ }
+
return this;
},
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 6588da7d42..7a7fe692c1 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -68,9 +68,6 @@
initialize: function(options) {
var view = this;
- this.model.on('change', function() {
- view.render();
- });
this.model.on('fetchError', function() {
OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'));
@@ -82,6 +79,10 @@
throw 'missing OC.Share.ShareConfigModel';
}
+ this.configModel.on('change:isRemoteShareAllowed', function() {
+ view.render();
+ });
+
var subViewOptions = {
model: this.model,
configModel: this.configModel
@@ -188,17 +189,6 @@
this.shareeListView.render();
this.$el.find('.hasTooltip').tooltip();
- if(this.configModel.areAvatarsEnabled()) {
- this.$el.find('.avatar').each(function() {
- var $this = $(this);
- $this.avatar($this.data('username'), 32);
- });
- this.$el.find('.avatar.imageplaceholderseed').each(function() {
- var $this = $(this);
- $this.imageplaceholder($this.data('seed'));
- });
- }
- this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
return this;
},
@@ -216,7 +206,7 @@
_renderRemoteShareInfoPart: function() {
var remoteShareInfo = '';
- if(this.configModel.isRemoteShareAllowed()) {
+ if(this.configModel.get('isRemoteShareAllowed')) {
var infoTemplate = this._getRemoteShareInfoTemplate();
remoteShareInfo = infoTemplate({
docLink: this.configModel.getFederatedShareDocLink(),
@@ -229,7 +219,7 @@
_renderSharePlaceholderPart: function () {
var sharePlaceholder = t('core', 'Share with users or groups …');
- if (this.configModel.isRemoteShareAllowed()) {
+ if (this.configModel.get('isRemoteShareAllowed')) {
sharePlaceholder = t('core', 'Share with users, groups or remote users …');
}
return sharePlaceholder;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 81e905b082..9e153dcb3e 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -89,12 +89,33 @@
linkShare: {}
},
+ addLinkShare: function() {
+ var model = this;
+ var expiration = this.configModel.getDefaultExpirationDateString();
+ var itemType = this.get('itemType');
+ var itemSource = this.get('itemSource');
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, this.fileInfoModel.get('name'), expiration, function(data) {
+ model.fetch();
+ //FIXME: updateIcon belongs to view
+ OC.Share.updateIcon(itemType, itemSource);
+ });
+ },
+
+ removeLinkShare: function() {
+ var model = this;
+ var itemType = this.get('itemType');
+ var itemSource = this.get('itemSource');
+
+ OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+ model.fetch();
+ //FIXME: updateIcon belongs to view
+ OC.Share.updateIcon(itemType, itemSource);
+ });
+ },
+
addShare: function(event, selected, options) {
event.preventDefault();
- //console.warn(selected);
- //return false;
-
var shareType = selected.item.value.shareType;
var shareWith = selected.item.value.shareWith;
var fileName = this.fileInfoModel.get('name');
@@ -121,8 +142,10 @@
}
var model = this;
- OC.Share.share(this.get('itemType'), this.get('itemSource'), shareType, shareWith, permissions, fileName, options.expiration, function() {
- model.fetch()
+ var itemType = this.get('itemType');
+ var itemSource = this.get('itemSource');
+ OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, fileName, options.expiration, function() {
+ model.fetch();
//FIXME: updateIcon belongs to view
OC.Share.updateIcon(itemType, itemSource);
});