From edd163a6113664921a2fda730037dcf68bfe08ae Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 31 Jul 2015 00:07:41 +0200
Subject: refactor share dialog for multi-purpose use (dropdown, sidebar) and
 better maintainability

---
 core/js/share.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index cd4a614e9d1..5d3253e6d5c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -3,7 +3,7 @@
 /**
  * @namespace
  */
-OC.Share={
+OC.Share = _.extend(OC.Share, {
 	SHARE_TYPE_USER:0,
 	SHARE_TYPE_GROUP:1,
 	SHARE_TYPE_LINK:3,
@@ -289,6 +289,12 @@ OC.Share={
 		}
 		img.attr('src', image);
 	},
+	/**
+	 *
+	 * @param itemType
+	 * @param itemSource
+	 * @returns {OC.Share.Types.ShareInfo}
+	 */
 	loadItem:function(itemType, itemSource) {
 		var data = '';
 		var checkReshare = true;
@@ -371,6 +377,21 @@ OC.Share={
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
+		var itemModel = new OC.Share.ShareItemModel(itemType, itemSource);
+		var dialogView = new OC.Share.ShareDialogView('dropdown');
+		dialogView.setContainerClasses('drop shareDropDown');
+		dialogView.setShowLink(link);
+		dialogView.setPossiblePermissions(possiblePermissions);
+		dialogView.setItemModel(itemModel);
+		var $dialog = dialogView.render();
+		$dialog.appendTo(appendTo);
+		$dialog.attr('data-item-source-name', filename);
+		$dialog.slideDown(OC.menuSpeed, function() {
+			OC.Share.droppedDown = true;
+		});
+		return;
+
+
 		var data = OC.Share.loadItem(itemType, itemSource);
 		var dropDownEl;
 		var html = '<div id="dropdown" class="drop shareDropDown" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
@@ -897,7 +918,7 @@ OC.Share={
 		}
 		return expireDateString;
 	}
-};
+});
 
 $(document).ready(function() {
 
-- 
cgit v1.2.3


From e7b5921206a6c602aa22614907b79f14b8ad39c9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 8 Aug 2015 00:23:06 +0200
Subject: share dialog view takes advantage of OC.Backbone.View

---
 core/js/share.js           |  14 +++---
 core/js/sharedialogview.js | 106 +++++++++++++++------------------------------
 2 files changed, 43 insertions(+), 77 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 5d3253e6d5c..9aba894f676 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -378,14 +378,18 @@ OC.Share = _.extend(OC.Share, {
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
 		var itemModel = new OC.Share.ShareItemModel(itemType, itemSource);
-		var dialogView = new OC.Share.ShareDialogView('dropdown');
-		dialogView.setContainerClasses('drop shareDropDown');
+		var dialogView = new OC.Share.ShareDialogView({
+			id: 'dropdown',
+			model: itemModel,
+			className: 'drop shareDropDown',
+			attributes: {
+				'data-item-source-name': filename
+			}
+		});
 		dialogView.setShowLink(link);
 		dialogView.setPossiblePermissions(possiblePermissions);
-		dialogView.setItemModel(itemModel);
-		var $dialog = dialogView.render();
+		var $dialog = dialogView.render().$el;
 		$dialog.appendTo(appendTo);
-		$dialog.attr('data-item-source-name', filename);
 		$dialog.slideDown(OC.menuSpeed, function() {
 			OC.Share.droppedDown = true;
 		});
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cbab9694afe..e085e85dd41 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,19 +14,17 @@
 	}
 
 	var TEMPLATE_BASE =
-		'<div id="{{containerID}}" {{{containerClasses}}}>' +
-		'    {{{resharerInfo}}}' +
-		'    <label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
-		'    <div class="oneline">' +
-		'        <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
-		'        <span class="shareWithLoading icon-loading-small hidden"></span>'+
-		'    </div>' +
+		'{{{resharerInfo}}}' +
+		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
+		'<div class="oneline">' +
+		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
+		'    <span class="shareWithLoading icon-loading-small hidden"></span>'+
+		'</div>' +
 			// FIXME: find a good position for remoteShareInfo
-		'    {{{remoteShareInfo}}}' +
-		'    <ul id="shareWithList">' +
-		'    </ul>' +
-		'    {{{linkShare}}}' +
-		'</div>';
+		'{{{remoteShareInfo}}}' +
+		'<ul id="shareWithList">' +
+		'</ul>' +
+		'{{{linkShare}}}';
 
 	var TEMPLATE_RESHARER_INFO =
 		'<span class="reshare">' +
@@ -57,47 +55,37 @@
 
 	/**
 	 * @class OCA.Share.ShareDialogView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
 	 * @classdesc
 	 *
 	 * Represents the GUI of the share dialogue
 	 *
 	 */
-	var ShareDialogView = function(id) {
-		this.initialize(id);
-	};
-
-	/**
-	 * @memberof OCA.Sharing
-	 */
-	ShareDialogView.prototype = {
-		/** @member {OC.Share.ShareItemModel} **/
-		_itemModel: null,
-
-		/** @var {string} **/
-		_id: null,
-
-		/** @var {Object} **/
+	var ShareDialogView = OC.Backbone.View.extend({
+		/** @type {Object} **/
 		_templates: {},
 
-		/** @var {string} **/
-		_containerClasses: '',
-
-		/** @var {boolean} **/
+		/** @type {boolean} **/
 		_showLink: true,
 
-		/** @var {unknown} **/
+		/** @type {unknown} **/
 		_possiblePermissions: null,
 
-		initialize: function (id) {
-			this._id = id;
+		/** @type {string} **/
+		tagName: 'div',
+
+		initialize: function() {
+			if(!this.model instanceof OC.Share.ShareItemModel) {
+				console.warn('model is not an instance of OC.Share.ShareItemModel');
+			}
 		},
 
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
-			var $dialog = $(baseTemplate({
-				containerID: this._id,
-				containerClasses: this._renderContainerClasses(),
+			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
@@ -105,25 +93,7 @@
 				linkShare: this._renderLinkSharePart()
 			}));
 
-			return $dialog;
-		},
-
-		setItemModel: function(model) {
-			if(model instanceof OC.Share.ShareItemModel) {
-				this._itemModel = model;
-			} else {
-				console.warn('model is not an instance of OC.Share.ShareItemModel');
-			}
-		},
-
-		/**
-		 * sets the classes the main container should get additionally
-		 * TODO:: figure out whether this is really necessary
-		 *
-		 * @param {string} classes whitespace seperated
-		 */
-		setContainerClasses: function(classes) {
-			this._containerClasses = classes;
+			return this;
 		},
 
 		/**
@@ -143,25 +113,25 @@
 
 		_renderResharerInfo: function() {
 			var resharerInfo = '';
-			if (   this._itemModel.hasReshare()
-				&& this._itemModel.getReshareOwner() !== OC.currentUser)
+			if (   this.model.hasReshare()
+				&& this.model.getReshareOwner() !== OC.currentUser)
 			{
 				var reshareTemplate = this._getReshareTemplate();
 				var sharedByText = '';
-				if (this._itemModel.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
+				if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
 					sharedByText = t(
 						'core',
 						'Shared with you and the group {group} by {owner}',
 						{
-							group: this._itemModel.getReshareWith(),
-							owner: this._itemModel.getReshareOwnerDisplayname()
+							group: this.model.getReshareWith(),
+							owner: this.model.getReshareOwnerDisplayname()
 						}
 					);
 				}  else {
 					sharedByText = t(
 						'core',
 						'Shared with you by {owner}',
-						{ owner: this._itemModel.getReshareOwnerDisplayname() }
+						{ owner: this.model.getReshareOwnerDisplayname() }
 					);
 				}
 
@@ -173,14 +143,6 @@
 			}
 		},
 
-		_renderContainerClasses: function() {
-			var classes = '';
-			if(this._containerClasses) {
-				classes = 'class="' + this._containerClasses + '"';
-			}
-			return classes;
-		},
-
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
 			if(oc_appconfig.core.remoteShareAllowed) {
@@ -245,8 +207,8 @@
 
 		_getReshareTemplate: function() {
 			return this._getTemplate('reshare', TEMPLATE_RESHARER_INFO);
-		},
-	};
+		}
+	});
 
 	OC.Share.ShareDialogView = ShareDialogView;
 
-- 
cgit v1.2.3


From 1651b8212cf67e2ca59cf890cefe6097fbfa6a8a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 10 Aug 2015 22:23:52 +0200
Subject: started to port the Model to Backbone`s

---
 core/js/share.js          |  3 ++-
 core/js/shareitemmodel.js | 43 +++++++++++++++++--------------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 9aba894f676..59467427eb3 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -377,7 +377,8 @@ OC.Share = _.extend(OC.Share, {
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
-		var itemModel = new OC.Share.ShareItemModel(itemType, itemSource);
+		var attributes = {itemType: itemType, itemSource: itemSource};
+		var itemModel = new OC.Share.ShareItemModel(attributes);
 		var dialogView = new OC.Share.ShareDialogView({
 			id: 'dropdown',
 			model: itemModel,
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 1db49536db5..2914b281ee1 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -55,59 +55,50 @@
 		this.initialize(itemType, itemSource);
 	};
 
+	// FIXME: migration is to Backbone.Model still WIP, only pushing for the night.
+
 	/**
 	 * @memberof OCA.Sharing
 	 */
-	ShareItemModel.prototype = {
-		/** @var {string} **/
-		_itemType: null,
-		/** @var {mixed} **/	//TODO: what type?
-		_itemSource: null,
-
-		/** @var {OC.Share.Types.Reshare} **/
-		_reshare: null,
-
-		/** @var {OC.Share.Types.ShareInfo[]} **/
-		_shares: null,
-
-		initialize: function(itemType, itemSource) {
-			this._itemType = itemType;
-			this._itemSource = itemSource;
-			this._retrieveData();
+	var ShareItemModel = OC.Backbone.Model.extend({
+		initialize: function() {
+			this._retrieveData(); // TODO I need to get my head around fetch() respectively sync() and url(). Left for later, it's late.
 		},
 
 		hasReshare: function() {
-			return _.isObject(this._reshare) && !_.isUndefined(this._reshare.uid_owner);
+			return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
 		},
 
 		getReshareOwner: function() {
-			return this._reshare.uid_owner;
+			return this.get('reshare').uid_owner;
 		},
 
 		getReshareOwnerDisplayname: function() {
-			return this._reshare.displayname_owner;
+			return this.get('reshare').displayname_owner;
 		},
 
 		getReshareWith: function() {
-			return this._reshare.share_with;
+			return this.get('reshare').share_with;
 		},
 
 		getReshareType: function() {
-			return this._reshare.share_type;
+			return this.get('reshare').share_type;
 		},
 
 		_retrieveData: function() {
 			/** var {OC.Share.Types.ShareItemInfo} **/
-			var data = OC.Share.loadItem(this._itemType, this._itemSource);
+			var data = OC.Share.loadItem(this.get('itemType'), this.get('itemSource'));
 			if(data === false) {
 				console.warn('no data was returned');
 				return;
 			}
-			this._reshare = data.reshare;
-			this._shares = data.shares;
-
+			var attributes = {
+				reshare: data.reshare,
+				shares: data.shares
+			};
+			this.set(attributes);
 		}
-	};
+	});
 
 	OC.Share.ShareItemModel = ShareItemModel;
 })();
-- 
cgit v1.2.3


From e6edc3e05dfc17584c81d11c52b444ffcf965c62 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Aug 2015 22:34:08 +0200
Subject: make loadItems work async if a callback is provided

not beautiful, but good enough. share.js will not be around too much longer.
---
 core/js/share.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 59467427eb3..d84da322274 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -293,23 +293,28 @@ OC.Share = _.extend(OC.Share, {
 	 *
 	 * @param itemType
 	 * @param itemSource
+	 * @param callback
 	 * @returns {OC.Share.Types.ShareInfo}
 	 */
-	loadItem:function(itemType, itemSource) {
+	loadItem:function(itemType, itemSource, callback) {
 		var data = '';
 		var checkReshare = true;
+		var async = !_.isUndefined(callback);
 		if (typeof OC.Share.statuses[itemSource] === 'undefined') {
 			// NOTE: Check does not always work and misses some shares, fix later
 			var checkShares = true;
 		} else {
 			var checkShares = true;
 		}
-		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkReshare: checkReshare, checkShares: checkShares }, async: false, success: function(result) {
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkReshare: checkReshare, checkShares: checkShares }, async: async, success: function(result) {
 			if (result && result.status === 'success') {
 				data = result.data;
 			} else {
 				data = false;
 			}
+			if(async) {
+				callback(data);
+			}
 		}});
 
 		return data;
-- 
cgit v1.2.3


From b015eff2e92ba83c6bf95c0084e283ddc7a5df70 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Aug 2015 23:14:44 +0200
Subject: improve reshare rendering part and move permission calculation to
 model

---
 core/js/share.js           |  7 +++---
 core/js/sharedialogview.js | 62 ++++++++++++++++++++--------------------------
 core/js/shareitemmodel.js  | 57 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 39 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index d84da322274..db35a2e111c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -382,18 +382,19 @@ OC.Share = _.extend(OC.Share, {
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
-		var attributes = {itemType: itemType, itemSource: itemSource};
+		var attributes = {itemType: itemType, itemSource: itemSource, possiblePermissions: possiblePermissions};
 		var itemModel = new OC.Share.ShareItemModel(attributes);
 		var dialogView = new OC.Share.ShareDialogView({
 			id: 'dropdown',
 			model: itemModel,
 			className: 'drop shareDropDown',
 			attributes: {
-				'data-item-source-name': filename
+				'data-item-source-name': filename,
+				'data-item-type': itemType,
+				'data-item-soruce': itemSource
 			}
 		});
 		dialogView.setShowLink(link);
-		dialogView.setPossiblePermissions(possiblePermissions);
 		var $dialog = dialogView.render().$el;
 		$dialog.appendTo(appendTo);
 		$dialog.slideDown(OC.menuSpeed, function() {
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 3c12bedca86..4ff4eb9a94e 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -70,9 +70,6 @@
 		/** @type {boolean} **/
 		_showLink: true,
 
-		/** @type {unknown} **/
-		_possiblePermissions: null,
-
 		/** @type {string} **/
 		tagName: 'div',
 
@@ -91,7 +88,6 @@
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
 			this.$el.html(baseTemplate({
-
 				shareLabel: t('core', 'Share'),
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
@@ -112,41 +108,37 @@
 			this._showLink = (typeof showLink === 'boolean') ? showLink : true;
 		},
 
-		setPossiblePermissions: function(permissions) {
-			//TODO: maybe move to model? Whatever this is.
-			this._possiblePermissions = permissions;
-		},
-
 		_renderResharerInfo: function() {
 			var resharerInfo = '';
-			if (   this.model.hasReshare()
-				&& this.model.getReshareOwner() !== OC.currentUser)
+			if (   !this.model.hasReshare()
+				|| !this.model.getReshareOwner() !== OC.currentUser)
 			{
-				var reshareTemplate = this._getReshareTemplate();
-				var sharedByText = '';
-				if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
-					sharedByText = t(
-						'core',
-						'Shared with you and the group {group} by {owner}',
-						{
-							group: this.model.getReshareWith(),
-							owner: this.model.getReshareOwnerDisplayname()
-						}
-					);
-				}  else {
-					sharedByText = t(
-						'core',
-						'Shared with you by {owner}',
-						{ owner: this.model.getReshareOwnerDisplayname() }
-					);
-				}
-
-
-				resharerInfo = reshareTemplate({
-					avatarEnabled: oc_config.enable_avatars === true,
-					sharedByText: sharedByText
-				});
+				return '';
 			}
+
+			var reshareTemplate = this._getReshareTemplate();
+			var sharedByText = '';
+			if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
+				sharedByText = t(
+					'core',
+					'Shared with you and the group {group} by {owner}',
+					{
+						group: this.model.getReshareWith(),
+						owner: this.model.getReshareOwnerDisplayname()
+					}
+				);
+			}  else {
+				sharedByText = t(
+					'core',
+					'Shared with you by {owner}',
+					{ owner: this.model.getReshareOwnerDisplayname() }
+				);
+			}
+
+			return reshareTemplate({
+				avatarEnabled: oc_config.enable_avatars === true,
+				sharedByText: sharedByText
+			});
 		},
 
 		_renderRemoteShareInfoPart: function() {
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index fe7aed46509..efce69f0f3e 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -57,6 +57,22 @@
 			this.fetch();
 		},
 
+		defaults: {
+			allowPublicUploadStatus: false
+		},
+
+		/**
+		 * @returns {boolean|jQuery}
+		 */
+		isPublicUploadEnabled: function() {
+			// FIXME: this really needs a better place
+			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
+			if (_.isUndefined(publicUploadEnabled)) {
+				publicUploadEnabled = 'no';
+			}
+			return publicUploadEnabled;
+		},
+
 		/**
 		 * whether this item has reshare information
 		 * @returns {boolean}
@@ -101,6 +117,26 @@
 			return this.get('reshare').share_type;
 		},
 
+		/**
+		 * @returns {number}
+		 */
+		getPermissions: function() {
+			var permissions = this.get('permissions');
+			if(_.isUndefined(permissions)) {
+				// model was not properly initialized
+				console.warn('Sharing error: undefined permissions');
+				permissions = 0;
+			}
+			return permissions;
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		hasSharePermission: function() {
+			return (this.getPermissions & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+		},
+
 		fetch: function() {
 			var model = this;
 			OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
@@ -114,10 +150,29 @@
 				trigger('fetchError');
 				return {};
 			}
+
+			var permissions = this.get('possiblePermissions');
+			if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions)) {
+				permissions = permissions & data.reshare.permissions;
+			}
+
+			var allowPublicUploadStatus = false;
+			if(!_.isUndefined(data.shares)) {
+				$.each(data.shares, function (key, value) {
+					if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
+						allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+						return true;
+					}
+				});
+			}
+
 			var attributes = {
 				reshare: data.reshare,
-				shares: data.shares
+				shares: data.shares,
+				permissions: permissions,
+				allowPublicUploadStatus: allowPublicUploadStatus
 			};
+
 			return attributes;
 		}
 	});
-- 
cgit v1.2.3


From 83d91ddf20bd2e61b9f01c82817ac8b815d3ac66 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 13 Aug 2015 02:38:14 +0200
Subject: further work on reimplementing the dialog layout

---
 core/js/share.js            |   4 +-
 core/js/shareconfigmodel.js |  54 +++++++++++++++++++++
 core/js/sharedialogview.js  | 112 +++++++++++++++++++++++++++++++++++++++++---
 core/js/shareitemmodel.js   |  39 +++++++++++----
 lib/private/share/share.php |   1 +
 5 files changed, 193 insertions(+), 17 deletions(-)
 create mode 100644 core/js/shareconfigmodel.js

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

diff --git a/core/js/share.js b/core/js/share.js
index db35a2e111c..8d25749a107 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -382,11 +382,13 @@ OC.Share = _.extend(OC.Share, {
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
+		var configModel = new OC.Share.ShareConfigModel();
 		var attributes = {itemType: itemType, itemSource: itemSource, possiblePermissions: possiblePermissions};
-		var itemModel = new OC.Share.ShareItemModel(attributes);
+		var itemModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
 		var dialogView = new OC.Share.ShareDialogView({
 			id: 'dropdown',
 			model: itemModel,
+			configModel: configModel,
 			className: 'drop shareDropDown',
 			attributes: {
 				'data-item-source-name': filename,
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
new file mode 100644
index 00000000000..371cc96df5e
--- /dev/null
+++ b/core/js/shareconfigmodel.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+		OC.Share.Types = {};
+	}
+
+	var ShareConfigModel = OC.Backbone.Model.extend({
+		defaults: {
+			publicUploadEnabled: false
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isPublicUploadEnabled: function() {
+			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
+			return !_.isUndefined(publicUploadEnabled);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isMailPublicNotificationEnabled: function() {
+			return $('input:hidden[name=mailPublicNotificationEnabled]').val() === 'yes';
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isDefaultExpireDateEnforced: function() {
+			return oc_appconfig.core.defaultExpireDateEnforced === true;
+		},
+
+		/**
+		 * @returns {number}
+		 */
+		getDefaultExpireDate: function () {
+			return oc_appconfig.core.defaultExpireDate;
+		}
+	});
+
+
+	OC.Share.ShareConfigModel = ShareConfigModel;
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 4ff4eb9a94e..7b0af2bc84c 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -24,7 +24,13 @@
 		'{{{remoteShareInfo}}}' +
 		'<ul id="shareWithList">' +
 		'</ul>' +
-		'{{{linkShare}}}';
+		'{{#if shareAllowed}}' +
+		'{{{linkShare}}}' +
+		'{{else}}' +
+		'{{{noSharing}}}' +
+		'{{/if}}' +
+		'{{{expiration}}}'
+		;
 
 	var TEMPLATE_RESHARER_INFO =
 		'<span class="reshare">' +
@@ -50,9 +56,37 @@
 			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
 			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
 			'        <span class="icon-loading-small hidden"></span>' +
-			'    </div>'
+			'    </div>' +
+			'    {{#if publicUpload}}' +
+			'    <div id="allowPublicUploadWrapper" class="hidden">' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'    </div>' +
+			'    {{/if}}' +
+			'    {{#if mailPublicNotificationEnabled}}' +
+			'    <form id="emailPrivateLink">' +
+			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'    </form>' +
+			'    {{/if}}' +
+			'</div>'
 		;
 
+	var TEMPLATE_NO_SHARING =
+		'<input id="shareWith" type="text" placeholder="{{placeholder}}" disabled="disabled"/>'
+	;
+
+	var TEMPLATE_EXPIRATION =
+		'<div id="expiration">' +
+		'    <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>' +
+		'</div>'
+	;
+
 	/**
 	 * @class OCA.Share.ShareDialogView
 	 * @member {OC.Share.ShareItemModel} model
@@ -73,7 +107,10 @@
 		/** @type {string} **/
 		tagName: 'div',
 
-		initialize: function() {
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
 				view.render();
@@ -82,6 +119,12 @@
 			this.model.on('fetchError', function() {
 				OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'));
 			});
+
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
 		},
 
 		render: function() {
@@ -92,7 +135,10 @@
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
-				linkShare: this._renderLinkSharePart()
+				linkShare: this._renderLinkSharePart(),
+				shareAllowed: this.model.hasSharePermission(),
+				noSharing: this._renderNoSharing(),
+				expiration: this._renderExpirationPart()
 			}));
 
 			return this;
@@ -155,14 +201,34 @@
 
 		_renderLinkSharePart: function() {
 			var linkShare = '';
-			if(this._showLink && $('#allowShareWithLink').val() === 'yes') {
+			if(    this.model.hasSharePermission()
+				&& this._showLink
+				&& $('#allowShareWithLink').val() === 'yes')
+			{
 				var linkShareTemplate = this._getLinkShareTemplate();
+
+				var publicUpload =
+					   this.model.isFolder()
+					&& this.model.hasCreatePermission()
+					&& this.configModel.isPublicUploadEnabled();
+
+				var publicUploadChecked = '';
+				if(this.model.isPublicUploadAllowed) {
+					publicUploadChecked = 'checked="checked"';
+				}
+
 				linkShare = linkShareTemplate({
 					linkShareLabel: t('core', 'Share link'),
 					urlLabel: t('core', 'Link'),
 					enablePasswordLabel: t('core', 'Password protect'),
 					passwordLabel: t('core', 'Password'),
-					passwordPlaceholder: t('core', 'Choose a password for the public link')
+					passwordPlaceholder: t('core', 'Choose a password for the public link'),
+					publicUpload: publicUpload,
+					publicUploadChecked: publicUploadChecked,
+					publicUploadLabel: t('core', 'Allow editing'),
+					mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+					mailPrivatePlaceholder: t('core', 'Email link to person'),
+					mailButtonText: t('core', 'Send')
 				});
 			}
 			return linkShare;
@@ -176,6 +242,40 @@
 			return sharePlaceholder;
 		},
 
+		_renderNoSharing: function () {
+			var noSharing = '';
+			if(!this.model.hasSharePermission()) {
+				var noSharingTemplate = this._getTemplate('noSharing', TEMPLATE_NO_SHARING);
+				noSharing = noSharingTemplate({
+					placeholder: t('core', 'Resharing is not allowed')
+				});
+			}
+			return noSharing;
+		},
+
+		_renderExpirationPart: function() {
+			var expirationTemplate = this._getTemplate('expiration', TEMPLATE_EXPIRATION);
+
+			var defaultExpireMessage = '';
+			if((   this.model.isFolder() || this.model.isFile())
+				&& this.configModel.isDefaultExpireDateEnforced()) {
+				defaultExpireMessage = t(
+						'core',
+						'The public link will expire no later than {days} days after it is created',
+						{'days': this.configModel.getDefaultExpireDate()}
+				);
+			}
+
+			var expiration = expirationTemplate({
+				setExpirationLabel: t('core', 'Set expiration date'),
+				expirationLabel: t('core', 'Expiration'),
+				expirationDatePlaceholder: t('core', 'Expiration date'),
+				defaultExpireMessage: defaultExpireMessage
+			});
+
+			return expiration;
+		},
+
 		/**
 		 *
 		 * @param {string} key - an identifier for the template
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index efce69f0f3e..eb93b91ce92 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -53,7 +53,10 @@
 	 * // FIXME: use OC Share API once #17143 is done
 	 */
 	var ShareItemModel = OC.Backbone.Model.extend({
-		initialize: function() {
+		initialize: function(attributes, options) {
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			}
 			this.fetch();
 		},
 
@@ -62,15 +65,24 @@
 		},
 
 		/**
-		 * @returns {boolean|jQuery}
+		 * @returns {boolean}
 		 */
-		isPublicUploadEnabled: function() {
-			// FIXME: this really needs a better place
-			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
-			if (_.isUndefined(publicUploadEnabled)) {
-				publicUploadEnabled = 'no';
-			}
-			return publicUploadEnabled;
+		isPublicUploadAllowed: function() {
+			return this.get('allowPublicUploadStatus');
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isFolder: function() {
+			return this.get('itemType') === 'folder';
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isFile: function() {
+			return this.get('itemType') === 'file';
 		},
 
 		/**
@@ -134,7 +146,14 @@
 		 * @returns {boolean}
 		 */
 		hasSharePermission: function() {
-			return (this.getPermissions & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+			return (this.getPermissions() & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		hasCreatePermission: function() {
+			return (this.getPermissions() & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE;
 		},
 
 		fetch: function() {
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 65968f581f5..cd3f0cbfb34 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -83,6 +83,7 @@ class Share extends Constants {
 					'supportedFileExtensions' => $supportedFileExtensions
 				);
 				if(count(self::$backendTypes) === 1) {
+					\OC_Util::addScript('core', 'shareconfigmodel');
 					\OC_Util::addScript('core', 'shareitemmodel');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
-- 
cgit v1.2.3


From e3fd96fa8ef2aa5b5fd3881e75b95c7a869895fa Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Aug 2015 13:04:02 +0200
Subject: improve doc

---
 core/js/share.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 8d25749a107..84da511497e 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -293,7 +293,9 @@ OC.Share = _.extend(OC.Share, {
 	 *
 	 * @param itemType
 	 * @param itemSource
-	 * @param callback
+	 * @param callback - optional. If a callback is given this method works
+	 * asynchronous and the callback will be provided with data when the request
+	 * is done.
 	 * @returns {OC.Share.Types.ShareInfo}
 	 */
 	loadItem:function(itemType, itemSource, callback) {
-- 
cgit v1.2.3


From f2fb20ed1cfc88c5e37c2ecc84ec4ec77d98f371 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 24 Aug 2015 23:27:43 +0200
Subject: no auto-fetch in model

---
 core/js/share.js          | 1 +
 core/js/shareitemmodel.js | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 84da511497e..1fc1ac9e20c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -404,6 +404,7 @@ OC.Share = _.extend(OC.Share, {
 		$dialog.slideDown(OC.menuSpeed, function() {
 			OC.Share.droppedDown = true;
 		});
+		itemModel.fetch();
 		return;
 
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 9c4a8141cda..0d823f05749 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -57,7 +57,6 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			}
-			this.fetch();
 		},
 
 		defaults: {
-- 
cgit v1.2.3


From 60abfcdab16ed674015422a6300bd28f3baa5e91 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Sep 2015 16:47:25 +0200
Subject: old OC.Share.addShareWith now reimplemented

---
 core/js/share.js                     | 106 -----------------------------------
 core/js/sharedialogshareelistview.js |  28 +--------
 core/js/shareitemmodel.js            |  26 ++++++++-
 3 files changed, 27 insertions(+), 133 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 1fc1ac9e20c..bd87ab10d40 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -685,112 +685,6 @@ OC.Share = _.extend(OC.Share, {
 			}
 		});
 	},
-	addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, mailSend, collection) {
-		var shareItem = {
-			share_type: shareType,
-			share_with: shareWith,
-			share_with_displayname: shareWithDisplayName,
-			permissions: permissions
-		};
-		if (shareType === OC.Share.SHARE_TYPE_GROUP) {
-			shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
-		}
-		if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
-			shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
-		}
-		if (!OC.Share.itemShares[shareType]) {
-			OC.Share.itemShares[shareType] = [];
-		}
-		OC.Share.itemShares[shareType].push(shareWith);
-		if (collection) {
-			if (collection.item_type == 'file' || collection.item_type == 'folder') {
-				var item = collection.path;
-			} else {
-				var item = collection.item_source;
-			}
-			var collectionList = $('#shareWithList li').filterAttr('data-collection', item);
-			if (collectionList.length > 0) {
-				$(collectionList).append(', '+shareWithDisplayName);
-			} else {
-				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWithDisplayName})+'</li>';
-				$('#shareWithList').prepend(html);
-			}
-		} else {
-			var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
-			if (permissions & OC.PERMISSION_CREATE) {
-				createChecked = 'checked="checked"';
-				editChecked = 'checked="checked"';
-			}
-			if (permissions & OC.PERMISSION_UPDATE) {
-				updateChecked = 'checked="checked"';
-				editChecked = 'checked="checked"';
-			}
-			if (permissions & OC.PERMISSION_DELETE) {
-				deleteChecked = 'checked="checked"';
-				editChecked = 'checked="checked"';
-			}
-			if (permissions & OC.PERMISSION_SHARE) {
-				shareChecked = 'checked="checked"';
-			}
-			var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">';
-			var showCrudsButton;
-			html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" title="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
-			if (oc_config.enable_avatars === true) {
-				html += '<div class="avatar"></div>';
-			}
-			html += '<span class="username">' + escapeHTML(shareWithDisplayName) + '</span>';
-			var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
-			if (mailNotificationEnabled === 'yes' && shareType !== OC.Share.SHARE_TYPE_REMOTE) {
-				var checked = '';
-				if (mailSend === '1') {
-					checked = 'checked';
-				}
-				html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify by email')+'</label> ';
-			}
-			if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
-				html += '<label><input id="canShare-'+escapeHTML(shareWith)+'" type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'can share')+'</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
-				html += '<label><input id="canEdit-'+escapeHTML(shareWith)+'" type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>';
-			}
-			if (shareType !== OC.Share.SHARE_TYPE_REMOTE) {
-				showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
-			}
-			html += '<div class="cruds" style="display:none;">';
-			if (possiblePermissions & OC.PERMISSION_CREATE) {
-				html += '<label><input id="canCreate-' + escapeHTML(shareWith) + '" type="checkbox" name="create" class="permissions" ' + createChecked + ' data-permissions="' + OC.PERMISSION_CREATE + '"/>' + t('core', 'create') + '</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_UPDATE) {
-				html += '<label><input id="canUpdate-' + escapeHTML(shareWith) + '" type="checkbox" name="update" class="permissions" ' + updateChecked + ' data-permissions="' + OC.PERMISSION_UPDATE + '"/>' + t('core', 'change') + '</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_DELETE) {
-				html += '<label><input id="canDelete-' + escapeHTML(shareWith) + '" type="checkbox" name="delete" class="permissions" ' + deleteChecked + ' data-permissions="' + OC.PERMISSION_DELETE + '"/>' + t('core', 'delete') + '</label>';
-			}
-			html += '</div>';
-			html += '</li>';
-			html = $(html).appendTo('#shareWithList');
-			if (oc_config.enable_avatars === true) {
-				if (shareType === OC.Share.SHARE_TYPE_USER) {
-					html.find('.avatar').avatar(escapeHTML(shareWith), 32);
-				} else {
-					//Add sharetype to generate different seed if there is a group and use with the same name
-					html.find('.avatar').imageplaceholder(escapeHTML(shareWith) + ' ' + shareType);
-				}
-			}
-			// insert cruds button into last label element
-			var lastLabel = html.find('>label:last');
-			if (lastLabel.exists()){
-				lastLabel.append(showCrudsButton);
-			}
-			else{
-				html.find('.cruds').before(showCrudsButton);
-			}
-			if (!OC.Share.currentShares[shareType]) {
-				OC.Share.currentShares[shareType] = [];
-			}
-			OC.Share.currentShares[shareType].push(shareItem);
-		}
-	},
 	showLink:function(token, password, itemSource) {
 		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 8e08e2b4f76..f9d725bf51e 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -111,18 +111,6 @@
 			}
 		},
 
-		getCollectionObject: function(shareIndex) {
-			var type = this.model.getCollectionType(shareIndex);
-			var id = this.model.getCollectionPath(shareIndex);
-			if(type !== 'file' && type !== 'folder') {
-				id = this.model.getCollectionSource(shareIndex);
-			}
-			return {
-				collectionID: id,
-				text: t('core', 'Shared in {item} with {user}', {'item': id, user: this.model.getShareWithDisplayName(shareIndex)})
-			}
-		},
-
 		/**
 		 *
 		 * @param {OC.Share.Types.ShareInfo} shareInfo
@@ -149,7 +137,8 @@
 				shareWith: shareWith,
 				shareWithDisplayName: shareWithDisplayName,
 				shareType: shareType,
-				modSeed: shareType !== OC.Share.SHARE_TYPE_USER
+				modSeed: shareType !== OC.Share.SHARE_TYPE_USER,
+				isRemoteShare: shareType === OC.Share.SHARE_TYPE_REMOTE
 			};
 		},
 
@@ -181,9 +170,6 @@
 
 			this._collections = {};
 
-			// TODO: sharess must have following attributes
-			// isRemoteShare
-
 			if(!this.model.hasShares()) {
 				return [];
 			}
@@ -191,16 +177,6 @@
 			var shares = this.model.get('shares');
 			var list = [];
 			for(var index = 0; index < shares.length; index++) {
-
-				// #### FIXME: LEGACY ####
-				// this does not belong to a view
-				var shareType = this.model.getShareType(index);
-				if (!OC.Share.currentShares[shareType]) {
-					OC.Share.currentShares[shareType] = [];
-				}
-				OC.Share.currentShares[shareType].push(this.model.getShareWith(index));
-				// #### /FIXME: LEGACY ####
-
 				if(this.model.isCollection(index)) {
 					this.processCollectionShare(index);
 				} else {
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index d4fbc3543a7..8afc4954902 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -350,6 +350,27 @@
 			});
 		},
 
+		legacyFillCurrentShares: function(shares) {
+			OC.Share.currentShares = {};
+			OC.Share.itemShares = [];
+			_.each(shares,
+				/**
+				 * @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] = [];
+					}
+					OC.Share.itemShares[share.share_type].push(share.share_with);
+				}
+			);
+		},
+
 		parse: function(data) {
 			if(data === false) {
 				console.warn('no data was returned');
@@ -372,9 +393,12 @@
 				});
 			}
 
+			var shares = _.toArray(data.shares);
+			this.legacyFillCurrentShares(shares);
+
 			return {
 				reshare: data.reshare,
-				shares: _.toArray(data.shares),
+				shares: shares,
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-- 
cgit v1.2.3


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

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

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

diff --git a/core/js/share.js b/core/js/share.js
index bd87ab10d40..6581c401281 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -956,80 +956,6 @@ $(document).ready(function() {
 			permissions);
 	});
 
-	$(document).on('change', '#dropdown #linkCheckbox', function() {
-		var $dropDown = $('#dropdown');
-		var itemType = $dropDown.data('item-type');
-		var itemSource = $dropDown.data('item-source');
-		var itemSourceName = $dropDown.data('item-source-name');
-		var $loading = $dropDown.find('#link .icon-loading-small');
-		var $button = $(this);
-
-		if (!$loading.hasClass('hidden')) {
-			// already in progress
-			return false;
-		}
-
-		if (this.checked) {
-			// Reset password placeholder
-			$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
-			// Reset link
-			$('#linkText').val('');
-			$('#showPassword').prop('checked', false);
-			$('#linkPass').hide();
-			$('#sharingDialogAllowPublicUpload').prop('checked', false);
-			$('#expirationCheckbox').prop('checked', false);
-			$('#expirationDate').hide();
-			var expireDateString = '';
-			// Create a link
-			if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
-				expireDateString = OC.Share.getDefaultExpirationDate();
-				$loading.removeClass('hidden');
-				$button.addClass('hidden');
-				$button.prop('disabled', true);
-
-				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expireDateString, function(data) {
-					$loading.addClass('hidden');
-					$button.removeClass('hidden');
-					$button.prop('disabled', false);
-					OC.Share.showLink(data.token, null, itemSource);
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-				});
-			} else {
-				$('#linkPass').slideToggle(OC.menuSpeed);
-				// TODO drop with IE8 drop
-				if($('html').hasClass('ie8')) {
-					$('#linkPassText').attr('placeholder', null);
-					$('#linkPassText').val('');
-				}
-				$('#linkPassText').focus();
-			}
-			if (expireDateString !== '') {
-				OC.Share.showExpirationDate(expireDateString);
-			}
-		} else {
-			// Delete private link
-			OC.Share.hideLink();
-			$('#expiration').slideUp(OC.menuSpeed);
-			if ($('#linkText').val() !== '') {
-				$loading.removeClass('hidden');
-				$button.addClass('hidden');
-				$button.prop('disabled', true);
-				OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
-					$loading.addClass('hidden');
-					$button.removeClass('hidden');
-					$button.prop('disabled', false);
-					OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-					if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-						$('#expiration').slideUp(OC.menuSpeed);
-					}
-				});
-			}
-		}
-	});
-
 	$(document).on('click', '#dropdown #linkText', function() {
 		$(this).focus();
 		$(this).select();
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 98280e01eb6..c6891154c98 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -19,6 +19,8 @@
 			publicUploadEnabled: false,
 			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
 			isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
+			isDefaultExpireDateEnabled: oc_appconfig.core.defaultExpireDateEnabled === true,
+			isRemoteShareAllowed: oc_appconfig.core.remoteShareAllowed,
 			defaultExpireDate: oc_appconfig.core.defaultExpireDate,
 			isResharingAllowed: oc_appconfig.core.resharingAllowed
 		},
@@ -45,13 +47,6 @@
 			return $('input:hidden[name=mailPublicNotificationEnabled]').val() === 'yes';
 		},
 
-		/**
-		 * @returns {boolean}
-		 */
-		isRemoteShareAllowed: function() {
-			return oc_appconfig.core.remoteShareAllowed;
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
@@ -64,6 +59,20 @@
 		 */
 		getFederatedShareDocLink: function() {
 			return oc_appconfig.core.federatedCloudShareDoc;
+		},
+
+		getDefaultExpirationDateString: function () {
+			var expireDateString = '';
+			if (this.get('isDefaultExpireDateEnabled')) {
+				var date = new Date().getTime();
+				var expireAfterMs = this.get('defaultExpireDate') * 24 * 60 * 60 * 1000;
+				var expireDate = new Date(date + expireAfterMs);
+				var month = expireDate.getMonth() + 1;
+				var year = expireDate.getFullYear();
+				var day = expireDate.getDate();
+				expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
+			}
+			return expireDateString;
 		}
 	});
 
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 56473cdb1fa..f244fe56548 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -24,7 +24,7 @@
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
 			'    {{#if isExpirationSet}}' +
 			'<label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
-			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" />' +
+			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{expirationValue}}" />' +
 			'    {{/if}}' +
 			'    {{#if isExpirationEnforced}}' +
 				// originally the expire message was shown when a default date was set, however it never had text
@@ -64,13 +64,28 @@
 			} else {
 				throw 'missing OC.Share.ShareConfigModel';
 			}
+
+			var view = this;
+			this.configModel.on('change:isDefaultExpireDateEnforced', function() {
+				view.render();
+			});
+
+			this.model.on('change:itemType', function() {
+				view.render();
+			});
+
+			this.model.on('change:linkShare', function() {
+				view.render();
+			});
 		},
 
 		render: function() {
 			var defaultExpireMessage = '';
 			var defaultExpireDays = this.configModel.get('defaultExpireDate');
+			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+
 			if(    (this.model.isFolder() || this.model.isFile())
-				&& this.configModel.get('isDefaultExpireDateEnforced')) {
+				&& isExpirationEnforced) {
 				defaultExpireMessage = t(
 					'core',
 					'The public link will expire no later than {days} days after it is created',
@@ -79,7 +94,6 @@
 			}
 
 			var isExpirationSet = !!this.model.get('linkShare').expiration;
-			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
 
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
@@ -120,6 +134,8 @@
 				});
 			}
 
+			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
+
 			return this;
 		},
 
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 373d6d180bc..b94f1c3e70b 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -23,13 +23,11 @@
 			'   {{#if showPasswordCheckBox}}' +
 			'<input type="checkbox" name="showPassword" id="showPassword" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" /><label for="showPassword">{{enablePasswordLabel}}</label>' +
 			'   {{/if}}' +
-			'   {{#if isPasswordSet}}' +
-			'<div id="linkPass">' +
+			'<div id="linkPass" {{#unless isPasswordSet}}class="hidden"{{/unless}}>' +
 			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
 			'    <input id="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" />' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
-			'   {{/if}}' +
 			'    {{#if publicUpload}}' +
 			'<div id="allowPublicUploadWrapper" class="hidden">' +
 			'    <span class="icon-loading-small hidden"></span>' +
@@ -86,11 +84,42 @@
 				view.render();
 			});
 
+			this.model.on('change:linkShare', function() {
+				view.render();
+			});
+
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
 				throw 'missing OC.Share.ShareConfigModel';
 			}
+
+			_.bindAll(this, 'onLinkCheckBoxChange');
+		},
+
+		onLinkCheckBoxChange: function() {
+			var $checkBox = this.$el.find('#linkCheckbox');
+			var $loading = $checkBox.siblings('.icon-loading-small');
+			if(!$loading.hasClass('hidden')) {
+				return false;
+			}
+
+			if($checkBox.is(':checked')) {
+				if(this.configModel.get('enforcePasswordForPublicLink') === false) {
+					$loading.removeClass('hidden');
+					this.model.addLinkShare();
+				} else {
+					this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
+					// TODO drop with IE8 drop
+					if($('html').hasClass('ie8')) {
+						this.$el.find('#linkPassText').attr('placeholder', null);
+						this.$el.find('#linkPassText').val('');
+					}
+					this.$el.find('#linkPassText').focus();
+				}
+			} else {
+				this.model.removeLinkShare();
+			}
 		},
 
 		render: function() {
@@ -142,6 +171,8 @@
 				mailButtonText: t('core', 'Send')
 			}));
 
+			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index f7de90e264f..f6b927c08c5 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -96,6 +96,13 @@
 				sharedByText: sharedByText
 			}));
 
+			if(this.configModel.areAvatarsEnabled()) {
+				this.$el.find('.avatar').each(function() {
+					var $this = $(this);
+					$this.avatar($this.data('username'), 32);
+				});
+			}
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 4ac669ee2b9..895f14508d5 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -201,6 +201,17 @@
 				sharees: this.getShareeList()
 			}));
 
