From f9c232c4ce16b101fce233f1f20e0cafc7e4d1fa Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 15:40:50 +0200
Subject: split off linkShareView

---
 core/js/sharedialoglinkshareview.js | 143 ++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 core/js/sharedialoglinkshareview.js

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
new file mode 100644
index 00000000000..ccd705803f6
--- /dev/null
+++ b/core/js/sharedialoglinkshareview.js
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+			'<div id="link" class="linkShare">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'    <br />' +
+			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
+			'    <input id="linkText" type="text" readonly="readonly" />' +
+			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'    <div id="linkPass">' +
+			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
+			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'    </div>' +
+			'    {{#if publicUpload}}' +
+			'    <div id="allowPublicUploadWrapper" class="hidden">' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'    </div>' +
+			'    {{/if}}' +
+			'    {{#if mailPublicNotificationEnabled}}' +
+			'    <form id="emailPrivateLink">' +
+			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'    </form>' +
+			'    {{/if}}' +
+			'</div>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogLinkShareView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogLinkShareView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogLinkShare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		/** @type {boolean} **/
+		showLink: true,
+
+		initialize: function(options) {
+			var view = this;
+
+			this.model.on('change:permissions', function() {
+				view.render();
+			});
+
+			this.model.on('change:itemType', function() {
+				view.render();
+			});
+
+			this.model.on('change:allowPublicUploadStatus', function() {
+				view.render();
+			});
+
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
+		},
+
+		render: function() {
+			if(    !this.model.hasSharePermission()
+				|| !this.showLink
+				|| !this.configModel.isShareWithLinkAllowed())
+			{
+				this.$el.empty();
+				return this;
+			}
+
+			var publicUpload =
+				this.model.isFolder()
+				&& this.model.hasCreatePermission()
+				&& this.configModel.isPublicUploadEnabled();
+
+			var publicUploadChecked = '';
+			if(this.model.isPublicUploadAllowed()) {
+				publicUploadChecked = 'checked="checked"';
+			}
+
+			var linkShareTemplate = this.template();
+			this.$el.empty();
+			this.$el.append(linkShareTemplate({
+				linkShareLabel: t('core', 'Share link'),
+				urlLabel: t('core', 'Link'),
+				enablePasswordLabel: t('core', 'Password protect'),
+				passwordLabel: t('core', 'Password'),
+				passwordPlaceholder: t('core', 'Choose a password for the public link'),
+				publicUpload: publicUpload,
+				publicUploadChecked: publicUploadChecked,
+				publicUploadLabel: t('core', 'Allow editing'),
+				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+				mailPrivatePlaceholder: t('core', 'Email link to person'),
+				mailButtonText: t('core', 'Send')
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogLinkShareView = ShareDialogLinkShareView;
+
+})();
-- 
cgit v1.2.3


From 6af6024e172bc4810691f54ccaa2da6912395962 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 20:29:12 +0200
Subject: integraton noshare part into ShareDialogLinkShareView

---
 core/js/sharedialoglinkshareview.js | 52 +++++++++++++++++++++----------------
 core/js/sharedialogview.js          | 25 +++---------------
 2 files changed, 33 insertions(+), 44 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index ccd705803f6..ca6413761b0 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -14,32 +14,34 @@
 	}
 
 	var TEMPLATE =
-			'<div id="link" class="linkShare">' +
+			'{{#if shareAllowed}}' +
+			'<span class="icon-loading-small hidden"></span>' +
+			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'<br />' +
+			'<label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
+			'<input id="linkText" type="text" readonly="readonly" />' +
+			'<input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'<div id="linkPass">' +
+			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
+			'    <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
 			'    <span class="icon-loading-small hidden"></span>' +
-			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
-			'    <br />' +
-			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
-			'    <input id="linkText" type="text" readonly="readonly" />' +
-			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
-			'    <div id="linkPass">' +
-			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
-			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'    </div>' +
+			'</div>' +
 			'    {{#if publicUpload}}' +
-			'    <div id="allowPublicUploadWrapper" class="hidden">' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
-			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
-			'    </div>' +
+			'<div id="allowPublicUploadWrapper" class="hidden">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'    <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'</div>' +
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
-			'    <form id="emailPrivateLink">' +
-			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
-			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
-			'    </form>' +
+			'<form id="emailPrivateLink">' +
+			'    <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'    <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'</form>' +
 			'    {{/if}}' +
-			'</div>'
+			'{{else}}' +
+			'<input id="shareWith" type="text" placeholder="{{noSharingPlaceholder}}" disabled="disabled"/>' +
+			'{{/if}}'
 		;
 
 	/**
@@ -88,11 +90,17 @@
 		},
 
 		render: function() {
+			var linkShareTemplate = this.template();
+
 			if(    !this.model.hasSharePermission()
 				|| !this.showLink
 				|| !this.configModel.isShareWithLinkAllowed())
 			{
 				this.$el.empty();
+				this.$el.append(linkShareTemplate({
+					shareAllowed: false,
+					noSharingPlaceholder: t('core', 'Resharing is not allowed')
+				}));
 				return this;
 			}
 
@@ -106,9 +114,9 @@
 				publicUploadChecked = 'checked="checked"';
 			}
 
-			var linkShareTemplate = this.template();
 			this.$el.empty();
 			this.$el.append(linkShareTemplate({
+				shareAllowed: true,
 				linkShareLabel: t('core', 'Share link'),
 				urlLabel: t('core', 'Link'),
 				enablePasswordLabel: t('core', 'Password protect'),
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index b33130a83dc..63c3473252f 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -24,11 +24,7 @@
 		'{{{remoteShareInfo}}}' +
 		'<ul id="shareWithList">' +
 		'</ul>' +
-		'{{#if shareAllowed}}' +
 		'<div class="linkShareView"></div>' +
-		'{{else}}' +
-		'{{{noSharing}}}' +
-		'{{/if}}' +
 		'<div class="expirationView"></div>'
 		;
 
@@ -114,21 +110,17 @@
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
-				shareAllowed: this.model.hasSharePermission(),
-				noSharing: this._renderNoSharing(),
 			}));
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
 
+			this.linkShareView.$el = this.$el.find('.linkShareView');
+			this.linkShareView.render();
+
 			this.expirationView.$el = this.$el.find('.expirationView');
 			this.expirationView.render();
 
-			if(this.model.hasSharePermission()) {
-				this.linkShareView.$el = this.$el.find('.linkShareView');
-				this.linkShareView.render();
-			}
-
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
@@ -169,17 +161,6 @@
 			return sharePlaceholder;
 		},
 
-		_renderNoSharing: function () {
-			var noSharing = '';
-			if(!this.model.hasSharePermission()) {
-				var noSharingTemplate = this._getTemplate('noSharing', TEMPLATE_NO_SHARING);
-				noSharing = noSharingTemplate({
-					placeholder: t('core', 'Resharing is not allowed')
-				});
-			}
-			return noSharing;
-		},
-
 		/**
 		 *
 		 * @param {string} key - an identifier for the template
-- 
cgit v1.2.3


From fdb95613e9b133feed7b7dbad22dc289a54ef094 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 24 Aug 2015 23:20:01 +0200
Subject: simplification, and throwing where throwing is needed

---
 core/js/sharedialogexpirationview.js   | 5 ++---
 core/js/sharedialoglinkshareview.js    | 8 +++-----
 core/js/sharedialogresharerinfoview.js | 5 ++---
 core/js/sharedialogview.js             | 2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index e752c66bf35..4c628f5498a 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -48,7 +48,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 		},
 
@@ -64,8 +64,7 @@
 			}
 
 			var expirationTemplate = this.template();
-			this.$el.empty();
-			this.$el.append(expirationTemplate({
+			this.$el.html(expirationTemplate({
 				setExpirationLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
 				expirationDatePlaceholder: t('core', 'Expiration date'),
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index ca6413761b0..ff22b629dc4 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -85,7 +85,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 		},
 
@@ -96,8 +96,7 @@
 				|| !this.showLink
 				|| !this.configModel.isShareWithLinkAllowed())
 			{
-				this.$el.empty();
-				this.$el.append(linkShareTemplate({
+				this.$el.html(linkShareTemplate({
 					shareAllowed: false,
 					noSharingPlaceholder: t('core', 'Resharing is not allowed')
 				}));
@@ -114,8 +113,7 @@
 				publicUploadChecked = 'checked="checked"';
 			}
 
-			this.$el.empty();
-			this.$el.append(linkShareTemplate({
+			this.$el.html(linkShareTemplate({
 				shareAllowed: true,
 				linkShareLabel: t('core', 'Share link'),
 				urlLabel: t('core', 'Link'),
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 8970d857fc3..63df25b4ed8 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -58,7 +58,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 		},
 
@@ -90,8 +90,7 @@
 				);
 			}
 
-			this.$el.empty();
-			this.$el.append(reshareTemplate({
+			this.$el.html(reshareTemplate({
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				sharedByText: sharedByText
 			}));
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 63c3473252f..e07a5cee49a 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -81,7 +81,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 
 			var subViewOptions = {
-- 
cgit v1.2.3


From 5db1db38efffc2110e34886263f3a1117fe8efa5 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 1 Sep 2015 12:43:04 +0200
Subject: continue to reimplement sharee list view. still WIP

---
 core/js/sharedialoglinkshareview.js    |   4 +-
 core/js/sharedialogresharerinfoview.js |   3 +-
 core/js/sharedialogshareelistview.js   | 113 ++++++++++++++++--
 core/js/sharedialogview.js             |  14 ++-
 core/js/shareitemmodel.js              | 212 ++++++++++++++++++++++++++++++++-
 5 files changed, 327 insertions(+), 19 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index ff22b629dc4..eebf8a34247 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -92,7 +92,7 @@
 		render: function() {
 			var linkShareTemplate = this.template();
 
-			if(    !this.model.hasSharePermission()
+			if(    !this.model.sharePermissionPossible()
 				|| !this.showLink
 				|| !this.configModel.isShareWithLinkAllowed())
 			{
@@ -105,7 +105,7 @@
 
 			var publicUpload =
 				this.model.isFolder()
-				&& this.model.hasCreatePermission()
+				&& this.model.createPermissionPossible()
 				&& this.configModel.isPublicUploadEnabled();
 
 			var publicUploadChecked = '';
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 63df25b4ed8..f7de90e264f 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -16,7 +16,7 @@
 	var TEMPLATE =
 		'<span class="reshare">' +
 		'    {{#if avatarEnabled}}' +
-		'    <div class="avatar"></div>' +
+		'    <div class="avatar" data-userName="{{reshareOwner}}"></div>' +
 		'    {{/if}}' +
 		'    {{sharedByText}}' +
 		'</span><br/>'
@@ -92,6 +92,7 @@
 
 			this.$el.html(reshareTemplate({
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
+				reshareOwner: this.model.getReshareOwner(),
 				sharedByText: sharedByText
 			}));
 
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 177e0b4a899..8179926ad51 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -16,18 +16,41 @@
 	var TEMPLATE =
 			'<ul id="shareWithList">' +
 			'{{#each sharees}}' +
+			'    {{#if isCollection}}' +
+			'    <li data-collection="{{collectionID}}">{{text}}</li>' +
+			'    {{/if}}' +
+			'    {{#unless isCollection}}' +
 			'    <li data-share-type="{{shareType}}" data-share-with="{{shareWith}}" title="{{shareWith}}">' +
 			'        <a href="#" class="unshare"><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' +
 			'        {{#if avatarEnabled}}' +
-			'        <div class="avatar"></div>' +
+			'        <div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
 			'        {{/if}}' +
 			'        <span class="username">{{shareWithDisplayName}}</span>' +
 			'        {{#if mailPublicNotificationEnabled}} {{#unless isRemoteShare}}' +
-			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{isMailSent}} />{{notifyByMailLabel}}</label>' +
+			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{#if wasMailSent}}checked="checked"{{/if}} />{{notifyByMailLabel}}</label>' +
 			'        {{/unless}} {{/if}}' +
-			'        {{#if isResharingAllowed}} {{#if hasSharePermission}}' +
+			'        {{#if isResharingAllowed}} {{#if sharePermissionPossible}}' +
+			'        <label><input id="canShare-{{shareWith}}" type="checkbox" name="share" class="permissions" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />{{canShareLabel}}</label>' +
 			'        {{/if}} {{/if}}' +
+			'        {{#if editPermissionPossible}}' +
+			'        <label><input id="canEdit-{{shareWith}}" type="checkbox" name="edit" class="permissions" {{#if hasEditPermission}}checked="checked"{{/if}} />{{canEditLabel}}</label>' +
+			'        {{/if}}' +
+			'        {{#unless isRemoteShare}}' +
+			'        <a href="#" class="showCruds"><img class="svg" alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
+			'        <div class="cruds" class="hidden">' +
+			'            {{#if createPermissionPossible}}' +
+			'            <label><input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>{{createPermissionLabel}}</label>' +
+			'            {{/if}}' +
+			'            {{#if updatePermissionPossible}}' +
+			'            <label><input id="canUpdate-{{shareWith}}" type="checkbox" name="update" class="permissions" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>{{updatePermissionLabel}}</label>' +
+			'            {{/if}}' +
+			'            {{#if deletePermissionPossible}}' +
+			'            <label><input id="canDelete-{{shareWith}}" type="checkbox" name="delete" class="permissions" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>{{deletePermissionLabel}}</label>' +
+			'            {{/if}}' +
+			'        </div>' +
+			'        {{/unless}}' +
 			'    </li>' +
+			'    {{/unless}}' +
 			'{{/each}}' +
 			'</ul>'
 		;
@@ -61,6 +84,54 @@
 			} else {
 				throw 'missing OC.Share.ShareConfigModel';
 			}
+
+			var view = this;
+			this.model.on('change:shares', function() {
+				view.render();
+			});
+		},
+
+		getCollectionObject: function(shareIndex) {
+			var type = this.model.getCollectionType(shareIndex);
+			var id = this.model.getCollectionPath(shareIndex);
+			if(type !== 'file' && type !== 'folder') {
+				id = this.model.getCollectionSource(shareIndex);
+			}
+			return {
+				collectionID: id,
+				text: t('core', 'Shared in {item} with {user}', {'item': id, user: this.model.getShareWithDisplayName(shareIndex)})
+			}
+		},
+
+		/**
+		 *
+		 * @param {OC.Share.Types.ShareInfo} shareInfo
+		 * @returns {object}
+		 */
+		getShareeObject: function(shareIndex) {
+			var shareWith = this.model.getShareWith(shareIndex);
+			var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex);
+			var shareType = this.model.getShareType(shareIndex);
+
+			if (shareType === OC.Share.SHARE_TYPE_GROUP) {
+				shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
+			} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
+				shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
+			}
+
+
+			return {
+				hasSharePermission: this.model.hasSharePermission(shareIndex),
+				hasEditPermission: this.model.hasEditPermission(shareIndex),
+				hasCreatePermission: this.model.hasCreatePermission(shareIndex),
+				hasUpdatePermission: this.model.hasUpdatePermission(shareIndex),
+				hasDeletePermission: this.model.hasDeletePermission(shareIndex),
+				wasMailSent: this.model.notificationMailWasSent(shareIndex),
+				shareWith: shareWith,
+				shareWithDisplayName: shareWithDisplayName,
+				shareType: shareType,
+				modSeed: shareType !== OC.Share.SHARE_TYPE_USER
+			};
 		},
 
 		getShareeList: function() {
@@ -69,23 +140,49 @@
 				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
 				notifyByMailLabel: t('core', 'notify by email'),
 				unshareLabel: t('core', 'Unshare'),
-				unshareImage: OC.imagePath('core', 'actions/delete')
+				unshareImage: OC.imagePath('core', 'actions/delete'),
+				canShareLabel: t('core', 'can share'),
+				canEditLabel: t('core', 'can edit'),
+				createPermissionLabel: t('core', 'create'),
+				updatePermissionLabel: t('core', 'change'),
+				deletePermissionLabel: t('core', 'delete'),
+				crudsLabel: t('core', 'access control'),
+				triangleSImage: OC.imagePath('core', 'actions/triangle-s'),
+				isResharingAllowed: this.configModel.isResharingAllowed(),
+				sharePermissionPossible: this.model.sharePermissionPossible(),
+				editPermissionPossible: this.model.editPermissionPossible(),
+				createPermissionPossible: this.model.createPermissionPossible(),
+				updatePermissionPossible: this.model.updatePermissionPossible(),
+				deletePermissionPossible: this.model.deletePermissionPossible(),
+				sharePermission: OC.PERMISSION_SHARE,
+				createPermission: OC.PERMISSION_CREATE,
+				updatePermission: OC.PERMISSION_UPDATE,
+				deletePermission: OC.PERMISSION_DELETE
 			};
 
 			// TODO: sharess must have following attributes
