From 018d07b3e55fd7234008c51d0a124b7b681a1a4f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 24 Aug 2015 13:00:03 +0200
Subject: Add share dialog into share tab

---
 apps/files_sharing/js/share.js        |  4 +---
 apps/files_sharing/js/sharetabview.js | 38 ++++++++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 10 deletions(-)

(limited to 'apps/files_sharing/js')

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index c124d390d04..a4ae7fad899 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -151,9 +151,7 @@
 				}
 			});
 
-			OC.addScript('files_sharing', 'sharetabview').done(function() {
-				fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
-			});
+			fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
 		},
 
 		/**
diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index ee572b747ea..99a5a0fb1db 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -10,7 +10,10 @@
 
 (function() {
 	var TEMPLATE =
-		'<div><ul>{{#if owner}}<li>Owner: {{owner}}</li>{{/if}}</ul></div>';
+		'<div>' +
+		'<ul>{{#if owner}}<li>Owner: {{owner}}</li>{{/if}}</ul>' +
+		'<div class="dialogContainer"></div>' +
+		'</div>';
 
 	/**
 	 * @memberof OCA.Sharing
@@ -20,7 +23,12 @@
 		id: 'shareTabView',
 		className: 'tab shareTabView',
 
-		_template: null,
+		template: function(params) {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template(params);
+		},
 
 		getLabel: function() {
 			return t('files_sharing', 'Sharing');
@@ -30,10 +38,10 @@
 		 * Renders this details view
 		 */
 		render: function() {
-			this.$el.empty();
-
-			if (!this._template) {
-				this._template = Handlebars.compile(TEMPLATE);
+			if (this._dialog) {
+				// remove/destroy older instance
+				this._dialog.remove();
+				this._dialog = null;
 			}
 
 			if (this.model) {
@@ -42,11 +50,27 @@
 				if (owner === OC.currentUser) {
 					owner = null;
 				}
-				this.$el.append(this._template({
+				this.$el.html(this.template({
 					owner: owner
 				}));
 
+				var attributes = {
+					itemType: 'file',
+				   	itemSource: this.model.get('id'),
+					// TODO: make these available
+				   	possiblePermissions: this.model.get('sharingPossiblePermissions')
+				};
+				var shareModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
+				var configModel = new OC.Share.ShareConfigModel();
+				this._dialog = new OC.Share.ShareDialogView({
+					configModel: configModel,
+					model: shareModel
+				});
+				this.$el.find('.dialogContainer').append(this._dialog.$el);
+				this._dialog.render();
+				shareModel.fetch();
 			} else {
+				this.$el.empty();
 				// TODO: render placeholder text?
 			}
 		}
-- 
cgit v1.2.3


From f709022559d434612f995ecce56a65b034590f6b Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 24 Aug 2015 13:15:33 +0200
Subject: Fix share permissions for share tab

---
 apps/files_sharing/js/sharetabview.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'apps/files_sharing/js')

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 99a5a0fb1db..11f25c0c47c 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -57,8 +57,7 @@
 				var attributes = {
 					itemType: 'file',
 				   	itemSource: this.model.get('id'),
-					// TODO: make these available
-				   	possiblePermissions: this.model.get('sharingPossiblePermissions')
+					possiblePermissions: this.model.get('sharePermissions')
 				};
 				var shareModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
 				var configModel = new OC.Share.ShareConfigModel();
-- 
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 'apps/files_sharing/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 5fad379bf1ba0bc6502055ba92869663b36c9a84 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 12:01:36 +0200
Subject: remove obsolete file action

---
 apps/files_sharing/js/share.js | 55 ------------------------------------------
 1 file changed, 55 deletions(-)

(limited to 'apps/files_sharing/js')

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index a4ae7fad899..c3d567fec86 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -32,7 +32,6 @@
 			if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
 				return;
 			}
-			var fileActions = fileList.fileActions;
 			var oldCreateRow = fileList._createRow;
 			fileList._createRow = function(fileData) {
 				var tr = oldCreateRow.apply(this, arguments);
@@ -97,60 +96,6 @@
 				}
 			});
 