+			if(this.configModel.areAvatarsEnabled()) {
+				this.$el.find('.avatar').each(function() {
+					var $this = $(this);
+					$this.avatar($this.data('username'), 32);
+				});
+				this.$el.find('.avatar.imageplaceholderseed').each(function() {
+					var $this = $(this);
+					$this.imageplaceholder($this.data('seed'));
+				});
+			}
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 6588da7d429..7a7fe692c13 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -68,9 +68,6 @@
 
 		initialize: function(options) {
 			var view = this;
-			this.model.on('change', function() {
-				view.render();
-			});
 
 			this.model.on('fetchError', function() {
 				OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'));
@@ -82,6 +79,10 @@
 				throw 'missing OC.Share.ShareConfigModel';
 			}
 
+			this.configModel.on('change:isRemoteShareAllowed', function() {
+				view.render();
+			});
+
 			var subViewOptions = {
 				model: this.model,
 				configModel: this.configModel
@@ -188,17 +189,6 @@
 			this.shareeListView.render();
 
 			this.$el.find('.hasTooltip').tooltip();
-			if(this.configModel.areAvatarsEnabled()) {
-				this.$el.find('.avatar').each(function() {
-					var $this = $(this);
-					$this.avatar($this.data('username'), 32);
-				});
-				this.$el.find('.avatar.imageplaceholderseed').each(function() {
-					var $this = $(this);
-					$this.imageplaceholder($this.data('seed'));
-				});
-			}
-			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
 			return this;
 		},
@@ -216,7 +206,7 @@
 
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
-			if(this.configModel.isRemoteShareAllowed()) {
+			if(this.configModel.get('isRemoteShareAllowed')) {
 				var infoTemplate = this._getRemoteShareInfoTemplate();
 				remoteShareInfo = infoTemplate({
 					docLink: this.configModel.getFederatedShareDocLink(),
@@ -229,7 +219,7 @@
 
 		_renderSharePlaceholderPart: function () {
 			var sharePlaceholder = t('core', 'Share with users or groups …');
-			if (this.configModel.isRemoteShareAllowed()) {
+			if (this.configModel.get('isRemoteShareAllowed')) {
 				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
 			}
 			return sharePlaceholder;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 81e905b082e..9e153dcb3e5 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -89,12 +89,33 @@
 			linkShare: {}
 		},
 
+		addLinkShare: function() {
+			var model = this;
+			var expiration = this.configModel.getDefaultExpirationDateString();
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, this.fileInfoModel.get('name'), expiration, function(data) {
+				model.fetch();
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
+		removeLinkShare: function() {
+			var model = this;
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+
+			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+				model.fetch();
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
 		addShare: function(event, selected, options) {
 			event.preventDefault();
 
-			//console.warn(selected);
-			//return false;
-
 			var shareType = selected.item.value.shareType;
 			var shareWith = selected.item.value.shareWith;
 			var fileName = this.fileInfoModel.get('name');
@@ -121,8 +142,10 @@
 			}
 
 			var model = this;
-			OC.Share.share(this.get('itemType'), this.get('itemSource'), shareType, shareWith, permissions, fileName, options.expiration, function() {
-				model.fetch()
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+			OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, fileName, options.expiration, function() {
+				model.fetch();
 				//FIXME: updateIcon belongs to view
 				OC.Share.updateIcon(itemType, itemSource);
 			});
-- 
cgit v1.2.3


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

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

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

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


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

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

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

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


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

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

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

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


From a5b0ea031de3036fc75c3b1d6b3c030a824c1736 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:24:21 +0200
Subject: make unshare work

---
 core/js/share.js                     | 34 ----------------------------------
 core/js/sharedialogshareelistview.js | 21 +++++++++++++++++++++
 core/js/shareitemmodel.js            | 22 +++++++++++++---------
 3 files changed, 34 insertions(+), 43 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 0157bcdba7c..85b920a6913 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -885,40 +885,6 @@ $(document).ready(function() {
 		return false;
 	});
 
-	$(document).on('click', '#dropdown .unshare', function() {
-		var $li = $(this).closest('li');
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		var shareType = $li.data('share-type');
-		var shareWith = $li.attr('data-share-with');
-		var $button = $(this);
-
-		if (!$button.is('a')) {
-			$button = $button.closest('a');
-		}
-
-		if ($button.hasClass('icon-loading-small')) {
-			// deletion in progress
-			return false;
-		}
-		$button.empty().addClass('icon-loading-small');
-
-		OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
-			$li.remove();
-			var index = OC.Share.itemShares[shareType].indexOf(shareWith);
-			OC.Share.itemShares[shareType].splice(index, 1);
-			// updated list of shares
-			OC.Share.currentShares[shareType].splice(index, 1);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-			OC.Share.updateIcon(itemType, itemSource);
-			if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-				$('#expiration').slideUp(OC.menuSpeed);
-			}
-		});
-
-		return false;
-	});
-
 	$(document).on('change', '#dropdown .permissions', function() {
 		var li = $(this).closest('li');
 		if ($(this).attr('name') == 'edit') {
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 895f14508d5..dda2fe949ac 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -212,6 +212,9 @@
 				});
 			}
 
+			var view = this;
+			this.$el.find('.unshare').click(function() { view.onUnshare(this, view); });
+
 			return this;
 		},
 
@@ -224,6 +227,24 @@
 				this._template = Handlebars.compile(TEMPLATE);
 			}
 			return this._template;
+		},
+
+		onUnshare: function(element, view) {
+			var $element = $(element);
+
+			if($element.hasClass('icon-loading-small')) {
+				// in process
+				return;
+			}
+			$element.empty().addClass('icon-loading-small');
+
+			var $li = $element.closest('li');
+			var shareType = $li.data('share-type');
+			var shareWith = $li.attr('data-share-with');
+
+			view.model.removeShare(shareType, shareWith);
+
+			return false;
 		}
 
 	});
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 3569c6ffd1a..dabcc65c0a1 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -121,15 +121,7 @@
 		},
 
 		removeLinkShare: function() {
-			var model = this;
-			var itemType = this.get('itemType');
-			var itemSource = this.get('itemSource');
-
-			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
-				model.fetch();
-				//FIXME: updateIcon belongs to view
-				OC.Share.updateIcon(itemType, itemSource);
-			});
+			this.removeShare(OC.Share.SHARE_TYPE_LINK, '');
 		},
 
 		setPublicUpload: function(allow) {
@@ -179,6 +171,18 @@
 			});
 		},
 