-			// shareType
-			// shareWith
-			// shareWithDisplayName
 			// isRemoteShare
 			// isMailSent
 
-			var list = _.extend({}, universal);
+			if(!this.model.hasShares()) {
+				return [];
+			}
+
+			var list = [];
+			for(var index in this.model.get('shares')) {
+				if(this.model.isCollection(index)) {
+					list.unshift(this.getCollectionObject(index));
+				} else {
+					list.push(_.extend(this.getShareeObject(index), universal))
+				}
+			}
 
 			return list;
 		},
 
 		render: function() {
 			var shareeListTemplate = this.template();
+			var list = this.getShareeList();
 			this.$el.html(shareeListTemplate({
 				sharees: this.getShareeList()
 			}));
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 2348c14bb88..9bfe38eea3c 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -63,6 +63,9 @@
 		/** @type {object} **/
 		expirationView: undefined,
 
+		/** @type {object} **/
+		shareeListView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -118,11 +121,18 @@
 			this.expirationView.render();
 
 			this.shareeListView.$el = this.$el.find('.shareeListView');
-			this.shareeListView.redner();
+			this.shareeListView.render();
 
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
-				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+				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/shareitemmodel.js b/core/js/shareitemmodel.js
index c5d0581390c..b5370faca0a 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -14,6 +14,13 @@
 		OC.Share.Types = {};
 	}
 
+	/**
+	 * @typedef {object} OC.Share.Types.Collection
+	 * @property {string} item_type
+	 * @property {string} path
+	 * @property {string} item_source TODO: verify
+	 */
+
 	/**
 	 * @typedef {object} OC.Share.Types.Reshare
 	 * @property {string} uid_owner
@@ -33,7 +40,7 @@
 	 * @property {string} share_with
 	 * @property {string} share_with_displayname
 	 * @property {string} share_mail_send
-	 * @property {bool} collection //TODO: verify
+	 * @property {OC.Share.Types.Collection|undefined} collection
 	 * @property {Date} expiration optional?
 	 * @property {number} stime optional?
 	 */
@@ -95,13 +102,79 @@
 		},
 
 		/**
-		 * whether this item has reshare information
+		 * whether this item has share information
 		 * @returns {boolean}
 		 */
 		hasShares: function() {
-			return _.isObject(this.get('shares'));
+			var shares = this.get('shares');
+			return _.isArray(this.get('shares'));
 		},
 
+		/**
+		 * @param {number} shareIndex
+		 * @returns {string}
+		 */
+		getCollectionType: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			} else if(_.isUndefined(share.collection)) {
+				throw "Share is not a collection";
+			}
+
+			return share.collection.item_type;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {string}
+		 */
+		getCollectionPath: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			} else if(_.isUndefined(share.collection)) {
+				throw "Share is not a collection";
+			}
+
+			return share.collection.path;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {string}
+		 */
+		getCollectionSource: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			} else if(_.isUndefined(share.collection)) {
+				throw "Share is not a collection";
+			}
+
+			return share.collection.item_source;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		isCollection: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			if(_.isUndefined(share.collection)) {
+				return false;
+			}
+			return true;
+		},
+
+
 		/**
 		 * @returns {string}
 		 */
@@ -131,20 +204,145 @@
 			return this.get('reshare').share_type;
 		},
 
+		/**
+		 * @param shareIndex
+		 * @returns {string}
+		 */
+		getShareWith: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_with;
+		},
+
+		/**
+		 * @param shareIndex
+		 * @returns {string}
+		 */
+		getShareWithDisplayName: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_with_displayname;
+		},
+
+		getShareType: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_type;
+		},
+
+		/**
+		 * whether a share from shares has the requested permission
+		 *
+		 * @param {number} shareIndex
+		 * @param {number} permission
+		 * @returns {boolean}
+		 * @private
+		 */
+		_shareHasPermission: function(shareIndex, permission) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return (share.permissions & permission) === permission;
+		},
+
+		notificationMailWasSent: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_mail_send === '1';
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-		hasSharePermission: function() {
+		sharePermissionPossible: function() {
 			return (this.get('permissions') & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
 		},
 
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasSharePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_SHARE);
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-		hasCreatePermission: function() {
+		createPermissionPossible: function() {
 			return (this.get('permissions') & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE;
 		},
 
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasCreatePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_CREATE);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		updatePermissionPossible: function() {
+			return (this.get('permissions') & OC.PERMISSION_UPDATE) === OC.PERMISSION_UPDATE;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasUpdatePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_UPDATE);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		deletePermissionPossible: function() {
+			return (this.get('permissions') & OC.PERMISSION_DELETE) === OC.PERMISSION_DELETE;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasDeletePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_DELETE);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		editPermissionPossible: function() {
+			return    this.createPermissionPossible()
+				   || this.updatePermissionPossible()
+				   || this.deletePermissionPossible();
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		hasEditPermission: function(shareIndex) {
+			return    this.hasCreatePermission(shareIndex)
+				   || this.hasUpdatePermission(shareIndex)
+				   || this.hasDeletePermission(shareIndex);
+		},
+
 		fetch: function() {
 			var model = this;
 			OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
@@ -159,6 +357,8 @@
 				return {};
 			}
 
+			console.log(data.shares);
+
 			var permissions = this.get('possiblePermissions');
 			if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions)) {
 				permissions = permissions & data.reshare.permissions;
@@ -176,7 +376,7 @@
 
 			return {
 				reshare: data.reshare,
-				shares: data.shares,
+				shares: $.map(data.shares, function(value) { return [value]; }),
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-- 
cgit v1.2.3


From ce1b0c650e3a0e4cb701609ee08a13182909219a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 3 Sep 2015 15:53:17 +0200
Subject: show link share

---
 apps/files_sharing/js/sharetabview.js |  6 ++--
 core/css/share.css                    |  4 ---
 core/js/shareconfigmodel.js           |  3 +-
 core/js/sharedialogexpirationview.js  | 10 ++++--
 core/js/sharedialoglinkshareview.js   | 32 ++++++++++++++------
 core/js/shareitemmodel.js             | 57 +++++++++++++++++++++++++++++++++--
 6 files changed, 92 insertions(+), 20 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 11f25c0c47c..6836107306a 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -45,7 +45,6 @@
 			}
 
 			if (this.model) {
-				console.log(this.model);
 				var owner = this.model.get('shareOwner');
 				if (owner === OC.currentUser) {
 					owner = null;
@@ -59,8 +58,11 @@
 				   	itemSource: this.model.get('id'),
 					possiblePermissions: this.model.get('sharePermissions')
 				};
-				var shareModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
 				var configModel = new OC.Share.ShareConfigModel();
+				var shareModel = new OC.Share.ShareItemModel(attributes, {
+					configModel: configModel,
+					fileInfoModel: this.model
+				});
 				this._dialog = new OC.Share.ShareDialogView({
 					configModel: configModel,
 					model: shareModel
diff --git a/core/css/share.css b/core/css/share.css
index 0d687cb76da..bdf34e9a863 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -126,10 +126,6 @@ a.unshare {
 	margin-right: 0;
 }
 
-#linkText,#linkPass,#expiration {
-	display:none;
-}
-
 #link #showPassword img {
 	padding-left:5px;
 	width:12px;
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index e948c57cbac..846b2692ecb 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -16,7 +16,8 @@
 
 	var ShareConfigModel = OC.Backbone.Model.extend({
 		defaults: {
-			publicUploadEnabled: false
+			publicUploadEnabled: false,
+			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink
 		},
 
 		/**
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 4c628f5498a..9fb404a090e 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -14,11 +14,14 @@
 	}
 
 	var TEMPLATE =
+			// well that could go to linkShareView…
+			'{{#if isLinkShare}}' +
 			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" />' +
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
 			'<label for="expirationDate" class="hidden-visually">{{expirationLabel}}</label>' +
 			'<input id="expirationDate" type="text" placeholder="{{expirationDatePlaceholder}}" class="hidden" />' +
-			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>'
+			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
+			'{{/if}}'
 		;
 
 	/**
@@ -44,6 +47,8 @@
 		/** @type {boolean} **/
 		showLink: true,
 
+		className: 'hidden',
+
 		initialize: function(options) {
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
@@ -68,7 +73,8 @@
 				setExpirationLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
 				expirationDatePlaceholder: t('core', 'Expiration date'),
-				defaultExpireMessage: defaultExpireMessage
+				defaultExpireMessage: defaultExpireMessage,
+				isLinkShare: this.model.get('linkShare').isLinkShare
 			}));
 
 			return this;
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index eebf8a34247..373d6d180bc 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -16,16 +16,20 @@
 	var TEMPLATE =
 			'{{#if shareAllowed}}' +
 			'<span class="icon-loading-small hidden"></span>' +
-			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" {{#if isLinkShare}}checked="checked"{{/if}} /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
 			'<br />' +
 			'<label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
-			'<input id="linkText" type="text" readonly="readonly" />' +
-			'<input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'<input id="linkText" {{#unless isLinkShare}}class="hidden"{{/unless}} type="text" readonly="readonly" value="{{shareLinkURL}}" />' +
+			'   {{#if showPasswordCheckBox}}' +
+			'<input type="checkbox" name="showPassword" id="showPassword" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" /><label for="showPassword">{{enablePasswordLabel}}</label>' +
+			'   {{/if}}' +
+			'   {{#if isPasswordSet}}' +
 			'<div id="linkPass">' +
 			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
-			'    <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
+			'    <input id="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" />' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
+			'   {{/if}}' +
 			'    {{#if publicUpload}}' +
 			'<div id="allowPublicUploadWrapper" class="hidden">' +
 			'    <span class="icon-loading-small hidden"></span>' +
@@ -35,8 +39,8 @@
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
 			'<form id="emailPrivateLink">' +
-			'    <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
-			'    <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'    <input id="email" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'    <input id="emailButton" type="submit" value="{{mailButtonText}}" />' +
 			'</form>' +
 			'    {{/if}}' +
 			'{{else}}' +
@@ -113,17 +117,27 @@
 				publicUploadChecked = 'checked="checked"';
 			}
 
+			var isLinkShare = this.model.get('linkShare').isLinkShare;
+			var isPasswordSet = !!this.model.get('linkShare').password;
+			var showPasswordCheckBox = isLinkShare
+				&& (   !this.configModel.get('enforcePasswordForPublicLink')
+					|| !this.model.get('linkShare').password);
+
 			this.$el.html(linkShareTemplate({
 				shareAllowed: true,
+				isLinkShare: isLinkShare,
+				shareLinkURL: this.model.get('linkShare').link,
 				linkShareLabel: t('core', 'Share link'),
 				urlLabel: t('core', 'Link'),
 				enablePasswordLabel: t('core', 'Password protect'),
 				passwordLabel: t('core', 'Password'),
-				passwordPlaceholder: t('core', 'Choose a password for the public link'),
-				publicUpload: publicUpload,
+				passwordPlaceholder: isPasswordSet ? '**********' : t('core', 'Choose a password for the public link'),
+				isPasswordSet: isPasswordSet,
+				showPasswordCheckBox: showPasswordCheckBox,
+				publicUpload: publicUpload && isLinkShare,
 				publicUploadChecked: publicUploadChecked,
 				publicUploadLabel: t('core', 'Allow editing'),
-				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+				mailPublicNotificationEnabled: isLinkShare && this.configModel.isMailPublicNotificationEnabled(),
 				mailPrivatePlaceholder: t('core', 'Email link to person'),
 				mailButtonText: t('core', 'Send')
 			}));
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index acaa890be11..e8371e16e0a 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -14,6 +14,14 @@
 		OC.Share.Types = {};
 	}
 
+	/**
+	 * @typedef {object} OC.Share.Types.LinkShareInfo
+	 * @property {bool} isLinkShare
+	 * @property {string} token
+	 * @property {string|null} password
+	 * @property {string} link
+	 */
+
 	/**
 	 * @typedef {object} OC.Share.Types.Collection
 	 * @property {string} item_type
@@ -49,6 +57,7 @@
 	 * @typedef {object} OC.Share.Types.ShareItemInfo
 	 * @property {OC.Share.Types.Reshare} reshare
 	 * @property {OC.Share.Types.ShareInfo[]} shares
+	 * @property {OC.Share.Types.LinkShareInfo|undefined} linkShare
 	 */
 
 	/**
@@ -64,11 +73,16 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			}
+			if(!_.isUndefined(options.fileInfoModel)) {
+				/** @type {OC.Files.FileInfo} **/
+				this.fileInfoModel = options.fileInfoModel;
+			}
 		},
 
 		defaults: {
 			allowPublicUploadStatus: false,
-			permissions: 0
+			permissions: 0,
+			linkShare: {}
 		},
 
 		/**
@@ -186,7 +200,6 @@
 		 * @returns {string}
 		 */
 		getReshareOwnerDisplayname: function() {
-			return 'foo';
 			return this.get('reshare').displayname_owner;
 		},
 
@@ -399,12 +412,52 @@
 				});
 			}
 