-			fileActions.registerAction({
-				name: 'Share',
-				displayName: '',
-				mime: 'all',
-				permissions: OC.PERMISSION_SHARE,
-				icon: OC.imagePath('core', 'actions/share'),
-				type: OCA.Files.FileActions.TYPE_INLINE,
-				actionHandler: function(filename, context) {
-					var $tr = context.$file;
-					var itemType = 'file';
-					if ($tr.data('type') === 'dir') {
-						itemType = 'folder';
-					}
-					var possiblePermissions = $tr.data('share-permissions');
-					if (_.isUndefined(possiblePermissions)) {
-						possiblePermissions = $tr.data('permissions');
-					}
-
-					var appendTo = $tr.find('td.filename');
-					// Check if drop down is already visible for a different file
-					if (OC.Share.droppedDown) {
-						if ($tr.attr('data-id') !== $('#dropdown').attr('data-item-source')) {
-							OC.Share.hideDropDown(function () {
-								$tr.addClass('mouseOver');
-								OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
-							});
-						} else {
-							OC.Share.hideDropDown();
-						}
-					} else {
-						$tr.addClass('mouseOver');
-						OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
-					}
-					$('#dropdown').on('sharesChanged', function(ev) {
-						// files app current cannot show recipients on load, so we don't update the
-						// icon when changed for consistency
-						if (context.fileList.$el.closest('#app-content-files').length) {
-							return;
-						}
-						var recipients = _.pluck(ev.shares[OC.Share.SHARE_TYPE_USER], 'share_with_displayname');
-						var groupRecipients = _.pluck(ev.shares[OC.Share.SHARE_TYPE_GROUP], 'share_with_displayname');
-						recipients = recipients.concat(groupRecipients);
-						// note: we only update the data attribute because updateIcon()
-						// is called automatically after this event
-						if (recipients.length) {
-							$tr.attr('data-share-recipients', OCA.Sharing.Util.formatRecipients(recipients));
-						}
-						else {
-							$tr.removeAttr('data-share-recipients');
-						}
-					});
-				}
-			});
-
 			fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
 		},
 
-- 
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 'apps/files_sharing/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 e90065881d47a64b6c376208ece208932711c765 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 17:20:51 +0200
Subject: Bring back the share icon and update its status

Display share icon in file list row.
Update share icon status when the sharing state changed.
---
 apps/files/js/filelist.js             | 14 ++++++++
 apps/files_sharing/js/share.js        | 63 +++++++++++++++++++++++++++++----
 apps/files_sharing/js/sharetabview.js |  7 +++-
 core/js/sharedialogshareelistview.js  |  2 +-
 core/js/shareitemmodel.js             | 65 +++++++++++++++++++++++++----------
 5 files changed, 123 insertions(+), 28 deletions(-)

(limited to 'apps/files_sharing/js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 194c658e3a1..699df691bbc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -367,6 +367,20 @@
 			return model;
 		},
 
+		/**
+		 * Displays the details view for the given file and
+		 * selects the given tab
+		 *
+		 * @param {string} fileName file name for which to show details
+		 * @param {string} [tabId] optional tab id to select
+		 */
+		showDetailsView: function(fileName, tabId) {
+			this._updateDetailsView(fileName);
+			if (tabId) {
+				this._detailsView.selectTab(tabId);
+			}
+		},
+
 		/**
 		 * Update the details view to display the given file
 		 *
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index c3d567fec86..5290dfbb7d1 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -32,6 +32,7 @@
 			if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
 				return;
 			}
+			var fileActions = fileList.fileActions;
 			var oldCreateRow = fileList._createRow;
 			fileList._createRow = function(fileData) {
 				var tr = oldCreateRow.apply(this, arguments);
@@ -78,7 +79,9 @@
 						$files = fileList.$fileList.find('tr');
 					}
 					_.each($files, function(file) {
-						OCA.Sharing.Util.updateFileActionIcon($(file));
+						var $tr = $(file);
+						var shareStatus = OC.Share.statuses[$tr.data('id')];
+						OCA.Sharing.Util._updateFileActionIcon($tr, !!shareStatus, shareStatus && shareStatus.link);
 					});
 				}
 
@@ -96,22 +99,66 @@
 				}
 			});
 
-			fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
+			fileActions.registerAction({
+				name: 'Share',
+				displayName: '',
+				mime: 'all',
+				permissions: OC.PERMISSION_SHARE,
+				icon: OC.imagePath('core', 'actions/share'),
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				actionHandler: function(fileName) {
+					fileList.showDetailsView(fileName, 'shareTabView');
+				}
+			});
+
+			var shareTab = new OCA.Sharing.ShareTabView('shareTabView');
+			// detect changes and change the matching list entry
+			shareTab.on('sharesChanged', function(shareModel) {
+				var fileInfoModel = shareModel.fileInfoModel;
+				var $tr = fileList.findFileEl(fileInfoModel.get('name'));
+				OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel);
+				if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), shareModel.hasLinkShare())) {
+					// remove icon, if applicable
+					OC.Share.markFileAsShared($tr, false, false);
+				}
+			});
+			fileList.registerTabView(shareTab);
+		},
+
+		/**
+		 * Update file list data attributes
+		 */
+		_updateFileListDataAttributes: function(fileList, $tr, shareModel) {
+			// files app current cannot show recipients on load, so we don't update the
+			// icon when changed for consistency
+			if (fileList.id === 'files') {
+				return;
+			}
+			var recipients = _.pluck(shareModel.get('shares'), 'share_with_displayname');
+			// note: we only update the data attribute because updateIcon()
+			if (recipients.length) {
+				$tr.attr('data-share-recipients', OCA.Sharing.Util.formatRecipients(recipients));
+			}
+			else {
+				$tr.removeAttr('data-share-recipients');
+			}
 		},
 
 		/**
 		 * Update the file action share icon for the given file
 		 *
 		 * @param $tr file element of the file to update
+		 * @param {bool} hasUserShares true if a user share exists
+		 * @param {bool} hasLinkShare true if a link share exists
+		 *
+		 * @return {bool} true if the icon was set, false otherwise
 		 */