+		removeShare: function(shareType, shareWith) {
+			var model = this;
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+
+			OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
+				model.fetch();
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-- 
cgit v1.2.3


From d4bbc062be79f48633f047e142800f37efa04e1f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:26:38 +0200
Subject: cleanup

---
 core/js/share.js | 24 ------------------------
 1 file changed, 24 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 85b920a6913..7c87fb88cfd 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -846,30 +846,6 @@ $(document).ready(function() {
 			minDate : minDate
 		});
 	}
-	$(document).on('click', 'a.share', function(event) {
-		event.stopPropagation();
-		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
-			var itemType = $(this).data('item-type');
-			var itemSource = $(this).data('item');
-			var appendTo = $(this).parent().parent();
-			var link = false;
-			var possiblePermissions = $(this).data('possible-permissions');
-			if ($(this).data('link') !== undefined && $(this).data('link') == true) {
-				link = true;
-			}
-			if (OC.Share.droppedDown) {
-				if (itemSource != $('#dropdown').data('item')) {
-					OC.Share.hideDropDown(function () {
-						OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
-					});
-				} else {
-					OC.Share.hideDropDown();
-				}
-			} else {
-				OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
-			}
-		}
-	});
 
 	$(this).click(function(event) {
 		var target = $(event.target);
-- 
cgit v1.2.3


From c7453b4db1c31884f798b8aa826bb25560e9551e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:40:16 +0200
Subject: toggle visibility of detailed cruds permissions

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

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

diff --git a/core/js/share.js b/core/js/share.js
index 7c87fb88cfd..e3c4d3d91af 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -856,11 +856,6 @@ $(document).ready(function() {
 		}
 	});
 
-	$(document).on('click', '#dropdown .showCruds', function() {
-		$(this).closest('li').find('.cruds').toggle();
-		return false;
-	});
-
 	$(document).on('change', '#dropdown .permissions', function() {
 		var li = $(this).closest('li');
 		if ($(this).attr('name') == 'edit') {
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index dda2fe949ac..f078ab8a06b 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -37,7 +37,7 @@
 			'        {{/if}}' +
 			'        {{#unless isRemoteShare}}' +
 			'        <a href="#" class="showCruds"><img class="svg" alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
-			'        <div class="cruds" class="hidden">' +
+			'        <div class="cruds hidden">' +
 			'            {{#if createPermissionPossible}}' +
 			'            <label><input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>{{createPermissionLabel}}</label>' +
 			'            {{/if}}' +
@@ -214,6 +214,7 @@
 
 			var view = this;
 			this.$el.find('.unshare').click(function() { view.onUnshare(this, view); });
+			this.$el.find('.showCruds').click(this.onCrudsToggle);
 
 			return this;
 		},
@@ -244,6 +245,11 @@
 
 			view.model.removeShare(shareType, shareWith);
 
+			return false;
+		},
+
+		onCrudsToggle: function() {
+			$(this).siblings('.cruds').toggleClass('hidden');
 			return false;
 		}
 
-- 
cgit v1.2.3


From a0fa7186f55b16ddccbd3780f61433e977cbefd2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 02:29:22 +0200
Subject: make permission/cruds checkboxes work

---
 core/js/share.js                     | 37 ------------------------------------
 core/js/sharedialogshareelistview.js | 29 ++++++++++++++++++++++++++++
 core/js/shareitemmodel.js            |  7 +++++++
 3 files changed, 36 insertions(+), 37 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index e3c4d3d91af..c05f3602dd7 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -856,43 +856,6 @@ $(document).ready(function() {
 		}
 	});
 
-	$(document).on('change', '#dropdown .permissions', function() {
-		var li = $(this).closest('li');
-		if ($(this).attr('name') == 'edit') {
-			var checkboxes = $('.permissions', li);
-			var checked = $(this).is(':checked');
-			// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
-			$(checkboxes).filter('input[name="create"]').attr('checked', checked);
-			$(checkboxes).filter('input[name="update"]').attr('checked', checked);
-			$(checkboxes).filter('input[name="delete"]').attr('checked', checked);
-		} else {
-			var checkboxes = $('.permissions', li);
-			// Uncheck Edit if Create, Update, and Delete are not checked
-			if (!$(this).is(':checked')
-				&& !$(checkboxes).filter('input[name="create"]').is(':checked')
-				&& !$(checkboxes).filter('input[name="update"]').is(':checked')
-				&& !$(checkboxes).filter('input[name="delete"]').is(':checked'))
-			{
-				$(checkboxes).filter('input[name="edit"]').attr('checked', false);
-			// Check Edit if Create, Update, or Delete is checked
-			} else if (($(this).attr('name') == 'create'
-				|| $(this).attr('name') == 'update'
-				|| $(this).attr('name') == 'delete'))
-			{
-				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
-			}
-		}
-		var permissions = OC.PERMISSION_READ;
-		$(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) {
-			permissions |= $(checkbox).data('permissions');
-		});
-		OC.Share.setPermissions($('#dropdown').data('item-type'),
-			$('#dropdown').data('item-source'),
-			li.data('share-type'),
-			li.attr('data-share-with'),
-			permissions);
-	});
-
 	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index f078ab8a06b..1f53a479fb5 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -214,6 +214,7 @@
 
 			var view = this;
 			this.$el.find('.unshare').click(function() { view.onUnshare(this, view); });