+			/** @type {OC.Share.Types.ShareInfo[]} **/
 			var shares = _.toArray(data.shares);
 			this.legacyFillCurrentShares(shares);
 
+			var linkShare = { isLinkShare: false };
+			// filter out the share by link
+			shares = _.reject(shares,
+				/**
+				 * @param {OC.Share.Types.ShareInfo} share
+				 */
+				function(share) {
+					var isShareLink =
+						share.share_type === OC.Share.SHARE_TYPE_LINK
+						&& (   share.file_source === this.get('itemSource')
+						|| share.item_source === this.get('itemSource'));
+
+					if (isShareLink) {
+						var link = window.location.protocol + '//' + window.location.host;
+						if (!share.token) {
+							// pre-token link
+							var fullPath = this.fileInfoModel.get('path') + '/' +
+								this.fileInfoModel.get('name');
+							var location = '/' + OC.currentUser + '/files' + fullPath;
+							var type = this.fileInfoModel.isDirectory() ? 'folder' : 'file';
+							link += OC.linkTo('', 'public.php') + '?service=files&' +
+								type + '=' + encodeURIComponent(location);
+						} else {
+							link += OC.generateUrl('/s/') + share.token;
+						}
+						linkShare = {
+							isLinkShare: true,
+							token: share.token,
+							password: share.share_with,
+							link: link
+						};
+
+						return share;
+					}
+				},
+				this
+			);
+
 			return {
 				reshare: data.reshare,
 				shares: shares,
+				linkShare: linkShare,
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-- 
cgit v1.2.3


From f29b51682bc0be785e1a3e4e5901db3255e4a377 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 14:21:14 +0200
Subject: share and unshare via link (not yet password). also some internal
 changes to reduce unnecessary rendering

---
 core/js/share.js                       | 74 ----------------------------------
 core/js/shareconfigmodel.js            | 23 +++++++----
 core/js/sharedialogexpirationview.js   | 22 ++++++++--
 core/js/sharedialoglinkshareview.js    | 37 +++++++++++++++--
 core/js/sharedialogresharerinfoview.js |  7 ++++
 core/js/sharedialogshareelistview.js   | 11 +++++
 core/js/sharedialogview.js             | 22 +++-------
 core/js/shareitemmodel.js              | 33 ++++++++++++---
 8 files changed, 121 insertions(+), 108 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/share.js b/core/js/share.js
index bd87ab10d40..6581c401281 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -956,80 +956,6 @@ $(document).ready(function() {
 			permissions);
 	});
 
-	$(document).on('change', '#dropdown #linkCheckbox', function() {
-		var $dropDown = $('#dropdown');
-		var itemType = $dropDown.data('item-type');
-		var itemSource = $dropDown.data('item-source');
-		var itemSourceName = $dropDown.data('item-source-name');
-		var $loading = $dropDown.find('#link .icon-loading-small');
-		var $button = $(this);
-
-		if (!$loading.hasClass('hidden')) {
-			// already in progress
-			return false;
-		}
-
-		if (this.checked) {
-			// Reset password placeholder
-			$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
-			// Reset link
-			$('#linkText').val('');
-			$('#showPassword').prop('checked', false);
-			$('#linkPass').hide();
-			$('#sharingDialogAllowPublicUpload').prop('checked', false);
-			$('#expirationCheckbox').prop('checked', false);
-			$('#expirationDate').hide();
-			var expireDateString = '';
-			// Create a link
-			if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
-				expireDateString = OC.Share.getDefaultExpirationDate();
-				$loading.removeClass('hidden');
-				$button.addClass('hidden');
-				$button.prop('disabled', true);
-
-				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expireDateString, function(data) {
-					$loading.addClass('hidden');
-					$button.removeClass('hidden');
-					$button.prop('disabled', false);
-					OC.Share.showLink(data.token, null, itemSource);
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-				});
-			} else {
-				$('#linkPass').slideToggle(OC.menuSpeed);
-				// TODO drop with IE8 drop
-				if($('html').hasClass('ie8')) {
-					$('#linkPassText').attr('placeholder', null);
-					$('#linkPassText').val('');
-				}
-				$('#linkPassText').focus();
-			}
-			if (expireDateString !== '') {
-				OC.Share.showExpirationDate(expireDateString);
-			}
-		} else {
-			// Delete private link
-			OC.Share.hideLink();
-			$('#expiration').slideUp(OC.menuSpeed);
-			if ($('#linkText').val() !== '') {
-				$loading.removeClass('hidden');
-				$button.addClass('hidden');
-				$button.prop('disabled', true);
-				OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
-					$loading.addClass('hidden');
-					$button.removeClass('hidden');
-					$button.prop('disabled', false);
-					OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-					if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-						$('#expiration').slideUp(OC.menuSpeed);
-					}
-				});
-			}
-		}
-	});
-
 	$(document).on('click', '#dropdown #linkText', function() {
 		$(this).focus();
 		$(this).select();
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 98280e01eb6..c6891154c98 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -19,6 +19,8 @@
 			publicUploadEnabled: false,
 			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
 			isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
+			isDefaultExpireDateEnabled: oc_appconfig.core.defaultExpireDateEnabled === true,
+			isRemoteShareAllowed: oc_appconfig.core.remoteShareAllowed,
 			defaultExpireDate: oc_appconfig.core.defaultExpireDate,
 			isResharingAllowed: oc_appconfig.core.resharingAllowed
 		},
@@ -45,13 +47,6 @@
 			return $('input:hidden[name=mailPublicNotificationEnabled]').val() === 'yes';
 		},
 
-		/**
-		 * @returns {boolean}
-		 */
-		isRemoteShareAllowed: function() {
-			return oc_appconfig.core.remoteShareAllowed;
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
@@ -64,6 +59,20 @@
 		 */
 		getFederatedShareDocLink: function() {
 			return oc_appconfig.core.federatedCloudShareDoc;
+		},
+
+		getDefaultExpirationDateString: function () {
+			var expireDateString = '';
+			if (this.get('isDefaultExpireDateEnabled')) {
+				var date = new Date().getTime();
+				var expireAfterMs = this.get('defaultExpireDate') * 24 * 60 * 60 * 1000;
+				var expireDate = new Date(date + expireAfterMs);
+				var month = expireDate.getMonth() + 1;
+				var year = expireDate.getFullYear();
+				var day = expireDate.getDate();
+				expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
+			}
+			return expireDateString;
 		}
 	});
 
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 56473cdb1fa..f244fe56548 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -24,7 +24,7 @@
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
 			'    {{#if isExpirationSet}}' +
 			'<label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
-			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" />' +
+			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{expirationValue}}" />' +
 			'    {{/if}}' +
 			'    {{#if isExpirationEnforced}}' +
 				// originally the expire message was shown when a default date was set, however it never had text
@@ -64,13 +64,28 @@
 			} else {
 				throw 'missing OC.Share.ShareConfigModel';
 			}
+
+			var view = this;
+			this.configModel.on('change:isDefaultExpireDateEnforced', function() {
+				view.render();
+			});
+
+			this.model.on('change:itemType', function() {
+				view.render();
+			});
+
+			this.model.on('change:linkShare', function() {
+				view.render();
+			});
 		},
 
 		render: function() {
 			var defaultExpireMessage = '';
 			var defaultExpireDays = this.configModel.get('defaultExpireDate');
+			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+
 			if(    (this.model.isFolder() || this.model.isFile())
-				&& this.configModel.get('isDefaultExpireDateEnforced')) {
+				&& isExpirationEnforced) {
 				defaultExpireMessage = t(
 					'core',
 					'The public link will expire no later than {days} days after it is created',
@@ -79,7 +94,6 @@
 			}
 
 			var isExpirationSet = !!this.model.get('linkShare').expiration;
-			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
 
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
@@ -120,6 +134,8 @@
 				});
 			}
 
+			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
+
 			return this;
 		},
 
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 373d6d180bc..b94f1c3e70b 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -23,13 +23,11 @@
 			'   {{#if showPasswordCheckBox}}' +
 			'<input type="checkbox" name="showPassword" id="showPassword" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" /><label for="showPassword">{{enablePasswordLabel}}</label>' +
 			'   {{/if}}' +
-			'   {{#if isPasswordSet}}' +
-			'<div id="linkPass">' +
+			'<div id="linkPass" {{#unless isPasswordSet}}class="hidden"{{/unless}}>' +
 			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
 			'    <input id="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" />' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
-			'   {{/if}}' +
 			'    {{#if publicUpload}}' +
 			'<div id="allowPublicUploadWrapper" class="hidden">' +
 			'    <span class="icon-loading-small hidden"></span>' +
@@ -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 f7de90e264f..f6b927c08c5 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 4ac669ee2b9..895f14508d5 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 6588da7d429..7a7fe692c13 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 81e905b082e..9e153dcb3e5 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);
 			});
-- 
cgit v1.2.3


From 5dfaa0c82d93a075d063cc24ea4345a5943b0b1f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 15:53:05 +0200
Subject: mark url on click

---
 core/js/share.js                    | 5 -----
 core/js/sharedialoglinkshareview.js | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/share.js b/core/js/share.js
index 6581c401281..4b1e773c1ac 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -956,11 +956,6 @@ $(document).ready(function() {
 			permissions);
 	});
 
-	$(document).on('click', '#dropdown #linkText', function() {
-		$(this).focus();
-		$(this).select();
-	});
-
 	// Handle the Allow Public Upload Checkbox
 	$(document).on('click', '#sharingDialogAllowPublicUpload', function() {
 
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index b94f1c3e70b..3e3ef2d5029 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -122,6 +122,11 @@
 			}
 		},
 
+		onLinkTextClick: function() {
+			this.focus();
+			this.select();
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -172,6 +177,7 @@
 			}));
 
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+			this.$el.find('#linkText').click(this.onLinkTextClick);
 
 			return this;
 		},
-- 
cgit v1.2.3


From 9fe6d7c568221a77686de80634870e4a40e6ac29 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 17:02:03 +0200
Subject: implements setting and removing password for link shares, including
 forced ones

---
 apps/files_sharing/css/sharetabview.css |  4 ++
 core/js/share.js                        | 70 ---------------------------------
 core/js/sharedialoglinkshareview.js     | 32 ++++++++++++++-
 core/js/sharedialogview.js              |  2 +-
 core/js/shareitemmodel.js               | 24 ++++++++++-
 5 files changed, 58 insertions(+), 74 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 96a75717c53..0cc812e917c 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -69,3 +69,7 @@
 #shareWithList li label{
 	margin-right: 8px;
 }
+
+.shareTabView .icon-loading-small {
+	margin-left: -30px;
+}
diff --git a/core/js/share.js b/core/js/share.js
index 4b1e773c1ac..f97a91bd3ab 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -996,76 +996,6 @@ $(document).ready(function() {
 		});
 	});
 
-	$(document).on('click', '#dropdown #showPassword', function() {
-		$('#linkPass').slideToggle(OC.menuSpeed);
-		if (!$('#showPassword').is(':checked') ) {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			var itemSourceName = $('#dropdown').data('item-source-name');
-			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
-			var permissions = 0;
-			var $loading = $('#showPassword .icon-loading-small');
-
-			// Calculate permissions
-			if (allowPublicUpload) {
-				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
-			} else {
-				permissions = OC.PERMISSION_READ;
-			}
-
-			$loading.removeClass('hidden');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName).then(function() {
-				$loading.addClass('hidden');
-				$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
-			});
-		} else {
-			$('#linkPassText').focus();
-		}
-	});
-
-	$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
-		var linkPassText = $('#linkPassText');
-		if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
-			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
-			var dropDown = $('#dropdown');
-			var itemType = dropDown.data('item-type');
-			var itemSource = dropDown.data('item-source');
-			var itemSourceName = $('#dropdown').data('item-source-name');
-			var permissions = 0;
-			var $loading = dropDown.find('#linkPass .icon-loading-small');
-
-			// Calculate permissions
-			if (allowPublicUpload) {
-				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
-			} else {
-				permissions = OC.PERMISSION_READ;
-			}
-
-			var expireDateString = OC.Share.getDefaultExpirationDate();
-
-			$loading.removeClass('hidden');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, expireDateString, function(data) {
-				$loading.addClass('hidden');
-				linkPassText.val('');
-				linkPassText.attr('placeholder', t('core', 'Password protected'));
-
-				if (oc_appconfig.core.enforcePasswordForPublicLink) {
-					OC.Share.showLink(data.token, "password set", itemSource);
-					OC.Share.updateIcon(itemType, itemSource);
-				}
-				$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-			}, function(result) {
-				$loading.addClass('hidden');
-				linkPassText.val('');
-				linkPassText.attr('placeholder', result.data.message);
-			});
-
-			if (expireDateString !== '') {
-				OC.Share.showExpirationDate(expireDateString);
-			}
-		}
-	});
-
 	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 3e3ef2d5029..d95b3d82020 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -94,7 +94,7 @@
 				throw 'missing OC.Share.ShareConfigModel';
 			}
 
-			_.bindAll(this, 'onLinkCheckBoxChange');
+			_.bindAll(this, 'onLinkCheckBoxChange', 'onPasswordEntered', 'onShowPasswordClick');
 		},
 
 		onLinkCheckBoxChange: function() {
@@ -127,6 +127,28 @@
 			this.select();
 		},
 
+		onShowPasswordClick: function() {
+			this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
+			if(!this.$el.find('#showPassword').is(':checked')) {
+				this.model.addLinkShare({password: ''});
+			} else {
+				this.$el.find('#linkPassText').focus();
+			}
+		},
+
+		onPasswordEntered: function() {
+			var password = this.$el.find('#linkPassText').val();
+			if(password === '') {
+				return;
+			}
+
+			this.$el.find('#linkPass .icon-loading-small')
+				.removeClass('hidden')
+				.addClass('inlineblock');
+
+			this.model.addLinkShare({password: password});
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -178,6 +200,14 @@
 
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
+			this.$el.find('#showPassword').click(this.onShowPasswordClick);
+			this.$el.find('#linkPassText').focusout(this.onPasswordEntered);
+			var view = this;
+			this.$el.find('#linkPassText').keyup(function(event) {
+				if(event.keyCode == 13) {
+					view.onPasswordEntered();
+				}
+			});
 
 			return this;
 		},
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 7a7fe692c13..416fff53de4 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -157,7 +157,7 @@
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
-				remoteShareInfo: this._renderRemoteShareInfoPart(),
+				remoteShareInfo: this._renderRemoteShareInfoPart()
 			}));
 
 			var view = this;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 9e153dcb3e5..9e3f829e457 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -20,6 +20,7 @@
 	 * @property {string} token
 	 * @property {string|null} password
 	 * @property {string} link