-		updateFileActionIcon: function($tr) {
+		_updateFileActionIcon: function($tr, hasUserShares, hasLinkShare) {
 			// if the statuses are loaded already, use them for the icon
 			// (needed when scrolling to the next page)
-			var shareStatus = OC.Share.statuses[$tr.data('id')];
-			if (shareStatus || $tr.attr('data-share-recipients') || $tr.attr('data-share-owner')) {
+			if (hasUserShares || hasLinkShare || $tr.attr('data-share-recipients') || $tr.attr('data-share-owner')) {
 				var permissions = $tr.data('permissions');
-				var hasLink = !!(shareStatus && shareStatus.link);
-				OC.Share.markFileAsShared($tr, true, hasLink);
+				OC.Share.markFileAsShared($tr, true, hasLinkShare);
 				if ((permissions & OC.PERMISSION_SHARE) === 0 && $tr.attr('data-share-owner')) {
 					// if no share action exists because the admin disabled sharing for this user
 					// we create a share notification action to inform the user about files
@@ -130,7 +177,9 @@
 						return $result;
 					});
 				}
+				return true;
 			}
+			return false;
 		},
 
 		/**
diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 9f6c71d1924..1ad17365957 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -38,8 +38,10 @@
 		 * Renders this details view
 		 */
 		render: function() {
+			var self = this;
 			if (this._dialog) {
 				// remove/destroy older instance
+				this._dialog.model.off();
 				this._dialog.remove();
 				this._dialog = null;
 			}
@@ -69,7 +71,10 @@
 				});
 				this.$el.find('.dialogContainer').append(this._dialog.$el);
 				this._dialog.render();
-				shareModel.fetch();
+				this._dialog.model.fetch();
+				this._dialog.model.on('change', function() {
+					self.trigger('sharesChanged', shareModel);
+				});
 			} else {
 				this.$el.empty();
 				// TODO: render placeholder text?
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 1f53a479fb5..cf8905ff982 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -175,7 +175,7 @@
 
 			this._collections = {};
 
-			if(!this.model.hasShares()) {
+			if(!this.model.hasUserShares()) {
 				return [];
 			}
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 2a97bc8abd5..949c86599bc 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -149,8 +149,6 @@
 							options.error(model);
 						}
 					}
-					//FIXME: updateIcon belongs to view
-					OC.Share.updateIcon(itemType, itemSource);
 				},
 				function(result) {
 					var msg = t('core', 'Error');
@@ -236,8 +234,6 @@
 			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);
 			});
 		},
 
@@ -255,8 +251,6 @@
 
 			OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
 				model.fetch();
-				//FIXME: updateIcon belongs to view
-				OC.Share.updateIcon(itemType, itemSource);
 			});
 		},
 
@@ -291,12 +285,25 @@
 		},
 
 		/**
-		 * whether this item has share information
+		 * whether this item has user share information
 		 * @returns {boolean}
 		 */