+			this.$el.find('.permissions').click(function() { view.onPermissionChange(this, view); });
 			this.$el.find('.showCruds').click(this.onCrudsToggle);
 
 			return this;
@@ -248,6 +249,34 @@
 			return false;
 		},
 
+		onPermissionChange: function(element, view) {
+			var $element = $(element);
+			var $li = $element.closest('li');
+			var shareType = $li.data('share-type');
+			var shareWith = $li.attr('data-share-with');
+
+			// adjust checkbox states
+			var $checkboxes = $('.permissions', $li).not('input[name="edit"]').not('input[name="share"]');
+			if ($element.attr('name') === 'edit') {
+				var checked = $element.is(':checked');
+				// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
+				$($checkboxes).attr('checked', checked);
+			} else {
+				var numberChecked = $checkboxes.filter(':checked').length;
+				var checked = numberChecked > 0;
+				$('input[name="edit"]', $li).attr('checked', checked);
+			}
+
+			var permissions = OC.PERMISSION_READ;
+			$('.permissions', $li).not('input[name="edit"]').filter(':checked').each(function(index, checkbox) {
+				permissions |= $(checkbox).data('permissions');
+			});
+
+			view.model.setPermissions(shareType, shareWith, permissions);
+
+			return false;
+		},
+
 		onCrudsToggle: function() {
 			$(this).siblings('.cruds').toggleClass('hidden');
 			return false;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index dabcc65c0a1..eb44b735737 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -171,6 +171,13 @@
 			});
 		},
 