+	 * @property {number} permissions
 	 * @property {Date} expiration
 	 * @property {number} stime share time
 	 */
@@ -89,12 +90,30 @@
 			linkShare: {}
 		},
 
-		addLinkShare: function() {
+		addLinkShare: function(options) {
 			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) {
+
+			var options = options || {};
+			var requiredOptions = [
+				{ name: 'password',	   defaultValue: '' },
+				{ name: 'permissions', defaultValue: OC.PERMISSION_READ }
+			];
+			_.each(requiredOptions, function(option) {
+				// a provided options overrides a present value of the link
+				// share. If neither is given, the default value is used.
+				if(_.isUndefined(options[option.name])) {
+					options[option.name] = option.defaultValue;
+					var currentValue = model.get('linkShare')[option.name];
+					if(!_.isUndefined(currentValue)) {
+						options[option.name] = currentValue;
+					}
+				}
+			});
+
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, options.password, options.permissions, this.fileInfoModel.get('name'), expiration, function(data) {
 				model.fetch();
 				//FIXME: updateIcon belongs to view
 				OC.Share.updateIcon(itemType, itemSource);
@@ -512,6 +531,7 @@
 							token: share.token,
 							password: share.share_with,
 							link: link,
+							permissions: share.permissions,
 							// currently expiration is only effective for link shares.
 							expiration: share.expiration,
 							stime: share.stime
-- 
cgit v1.2.3


From 6d832359b6f00bed5b2444b8d3cd0680a459619e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 00:43:11 +0200
Subject: fix allow upload checkbox appeareance

---
 apps/files_sharing/js/sharetabview.js | 2 +-
 core/js/shareconfigmodel.js           | 2 +-
 core/js/sharedialoglinkshareview.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 6836107306a..9f6c71d1924 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -54,7 +54,7 @@
 				}));
 
 				var attributes = {
-					itemType: 'file',
+					itemType: this.model.isDirectory() ? 'folder' : 'file',
 				   	itemSource: this.model.get('id'),
 					possiblePermissions: this.model.get('sharePermissions')
 				};
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index c6891154c98..16f7e2514d8 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -37,7 +37,7 @@
 		 */
 		isPublicUploadEnabled: function() {
 			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
-			return !_.isUndefined(publicUploadEnabled);
+			return publicUploadEnabled === 'yes';
 		},
 
 		/**
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index d95b3d82020..04ea41e5e00 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -29,7 +29,7 @@
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
 			'    {{#if publicUpload}}' +
-			'<div id="allowPublicUploadWrapper" class="hidden">' +
+			'<div id="allowPublicUploadWrapper">' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
 			'    <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
-- 
cgit v1.2.3


From 7ae84e0e5c60a5b891dcc4183b0a1cff83f36090 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:01:02 +0200
Subject: make 'Allow editing' (aka public upload) checkbox work

---
 core/js/share.js                    | 40 -------------------------------------
 core/js/sharedialoglinkshareview.js | 10 +++++++++-
 core/js/shareitemmodel.js           |  9 +++++++++
 3 files changed, 18 insertions(+), 41 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/share.js b/core/js/share.js
index f97a91bd3ab..0157bcdba7c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -956,46 +956,6 @@ $(document).ready(function() {
 			permissions);
 	});
 
-	// Handle the Allow Public Upload Checkbox
-	$(document).on('click', '#sharingDialogAllowPublicUpload', function() {
-
-		// Gather data
-		var $dropDown = $('#dropdown');
-		var allowPublicUpload = $(this).is(':checked');
-		var itemType = $dropDown.data('item-type');
-		var itemSource = $dropDown.data('item-source');
-		var itemSourceName = $dropDown.data('item-source-name');
-		var expirationDate = '';
-		if ($('#expirationCheckbox').is(':checked') === true) {
-			expirationDate = $( "#expirationDate" ).val();
-		}
-		var permissions = 0;
-		var $button = $(this);
-		var $loading = $dropDown.find('#allowPublicUploadWrapper .icon-loading-small');
-
-		if (!$loading.hasClass('hidden')) {
-			// already in progress
-			return false;
-		}
-
-		// Calculate permissions
-		if (allowPublicUpload) {
-			permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
-		} else {
-			permissions = OC.PERMISSION_READ;
-		}
-
-		// Update the share information
-		$button.addClass('hidden');
-		$button.prop('disabled', true);
-		$loading.removeClass('hidden');
-		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, expirationDate, function(data) {
-			$loading.addClass('hidden');
-			$button.removeClass('hidden');
-			$button.prop('disabled', false);
-		});
-	});
-
 	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 04ea41e5e00..f49a73f291b 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -94,7 +94,8 @@
 				throw 'missing OC.Share.ShareConfigModel';
 			}
 
-			_.bindAll(this, 'onLinkCheckBoxChange', 'onPasswordEntered', 'onShowPasswordClick');
+			_.bindAll(this, 'onLinkCheckBoxChange', 'onPasswordEntered',
+				'onShowPasswordClick', 'onAllowPublicUploadChange');
 		},
 
 		onLinkCheckBoxChange: function() {
@@ -149,6 +150,12 @@
 			this.model.addLinkShare({password: password});
 		},
 
+		onAllowPublicUploadChange: function() {
+			this.$el.find('#sharingDialogAllowPublicUpload')
+					.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
+			this.model.setPublicUpload(this.$el.find('#sharingDialogAllowPublicUpload').is(':checked'));
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -199,6 +206,7 @@
 			}));
 
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+			this.$el.find('#sharingDialogAllowPublicUpload').change(this.onAllowPublicUploadChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
 			this.$el.find('#showPassword').click(this.onShowPasswordClick);
 			this.$el.find('#linkPassText').focusout(this.onPasswordEntered);
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 9e3f829e457..3569c6ffd1a 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -132,6 +132,15 @@
 			});
 		},
 
+		setPublicUpload: function(allow) {
+			var permissions = OC.PERMISSION_READ;
+			if(allow) {
+				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+			}
+
+			this.addLinkShare({permissions: permissions});
+		},
+
 		addShare: function(event, selected, options) {
 			event.preventDefault();
 
-- 
cgit v1.2.3


From 8194d092e71b1c44a441dddc64b7e7533adbbfb9 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 12:48:01 +0200
Subject: Add expiration date handling in share tab

---
 core/css/share.css                   |   8 +++
 core/js/sharedialogexpirationview.js |  49 +++++++++++++++--
 core/js/sharedialoglinkshareview.js  |  11 +++-
 core/js/shareitemmodel.js            | 104 +++++++++++++++++++++++++++++------
 4 files changed, 147 insertions(+), 25 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/css/share.css b/core/css/share.css
index bdf34e9a863..73bad5c500d 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -126,6 +126,14 @@ a.unshare {
 	margin-right: 0;
 }
 
+.shareTabView .error {
+	color: #e9322d;
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+
 #link #showPassword img {
 	padding-left:5px;
 	width:12px;
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index f244fe56548..c5d8c829657 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -19,13 +19,13 @@
 			// in the LinkShareView to ease reusing it in future. Then,
 			// modifications (getting rid of IDs) are still necessary.
 			'{{#if isLinkShare}}' +
-			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" ' +
+			'<input type="checkbox" name="expirationCheckbox" class="expirationCheckbox" id="expirationCheckbox" value="1" ' +
 				'{{#if isExpirationSet}}checked="checked"{{/if}} {{#if disableCheckbox}}disabled="disabled"{{/if}} />' +
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
-			'    {{#if isExpirationSet}}' +
-			'<label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
-			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{expirationValue}}" />' +
-			'    {{/if}}' +
+			'<div class="expirationDateContainer {{#unless isExpirationSet}}hidden{{/unless}}">' +
+			'    <label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
+			'    <input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{expirationValue}}" />' +
+			'</div>' +
 			'    {{#if isExpirationEnforced}}' +
 				// originally the expire message was shown when a default date was set, however it never had text
 			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
@@ -58,6 +58,11 @@
 
 		className: 'hidden',
 
+		events: {
+			'change .expirationCheckbox': '_onToggleExpiration',
+			'change .datepicker': '_onChangeExpirationDate'
+		},
+
 		initialize: function(options) {
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
@@ -79,6 +84,38 @@
 			});
 		},
 
+		_onToggleExpiration: function(event) {
+			var $checkbox = $(event.target);
+			var state = $checkbox.prop('checked');
+			// TODO: slide animation
+			this.$el.find('.expirationDateContainer').toggleClass('hidden', !state);
+			if (!state) {
+				// discard expiration date
+				this.model.setExpirationDate('');
+				this.model.saveLinkShare();
+			}
+		},
+
+		_onChangeExpirationDate: function(event) {
+			var $target = $(event.target);
+			$target.tooltip('hide');
+			$target.removeClass('error');
+
+			this.model.setExpirationDate($target.val());
+			this.model.saveLinkShare(null, {
+				error: function(model, message) {
+					if (!message) {
+						$target.attr('title', t('core', 'Error setting expiration date'));
+					} else {
+						$target.attr('title', message);
+					}
+					$target.tooltip({gravity: 'n'});
+					$target.tooltip('show');
+					$target.addClass('error');
+				}
+			});
+		},
+
 		render: function() {
 			var defaultExpireMessage = '';
 			var defaultExpireDays = this.configModel.get('defaultExpireDate');
@@ -136,6 +173,8 @@
 
 			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
+			this.delegateEvents();
+
 			return this;
 		},
 
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index f49a73f291b..cadec3071d3 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -108,7 +108,8 @@
 			if($checkBox.is(':checked')) {
 				if(this.configModel.get('enforcePasswordForPublicLink') === false) {
 					$loading.removeClass('hidden');
-					this.model.addLinkShare();
+					// this will create it
+					this.model.saveLinkShare();
 				} else {
 					this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
 					// TODO drop with IE8 drop
@@ -131,7 +132,8 @@
 		onShowPasswordClick: function() {
 			this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
 			if(!this.$el.find('#showPassword').is(':checked')) {
-				this.model.addLinkShare({password: ''});
+				this.model.setPassword('');
+				this.model.saveLinkShare();
 			} else {
 				this.$el.find('#linkPassText').focus();
 			}
@@ -147,13 +149,15 @@
 				.removeClass('hidden')
 				.addClass('inlineblock');
 
-			this.model.addLinkShare({password: password});
+			this.model.setPassword(password);
+			this.model.saveLinkShare();
 		},
 
 		onAllowPublicUploadChange: function() {
 			this.$el.find('#sharingDialogAllowPublicUpload')
 					.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
 			this.model.setPublicUpload(this.$el.find('#sharingDialogAllowPublicUpload').is(':checked'));
+			this.model.saveLinkShare();
 		},
 
 		render: function() {
@@ -205,6 +209,7 @@
 				mailButtonText: t('core', 'Send')
 			}));
 
+			// TODO: move this to delegate events instead
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
 			this.$el.find('#sharingDialogAllowPublicUpload').change(this.onAllowPublicUploadChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index eb44b735737..2a97bc8abd5 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -70,6 +70,9 @@
 	 * Represents the GUI of the share dialogue
 	 *
 	 * // FIXME: use OC Share API once #17143 is done
+	 *
+	 * // TODO: this really should be a collection of share item models instead,
+	 * where the link share is one of them
 	 */
 	var ShareItemModel = OC.Backbone.Model.extend({
 		initialize: function(attributes, options) {
@@ -90,47 +93,114 @@
 			linkShare: {}
 		},
 
-		addLinkShare: function(options) {
+		/**
+		 * Saves the current link share information.
+		 *
+		 * This will trigger an ajax call and refetch the model afterwards.
+		 *
+		 * TODO: this should be a separate model
+		 */
+		saveLinkShare: function(attributes, options) {
 			var model = this;
-			var expiration = this.configModel.getDefaultExpirationDateString();
 			var itemType = this.get('itemType');
 			var itemSource = this.get('itemSource');
 
-			var options = options || {};
-			var requiredOptions = [
+			// TODO: use backbone's default value mechanism once this is a separate model
+			var requiredAttributes = [
 				{ name: 'password',	   defaultValue: '' },
-				{ name: 'permissions', defaultValue: OC.PERMISSION_READ }
+				{ name: 'permissions', defaultValue: OC.PERMISSION_READ },
+				{ name: 'expiration', defaultValue: this.configModel.getDefaultExpirationDateString() }
 			];
-			_.each(requiredOptions, function(option) {
+
+			attributes = attributes || {};
+
+			// get attributes from the model and fill in with default values
+			_.each(requiredAttributes, function(attribute) {
 				// a provided options overrides a present value of the link
 				// share. If neither is given, the default value is used.
-				if(_.isUndefined(options[option.name])) {
-					options[option.name] = option.defaultValue;
-					var currentValue = model.get('linkShare')[option.name];
+				if(_.isUndefined(attribute[attribute.name])) {
+					attributes[attribute.name] = attribute.defaultValue;
+					var currentValue = model.get('linkShare')[attribute.name];
 					if(!_.isUndefined(currentValue)) {
-						options[option.name] = currentValue;
+						attributes[attribute.name] = currentValue;
 					}
 				}
 			});
 
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, options.password, options.permissions, this.fileInfoModel.get('name'), expiration, function(data) {
-				model.fetch();
-				//FIXME: updateIcon belongs to view
-				OC.Share.updateIcon(itemType, itemSource);
-			});
+			OC.Share.share(
+				itemType,
+				itemSource,
+				OC.Share.SHARE_TYPE_LINK,
+				attributes.password,
+				attributes.permissions,
+				this.fileInfoModel.get('name'),
+				attributes.expiration,
+				function(result) {
+					if (!result || result.status !== 'success') {
+						model.fetch({
+							success: function() {
+								if (options && _.isFunction(options.success)) {
+									options.success(model);
+								}
+							}
+						});
+					} else {
+						if (options && _.isFunction(options.error)) {
+							options.error(model);
+						}
+					}
+					//FIXME: updateIcon belongs to view
+					OC.Share.updateIcon(itemType, itemSource);
+				},
+				function(result) {
+					var msg = t('core', 'Error');
+					if (result.data && result.data.message) {
+						msg = result.data.message;
+					}
+
+					if (options && _.isFunction(options.error)) {
+						options.error(model, msg);
+					} else {
+						OC.dialogs.alert(msg, t('core', 'Error while sharing'));
+					}
+				}
+			);
 		},
 
 		removeLinkShare: function() {
 			this.removeShare(OC.Share.SHARE_TYPE_LINK, '');
 		},
 
+		/**
+		 * Sets the public upload flag
+		 *
+		 * @param {bool} allow whether public upload is allowed
+		 */
 		setPublicUpload: function(allow) {
 			var permissions = OC.PERMISSION_READ;
 			if(allow) {
-				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+				permissions = OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ;
 			}
 
-			this.addLinkShare({permissions: permissions});
+			this.get('linkShare').permissions = permissions;
+		},
+
+		/**
+		 * Sets the expiration date of the public link
+		 *
+		 * @param {string} expiration expiration date
+		 */
+		setExpirationDate: function(expiration) {
+			this.get('linkShare').expiration = expiration;
+		},
+
+		/**
+		 * Set password of the public link share
+		 *
+		 * @param {string} password
+		 */
+		setPassword: function(password) {
+			this.get('linkShare').password = password;
 		},
 
 		addShare: function(event, selected, options) {
-- 
cgit v1.2.3


From 62ff78787a0f033ca27a14051affa0be3c9393b2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 18:24:58 +0200
Subject: Implement email share link

---
 core/js/sharedialoglinkshareview.js | 30 +++++++++++++++++++++++++++++-
 core/js/shareitemmodel.js           | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 2 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index cadec3071d3..599ffd3c43f 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -36,7 +36,7 @@
 			'</div>' +
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
-			'<form id="emailPrivateLink">' +
+			'<form id="emailPrivateLink" class="emailPrivateLinkForm">' +
 			'    <input id="email" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
 			'    <input id="emailButton" type="submit" value="{{mailButtonText}}" />' +
 			'</form>' +
@@ -69,6 +69,10 @@
 		/** @type {boolean} **/
 		showLink: true,
 
+		events: {
+			'submit .emailPrivateLinkForm': '_onEmailPrivateLink'
+		},
+
 		initialize: function(options) {
 			var view = this;
 
@@ -160,6 +164,28 @@
 			this.model.saveLinkShare();
 		},
 
+		_onEmailPrivateLink: function(event) {
+			event.preventDefault();
+
+			var $emailField = this.$el.find('#email');
+			var $emailButton = this.$el.find('#emailButton');
+			var email = this.$el.find('#email').val();
+			if (email !== '') {
+				$emailField.prop('disabled', true);
+				$emailButton.prop('disabled', true);
+				$emailField.val(t('core', 'Sending ...'));
+				this.model.sendEmailPrivateLink(email).then(function() {
+					$emailField.css('font-weight', 'bold').val(t('core','Email sent'));
+					setTimeout(function() {
+						$emailField.css('font-weight', 'normal').val('');
+						$emailField.prop('disabled', false);
+						$emailButton.prop('disabled', false);
+					}, 2000);
+				});
+			}
+			return false;
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -222,6 +248,8 @@
 				}
 			});
 
+			this.delegateEvents();
+
 			return this;
 		},
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 595670faaef..e0d44586613 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -476,7 +476,7 @@
 			var itemType = this.get('itemType');
 			var itemSource = this.get('itemSource');
 
-			$.post(
+			return $.post(
 				OC.generateUrl('core/ajax/share.php'),
 				{
 					action: state ? 'informRecipients' : 'informRecipientsDisabled',
@@ -487,12 +487,41 @@
 				},
 				function(result) {
 					if (result.status !== 'success') {
+						// FIXME: a model should not show dialogs
 						OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
 					}
 				}
 			);
 		},
 
+		/**
+		 * Send the link share information by email
+		 *
+		 * @param {string} recipientEmail recipient email address
+		 */
+		sendEmailPrivateLink: function(recipientEmail) {
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+			var linkShare = this.get('linkShare');
+
+			return $.post(
+				OC.generateUrl('core/ajax/share.php'), {
+					action: 'email',
+					toaddress: recipientEmail,
+					link: linkShare.link,
+					itemType: itemType,
+					itemSource: itemSource,
+					file: this.fileInfoModel.get('name'),
+					expiration: linkShare.expiration || ''
+				},
+				function(result) {
+					if (!result || result.status !== 'success') {
+						// FIXME: a model should not show dialogs
+						OC.dialogs.alert(result.data.message, t('core', 'Error while sending notification'));
+					}
+			});
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-- 
cgit v1.2.3


From 1933bcfa92d35dfc6ed38569e50c13805dd84396 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 18:34:56 +0200
Subject: Implement email autocomplete for link share

---
 core/js/sharedialoglinkshareview.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 599ffd3c43f..1191aa401b4 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -248,6 +248,33 @@
 				}
 			});
 
+			var $emailField = this.$el.find('#email');
+			if (isLinkShare && $emailField.length !== 0) {
+				$emailField.autocomplete({
+					minLength: 1,
+					source: function (search, response) {
+						$.get(
+							OC.generateUrl('core/ajax/share.php'), {
+								fetch: 'getShareWithEmail',
+								search: search.term
+							}, function(result) {
+								if (result.status == 'success' && result.data.length > 0) {
+									response(result.data);
+								}
+							});
+						},
+					select: function( event, item ) {
+						$emailField.val(item.item.email);
+						return false;
+					}
+				})
+				.data("ui-autocomplete")._renderItem = function( ul, item ) {
+					return $('<li>')
+						.append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
+						.appendTo( ul );
+				};
+			}
+
 			this.delegateEvents();
 
 			return this;
-- 
cgit v1.2.3


From 886f1ed660e91edb8f370cf711ed395fdff7dc30 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 10:27:33 +0200
Subject: Update JS unit tests for share dialog (WIP)

---
 apps/files_sharing/js/sharetabview.js      |    1 +
 apps/files_sharing/tests/js/shareSpec.js   |  125 ++--
 core/js/core.json                          |    7 +
 core/js/share.js                           |    4 +-
 core/js/shareconfigmodel.js                |    2 +
 core/js/sharedialoglinkshareview.js        |    2 +-
 core/js/tests/specs/shareSpec.js           | 1100 ----------------------------
 core/js/tests/specs/sharedialogviewSpec.js |  911 +++++++++++++++++++++++
 core/js/tests/specs/shareitemmodelSpec.js  |  234 ++++++
 tests/karma.config.js                      |    3 +-
 10 files changed, 1217 insertions(+), 1172 deletions(-)
 create mode 100644 core/js/tests/specs/sharedialogviewSpec.js
 create mode 100644 core/js/tests/specs/shareitemmodelSpec.js

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 1ad17365957..68288500ae0 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -55,6 +55,7 @@
 					owner: owner
 				}));
 