-		hasShares: function() {
+		hasUserShares: function() {
 			var shares = this.get('shares');
-			return _.isArray(this.get('shares'));
+			return _.isArray(shares) && shares.length > 0;
+		},
+
+		/**
+		 * Returns whether this item has a link share
+		 *
+		 * @return {bool} true if a link share exists, false otherwise
+		 */
+		hasLinkShare: function() {
+			var linkShare = this.get('linkShare');
+			if (linkShare && linkShare.isLinkShare) {
+				return true;
+			}
+			return false;
 		},
 
 		/**
@@ -544,7 +551,27 @@
 			});
 		},
 
-		legacyFillCurrentShares: function(shares) {
+		/**
+		 * Updates OC.Share.itemShares and OC.Share.statuses.
+		 *
+		 * This is required in case the user navigates away and comes back,
+		 * the share statuses from the old arrays are still used to fill in the icons
+		 * in the file list.
+		 */
+		_legacyFillCurrentShares: function(shares) {
+			var fileId = this.fileInfoModel.get('id');
+			if (!shares || !shares.length) {
+				delete OC.Share.statuses[fileId];
+				return;
+			}
+
+			var currentShareStatus = OC.Share.statuses[fileId];
+			if (!currentShareStatus) {
+				currentShareStatus = {link: false};
+				OC.Share.statuses[fileId] = currentShareStatus;
+			}
+			currentShareStatus.link = false;
+
 			OC.Share.currentShares = {};
 			OC.Share.itemShares = [];
 			_.each(shares,
@@ -552,15 +579,15 @@
 				 * @param {OC.Share.Types.ShareInfo} share
 				 */
 				function(share) {
-					if (!OC.Share.currentShares[share.share_type]) {
-						OC.Share.currentShares[share.share_type] = [];
-					}
-					OC.Share.currentShares[share.share_type].push(share);
-
-					if (!OC.Share.itemShares[share.share_type]) {
-						OC.Share.itemShares[share.share_type] = [];
+					if (share.share_type === OC.Share.SHARE_TYPE_LINK) {
+						OC.Share.itemShares[share.share_type] = true;
+						currentShareStatus.link = true;
+					} else {
+						if (!OC.Share.itemShares[share.share_type]) {
+							OC.Share.itemShares[share.share_type] = [];
+						}
+						OC.Share.itemShares[share.share_type].push(share.share_with);
 					}
-					OC.Share.itemShares[share.share_type].push(share.share_with);
 				}
 			);
 		},
@@ -589,7 +616,7 @@
 
 			/** @type {OC.Share.Types.ShareInfo[]} **/
 			var shares = _.toArray(data.shares);
-			this.legacyFillCurrentShares(shares);
+			this._legacyFillCurrentShares(shares);
 
 			var linkShare = { isLinkShare: false };
 			// filter out the share by link
-- 
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 'apps/files_sharing/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 996639f4fbd4107851efc11ee34b24cead43e790 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 15:29:30 +0200
Subject: More unit tests for share dialog

---
 apps/files_sharing/js/sharetabview.js      |   9 +-
 core/js/sharedialogexpirationview.js       |  23 +-
 core/js/sharedialogresharerinfoview.js     |   4 +-
 core/js/sharedialogshareelistview.js       |  11 +-
 core/js/sharedialogview.js                 |  24 +-
 core/js/tests/specs/sharedialogviewSpec.js | 467 +++++++----------------------
 core/js/tests/specs/shareitemmodelSpec.js  |  73 ++++-
 7 files changed, 203 insertions(+), 408 deletions(-)

(limited to 'apps/files_sharing/js')

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 68288500ae0..e24320604fb 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -11,7 +11,6 @@
 (function() {
 	var TEMPLATE =
 		'<div>' +
-		'<ul>{{#if owner}}<li>Owner: {{owner}}</li>{{/if}}</ul>' +
 		'<div class="dialogContainer"></div>' +
 		'</div>';
 
@@ -47,13 +46,7 @@
 			}
 
 			if (this.model) {
-				var owner = this.model.get('shareOwner');
-				if (owner === OC.currentUser) {
-					owner = null;
-				}
-				this.$el.html(this.template({
-					owner: owner
-				}));
+				this.$el.html(this.template());
 
 				// TODO: the model should read these directly off the passed fileInfoModel
 				var attributes = {
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index c5d8c829657..3fba4b135d9 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -130,7 +130,7 @@
 				);
 			}
 
-			var isExpirationSet = !!this.model.get('linkShare').expiration;
+			var isExpirationSet = !!this.model.get('linkShare').expiration || isExpirationEnforced;
 
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
@@ -145,13 +145,13 @@
 				expirationValue: this.model.get('linkShare').expiration
 			}));
 