+		setPermissions: function(shareType, shareWith, permissions) {
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+
+			OC.Share.setPermissions(itemType, itemSource, shareType, shareWith, permissions);
+		},
+
 		removeShare: function(shareType, shareWith) {
 			var model = this;
 			var itemType = this.get('itemType');
-- 
cgit v1.2.3


From c2ff2ca9825af347d0247687322d3d12eb311185 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 02:32:34 +0200
Subject: cleanup

---
 core/js/share.js | 80 --------------------------------------------------------
 1 file changed, 80 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index c05f3602dd7..01467b495f2 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -685,68 +685,6 @@ OC.Share = _.extend(OC.Share, {
 			}
 		});
 	},
-	showLink:function(token, password, itemSource) {
-		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
-		$('#linkCheckbox').attr('checked', true);
-
-		//check itemType
-		var linkSharetype=$('#dropdown').data('item-type');
-
-		if (! token) {
-			//fallback to pre token link
-			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-			var type = $('tr').filterAttr('data-id', String(itemSource)).data('type');
-			if ($('#dir').val() == '/') {
-				var file = $('#dir').val() + filename;
-			} else {
-				var file = $('#dir').val() + '/' + filename;
-			}
-			file = '/'+OC.currentUser+'/files'+file;
-			// TODO: use oc webroot ?
-			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
-		} else {
-			//TODO add path param when showing a link to file in a subfolder of a public link share
-			var service='';
-			if(linkSharetype === 'folder' || linkSharetype === 'file'){
-				service='files';
-			}else{
-				service=linkSharetype;
-			}
-
-			// TODO: use oc webroot ?
-			if (service !== 'files') {
-				var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
-			} else {
-				var link = parent.location.protocol+'//'+location.host+OC.generateUrl('/s/')+token;
-			}
-		}
-		$('#linkText').val(link);
-		$('#linkText').slideDown(OC.menuSpeed);
-		$('#linkText').css('display','block');
-		if (oc_appconfig.core.enforcePasswordForPublicLink === false || password === null) {
-			$('#showPassword').show();
-			$('#showPassword+label').show();
-		}
-		if (password != null) {
-			$('#linkPass').slideDown(OC.menuSpeed);
-			$('#showPassword').attr('checked', true);
-			$('#linkPassText').attr('placeholder', '**********');
-		}
-		$('#expiration').show();
-		$('#emailPrivateLink #email').show();
-		$('#emailPrivateLink #emailButton').show();
-		$('#allowPublicUploadWrapper').show();
-	},
-	hideLink:function() {
-		$('#linkText').slideUp(OC.menuSpeed);
-		$('#defaultExpireMessage').hide();
-		$('#showPassword').hide();
-		$('#showPassword+label').hide();
-		$('#linkPass').slideUp(OC.menuSpeed);
-		$('#emailPrivateLink #email').hide();
-		$('#emailPrivateLink #emailButton').hide();
-		$('#allowPublicUploadWrapper').hide();
-	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
@@ -809,24 +747,6 @@ OC.Share = _.extend(OC.Share, {
 			$('#defaultExpireMessage').slideDown(OC.menuSpeed);
 		}
 		$.datepicker.setDefaults(datePickerOptions);
-	},
-	/**
-	 * Get the default Expire date
-	 *
-	 * @return {String} The expire date
-	 */
-	getDefaultExpirationDate:function() {
-		var expireDateString = '';
-		if (oc_appconfig.core.defaultExpireDateEnabled) {
-			var date = new Date().getTime();
-			var expireAfterMs = oc_appconfig.core.defaultExpireDate * 24 * 60 * 60 * 1000;
-			var expireDate = new Date(date + expireAfterMs);
-			var month = expireDate.getMonth() + 1;
-			var year = expireDate.getFullYear();
-			var day = expireDate.getDate();
-			expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
-		}
-		return expireDateString;
 	}
 });
 