+				// TODO: the model should read these directly off the passed fileInfoModel
 				var attributes = {
 					itemType: this.model.isDirectory() ? 'folder' : 'file',
 				   	itemSource: this.model.get('id'),
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index b6368b901ee..96a96f1b814 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -97,7 +97,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -116,7 +115,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -137,7 +135,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('public.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-public.svg');
@@ -158,7 +155,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -178,7 +174,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -200,7 +195,6 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			expect($tr.find('.action-share').length).toEqual(0);
 			$action = $tr.find('.action-share-notification');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -225,7 +219,7 @@ describe('OCA.Sharing.Util tests', function() {
 		});
 	});
 	describe('Share action', function() {
-		var showDropDownStub;
+		var shareTab;
 
 		function makeDummyShareItem(displayName) {
 			return {
@@ -234,12 +228,35 @@ describe('OCA.Sharing.Util tests', function() {
 		}
 
 		beforeEach(function() {
-			showDropDownStub = sinon.stub(OC.Share, 'showDropDown', function() {
-				$('#testArea').append($('<div id="dropdown"></div>'));
-			});
+			// make it look like not the "All files" list
+			fileList.id = 'test';
+			shareTab = fileList._detailsView._tabViews[0];
 		});
 		afterEach(function() {
-			showDropDownStub.restore();
+			shareTab = null;
+		});
+		it('clicking share action opens sidebar and share tab', function() {
+			var showDetailsViewStub = sinon.stub(fileList, 'showDetailsView');
+
+			fileList.setFiles([{
+				id: 1,
+				type: 'file',
+				name: 'One.txt',
+				path: '/subdir',
+				mimetype: 'text/plain',
+				size: 12,
+				permissions: OC.PERMISSION_ALL,
+				etag: 'abc'
+			}]);
+
+			var $tr = fileList.$el.find('tr:first');
+			$tr.find('.action-share').click();
+
+			expect(showDetailsViewStub.calledOnce).toEqual(true);
+			expect(showDetailsViewStub.getCall(0).args[0]).toEqual('One.txt');
+			expect(showDetailsViewStub.getCall(0).args[1]).toEqual('shareTabView');
+
+			showDetailsViewStub.restore();
 		});
 		it('adds share icon after sharing a non-shared file', function() {
 			var $action, $tr;
@@ -257,24 +274,20 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			var shares = {};
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_USER] = ['user1', 'user2'];
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_GROUP] = ['group1', 'group2'];
-			shares[OC.Share.SHARE_TYPE_USER] = _.map(['User One', 'User Two'], makeDummyShareItem);
-			shares[OC.Share.SHARE_TYPE_GROUP] = _.map(['Group One', 'Group Two'], makeDummyShareItem);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: shares}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: [
+					{share_with_displayname: 'User One'},
+					{share_with_displayname: 'User Two'},
+					{share_with_displayname: 'Group One'},
+					{share_with_displayname: 'Group Two'}
+				]
+			});
 
 			expect($tr.attr('data-share-recipients')).toEqual('Group One, Group Two, User One, User Two');
 
-			OC.Share.updateIcon('file', 1);
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared with Group One, Group Two, User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
@@ -294,23 +307,19 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			var shares = {};
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_USER] = ['user1', 'user2', 'user3'];
-			shares[OC.Share.SHARE_TYPE_USER] = _.map(['User One', 'User Two', 'User Three'], makeDummyShareItem);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: shares}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: [
+					{share_with_displayname: 'User One'},
+					{share_with_displayname: 'User Two'},
+					{share_with_displayname: 'User Three'}
+				]
+			});
 
 			expect($tr.attr('data-share-recipients')).toEqual('User One, User Three, User Two');
 
-			OC.Share.updateIcon('file', 1);
-
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Three, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
@@ -331,20 +340,14 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			OC.Share.itemShares = {};
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: {}}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: []
+			});
 
 			expect($tr.attr('data-share-recipients')).not.toBeDefined();
-
-			OC.Share.updateIcon('file', 1);
-			expect($action.hasClass('permanent')).toEqual(true);
 		});
 		it('keep share text after updating reshare', function() {
 			var $action, $tr;
@@ -363,23 +366,15 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			var shares = {};
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_USER] = ['user2'];
-			shares[OC.Share.SHARE_TYPE_USER] = _.map(['User Two'], makeDummyShareItem);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: shares}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: [{share_with_displayname: 'User Two'}]
+			});
 
 			expect($tr.attr('data-share-recipients')).toEqual('User Two');
 
-			OC.Share.updateIcon('file', 1);
-
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
@@ -401,21 +396,15 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			OC.Share.itemShares = {};
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: {}}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: []
+			});
 
 			expect($tr.attr('data-share-recipients')).not.toBeDefined();
 
-			OC.Share.updateIcon('file', 1);
-
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
diff --git a/core/js/core.json b/core/js/core.json
index a67491c4a35..a80636e8463 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -24,6 +24,13 @@
 		"l10n.js",
 		"apps.js",
 		"share.js",
+		"shareconfigmodel.js",
+		"shareitemmodel.js",
+		"sharedialogview.js",
+		"sharedialogexpirationview.js",
+		"sharedialoglinkshareview.js",
+		"sharedialogresharerinfoview.js",
+		"sharedialogshareelistview.js",
 		"octemplate.js",
 		"eventsource.js",
 		"config.js",
diff --git a/core/js/share.js b/core/js/share.js
index 0a3bba49b6c..a2e6e6af0fc 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -3,7 +3,7 @@
 /**
  * @namespace
  */