-			if(isExpirationSet) {
-				// what if there is another date picker on that page?
-				var minDate = new Date();
-				// min date should always be the next day
-				minDate.setDate(minDate.getDate()+1);
+			// what if there is another date picker on that page?
+			var minDate = new Date();
+			var maxDate = null;
+			// min date should always be the next day
+			minDate.setDate(minDate.getDate()+1);
 
-				var maxDate = null;
+			if(isExpirationSet) {
 				if(isExpirationEnforced) {
 					// TODO: hack: backend returns string instead of integer
 					var shareTime = this.model.get('linkShare').stime;
@@ -164,12 +164,11 @@
 					shareTime = OC.Util.stripTime(shareTime).getTime();
 					maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000);
 				}
-
-				$.datepicker.setDefaults({
-					minDate: minDate,
-					maxDate: maxDate
-				});
 			}
+			$.datepicker.setDefaults({
+				minDate: minDate,
+				maxDate: maxDate
+			});
 
 			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index f6b927c08c5..600e2ecbf56 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -63,8 +63,8 @@
 		},
 
 		render: function() {
-			if (   !this.model.hasReshare()
-				|| !this.model.getReshareOwner() !== OC.currentUser)
+			if (!this.model.hasReshare()
+				|| this.model.getReshareOwner() === OC.currentUser)
 			{
 				this.$el.empty();
 				return this;
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 463d2468bbd..c1d7ba4cf66 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -211,11 +211,12 @@
 			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'));
+					if ($this.hasClass('imageplaceholderseed')) {
+						$this.css({width: 32, height: 32});
+						$this.imageplaceholder($this.data('seed'));
+					} else {
+						$this.avatar($this.data('username'), 32);
+					}
 				});
 			}
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 36e63993203..8c390ee5450 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -15,6 +15,7 @@
 
 	var TEMPLATE_BASE =
 		'<div class="resharerInfoView"></div>' +
+		'{{#if isSharingAllowed}}' +
 		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
@@ -22,6 +23,7 @@
 		'</div>' +
 			// FIXME: find a good position for remoteShareInfo
 		'{{{remoteShareInfo}}}' +
+		'{{/if}}' +
 		'<div class="shareeListView"></div>' +
 		'<div class="linkShareView"></div>' +
 		'<div class="expirationView"></div>'
@@ -82,6 +84,9 @@
 			this.configModel.on('change:isRemoteShareAllowed', function() {
 				view.render();
 			});
+			this.model.on('change:permissions', function() {
+				view.render();
+			});
 
 			var subViewOptions = {
 				model: this.model,
@@ -163,16 +168,19 @@
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
-				remoteShareInfo: this._renderRemoteShareInfoPart()
+				remoteShareInfo: this._renderRemoteShareInfoPart(),
+				isSharingAllowed: this.model.sharePermissionPossible()
 			}));
 