-- 
cgit v1.2.3


From 41f16e821a086d9529cc4eb3f26e24bbb1e04c72 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 18:40:09 +0200
Subject: Remove unused/obsoleted OC.Share code

The sharing dialog has been moved to ShareDialogView
---
 core/js/share.js | 424 -------------------------------------------------------
 1 file changed, 424 deletions(-)

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

diff --git a/core/js/share.js b/core/js/share.js
index 01467b495f2..0a3bba49b6c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -405,272 +405,6 @@ OC.Share = _.extend(OC.Share, {
 			OC.Share.droppedDown = true;
 		});
 		itemModel.fetch();
-		return;
-
-
-		var data = OC.Share.loadItem(itemType, itemSource);
-		var dropDownEl;
-		var html = '<div id="dropdown" class="drop shareDropDown" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
-		if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined && data.reshare.uid_owner !== OC.currentUser) {
-			html += '<span class="reshare">';
-			if (oc_config.enable_avatars === true) {
-				html += '<div class="avatar"></div> ';
-			}
-
-			if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
-				html += t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.displayname_owner});
-			} else {
-				html += t('core', 'Shared with you by {owner}', {owner: data.reshare.displayname_owner});
-			}
-			html += '</span><br />';
-			// reduce possible permissions to what the original share allowed
-			possiblePermissions = possiblePermissions & data.reshare.permissions;
-		}
-
-		if (possiblePermissions & OC.PERMISSION_SHARE) {
-			// Determine the Allow Public Upload status.
-			// Used later on to determine if the
-			// respective checkbox should be checked or
-			// not.
-
-			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
-			if (typeof publicUploadEnabled == 'undefined') {
-				publicUploadEnabled = 'no';
-			}
-			var allowPublicUploadStatus = false;
-
-			$.each(data.shares, function(key, value) {
-				if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
-					allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
-					return true;
-				}
-			});
-
-			var sharePlaceholder = t('core', 'Share with users or groups …');
-			if(oc_appconfig.core.remoteShareAllowed) {
-				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
-			}
-
-			html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>';
-			html += '<input id="shareWith" type="text" placeholder="' + sharePlaceholder + '" />';
-			if(oc_appconfig.core.remoteShareAllowed) {
-				var federatedCloudSharingDoc = '<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{docLink}" '
-					+ 'title="' + t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud') + '"></a>';
-				html += federatedCloudSharingDoc.replace('{docLink}', oc_appconfig.core.federatedCloudShareDoc);
-			}
-			html += '<span class="shareWithLoading icon-loading-small hidden"></span>';
-			html += '<ul id="shareWithList">';
-			html += '</ul>';
-			var linksAllowed = $('#allowShareWithLink').val() === 'yes';
-			if (link && linksAllowed) {
-				html += '<div id="link" class="linkShare">';
-				html += '<span class="icon-loading-small hidden"></span>';
-				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>';
-				html += '<br />';
-
-				var defaultExpireMessage = '';
-				if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnforced) {
-					defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created',  {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
-				}
-
-				html += '<label for="linkText" class="hidden-visually">'+t('core', 'Link')+'</label>';
-				html += '<input id="linkText" type="text" readonly="readonly" />';
-				html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
-				html += '<div id="linkPass">';
-				html += '<label for="linkPassText" class="hidden-visually">'+t('core', 'Password')+'</label>';
-				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Choose a password for the public link')+'" />';
-				html += '<span class="icon-loading-small hidden"></span>';
-				html += '</div>';
-
-				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
-					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
-					html += '<span class="icon-loading-small hidden"></span>';
-					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
-					html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow editing') + '</label>';
-					html += '</div>';
-				}
-				html += '</div>';
-				var mailPublicNotificationEnabled = $('input:hidden[name=mailPublicNotificationEnabled]').val();
-				if (mailPublicNotificationEnabled === 'yes') {
-					html += '<form id="emailPrivateLink">';
-					html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-					html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
-					html += '</form>';
-				}
-			}
-
-			html += '<div id="expiration">';
-			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
-			html += '<label for="expirationDate" class="hidden-visually">'+t('core', 'Expiration')+'</label>';
-			html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
-			html += '<em id="defaultExpireMessage">'+defaultExpireMessage+'</em>';
-			html += '</div>';
-			dropDownEl = $(html);
-			dropDownEl = dropDownEl.appendTo(appendTo);
-
-			// trigger remote share info tooltip
-			if(oc_appconfig.core.remoteShareAllowed) {
-				$('.shareWithRemoteInfo').tipsy({gravity: 'e'});
-			}
-
-			//Get owner avatars
-			if (oc_config.enable_avatars === true && data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
-				dropDownEl.find(".avatar").avatar(data.reshare.uid_owner, 32);
-			}
-
-			// Reset item shares
-			OC.Share.itemShares = [];
-			OC.Share.currentShares = {};
-			if (data.shares) {
-				$.each(data.shares, function(index, share) {
-					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
-						if (itemSource === share.file_source || itemSource === share.item_source) {
-							OC.Share.showLink(share.token, share.share_with, itemSource);
-						}
-					} else {
-						if (share.collection) {
-							OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, share.collection);
-						} else {
-							if (share.share_type === OC.Share.SHARE_TYPE_REMOTE) {
-								OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE, share.mail_send, false);
-							} else {
-								OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, false);
-							}
-						}
-					}
-					if (share.expiration != null) {
-						OC.Share.showExpirationDate(share.expiration, share.stime);
-					}
-				});
-			}
-			$('#shareWith').autocomplete({minLength: 2, delay: 750, source: function(search, response) {
-				var $loading = $('#dropdown .shareWithLoading');
-				$loading.removeClass('hidden');
-				$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term.trim(), limit: 200, itemShares: OC.Share.itemShares, itemType: itemType }, function(result) {
-					$loading.addClass('hidden');
-					if (result.status == 'success' && result.data.length > 0) {
-						$( "#shareWith" ).autocomplete( "option", "autoFocus", true );
-						response(result.data);
-					} else {
-						response();
-					}
-				}).fail(function(){
-					$('#dropdown').find('.shareWithLoading').addClass('hidden');
-					OC.Notification.show(t('core', 'An error occured. Please try again'));
-					window.setTimeout(OC.Notification.hide, 5000);
-				});
-			},
-			focus: function(event, focused) {
-				event.preventDefault();
-			},
-			select: function(event, selected) {
-				event.stopPropagation();
-				var $dropDown = $('#dropdown');
-				var itemType = $dropDown.data('item-type');
-				var itemSource = $dropDown.data('item-source');
-				var itemSourceName = $dropDown.data('item-source-name');
-				var expirationDate = '';
-				if ( $('#expirationCheckbox').is(':checked') === true ) {
-					expirationDate = $( "#expirationDate" ).val();
-				}
-				var shareType = selected.item.value.shareType;
-				var shareWith = selected.item.value.shareWith;
-				$(this).val(shareWith);
-				// Default permissions are Edit (CRUD) and Share
-				// Check if these permissions are possible
-				var permissions = OC.PERMISSION_READ;
-				if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
-					permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_READ;
-				} else {
-					if (possiblePermissions & OC.PERMISSION_UPDATE) {
-						permissions = permissions | OC.PERMISSION_UPDATE;
-					}
-					if (possiblePermissions & OC.PERMISSION_CREATE) {
-						permissions = permissions | OC.PERMISSION_CREATE;
-					}
-					if (possiblePermissions & OC.PERMISSION_DELETE) {
-						permissions = permissions | OC.PERMISSION_DELETE;
-					}
-					if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
-						permissions = permissions | OC.PERMISSION_SHARE;
-					}
-				}
-
-				var $input = $(this);
-				var $loading = $dropDown.find('.shareWithLoading');
-				$loading.removeClass('hidden');
-				$input.val(t('core', 'Adding user...'));
-				$input.prop('disabled', true);
-
-				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, function() {
-					$input.prop('disabled', false);
-					$loading.addClass('hidden');
-					var posPermissions = possiblePermissions;
-					if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
-						posPermissions = permissions;
-					}
-					OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, posPermissions);
-					$('#shareWith').val('');
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-				});
-				return false;
-			}
-			})
-			// customize internal _renderItem function to display groups and users differently
-			.data("ui-autocomplete")._renderItem = function( ul, item ) {
-				var insert = $( "<a>" );
-				var text = item.label;
-				if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
-					text = text +  ' ('+t('core', 'group')+')';
-				} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
-					text = text +  ' ('+t('core', 'remote')+')';
-				}
-				insert.text( text );
-				if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
-					insert = insert.wrapInner('<strong></strong>');
-				}
-				return $( "<li>" )
-					.addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP)?'group':'user')
-					.append( insert )
-					.appendTo( ul );
-			};
-			if (link && linksAllowed && $('#email').length != 0) {
-				$('#email').autocomplete({
-					minLength: 1,
-					source: function (search, response) {
-						$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWithEmail', search: search.term }, function(result) {
-							if (result.status == 'success' && result.data.length > 0) {
-								response(result.data);
-							}
-						});
-						},
-					select: function( event, item ) {
-						$('#email').val(item.item.email);
-						return false;
-					}
-				})
-				.data("ui-autocomplete")._renderItem = function( ul, item ) {
-					return $('<li>')
-						.append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
-						.appendTo( ul );
-				};
-			}
-
-		} else {
-			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>';
-			html += '</div>';
-			dropDownEl = $(html);
-			dropDownEl.appendTo(appendTo);
-		}
-		dropDownEl.attr('data-item-source-name', filename);
-		$('#dropdown').slideDown(OC.menuSpeed, function() {
-			OC.Share.droppedDown = true;
-		});
-		if ($('html').hasClass('lte9')){
-			$('#dropdown input[placeholder]').placeholder();
-		}
-		$('#shareWith').focus();
 	},
 	hideDropDown:function(callback) {
 		OC.Share.currentShares = null;
@@ -687,66 +421,6 @@ OC.Share = _.extend(OC.Share, {
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
-	},
-	/**
-	 * Parses a string to an valid integer (unix timestamp)
-	 * @param time
-	 * @returns {*}
-	 * @internal Only used to work around a bug in the backend
-	 */
-	_parseTime: function(time) {
-		if (_.isString(time)) {
-			// skip empty strings and hex values
-			if (time === '' || (time.length > 1 && time[0] === '0' && time[1] === 'x')) {
-				return null;
-			}
-			time = parseInt(time, 10);
-			if(isNaN(time)) {
-				time = null;
-			}
-		}
-		return time;
-	},
-	/**
-	 * Displays the expiration date field
-	 *
-	 * @param {Date} date current expiration date
-	 * @param {int} [shareTime] share timestamp in seconds, defaults to now
-	 */
-	showExpirationDate:function(date, shareTime) {
-		var now = new Date();
-		// min date should always be the next day
-		var minDate = new Date();
-		minDate.setDate(minDate.getDate()+1);
-		var datePickerOptions = {
-			minDate: minDate,
-			maxDate: null
-		};
-		// TODO: hack: backend returns string instead of integer
-		shareTime = OC.Share._parseTime(shareTime);
-		if (_.isNumber(shareTime)) {
-			shareTime = new Date(shareTime * 1000);
-		}
-		if (!shareTime) {
-			shareTime = now;
-		}
-		$('#expirationCheckbox').attr('checked', true);
-		$('#expirationDate').val(date);
-		$('#expirationDate').slideDown(OC.menuSpeed);
-		$('#expirationDate').css('display','block');
-		$('#expirationDate').datepicker({
-			dateFormat : 'dd-mm-yy'
-		});
-		if (oc_appconfig.core.defaultExpireDateEnforced) {
-			$('#expirationCheckbox').attr('disabled', true);
-			shareTime = OC.Util.stripTime(shareTime).getTime();
-			// max date is share date + X days
-			datePickerOptions.maxDate = new Date(shareTime + oc_appconfig.core.defaultExpireDate * 24 * 3600 * 1000);
-		}
-		if(oc_appconfig.core.defaultExpireDateEnabled) {
-			$('#defaultExpireMessage').slideDown(OC.menuSpeed);
-		}
-		$.datepicker.setDefaults(datePickerOptions);
 	}
 });
 