-OC.Share = _.extend(OC.Share, {
+OC.Share = _.extend(OC.Share || {}, {
 	SHARE_TYPE_USER:0,
 	SHARE_TYPE_GROUP:1,
 	SHARE_TYPE_LINK:3,
@@ -445,7 +445,7 @@ $(document).ready(function() {
 		var target = $(event.target);
 		var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon')
 			&& !target.closest('#ui-datepicker-div').length && !target.closest('.ui-autocomplete').length;
-		if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
+		if (OC.Share && OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
 			OC.Share.hideDropDown();
 		}
 	});
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 16f7e2514d8..8729698d136 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -14,6 +14,8 @@
 		OC.Share.Types = {};
 	}
 
+	// FIXME: the config model should populate its own model attributes based on
+	// the old DOM-based config
 	var ShareConfigModel = OC.Backbone.Model.extend({
 		defaults: {
 			publicUploadEnabled: false,
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 1191aa401b4..2c7914b2545 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -236,7 +236,7 @@
 			}));
 
 			// TODO: move this to delegate events instead
-			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+			this.$el.find('#linkCheckbox').click(this.onLinkCheckBoxChange);
 			this.$el.find('#sharingDialogAllowPublicUpload').change(this.onAllowPublicUploadChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
 			this.$el.find('#showPassword').click(this.onShowPasswordClick);
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index 5a59a117d77..9e80f4fe19d 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -21,1090 +21,6 @@
 
 /* global oc_appconfig */
 describe('OC.Share tests', function() {
-	describe('dropdown', function() {
-		var $container;
-		var oldAppConfig;
-		var loadItemStub;
-		var autocompleteStub;
-		var oldEnableAvatars;
-		var avatarStub;
-		var placeholderStub;
-		var oldCurrentUser;
-
-		beforeEach(function() {
-			$('#testArea').append($('<div id="shareContainer"></div>'));
-			// horrible parameters
-			$('#testArea').append('<input id="allowShareWithLink" type="hidden" value="yes">');
-			$('#testArea').append('<input id="mailPublicNotificationEnabled" name="mailPublicNotificationEnabled" type="hidden" value="yes">');
-			$container = $('#shareContainer');
-			/* jshint camelcase:false */
-			oldAppConfig = _.extend({}, oc_appconfig.core);
-			oc_appconfig.core.enforcePasswordForPublicLink = false;
-
-			loadItemStub = sinon.stub(OC.Share, 'loadItem');
-			loadItemStub.returns({
-				reshare: [],
-				shares: []
-			});
-
-			autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
-				// dummy container with the expected attributes
-				if (!$(this).length) {
-					// simulate the real autocomplete that returns
-					// nothing at all when no element is specified
-					// (and potentially break stuff)
-					return null;
-				}
-				var $el = $('<div></div>').data('ui-autocomplete', {});
-				return $el;
-			});
-
-			oldEnableAvatars = oc_config.enable_avatars;
-			oc_config.enable_avatars = false;
-			avatarStub = sinon.stub($.fn, 'avatar');
-			placeholderStub = sinon.stub($.fn, 'imageplaceholder');
-
-			oldCurrentUser = OC.currentUser;
-			OC.currentUser = 'user0';
-		});
-		afterEach(function() {
-			OC.currentUser = oldCurrentUser;
-			/* jshint camelcase:false */
-			oc_appconfig.core = oldAppConfig;
-			loadItemStub.restore();
-
-			autocompleteStub.restore();
-			avatarStub.restore();
-			placeholderStub.restore();
-			oc_config.enable_avatars = oldEnableAvatars;
-			$('#dropdown').remove();
-		});
-		it('calls loadItem with the correct arguments', function() {
-			OC.Share.showDropDown(
-				'file',
-			   	123,
-			   	$container,
-				true,
-				31,
-				'shared_file_name.txt'
-			);
-			expect(loadItemStub.calledOnce).toEqual(true);
-			expect(loadItemStub.calledWith('file', 123)).toEqual(true);
-		});
-		it('shows the dropdown with default values', function() {
-			var $el;
-			OC.Share.showDropDown(
-				'file',
-			   	123,
-			   	$container,
-				true,
-				31,
-				'shared_file_name.txt'
-			);
-			$el = $container.find('#dropdown');
-			expect($el.length).toEqual(1);
-			expect($el.attr('data-item-type')).toEqual('file');
-			expect($el.attr('data-item-source')).toEqual('123');
-			// TODO: expect that other parts are rendered correctly
-		});
-		describe('Share with link', function() {
-			// TODO: test ajax calls
-			// TODO: test password field visibility (whenever enforced or not)
-			it('update password on focus out', function() {
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				// Enable password, enter password and focusout
-				$('#dropdown [name=showPassword]').click();
-				$('#dropdown #linkPassText').focus();
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').focusout();
-
-				expect(fakeServer.requests[1].method).toEqual('POST');
-				var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-				expect(body['shareWith']).toEqual('foo');
-
-				// Set password response
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				expect($('#dropdown #linkPassText').val()).toEqual('');
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Password protected');
-			});
-			it('update password on enter', function() {
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				// Enable password and enter password
-				$('#dropdown [name=showPassword]').click();
-				$('#dropdown #linkPassText').focus();
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-
-				expect(fakeServer.requests[1].method).toEqual('POST');
-				var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-				expect(body['shareWith']).toEqual('foo');
-
-				// Set password response
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				expect($('#dropdown #linkPassText').val()).toEqual('');
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Password protected');
-			});
-			it('shows share with link checkbox when allowed', function() {
-				$('#allowShareWithLink').val('yes');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,		
-					31,
-					'shared_file_name.txt'
-				);
-				expect($('#dropdown #linkCheckbox').length).toEqual(1);
-			});
-			it('does not show share with link checkbox when not allowed', function() {
-				$('#allowShareWithLink').val('no');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,		
-					31,
-					'shared_file_name.txt'
-				);
-				expect($('#dropdown #linkCheckbox').length).toEqual(0);
-			});
-			it('Reset link when password is enforced and link is toggled', function() { 
-				var old = oc_appconfig.core.enforcePasswordForPublicLink;
-				oc_appconfig.core.enforcePasswordForPublicLink = true;
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkText').val()).toEqual('');
-
-				// Set password
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				// Remove link
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				/*
-				 * Try to share again
-				 * The linkText should be emptied
-				 */
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkText').val()).toEqual('');
-
-				/*
-				 * Do not set password but untoggle
-				 * Since there is no share this should not result in another request to the server
-				 */
-				$('#dropdown [name=linkCheckbox]').click();
-				expect(fakeServer.requests.length).toEqual(2);
-
-				oc_appconfig.core.enforcePasswordForPublicLink = old;
-			});
-
-			it('Reset password placeholder when password is enforced and link is toggled', function() { 
-				var old = oc_appconfig.core.enforcePasswordForPublicLink;
-				oc_appconfig.core.enforcePasswordForPublicLink = true;
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
-
-				// Set password
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('**********');
-
-				// Remove link
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				// Try to share again
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
-
-				oc_appconfig.core.enforcePasswordForPublicLink = old;
-			});
-			it('reset password on toggle of share', function() {
-				$('#allowShareWithLink').val('yes');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				//Password protection should be unchecked and password field not visible
-				expect($('#dropdown [name=showPassword]').prop('checked')).toEqual(false);
-				expect($('#dropdown #linkPass').is(":visible")).toEqual(false);
-
-				// Toggle and set password
-				$('#dropdown [name=showPassword]').click();
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
-				);
-
-				// Unshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[2].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				// Toggle share again
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[3].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
-				);
-
-
-				// Password checkbox should be unchecked
-				expect($('#dropdown [name=showPassword]').prop('checked')).toEqual(false);
-				expect($('#dropdown #linkPass').is(":visible")).toEqual(false);
-			});
-			it('reset expiration on toggle of share', function() {
-				$('#allowShareWithLink').val('yes');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				//Expiration should be unchecked and expiration field not visible
-				expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-				expect($('#dropdown #expirationDate').is(":visible")).toEqual(false);
-
-				// Toggle and set password
-				$('#dropdown [name=expirationCheckbox]').click();
-				d = new Date();
-				d.setDate(d.getDate() + 1);
-				date=d.getDate() + '-' + (d.getMonth()+1) + '-' + d.getFullYear();
-				$('#dropdown #expirationDate').val(date);
-				$('#dropdown #expirationDate').change();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
-				);
-
-				// Unshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[2].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				// Toggle share again
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[3].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
-				);
-
-				// Recheck expire visibility
-				expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-				expect($('#dropdown #expirationDate').is(":visible")).toEqual(false);
-			});
-			it('shows populated link share when a link share exists', function() {
-				loadItemStub.returns({
-					reshare: [],
-					/* jshint camelcase: false */
-					shares: [{
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'folder',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					}]
-				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'folder'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(true);
-				// this is how the OC.Share class does it...
-				var link = parent.location.protocol + '//' + location.host +
-					OC.generateUrl('/s/') + 'tehtoken';
-				expect($('#dropdown #linkText').val()).toEqual(link);
-			});
-			it('does not show populated link share when a link share exists for a different file', function() {
-				loadItemStub.returns({
-					reshare: [],
-					/* jshint camelcase: false */
-					shares: [{
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'folder',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					}]
-				});
-				OC.Share.showDropDown(
-					'file',
-					456, // another file
-					$container,
-					true,
-					31,
-					'folder'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(false);
-			});
-			it('shows correct link share when a nest link share exists along with parent one', function() {
-				loadItemStub.returns({
-					reshare: [],
-					/* jshint camelcase: false */
-					shares: [{
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'file',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					}, {
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 456,
-						file_target: '/file_in_folder.txt',
-						id: 21,
-						item_source: '456',
-						item_type: 'file',
-						mail_send: '0',
-						parent: null,
-						path: '/folder/file_in_folder.txt',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884509,
-						storage: 1,
-						token: 'anothertoken',
-						uid_owner: 'root'
-					}]
-				});
-
-				// parent one
-				OC.Share.showDropDown(
-					'folder',
-					123,
-					$container,
-					true,
-					31,
-					'folder'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(true);
-				// this is how the OC.Share class does it...
-				var link = parent.location.protocol + '//' + location.host +
-					OC.generateUrl('/s/') + 'tehtoken';
-				expect($('#dropdown #linkText').val()).toEqual(link);
-
-				// nested one
-				OC.Share.showDropDown(
-					'file',
-					456,
-					$container,
-					true,
-					31,
-					'file_in_folder.txt'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(true);
-				// this is how the OC.Share class does it...
-				link = parent.location.protocol + '//' + location.host +
-					OC.generateUrl('/s/') + 'anothertoken';
-				expect($('#dropdown #linkText').val()).toEqual(link);
-			});
-			describe('expiration date', function() {
-				var shareData;
-				var shareItem;
-				var clock;
-				var expectedMinDate;
-
-				function showDropDown() {
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						31,
-						'folder'
-					);
-				}
-
-				beforeEach(function() {
-					// pick a fake date
-					clock = sinon.useFakeTimers(new Date(2014, 0, 20, 14, 0, 0).getTime());
-					expectedMinDate = new Date(2014, 0, 21, 14, 0, 0);
-					shareItem = {
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'folder',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					};
-					shareData = {
-						reshare: [],
-						shares: []
-					};
-					loadItemStub.returns(shareData);
-					oc_appconfig.core.defaultExpireDate = 7;
-					oc_appconfig.core.enforcePasswordForPublicLink = false;
-					oc_appconfig.core.defaultExpireDateEnabled = false;
-					oc_appconfig.core.defaultExpireDateEnforced = false;
-				});
-				afterEach(function() {
-					clock.restore();
-				});
-
-				it('does not check expiration date checkbox when no date was set', function() {
-					shareItem.expiration = null;
-					shareData.shares.push(shareItem);
-					showDropDown();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-					expect($('#dropdown #expirationDate').val()).toEqual('');
-				});
-				it('does not check expiration date checkbox for new share', function() {
-					showDropDown();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-					expect($('#dropdown #expirationDate').val()).toEqual('');
-				});
-				it('checks expiration date checkbox and populates field when expiration date was set', function() {
-					shareItem.expiration = 1234;
-					shareData.shares.push(shareItem);
-					showDropDown();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					expect($('#dropdown #expirationDate').val()).toEqual('1234');
-				});
-				it('sets default date when default date setting is enabled', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					// enabled by default
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					// TODO: those zeros must go...
-					expect($('#dropdown #expirationDate').val()).toEqual('2014-1-27 00:00:00');
-
-					// disabling is allowed
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-				});
-				it('enforces default date when enforced date setting is enabled', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					// TODO: those zeros must go...
-					expect($('#dropdown #expirationDate').val()).toEqual('2014-1-27 00:00:00');
-
-					// disabling is not allowed
-					expect($('#dropdown [name=expirationCheckbox]').prop('disabled')).toEqual(true);
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-				});
-				it('enforces default date when enforced date setting is enabled and password is enforced', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.enforcePasswordForPublicLink = true;
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-
-					//Enter password
-					$('#dropdown #linkPassText').val('foo');
-					$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-					fakeServer.requests[0].respond(
-						200,
-						{ 'Content-Type': 'application/json' },
-						JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-					);
-
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					// TODO: those zeros must go...
-					expect($('#dropdown #expirationDate').val()).toEqual('2014-1-27 00:00:00');
-
-					// disabling is not allowed
-					expect($('#dropdown [name=expirationCheckbox]').prop('disabled')).toEqual(true);
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-				});
-				it('displayes email form when sending emails is enabled', function() {
-					$('input[name=mailPublicNotificationEnabled]').val('yes');
-					showDropDown();
-					expect($('#emailPrivateLink').length).toEqual(1);
-				});
-				it('not renders email form when sending emails is disabled', function() {
-					$('input[name=mailPublicNotificationEnabled]').val('no');
-					showDropDown();
-					expect($('#emailPrivateLink').length).toEqual(0);
-				});
-				it('sets picker minDate to today and no maxDate by default', function() {
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
-					expect($.datepicker._defaults.maxDate).toEqual(null);
-				});
-				it('limits the date range to X days after share time when enforced', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
-					expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
-				});
-				it('limits the date range to X days after share time when enforced, even when redisplayed the next days', function() {
-					// item exists, was created two days ago
-					shareItem.expiration = '2014-1-27';
-					// share time has time component but must be stripped later
-					shareItem.stime = new Date(2014, 0, 20, 11, 0, 25).getTime() / 1000;
-					shareData.shares.push(shareItem);
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
-					expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
-				});
-			});
-		});
-		describe('check for avatar', function() {
-			beforeEach(function() {
-				loadItemStub.returns({
-					reshare: {
-						share_type: OC.Share.SHARE_TYPE_USER,
-						uid_owner: 'owner',
-						displayname_owner: 'Owner',
-						permissions: 31
-					},
-					shares: [{
-						id: 100,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_USER,
-						share_with: 'user1',
-						share_with_displayname: 'User One'
-					},{
-						id: 101,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_GROUP,
-						share_with: 'group',
-						share_with_displayname: 'group'
-					},{
-						id: 102,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_REMOTE,
-						share_with: 'foo@bar.com/baz',
-						share_with_displayname: 'foo@bar.com/baz'
-
-					}]
-				});
-			});
-
-			describe('avatars enabled', function() {
-				beforeEach(function() {
-					oc_config.enable_avatars = true;
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						31,
-						'shared_file_name.txt'
-					);
-				});
-
-				afterEach(function() {
-					oc_config.enable_avatars = false;
-				});
-
-				it('test correct function calls', function() {
-					expect(avatarStub.calledTwice).toEqual(true);
-					expect(placeholderStub.calledTwice).toEqual(true);
-					expect($('#shareWithList').children().length).toEqual(3);
-					expect($('.avatar').length).toEqual(4);
-				});
-
-				it('test avatar owner', function() {
-					var args = avatarStub.getCall(0).args;
-					expect(args.length).toEqual(2);
-					expect(args[0]).toEqual('owner');
-				});
-
-				it('test avatar user', function() {
-					var args = avatarStub.getCall(1).args;
-					expect(args.length).toEqual(2);
-					expect(args[0]).toEqual('user1');
-				});
-
-				it('test avatar for groups', function() {
-					var args = placeholderStub.getCall(0).args;
-					expect(args.length).toEqual(1);
-					expect(args[0]).toEqual('group ' + OC.Share.SHARE_TYPE_GROUP);
-				});
-
-				it('test avatar for remotes', function() {
-					var args = placeholderStub.getCall(1).args;
-					expect(args.length).toEqual(1);
-					expect(args[0]).toEqual('foo@bar.com/baz ' + OC.Share.SHARE_TYPE_REMOTE);
-				});
-			});
-
-			describe('avatars disabled', function() {
-				beforeEach(function() {
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						31,
-						'shared_file_name.txt'
-					);
-				});
-
-				it('no avatar classes', function() {
-					expect($('.avatar').length).toEqual(0);
-					expect(avatarStub.callCount).toEqual(0);
-					expect(placeholderStub.callCount).toEqual(0);
-				});
-			});
-		});
-		describe('"sharesChanged" event', function() {
-			var autocompleteOptions;
-			var handler;
-			beforeEach(function() {
-				handler = sinon.stub();
-				loadItemStub.returns({
-					reshare: [],
-					shares: [{
-						id: 100,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_USER,
-						share_with: 'user1',
-						share_with_displayname: 'User One'
-					}]
-				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-				$('#dropdown').on('sharesChanged', handler);
-				autocompleteOptions = autocompleteStub.getCall(0).args[0];
-			});
-			afterEach(function() {
-				autocompleteOptions = null;
-				handler = null;
-			});
-			it('triggers "sharesChanged" event when adding shares', function() {
-				// simulate autocomplete selection
-				autocompleteOptions.select(new $.Event('select'), {
-					item: {
-						label: 'User Two',
-						value: {
-							shareType: OC.Share.SHARE_TYPE_USER,
-							shareWith: 'user2'
-						}
-					}
-				});
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-				expect(handler.calledOnce).toEqual(true);
-				var shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-				expect(shares[OC.Share.SHARE_TYPE_USER][1].share_with_displayname).toEqual('User Two');
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-			});
-			it('triggers "sharesChanged" event when deleting shares', function() {
-				$('#dropdown .unshare:eq(0)').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-				expect(handler.calledOnce).toEqual(true);
-				var shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER]).toEqual([]);
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-			});
-			it('triggers "sharesChanged" event when toggling link share', function() {
-				// simulate autocomplete selection
-				$('#dropdown #linkCheckbox').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success', data: { token: 'abc' }})
-				);
-				expect(handler.calledOnce).toEqual(true);
-				var shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-
-				handler.reset();
-
-				// uncheck checkbox
-				$('#dropdown #linkCheckbox').click();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				expect(handler.calledOnce).toEqual(true);
-				shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-			});
-		});
-		describe('share permissions', function() {
-			beforeEach(function() {
-				oc_appconfig.core.resharingAllowed = true;
-			});
-
-			/**
-			 * Tests sharing with the given possible permissions
-			 *
-			 * @param {int} possiblePermissions
-			 * @return {int} permissions sent to the server
-			 */
-			function testWithPermissions(possiblePermissions) {
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					possiblePermissions,
-					'shared_file_name.txt'
-				);
-				var autocompleteOptions = autocompleteStub.getCall(0).args[0];
-				// simulate autocomplete selection
-				autocompleteOptions.select(new $.Event('select'), {
-					item: {
-						label: 'User Two',
-						value: {
-							shareType: OC.Share.SHARE_TYPE_USER,
-							shareWith: 'user2'
-						}
-					}
-				});
-				autocompleteStub.reset();
-				var requestBody = OC.parseQueryString(_.last(fakeServer.requests).requestBody);
-				return parseInt(requestBody.permissions, 10);
-			}
-
-			describe('regular sharing', function() {
-				it('shares with given permissions with default config', function() {
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_SHARE);
-				});
-				it('removes share permission when not allowed', function() {
-					oc_appconfig.core.resharingAllowed = false;
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE);
-				});
-				it('automatically adds READ permission even when not specified', function() {
-					oc_appconfig.core.resharingAllowed = false;
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_UPDATE);
-				});
-				it('does not show sharing options when sharing not allowed', function() {
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_READ,
-						'shared_file_name.txt'
-					);
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-			});
-			describe('resharing', function() {
-				it('shares with given permissions when original share had all permissions', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_ALL
-						},
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
-				});
-				it('reduces reshare permissions to the ones from the original share', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_READ,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_ALL,
-						'shared_file_name.txt'
-					);
-					// no resharing allowed
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-				it('reduces reshare permissions to possible permissions', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_ALL,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_READ,
-						'shared_file_name.txt'
-					);
-					// no resharing allowed
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-				it('does not show sharing options when resharing not allowed', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_ALL,
-						'shared_file_name.txt'
-					);
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-				it('allows owner to share their own share when they are also the recipient', function() {
-					OC.currentUser = 'user1';
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_READ,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_ALL,
-						'shared_file_name.txt'
-					);
-					// sharing still allowed
-					expect($('#dropdown #shareWithList').length).toEqual(1);
-				});
-			});
-		});
-	});
 	describe('markFileAsShared', function() {
 		var $file;
 		var tipsyStub;
@@ -1316,21 +232,5 @@ describe('OC.Share tests', function() {
 			});
 		});
 	});