-			var view = this;
-			this.$el.find('#shareWith').autocomplete({
-				minLength: 2,
-				delay: 750,
-				source: this.autocompleteHandler,
-				select: this._onSelectRecipient
-			}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
+			var $shareField = this.$el.find('#shareWith');
+			if ($shareField.length) {
+				$shareField.autocomplete({
+					minLength: 2,
+					delay: 750,
+					source: this.autocompleteHandler,
+					select: this._onSelectRecipient
+				}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
+			}
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index b50432a034f..071c9c58c4e 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -63,7 +63,14 @@ describe('OC.Share.ShareDialogView', function() {
 			possiblePermissions: 31,
 			permissions: 31
 		};
-		configModel = new OC.Share.ShareConfigModel();
+		configModel = new OC.Share.ShareConfigModel({
+			enforcePasswordForPublicLink: false,
+			isResharingAllowed: true,
+			enforcePasswordForPublicLink: false,
+			isDefaultExpireDateEnabled: false,
+			isDefaultExpireDateEnforced: false,
+			defaultExpireDate: 7
+		});
 		shareModel = new OC.Share.ShareItemModel(attributes, {
 			configModel: configModel,
 			fileInfoModel: fileInfoModel
@@ -112,9 +119,6 @@ describe('OC.Share.ShareDialogView', function() {
 		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() {
@@ -138,7 +142,9 @@ describe('OC.Share.ShareDialogView', function() {
 
 			expect(fakeServer.requests[1].method).toEqual('POST');
 			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-			expect(body['shareWith']).toEqual('foo');
+			expect(body.shareWith).toEqual('foo');
+
+			fetchStub.reset();
 
 			// Set password response
 			fakeServer.requests[1].respond(
@@ -147,6 +153,10 @@ describe('OC.Share.ShareDialogView', function() {
 				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
 			);
 
+			expect(fetchStub.calledOnce).toEqual(true);
+			// fetching the model will rerender the view
+			dialog.render();
+
 			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
 			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
 		});
@@ -171,7 +181,9 @@ describe('OC.Share.ShareDialogView', function() {
 
 			expect(fakeServer.requests[1].method).toEqual('POST');
 			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-			expect(body['shareWith']).toEqual('foo');
+			expect(body.shareWith).toEqual('foo');
+
+			fetchStub.reset();
 
 			// Set password response
 			fakeServer.requests[1].respond(
@@ -180,6 +192,10 @@ describe('OC.Share.ShareDialogView', function() {
 				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
 			);
 
+			expect(fetchStub.calledOnce).toEqual(true);
+			// fetching the model will rerender the view
+			dialog.render();
+
 			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
 			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
 		});
@@ -198,8 +214,7 @@ describe('OC.Share.ShareDialogView', function() {
 			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;
+			configModel.set('enforcePasswordForPublicLink', true);
 			$('#allowShareWithLink').val('yes');
 
 			dialog.render();
@@ -238,13 +253,9 @@ describe('OC.Share.ShareDialogView', function() {
 			 */
 			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();
@@ -261,6 +272,7 @@ describe('OC.Share.ShareDialogView', function() {
 				{ 'Content-Type': 'application/json' },
 				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
 			);
+			dialog.render();
 			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('**********');
 
 			// Remove link
@@ -274,119 +286,23 @@ describe('OC.Share.ShareDialogView', function() {
 			// 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() {
+			// this is how the OC.Share class does it...
+			var link = parent.location.protocol + '//' + location.host +
+				OC.generateUrl('/s/') + 'tehtoken';
 			shareModel.set('linkShare', {
 				isLinkShare: true,
 				token: 'tehtoken',
-				link: 'TODO',
+				link: link,
 				expiration: '',
 				permissions: OC.PERMISSION_READ,
 				stime: 1403884258,
 			});
 
+			dialog.render();
+
 			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() {
@@ -400,10 +316,12 @@ describe('OC.Share.ShareDialogView', function() {
 				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;
+				configModel.set({
+					enforcePasswordForPublicLink: false,
+					isDefaultExpireDateEnabled: false,
+					isDefaultExpireDateEnforced: false,
+					defaultExpireDate: 7
+				});
 
 				shareModel.set('linkShare', {
 					isLinkShare: true,
@@ -436,10 +354,13 @@ describe('OC.Share.ShareDialogView', function() {
 				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;
+				configModel.set('isDefaultExpireDateEnabled', true);
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
+				// here fetch would be called and the server returns the expiration date
+				shareModel.get('linkShare').expiration = '2014-1-27 00:00:00';
+				dialog.render();
+
 				// enabled by default
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
 				// TODO: those zeros must go...
@@ -450,11 +371,16 @@ describe('OC.Share.ShareDialogView', function() {
 				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;
+				configModel.set({
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
+				// here fetch would be called and the server returns the expiration date
+				shareModel.get('linkShare').expiration = '2014-1-27 00:00:00';
+				dialog.render();
+
 				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');
@@ -465,12 +391,16 @@ describe('OC.Share.ShareDialogView', function() {
 				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;
+				configModel.set({
+					enforcePasswordForPublicLink: true,
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
+				// here fetch would be called and the server returns the expiration date
+				shareModel.get('linkShare').expiration = '2014-1-27 00:00:00';
+				dialog.render();
 
 				//Enter password
 				dialog.$el.find('#linkPassText').val('foo');
@@ -493,12 +423,12 @@ describe('OC.Share.ShareDialogView', function() {
 			it('displayes email form when sending emails is enabled', function() {
 				$('input[name=mailPublicNotificationEnabled]').val('yes');
 				dialog.render();
-				expect($('#emailPrivateLink').length).toEqual(1);
+				expect(dialog.$('#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);
+				expect(dialog.$('#emailPrivateLink').length).toEqual(0);
 			});
 			it('sets picker minDate to today and no maxDate by default', function() {
 				dialog.render();
@@ -508,9 +438,10 @@ describe('OC.Share.ShareDialogView', function() {
 				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;
+				configModel.set({
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
 				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
@@ -518,13 +449,14 @@ describe('OC.Share.ShareDialogView', function() {
 			});
 			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
+				var shareItem = shareModel.get('linkShare');
 				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;
+				configModel.set({
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
 				expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
@@ -533,7 +465,7 @@ describe('OC.Share.ShareDialogView', function() {
 	});
 	describe('check for avatar', function() {
 		beforeEach(function() {
-			loadItemStub.returns({
+			shareModel.set({
 				reshare: {
 					share_type: OC.Share.SHARE_TYPE_USER,
 					uid_owner: 'owner',
@@ -569,14 +501,8 @@ describe('OC.Share.ShareDialogView', function() {
 		describe('avatars enabled', function() {
 			beforeEach(function() {
 				oc_config.enable_avatars = true;
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
+				avatarStub.reset();
+				dialog.render();
 			});
 
 			afterEach(function() {
@@ -586,8 +512,8 @@ describe('OC.Share.ShareDialogView', function() {
 			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);
+				expect(dialog.$('#shareWithList').children().length).toEqual(3);
+				expect(dialog.$('.avatar').length).toEqual(4);
 			});
 
 			it('test avatar owner', function() {
@@ -617,14 +543,7 @@ describe('OC.Share.ShareDialogView', function() {
 
 		describe('avatars disabled', function() {
 			beforeEach(function() {
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
+				dialog.render();
 			});
 
 			it('no avatar classes', function() {
@@ -634,104 +553,6 @@ describe('OC.Share.ShareDialogView', function() {
 			});
 		});
 	});
-	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;
@@ -744,14 +565,11 @@ describe('OC.Share.ShareDialogView', function() {
 		 * @return {int} permissions sent to the server
 		 */
 		function testWithPermissions(possiblePermissions) {
-			OC.Share.showDropDown(
-				'file',
-				123,
-				$container,
-				true,
-				possiblePermissions,
-				'shared_file_name.txt'
-			);
+			shareModel.set({
+				permissions: possiblePermissions,
+				possiblePermissions: possiblePermissions
+			});
+			dialog.render();
 			var autocompleteOptions = autocompleteStub.getCall(0).args[0];
 			// simulate autocomplete selection
 			autocompleteOptions.select(new $.Event('select'), {
@@ -770,8 +588,8 @@ describe('OC.Share.ShareDialogView', function() {
 
 		describe('regular sharing', function() {
 			it('shares with given permissions with default config', function() {
-				loadItemStub.returns({
-					reshare: [],
+				shareModel.set({
+					reshare: {},
 					shares: []
 				});
 				expect(
@@ -782,9 +600,9 @@ describe('OC.Share.ShareDialogView', function() {
 				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_SHARE);
 			});
 			it('removes share permission when not allowed', function() {
-				oc_appconfig.core.resharingAllowed = false;
-				loadItemStub.returns({
-					reshare: [],
+				configModel.set('isResharingAllowed', false);
+				shareModel.set({
+					reshare: {},
 					shares: []
 				});
 				expect(
@@ -792,9 +610,9 @@ describe('OC.Share.ShareDialogView', function() {
 				).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: [],
+				configModel.set('isResharingAllowed', false);
+				shareModel.set({
+					reshare: {},
 					shares: []
 				});
 				expect(
@@ -802,108 +620,35 @@ describe('OC.Share.ShareDialogView', function() {
 				).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: []
+				shareModel.set({
+					reshare: {},
+					shares: [],
+					permissions: OC.PERMISSION_READ
 				});
-				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);
+				dialog.render();
+				expect(dialog.$el.find('#shareWith').prop('disabled')).toEqual(true);
 			});
-			it('does not show sharing options when resharing not allowed', function() {
-				loadItemStub.returns({
+			it('shows reshare owner', function() {
+				shareModel.set({
 					reshare: {
-						permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE,
 						uid_owner: 'user1'
 					},
-					shares: []
+					shares: [],
+					permissions: OC.PERMISSION_READ
 				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					OC.PERMISSION_ALL,
-					'shared_file_name.txt'
-				);
-				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+				dialog.render();
+				expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(1);
 			});
-			it('allows owner to share their own share when they are also the recipient', function() {
-				OC.currentUser = 'user1';
-				loadItemStub.returns({
+			it('does not show reshare owner if owner is current user', function() {
+				shareModel.set({
 					reshare: {
-						permissions: OC.PERMISSION_READ,
-						uid_owner: 'user1'
+						uid_owner: OC.currentUser
 					},
-					shares: []
+					shares: [],
+					permissions: OC.PERMISSION_READ
 				});
-				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);
+				dialog.render();
+				expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(0);
 			});
 		});
 	});
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index d3c4b7d4004..2f676a4ba1f 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -23,13 +23,12 @@
 describe('OC.Share.ShareItemModel', function() {
 	var loadItemStub;
 	var fileInfoModel, configModel, model;
+	var oldCurrentUser;
 
 	beforeEach(function() {
+		oldCurrentUser = OC.currentUser;
+
 		loadItemStub = sinon.stub(OC.Share, 'loadItem');
-		loadItemStub.returns({
-			reshare: [],
-			shares: []
-		});
 
 		fileInfoModel = new OCA.Files.FileInfoModel({
 			id: 123,
@@ -54,6 +53,7 @@ describe('OC.Share.ShareItemModel', function() {
 	});
 	afterEach(function() {
 		loadItemStub.restore();
+		OC.currentUser = oldCurrentUser;
 	});
 
 	describe('Fetching and parsing', function() {
@@ -64,7 +64,7 @@ describe('OC.Share.ShareItemModel', function() {
 			expect(loadItemStub.calledWith('file', 123)).toEqual(true);
 		});
 		it('populates attributes with parsed response', function() {
-			loadItemStub.returns({
+			loadItemStub.yields({
 				/* jshint camelcase: false */
 				reshare: {
 					share_type: OC.Share.SHARE_TYPE_USER,
@@ -118,7 +118,11 @@ describe('OC.Share.ShareItemModel', function() {
 
 			var shares = model.get('shares');
 			expect(shares.length).toEqual(3);
-			expect(shares.file_source).toEqual(123);
+			expect(shares[0].id).toEqual(100);
+			expect(shares[0].permissions).toEqual(31);
+			expect(shares[0].share_type).toEqual(OC.Share.SHARE_TYPE_USER);
+			expect(shares[0].share_with).toEqual('user1');
+			expect(shares[0].share_with_displayname).toEqual('User One');
 
 			var linkShare = model.get('linkShare');
 			expect(linkShare.isLinkShare).toEqual(true);
@@ -126,7 +130,7 @@ describe('OC.Share.ShareItemModel', function() {
 			// TODO: check more attributes
 		});
 		it('does not parse link share when for a different file', function() {
-			loadItemStub.returns({
+			loadItemStub.yields({
 				reshare: [],
 				/* jshint camelcase: false */
 				shares: [{
@@ -153,13 +157,14 @@ describe('OC.Share.ShareItemModel', function() {
 			model.fetch();
 
 			var shares = model.get('shares');
-			expect(shares.length).toEqual(0);
+			// remaining share appears in this list
+			expect(shares.length).toEqual(1);
 
 			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({
+		it('parses correct link share when a nested link share exists along with parent one', function() {
+			loadItemStub.yields({
 				reshare: [],
 				/* jshint camelcase: false */
 				shares: [{
@@ -204,14 +209,58 @@ describe('OC.Share.ShareItemModel', function() {
 			model.fetch();
 
 			var shares = model.get('shares');
-			expect(shares.length).toEqual(0);
+			// the parent share remains in the list
+			expect(shares.length).toEqual(1);
 
 			var linkShare = model.get('linkShare');
-			expect(linkShare.isLinkShare).toEqual(false);
+			expect(linkShare.isLinkShare).toEqual(true);
 			expect(linkShare.token).toEqual('tehtoken');
 
 			// TODO: check child too
 		});
+		it('reduces reshare permissions to the ones from the original share', function() {
+			loadItemStub.yields({
+				reshare: {
+					permissions: OC.PERMISSION_READ,
+					uid_owner: 'user1'
+				},
+				shares: []
+			});
+			model.fetch();
+
+			// no resharing allowed
+			expect(model.get('permissions')).toEqual(OC.PERMISSION_READ);
+		});
+		it('reduces reshare permissions to possible permissions', function() {
+			loadItemStub.yields({
+				reshare: {
+					permissions: OC.PERMISSION_ALL,
+					uid_owner: 'user1'
+				},
+				shares: []
+			});
+
+			model.set('possiblePermissions', OC.PERMISSION_READ);
+			model.fetch();
+
+			// no resharing allowed
+			expect(model.get('permissions')).toEqual(OC.PERMISSION_READ);
+		});
+		it('allows owner to share their own share when they are also the recipient', function() {
+			OC.currentUser = 'user1';
+			loadItemStub.yields({
+				reshare: {
+					permissions: OC.PERMISSION_READ,
+					uid_owner: 'user1'
+				},
+				shares: []
+			});
+
+			model.fetch();
+
+			// sharing still allowed
+			expect(model.get('permissions') & OC.PERMISSION_SHARE).toEqual(OC.PERMISSION_SHARE);
+		});
 	});
 
 	describe('Util', function() {
-- 
cgit v1.2.3