@@ -776,104 +450,6 @@ $(document).ready(function() {
 		}
 	});
 
-	$(document).on('click', '#dropdown #expirationCheckbox', function() {
-		if (this.checked) {
-			OC.Share.showExpirationDate('');
-		} else {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) {
-				if (!result || result.status !== 'success') {
-					OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
-				}
-				$('#expirationDate').slideUp(OC.menuSpeed);
-				if (oc_appconfig.core.defaultExpireDateEnforced === false) {
-					$('#defaultExpireMessage').slideDown(OC.menuSpeed);
-				}
-			});
-		}
-	});
-
-	$(document).on('change', '#dropdown #expirationDate', function() {
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-
-		$(this).tipsy('hide');
-		$(this).removeClass('error');
-
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
-			if (!result || result.status !== 'success') {
-				var expirationDateField = $('#dropdown #expirationDate');
-				if (!result.data.message) {
-					expirationDateField.attr('original-title', t('core', 'Error setting expiration date'));
-				} else {
-					expirationDateField.attr('original-title', result.data.message);
-				}
-				expirationDateField.tipsy({gravity: 'n'});
-				expirationDateField.tipsy('show');
-				expirationDateField.addClass('error');
-			} else {
-				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
-					$('#defaultExpireMessage').slideUp(OC.menuSpeed);
-				}
-			}
-		});
-	});
-
-
-	$(document).on('submit', '#dropdown #emailPrivateLink', function(event) {
-		event.preventDefault();
-		var link = $('#linkText').val();
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-		var email = $('#email').val();
-		var expirationDate = '';
-		if ( $('#expirationCheckbox').is(':checked') === true ) {
-			expirationDate = $( "#expirationDate" ).val();
-		}
-		if (email != '') {
-			$('#email').prop('disabled', true);
-			$('#email').val(t('core', 'Sending ...'));
-			$('#emailButton').prop('disabled', true);
-
-			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file, expiration: expirationDate},
-				function(result) {
-					$('#email').prop('disabled', false);
-					$('#emailButton').prop('disabled', false);
-				if (result && result.status == 'success') {
-					$('#email').css('font-weight', 'bold').val(t('core','Email sent'));
-					setTimeout(function() {
-						$('#email').css('font-weight', 'normal').val('');
-					}, 2000);
-				} else {
-					OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
-				}
-			});
-		}
-	});
-
-	$(document).on('click', '#dropdown input[name=mailNotification]', function() {
-		var $li = $(this).closest('li');
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		var action = '';
-		if (this.checked) {
-			action = 'informRecipients';
-		} else {
-			action = 'informRecipientsDisabled';
-		}
-
-		var shareType = $li.data('share-type');
-		var shareWith = $li.attr('data-share-with');
-
-		$.post(OC.filePath('core', 'ajax', 'share.php'), {action: action, recipient: shareWith, shareType: shareType, itemSource: itemSource, itemType: itemType}, function(result) {
-			if (result.status !== 'success') {
-				OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
-			}
-		});
-
-});
 
 
 });
-- 
cgit v1.2.3


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

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

(limited to 'core/js/share.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