-	describe('OC.Share utils', function() {
-		it('parseTime should properly parse strings', function() {
-
-			_.each([
-				[ '123456', 123456],
-				[  123456 , 123456],
-				['0123456', 123456],
-				['abcdefg',   null],
-				['0x12345',   null],
-				[       '',   null],
-			], function(value) {
-				expect(OC.Share._parseTime(value[0])).toEqual(value[1]);
-			});
-
-		});
-	});
 });
 
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
new file mode 100644
index 00000000000..b50432a034f
--- /dev/null
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -0,0 +1,911 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/* global oc_appconfig */
+describe('OC.Share.ShareDialogView', function() {
+	var $container;
+	var oldAppConfig;
+	var autocompleteStub;
+	var oldEnableAvatars;
+	var avatarStub;
+	var placeholderStub;
+	var oldCurrentUser;
+
+	var fetchStub;
+
+	var configModel;
+	var shareModel;
+	var fileInfoModel;
+	var dialog;
+
+	beforeEach(function() {
+		// horrible parameters
+		$('#testArea').append('<input id="allowShareWithLink" type="hidden" value="yes">');
+		$('#testArea').append('<input id="mailPublicNotificationEnabled" name="mailPublicNotificationEnabled" type="hidden" value="yes">');
+		$container = $('#shareContainer');
+		/* jshint camelcase:false */
+		oldAppConfig = _.extend({}, oc_appconfig.core);
+		oc_appconfig.core.enforcePasswordForPublicLink = false;
+
+		fetchStub = sinon.stub(OC.Share.ShareItemModel.prototype, 'fetch');
+
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			id: 123,
+			name: 'shared_file_name.txt',
+			path: '/subdir',
+			size: 100,
+			mimetype: 'text/plain',
+			permissions: 31,
+			sharePermissions: 31
+		});
+
+		var attributes = {
+			itemType: fileInfoModel.isDirectory() ? 'folder' : 'file',
+			itemSource: fileInfoModel.get('id'),
+			possiblePermissions: 31,
+			permissions: 31
+		};
+		configModel = new OC.Share.ShareConfigModel();
+		shareModel = new OC.Share.ShareItemModel(attributes, {
+			configModel: configModel,
+			fileInfoModel: fileInfoModel
+		});
+		dialog = new OC.Share.ShareDialogView({
+			configModel: configModel,
+			model: shareModel
+		});
+
+		// triggers rendering
+		shareModel.set({
+			shares: [],
+			linkShare: {isLinkShare: false}
+		});
+
+		autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
+			// dummy container with the expected attributes
+			if (!$(this).length) {
+				// simulate the real autocomplete that returns
+				// nothing at all when no element is specified
+				// (and potentially break stuff)
+				return null;
+			}
+			var $el = $('<div></div>').data('ui-autocomplete', {});
+			return $el;
+		});
+
+		oldEnableAvatars = oc_config.enable_avatars;
+		oc_config.enable_avatars = false;
+		avatarStub = sinon.stub($.fn, 'avatar');
+		placeholderStub = sinon.stub($.fn, 'imageplaceholder');
+
+		oldCurrentUser = OC.currentUser;
+		OC.currentUser = 'user0';
+	});
+	afterEach(function() {
+		OC.currentUser = oldCurrentUser;
+		/* jshint camelcase:false */
+		oc_appconfig.core = oldAppConfig;
+
+		fetchStub.restore();
+
+		autocompleteStub.restore();
+		avatarStub.restore();
+		placeholderStub.restore();
+		oc_config.enable_avatars = oldEnableAvatars;
+	});
+	describe('Share with link', function() {
+		beforeEach(function() {
+			configModel.set('enforcePasswordForPublicLink', false);
+		});
+		// TODO: test ajax calls
+		// TODO: test password field visibility (whenever enforced or not)
+		it('update password on focus out', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			// Enable password, enter password and focusout
+			dialog.$el.find('[name=showPassword]').click();
+			dialog.$el.find('#linkPassText').focus();
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').focusout();
+
+			expect(fakeServer.requests[1].method).toEqual('POST');
+			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
+			expect(body['shareWith']).toEqual('foo');
+
+			// Set password response
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
+		});
+		it('update password on enter', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			// Enable password and enter password
+			dialog.$el.find('[name=showPassword]').click();
+			dialog.$el.find('#linkPassText').focus();
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+
+			expect(fakeServer.requests[1].method).toEqual('POST');
+			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
+			expect(body['shareWith']).toEqual('foo');
+
+			// Set password response
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
+		});
+		it('shows share with link checkbox when allowed', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			expect(dialog.$el.find('#linkCheckbox').length).toEqual(1);
+		});
+		it('does not show share with link checkbox when not allowed', function() {
+			$('#allowShareWithLink').val('no');
+
+			dialog.render();
+
+			expect(dialog.$el.find('#linkCheckbox').length).toEqual(0);
+		});
+		it('Reset link when password is enforced and link is toggled', function() { 
+			var old = oc_appconfig.core.enforcePasswordForPublicLink;
+			oc_appconfig.core.enforcePasswordForPublicLink = true;
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkText').val()).toEqual('');
+
+			// Set password
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			// Remove link
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			/*
+			 * Try to share again
+			 * The linkText should be emptied
+			 */
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkText').val()).toEqual('');
+
+			/*
+			 * Do not set password but untoggle
+			 * Since there is no share this should not result in another request to the server
+			 */
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(fakeServer.requests.length).toEqual(2);
+
+			oc_appconfig.core.enforcePasswordForPublicLink = old;
+		});
+
+		it('Reset password placeholder when password is enforced and link is toggled', function() { 
+			var old = oc_appconfig.core.enforcePasswordForPublicLink;
+			oc_appconfig.core.enforcePasswordForPublicLink = true;
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
+
+			// Set password
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('**********');
+
+			// Remove link
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			// Try to share again
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
+
+			oc_appconfig.core.enforcePasswordForPublicLink = old;
+		});
+		it('reset password on toggle of share', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			//Password protection should be unchecked and password field not visible
+			expect(dialog.$el.find('[name=showPassword]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#linkPass').is(":visible")).toEqual(false);
+
+			// Toggle and set password
+			dialog.$el.find('[name=showPassword]').click();
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
+			);
+
+			// Unshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[2].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			// Toggle share again
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[3].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
+			);
+
+
+			// Password checkbox should be unchecked
+			expect(dialog.$el.find('[name=showPassword]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#linkPass').is(":visible")).toEqual(false);
+		});
+		it('reset expiration on toggle of share', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			//Expiration should be unchecked and expiration field not visible
+			expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#expirationDate').is(":visible")).toEqual(false);
+
+			// Toggle and set password
+			dialog.$el.find('[name=expirationCheckbox]').click();
+			d = new Date();
+			d.setDate(d.getDate() + 1);
+			date=d.getDate() + '-' + (d.getMonth()+1) + '-' + d.getFullYear();
+			dialog.$el.find('#expirationDate').val(date);
+			dialog.$el.find('#expirationDate').change();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
+			);
+
+			// Unshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[2].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			// Toggle share again
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[3].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
+			);
+
+			// Recheck expire visibility
+			expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#expirationDate').is(":visible")).toEqual(false);
+		});
+		it('shows populated link share when a link share exists', function() {
+			shareModel.set('linkShare', {
+				isLinkShare: true,
+				token: 'tehtoken',
+				link: 'TODO',
+				expiration: '',
+				permissions: OC.PERMISSION_READ,
+				stime: 1403884258,
+			});
+
+			expect(dialog.$el.find('#linkCheckbox').prop('checked')).toEqual(true);
+			// this is how the OC.Share class does it...
+			var link = parent.location.protocol + '//' + location.host +
+				OC.generateUrl('/s/') + 'tehtoken';
+			expect(dialog.$el.find('#linkText').val()).toEqual(link);
+		});
+		describe('expiration date', function() {
+			var shareData;
+			var shareItem;
+			var clock;
+			var expectedMinDate;
+
+			beforeEach(function() {
+				// pick a fake date
+				clock = sinon.useFakeTimers(new Date(2014, 0, 20, 14, 0, 0).getTime());
+				expectedMinDate = new Date(2014, 0, 21, 14, 0, 0);
+
+				oc_appconfig.core.defaultExpireDate = 7;
+				oc_appconfig.core.enforcePasswordForPublicLink = false;
+				oc_appconfig.core.defaultExpireDateEnabled = false;
+				oc_appconfig.core.defaultExpireDateEnforced = false;
+
+				shareModel.set('linkShare', {
+					isLinkShare: true,
+					token: 'tehtoken',
+					permissions: OC.PERMISSION_READ,
+					expiration: null
+				});
+			});
+			afterEach(function() {
+				clock.restore();
+			});
+
+			it('does not check expiration date checkbox when no date was set', function() {
+				shareModel.get('linkShare').expiration = null;
+				dialog.render();
+
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('');
+			});
+			it('does not check expiration date checkbox for new share', function() {
+				dialog.render();
+
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('');
+			});
+			it('checks expiration date checkbox and populates field when expiration date was set', function() {
+				shareModel.get('linkShare').expiration = 1234;
+				dialog.render();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('1234');
+			});
+			it('sets default date when default date setting is enabled', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				// enabled by default
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				// TODO: those zeros must go...
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+
+				// disabling is allowed
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+			});
+			it('enforces default date when enforced date setting is enabled', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				// TODO: those zeros must go...
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+
+				// disabling is not allowed
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('disabled')).toEqual(true);
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+			});
+			it('enforces default date when enforced date setting is enabled and password is enforced', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.enforcePasswordForPublicLink = true;
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+
+				//Enter password
+				dialog.$el.find('#linkPassText').val('foo');
+				dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+				fakeServer.requests[0].respond(
+					200,
+					{ 'Content-Type': 'application/json' },
+					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+				);
+
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				// TODO: those zeros must go...
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+
+				// disabling is not allowed
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('disabled')).toEqual(true);
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+			});
+			it('displayes email form when sending emails is enabled', function() {
+				$('input[name=mailPublicNotificationEnabled]').val('yes');
+				dialog.render();
+				expect($('#emailPrivateLink').length).toEqual(1);
+			});
+			it('not renders email form when sending emails is disabled', function() {
+				$('input[name=mailPublicNotificationEnabled]').val('no');
+				dialog.render();
+				expect($('#emailPrivateLink').length).toEqual(0);
+			});
+			it('sets picker minDate to today and no maxDate by default', function() {
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
+				expect($.datepicker._defaults.maxDate).toEqual(null);
+			});
+			it('limits the date range to X days after share time when enforced', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
+				expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
+			});
+			it('limits the date range to X days after share time when enforced, even when redisplayed the next days', function() {
+				// item exists, was created two days ago
+				shareItem.expiration = '2014-1-27';
+				// share time has time component but must be stripped later
+				shareItem.stime = new Date(2014, 0, 20, 11, 0, 25).getTime() / 1000;
+				shareData.shares.push(shareItem);
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
+				expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
+			});
+		});
+	});
+	describe('check for avatar', function() {
+		beforeEach(function() {
+			loadItemStub.returns({
+				reshare: {
+					share_type: OC.Share.SHARE_TYPE_USER,
+					uid_owner: 'owner',
+					displayname_owner: 'Owner',
+					permissions: 31
+				},
+				shares: [{
+					id: 100,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					share_with_displayname: 'User One'
+				},{
+					id: 101,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					share_with: 'group',
+					share_with_displayname: 'group'
+				},{
+					id: 102,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_REMOTE,
+					share_with: 'foo@bar.com/baz',
+					share_with_displayname: 'foo@bar.com/baz'
+
+				}]
+			});
+		});
+
+		describe('avatars enabled', function() {
+			beforeEach(function() {
+				oc_config.enable_avatars = true;
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					31,
+					'shared_file_name.txt'
+				);
+			});
+
+			afterEach(function() {
+				oc_config.enable_avatars = false;
+			});
+
+			it('test correct function calls', function() {
+				expect(avatarStub.calledTwice).toEqual(true);
+				expect(placeholderStub.calledTwice).toEqual(true);
+				expect($('#shareWithList').children().length).toEqual(3);
+				expect($('.avatar').length).toEqual(4);
+			});
+
+			it('test avatar owner', function() {
+				var args = avatarStub.getCall(0).args;
+				expect(args.length).toEqual(2);
+				expect(args[0]).toEqual('owner');
+			});
+
+			it('test avatar user', function() {
+				var args = avatarStub.getCall(1).args;
+				expect(args.length).toEqual(2);
+				expect(args[0]).toEqual('user1');
+			});
+
+			it('test avatar for groups', function() {
+				var args = placeholderStub.getCall(0).args;
+				expect(args.length).toEqual(1);
+				expect(args[0]).toEqual('group ' + OC.Share.SHARE_TYPE_GROUP);
+			});
+
+			it('test avatar for remotes', function() {
+				var args = placeholderStub.getCall(1).args;
+				expect(args.length).toEqual(1);
+				expect(args[0]).toEqual('foo@bar.com/baz ' + OC.Share.SHARE_TYPE_REMOTE);
+			});
+		});
+
+		describe('avatars disabled', function() {
+			beforeEach(function() {
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					31,
+					'shared_file_name.txt'
+				);
+			});
+
+			it('no avatar classes', function() {
+				expect($('.avatar').length).toEqual(0);
+				expect(avatarStub.callCount).toEqual(0);
+				expect(placeholderStub.callCount).toEqual(0);
+			});
+		});
+	});
+	describe('"sharesChanged" event', function() {
+		var autocompleteOptions;
+		var handler;
+		beforeEach(function() {
+			handler = sinon.stub();
+			loadItemStub.returns({
+				reshare: [],
+				shares: [{
+					id: 100,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					share_with_displayname: 'User One'
+				}]
+			});
+			OC.Share.showDropDown(
+				'file',
+				123,
+				$container,
+				true,
+				31,
+				'shared_file_name.txt'
+			);
+			$('#dropdown').on('sharesChanged', handler);
+			autocompleteOptions = autocompleteStub.getCall(0).args[0];
+		});
+		afterEach(function() {
+			autocompleteOptions = null;
+			handler = null;
+		});
+		it('triggers "sharesChanged" event when adding shares', function() {
+			// simulate autocomplete selection
+			autocompleteOptions.select(new $.Event('select'), {
+				item: {
+					label: 'User Two',
+					value: {
+						shareType: OC.Share.SHARE_TYPE_USER,
+						shareWith: 'user2'
+					}
+				}
+			});
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+			expect(handler.calledOnce).toEqual(true);
+			var shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
+			expect(shares[OC.Share.SHARE_TYPE_USER][1].share_with_displayname).toEqual('User Two');
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+		});
+		it('triggers "sharesChanged" event when deleting shares', function() {
+			dialog.$el.find('.unshare:eq(0)').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+			expect(handler.calledOnce).toEqual(true);
+			var shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER]).toEqual([]);
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+		});
+		it('triggers "sharesChanged" event when toggling link share', function() {
+			// simulate autocomplete selection
+			dialog.$el.find('#linkCheckbox').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success', data: { token: 'abc' }})
+			);
+			expect(handler.calledOnce).toEqual(true);
+			var shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+
+			handler.reset();
+
+			// uncheck checkbox
+			dialog.$el.find('#linkCheckbox').click();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			expect(handler.calledOnce).toEqual(true);
+			shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+		});
+	});
+	describe('share permissions', function() {
+		beforeEach(function() {
+			oc_appconfig.core.resharingAllowed = true;
+		});
+
+		/**
+		 * Tests sharing with the given possible permissions
+		 *
+		 * @param {int} possiblePermissions
+		 * @return {int} permissions sent to the server
+		 */
+		function testWithPermissions(possiblePermissions) {
+			OC.Share.showDropDown(
+				'file',
+				123,
+				$container,
+				true,
+				possiblePermissions,
+				'shared_file_name.txt'
+			);
+			var autocompleteOptions = autocompleteStub.getCall(0).args[0];
+			// simulate autocomplete selection
+			autocompleteOptions.select(new $.Event('select'), {
+				item: {
+					label: 'User Two',
+					value: {
+						shareType: OC.Share.SHARE_TYPE_USER,
+						shareWith: 'user2'
+					}
+				}
+			});
+			autocompleteStub.reset();
+			var requestBody = OC.parseQueryString(_.last(fakeServer.requests).requestBody);
+			return parseInt(requestBody.permissions, 10);
+		}
+
+		describe('regular sharing', function() {
+			it('shares with given permissions with default config', function() {
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_SHARE);
+			});
+			it('removes share permission when not allowed', function() {
+				oc_appconfig.core.resharingAllowed = false;
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE);
+			});
+			it('automatically adds READ permission even when not specified', function() {
+				oc_appconfig.core.resharingAllowed = false;
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_UPDATE);
+			});
+			it('does not show sharing options when sharing not allowed', function() {
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_READ,
+					'shared_file_name.txt'
+				);
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+		});
+		describe('resharing', function() {
+			it('shares with given permissions when original share had all permissions', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_ALL
+					},
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
+			});
+			it('reduces reshare permissions to the ones from the original share', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_READ,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_ALL,
+					'shared_file_name.txt'
+				);
+				// no resharing allowed
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+			it('reduces reshare permissions to possible permissions', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_ALL,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_READ,
+					'shared_file_name.txt'
+				);
+				// no resharing allowed
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+			it('does not show sharing options when resharing not allowed', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_ALL,
+					'shared_file_name.txt'
+				);
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+			it('allows owner to share their own share when they are also the recipient', function() {
+				OC.currentUser = 'user1';
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_READ,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_ALL,
+					'shared_file_name.txt'
+				);
+				// sharing still allowed
+				expect(dialog.$el.find('#shareWithList').length).toEqual(1);
+			});
+		});
+	});
+});
+
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
new file mode 100644
index 00000000000..d3c4b7d4004
--- /dev/null
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -0,0 +1,234 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/* global oc_appconfig */
+describe('OC.Share.ShareItemModel', function() {
+	var loadItemStub;
+	var fileInfoModel, configModel, model;
+
+	beforeEach(function() {
+		loadItemStub = sinon.stub(OC.Share, 'loadItem');
+		loadItemStub.returns({
+			reshare: [],
+			shares: []
+		});
+
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			id: 123,
+			name: 'shared_file_name.txt',
+			path: '/subdir',
+			size: 100,
+			mimetype: 'text/plain',
+			permissions: 31,
+			sharePermissions: 31
+		});
+
+		var attributes = {
+			itemType: fileInfoModel.isDirectory() ? 'folder' : 'file',
+			itemSource: fileInfoModel.get('id'),
+			possiblePermissions: fileInfoModel.get('sharePermissions')
+		};
+		configModel = new OC.Share.ShareConfigModel();
+		model = new OC.Share.ShareItemModel(attributes, {
+			configModel: configModel,
+			fileInfoModel: fileInfoModel
+		});
+	});
+	afterEach(function() {
+		loadItemStub.restore();
+	});
+
+	describe('Fetching and parsing', function() {
+		it('fetching calls loadItem with the correct arguments', function() {
+			model.fetch();
+
+			expect(loadItemStub.calledOnce).toEqual(true);
+			expect(loadItemStub.calledWith('file', 123)).toEqual(true);
+		});
+		it('populates attributes with parsed response', function() {
+			loadItemStub.returns({
+				/* jshint camelcase: false */
+				reshare: {
+					share_type: OC.Share.SHARE_TYPE_USER,
+					uid_owner: 'owner',
+					displayname_owner: 'Owner',
+					permissions: 31
+				},
+				shares: [{
+					id: 100,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					share_with_displayname: 'User One'
+				}, {
+					id: 101,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					share_with: 'group',
+					share_with_displayname: 'group'
+				}, {
+					id: 102,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_REMOTE,
+					share_with: 'foo@bar.com/baz',
+					share_with_displayname: 'foo@bar.com/baz'
+
+				}, {
+					displayname_owner: 'root',
+					expiration: null,
+					file_source: 123,
+					file_target: '/folder',
+					id: 20,
+					item_source: '123',
+					item_type: 'folder',
+					mail_send: '0',
+					parent: null,
+					path: '/folder',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884258,
+					storage: 1,
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}]
+			});
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(3);
+			expect(shares.file_source).toEqual(123);
+
+			var linkShare = model.get('linkShare');
+			expect(linkShare.isLinkShare).toEqual(true);
+
+			// TODO: check more attributes
+		});
+		it('does not parse link share when for a different file', function() {
+			loadItemStub.returns({
+				reshare: [],
+				/* jshint camelcase: false */
+				shares: [{
+					displayname_owner: 'root',
+					expiration: null,
+					file_source: 456,
+					file_target: '/folder',
+					id: 20,
+					item_source: '456',
+					item_type: 'folder',
+					mail_send: '0',
+					parent: null,
+					path: '/folder',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884258,
+					storage: 1,
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}]
+			});
+
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(0);
+
+			var linkShare = model.get('linkShare');
+			expect(linkShare.isLinkShare).toEqual(false);
+		});
+		it('parsess correct link share when a nested link share exists along with parent one', function() {
+			loadItemStub.returns({
+				reshare: [],
+				/* jshint camelcase: false */
+				shares: [{
+					displayname_owner: 'root',
+					expiration: 1111,
+					file_source: 123,
+					file_target: '/folder',
+					id: 20,
+					item_source: '123',
+					item_type: 'file',
+					mail_send: '0',
+					parent: null,
+					path: '/folder',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884258,
+					storage: 1,
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}, {
+					displayname_owner: 'root',
+					expiration: 2222,
+					file_source: 456,
+					file_target: '/file_in_folder.txt',
+					id: 21,
+					item_source: '456',
+					item_type: 'file',
+					mail_send: '0',
+					parent: null,
+					path: '/folder/file_in_folder.txt',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884509,
+					storage: 1,
+					token: 'anothertoken',
+					uid_owner: 'root'
+				}]
+			});
+
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(0);
+
+			var linkShare = model.get('linkShare');
+			expect(linkShare.isLinkShare).toEqual(false);
+			expect(linkShare.token).toEqual('tehtoken');
+
+			// TODO: check child too
+		});
+	});
+
+	describe('Util', function() {
+		it('parseTime should properly parse strings', function() {
+
+			_.each([
+				[ '123456', 123456],
+				[  123456 , 123456],
+				['0123456', 123456],
+				['abcdefg',   null],
+				['0x12345',   null],
+				[       '',   null],
+			], function(value) {
+				expect(OC.Share._parseTime(value[0])).toEqual(value[1]);
+			});
+
+		});
+	});
+});
+
diff --git a/tests/karma.config.js b/tests/karma.config.js
index d3280b2939a..64a94ef230b 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -55,7 +55,8 @@ module.exports = function(config) {
 					'apps/files_sharing/js/sharedfilelist.js',
 					'apps/files_sharing/js/share.js',
 					'apps/files_sharing/js/external.js',
-					'apps/files_sharing/js/public.js'
+					'apps/files_sharing/js/public.js',
+					'apps/files_sharing/js/sharetabview.js'
 				],
 				testFiles: ['apps/files_sharing/tests/js/*.js']
 			},
-- 
cgit v1.2.3


From 6141ea12b1fbac1de2c5bc4c1f2b756b13d8034e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 16:14:29 +0200
Subject: Port share.css styles to the sidebar panel

---
 core/css/share.css                  | 30 ++++++++++++++++++------------
 core/js/sharedialoglinkshareview.js |  2 +-
 core/js/sharedialogview.js          |  3 +--
 3 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'core/js/sharedialoglinkshareview.js')

diff --git a/core/css/share.css b/core/css/share.css
index 73bad5c500d..6467cc0239c 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -23,29 +23,29 @@
 	}
 }
 
-#dropdown.shareDropDown .unshare.icon-loading-small {
+.shareTabView .unshare.icon-loading-small {
 	margin-top: 1px;
 }
 
-#dropdown.shareDropDown .shareWithLoading,
-#dropdown.shareDropDown .linkShare .icon-loading-small {
+.shareTabView .shareWithLoading,
+.shareTabView .linkShare .icon-loading-small {
 	display: inline-block !important;
 	padding-left: 10px;
 }
-#dropdown.shareDropDown .shareWithLoading {
+.shareTabView .shareWithLoading {
 	position: relative;
 	right: 70px;
 	top: 2px;
 }
-#dropdown.shareDropDown .icon-loading-small.hidden {
+.shareTabView .icon-loading-small.hidden {
 	display: none !important;
 }
 
-#dropdown .shareWithRemoteInfo {
+.shareTabView .shareWithRemoteInfo {
 	padding: 11px 20px;
 }
 
-#dropdown .avatar {
+.shareTabView .avatar {
 	margin-right: 8px;
 	display: inline-block;
 	overflow: hidden;
@@ -87,12 +87,12 @@
 #shareWithList li label{
 	margin-right: 8px;
 }
-#dropdown label {
+.shareTabView label {
 	font-weight:400;
 	white-space: nowrap;
 }
 
-#dropdown input[type="checkbox"] {
+.shareTabView input[type="checkbox"] {
 	margin:0 3px 0 8px;
 	vertical-align: middle;
 }
@@ -115,12 +115,18 @@ a.unshare {
 	padding-top:8px;
 }
 
-#dropdown input[type="text"],#dropdown input[type="password"] {
-	width: 86%;
+.shareTabView input[type="text"],
+.shareTabView input[type="password"],
+.shareTabView input[type="submit"] {
 	margin-left: 7px;
 }
 
-#dropdown form {
+.shareTabView input[type="text"],
+.shareTabView input[type="password"] {
+	width: 86%;
+}
+
+.shareTabView form {
 	font-size: 100%;
 	margin-left: 0;
 	margin-right: 0;
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 2c7914b2545..ab591b9c6e8 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -32,7 +32,7 @@
 			'<div id="allowPublicUploadWrapper">' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
-			'    <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'<label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
 			'</div>' +
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 8c390ee5450..2b61dab3ceb 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -20,9 +20,8 @@
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
 		'    <span class="shareWithLoading icon-loading-small hidden"></span>'+
-		'</div>' +
-			// FIXME: find a good position for remoteShareInfo
 		'{{{remoteShareInfo}}}' +
+		'</div>' +
 		'{{/if}}' +
 		'<div class="shareeListView"></div>' +
 		'<div class="linkShareView"></div>' +
-- 
cgit v1.2.3