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/sharedialogview.js | 253 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 253 insertions(+)
 create mode 100644 core/js/sharedialogview.js

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
new file mode 100644
index 00000000000..cbab9694afe
--- /dev/null
+++ b/core/js/sharedialogview.js
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if(!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE_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>' +
+			// FIXME: find a good position for remoteShareInfo
+		'    {{{remoteShareInfo}}}' +
+		'    <ul id="shareWithList">' +
+		'    </ul>' +
+		'    {{{linkShare}}}' +
+		'</div>';
+
+	var TEMPLATE_RESHARER_INFO =
+		'<span class="reshare">' +
+		'    {{#if avatarEnabled}}' +
+		'    <div class="avatar"></div>' +
+		'    {{/if}}' +
+		'    {{sharedByText}}' +
+		'</span><br />';
+
+	var TEMPLATE_REMOTE_SHARE_INFO =
+		'<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{{docLink}}" ' +
+		'title="{{tooltip}}"></a>';
+
+	var TEMPLATE_LINK_SHARE =
+			'<div id="link" class="linkShare">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'    <br />' +
+			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
+			'    <input id="linkText" type="text" readonly="readonly" />' +
+			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'    <div id="linkPass">' +
+			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
+			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'    </div>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogView
+	 * @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} **/
+		_templates: {},
+
+		/** @var {string} **/
+		_containerClasses: '',
+
+		/** @var {boolean} **/
+		_showLink: true,
+
+		/** @var {unknown} **/
+		_possiblePermissions: null,
+
+		initialize: function (id) {
+			this._id = id;
+		},
+
+		render: function() {
+			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
+
+			var $dialog = $(baseTemplate({
+				containerID: this._id,
+				containerClasses: this._renderContainerClasses(),
+				shareLabel: t('core', 'Share'),
+				resharerInfo: this._renderResharerInfo(),
+				sharePlaceholder: this._renderSharePlaceholderPart(),
+				remoteShareInfo: this._renderRemoteShareInfoPart(),
+				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;
+		},
+
+		/**
+		 * sets whether share by link should be displayed or not. Default is
+		 * true.
+		 *
+		 * @param {bool} showLink
+		 */
+		setShowLink: function(showLink) {
+			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._itemModel.hasReshare()
+				&& this._itemModel.getReshareOwner() !== OC.currentUser)
+			{
+				var reshareTemplate = this._getReshareTemplate();
+				var sharedByText = '';
+				if (this._itemModel.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()
+						}
+					);
+				}  else {
+					sharedByText = t(
+						'core',
+						'Shared with you by {owner}',
+						{ owner: this._itemModel.getReshareOwnerDisplayname() }
+					);
+				}
+
+
+				resharerInfo = reshareTemplate({
+					avatarEnabled: oc_config.enable_avatars === true,
+					sharedByText: sharedByText
+				});
+			}
+		},
+
+		_renderContainerClasses: function() {
+			var classes = '';
+			if(this._containerClasses) {
+				classes = 'class="' + this._containerClasses + '"';
+			}
+			return classes;
+		},
+
+		_renderRemoteShareInfoPart: function() {
+			var remoteShareInfo = '';
+			if(oc_appconfig.core.remoteShareAllowed) {
+				var infoTemplate = this._getRemoteShareInfoTemplate();
+				remoteShareInfo = infoTemplate({
+					docLink: oc_appconfig.core.federatedCloudShareDoc,
+					tooltip: t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')
+				});
+			}
+			return remoteShareInfo;
+		},
+
+		_renderLinkSharePart: function() {
+			var linkShare = '';
+			if(this._showLink && $('#allowShareWithLink').val() === 'yes') {
+				var linkShareTemplate = this._getLinkShareTemplate();
+				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')
+				});
+			}
+			return linkShare;
+		},
+
+		_renderSharePlaceholderPart: function () {
+			var sharePlaceholder = t('core', 'Share with users or groups …');
+			if (oc_appconfig.core.remoteShareAllowed) {
+				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
+			}
+			return sharePlaceholder;
+		},
+
+		_getTemplate: function (key, template) {
+			if (!this._templates[key]) {
+				this._templates[key] = Handlebars.compile(template);
+			}
+			return this._templates[key];
+		},
+
+		/**
+		 * returns the info template for remote sharing
+		 *
+		 * @returns {Handlebars}
+		 * @private
+		 */
+		_getRemoteShareInfoTemplate: function() {
+			return this._getTemplate('remoteShareInfo', TEMPLATE_REMOTE_SHARE_INFO);
+		},
+
+		/**
+		 * returns the info template for link sharing
+		 *
+		 * @returns {Handlebars}
+		 * @private
+		 */
+		_getLinkShareTemplate: function() {
+			return this._getTemplate('linkShare', TEMPLATE_LINK_SHARE);
+		},
+
+		_getReshareTemplate: function() {
+			return this._getTemplate('reshare', TEMPLATE_RESHARER_INFO);
+		},
+	};
+
+	OC.Share.ShareDialogView = ShareDialogView;
+
+})();
-- 
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/sharedialogview.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 ea6e380efe68e7249917d6470ecdffb25edbcc47 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 10 Aug 2015 21:46:46 +0200
Subject: remove possibly unreliable code and fix JSdoc

---
 core/js/sharedialogview.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index e085e85dd41..38b98a218aa 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -76,12 +76,6 @@
 		/** @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);
 
@@ -178,6 +172,13 @@
 			return sharePlaceholder;
 		},
 
+		/**
+		 *
+		 * @param {string} key - an identifier for the template
+		 * @param {string} template - the HTML to be compiled by Handlebars
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
 		_getTemplate: function (key, template) {
 			if (!this._templates[key]) {
 				this._templates[key] = Handlebars.compile(template);
@@ -188,7 +189,7 @@
 		/**
 		 * returns the info template for remote sharing
 		 *
-		 * @returns {Handlebars}
+		 * @returns {Function}
 		 * @private
 		 */
 		_getRemoteShareInfoTemplate: function() {
@@ -198,7 +199,7 @@
 		/**
 		 * returns the info template for link sharing
 		 *
-		 * @returns {Handlebars}
+		 * @returns {Function}
 		 * @private
 		 */
 		_getLinkShareTemplate: function() {
-- 
cgit v1.2.3


From 97b5fe0b1e7ece1c402f9226f13a6e9d711055cf Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Aug 2015 22:36:28 +0200
Subject: switch to async item loading, take care stuff is updated subsequently

---
 core/js/sharedialogview.js | 12 ++++++++++++
 core/js/shareitemmodel.js  | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 38b98a218aa..3c12bedca86 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -76,10 +76,22 @@
 		/** @type {string} **/
 		tagName: 'div',
 
+		initialize: function() {
+			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.'));
+			});
+		},
+
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
 			this.$el.html(baseTemplate({
+
 				shareLabel: t('core', 'Share'),
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 74e696e7200..fe7aed46509 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -65,6 +65,14 @@
 			return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
 		},
 
+		/**
+		 * whether this item has reshare information
+		 * @returns {boolean}
+		 */
+		hasShares: function() {
+			return _.isObject(this.get('shares'));
+		},
+
 		/**
 		 * @returns {string}
 		 */
@@ -94,16 +102,16 @@
 		},
 
 		fetch: function() {
-			/** var {OC.Share.Types.ShareItemInfo} **/
-			var data = OC.Share.loadItem(this.get('itemType'), this.get('itemSource'));
-			var attributes = this.parse(data);
-			this.set(attributes);
-			console.warn(this.attributes);
+			var model = this;
+			OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
+				model.set(model.parse(data));
+			});
 		},
 
 		parse: function(data) {
 			if(data === false) {
 				console.warn('no data was returned');
+				trigger('fetchError');
 				return {};
 			}
 			var attributes = {
-- 
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/sharedialogview.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/sharedialogview.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 a57ff13a23ce06846160c1264369ff4b07619890 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Aug 2015 12:13:08 +0200
Subject: move remaining global settings to configModel

---
 core/js/shareconfigmodel.js | 28 ++++++++++++++++++++++++++++
 core/js/sharedialogview.js  | 10 +++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

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

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 371cc96df5e..857e356a351 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -19,6 +19,13 @@
 			publicUploadEnabled: false
 		},
 
+		/**
+		 * @returns {boolean}
+		 */
+		areAvatarsEnabled: function() {
+			return oc_config.enable_avatars === true;
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
@@ -41,6 +48,27 @@
 			return oc_appconfig.core.defaultExpireDateEnforced === true;
 		},
 
+		/**
+		 * @returns {boolean}
+		 */
+		isRemoteShareAllowed: function() {
+			return oc_appconfig.core.remoteShareAllowed;
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isShareWithLinkAllowed: function() {
+			return $('#allowShareWithLink').val() === 'yes';
+		},
+
+		/**
+		 * @returns {string}
+		 */
+		getFederatedShareDocLink: function() {
+			return oc_appconfig.core.federatedCloudShareDoc;
+		},
+
 		/**
 		 * @returns {number}
 		 */
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 7b0af2bc84c..abf45a6bf45 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -182,17 +182,17 @@
 			}
 
 			return reshareTemplate({
-				avatarEnabled: oc_config.enable_avatars === true,
+				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				sharedByText: sharedByText
 			});
 		},
 
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
-			if(oc_appconfig.core.remoteShareAllowed) {
+			if(this.configModel.isRemoteShareAllowed()) {
 				var infoTemplate = this._getRemoteShareInfoTemplate();
 				remoteShareInfo = infoTemplate({
-					docLink: oc_appconfig.core.federatedCloudShareDoc,
+					docLink: this.configModel.getFederatedShareDocLink(),
 					tooltip: t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')
 				});
 			}
@@ -203,7 +203,7 @@
 			var linkShare = '';
 			if(    this.model.hasSharePermission()
 				&& this._showLink
-				&& $('#allowShareWithLink').val() === 'yes')
+				&& this.configModel.isShareWithLinkAllowed())
 			{
 				var linkShareTemplate = this._getLinkShareTemplate();
 
@@ -236,7 +236,7 @@
 
 		_renderSharePlaceholderPart: function () {
 			var sharePlaceholder = t('core', 'Share with users or groups …');
-			if (oc_appconfig.core.remoteShareAllowed) {
+			if (this.configModel.isRemoteShareAllowed()) {
 				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
 			}
 			return sharePlaceholder;
-- 
cgit v1.2.3


From 1bd6942be70da621da9acae56a23a39040ef24bf Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Aug 2015 17:23:32 +0200
Subject: show tooltips and load avatar

---
 core/js/sharedialogview.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index abf45a6bf45..5e3fb8b8d97 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -41,7 +41,7 @@
 		'</span><br />';
 
 	var TEMPLATE_REMOTE_SHARE_INFO =
-		'<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{{docLink}}" ' +
+		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
 
 	var TEMPLATE_LINK_SHARE =
@@ -141,6 +141,9 @@
 				expiration: this._renderExpirationPart()
 			}));
 
+			this.$el.find('.hasTooltip').tooltip();
+			this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+
 			return this;
 		},
 
@@ -196,6 +199,7 @@
 					tooltip: t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')
 				});
 			}
+
 			return remoteShareInfo;
 		},
 
-- 
cgit v1.2.3


From dcb084a617b2ee24031a14bce8b8e9749c821b75 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 19 Aug 2015 00:04:16 +0200
Subject: split ShareDialogResharerInfoView from base view

---
 core/js/sharedialogresharerinfoview.js | 117 +++++++++++++++++++++++++++++++++
 core/js/sharedialogview.js             |  62 ++++++-----------
 core/js/shareitemmodel.js              |   1 +
 lib/private/share/share.php            |   1 +
 4 files changed, 138 insertions(+), 43 deletions(-)
 create mode 100644 core/js/sharedialogresharerinfoview.js

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

diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
new file mode 100644
index 00000000000..3f996bb6d21
--- /dev/null
+++ b/core/js/sharedialogresharerinfoview.js
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+		'<span class="reshare">' +
+		'    {{#if avatarEnabled}}' +
+		'    <div class="avatar"></div>' +
+		'    {{/if}}' +
+		'    {{sharedByText}}' +
+		'</span><br/>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogResharerInfoView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogResharerInfo',
+
+		/** @type {string} **/
+		tagName: 'div',
+
+		/** @type {string} **/
+		className: 'reshare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		initialize: function(options) {
+			var view = this;
+
+			//FIXME: specific to reshares stuff
+			this.model.on('change', function() {
+				view.render();
+			});
+
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
+		},
+
+		render: function() {
+			if (   !this.model.hasReshare()
+				|| !this.model.getReshareOwner() !== OC.currentUser)
+			{
+				this.$el.html('');
+				return this;
+			}
+
+			var reshareTemplate = this.template();
+			var ownerDisplayName = this.model.getReshareOwnerDisplayname();
+			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: ownerDisplayName
+					}
+				);
+			}  else {
+				sharedByText = t(
+					'core',
+					'Shared with you by {owner}',
+					{ owner: ownerDisplayName }
+				);
+			}
+
+			this.$el.html(reshareTemplate({
+				avatarEnabled: this.configModel.areAvatarsEnabled(),
+				sharedByText: sharedByText
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogResharerInfoView = ShareDialogResharerInfoView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 5e3fb8b8d97..179d818e90f 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -32,14 +32,6 @@
 		'{{{expiration}}}'
 		;
 
-	var TEMPLATE_RESHARER_INFO =
-		'<span class="reshare">' +
-		'    {{#if avatarEnabled}}' +
-		'    <div class="avatar"></div>' +
-		'    {{/if}}' +
-		'    {{sharedByText}}' +
-		'</span><br />';
-
 	var TEMPLATE_REMOTE_SHARE_INFO =
 		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
@@ -110,6 +102,9 @@
 		/** @type {OC.Share.ShareConfigModel} **/
 		configModel: undefined,
 
+		/** @type {object} **/
+		resharerInfoView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -125,14 +120,26 @@
 			} else {
 				console.warn('missing OC.Share.ShareConfigModel');
 			}
+
+			var subViewOptions = {
+				model: this.model,
+				configModel: this.configModel
+			};
+
+			this.resharerInfoView = _.isUndefined(options.resharerInfoView)
+				? new OC.Share.ShareDialogResharerInfoView(subViewOptions)
+				: options.resharerInfoView;
+
 		},
 
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
+			this.resharerInfoView.render();
+
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
-				resharerInfo: this._renderResharerInfo(),
+				resharerInfo: this.resharerInfoView.el.innerHTML,
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 				linkShare: this._renderLinkSharePart(),
@@ -142,7 +149,9 @@
 			}));
 
 			this.$el.find('.hasTooltip').tooltip();
-			this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+			if(this.configModel.areAvatarsEnabled()) {
+				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+			}
 
 			return this;
 		},
@@ -157,39 +166,6 @@
 			this._showLink = (typeof showLink === 'boolean') ? showLink : true;
 		},
 
-		_renderResharerInfo: function() {
-			var resharerInfo = '';
-			if (   !this.model.hasReshare()
-				|| !this.model.getReshareOwner() !== OC.currentUser)
-			{
-				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: this.configModel.areAvatarsEnabled(),
-				sharedByText: sharedByText
-			});
-		},
-
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
 			if(this.configModel.isRemoteShareAllowed()) {
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index eb93b91ce92..0d2bce8b2ef 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -112,6 +112,7 @@
 		 * @returns {string}
 		 */
 		getReshareOwnerDisplayname: function() {
+			return 'foo';
 			return this.get('reshare').displayname_owner;
 		},
 
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index cd3f0cbfb34..10d0480ab89 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -85,6 +85,7 @@ class Share extends Constants {
 				if(count(self::$backendTypes) === 1) {
 					\OC_Util::addScript('core', 'shareconfigmodel');
 					\OC_Util::addScript('core', 'shareitemmodel');
+					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
cgit v1.2.3


From 277b786886de7979fea308595e4cf658e85aacf7 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 15:00:15 +0200
Subject: ShareDialogResharerInfoView improvements

---
 core/js/sharedialogresharerinfoview.js | 8 ++++----
 core/js/sharedialogview.js             | 8 ++++----
 core/js/shareitemmodel.js              | 3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

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

diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 3f996bb6d21..8970d857fc3 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -51,8 +51,7 @@
 		initialize: function(options) {
 			var view = this;
 
-			//FIXME: specific to reshares stuff
-			this.model.on('change', function() {
+			this.model.on('change:reshare', function() {
 				view.render();
 			});
 
@@ -67,7 +66,7 @@
 			if (   !this.model.hasReshare()
 				|| !this.model.getReshareOwner() !== OC.currentUser)
 			{
-				this.$el.html('');
+				this.$el.empty();
 				return this;
 			}
 
@@ -91,7 +90,8 @@
 				);
 			}
 
-			this.$el.html(reshareTemplate({
+			this.$el.empty();
+			this.$el.append(reshareTemplate({
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				sharedByText: sharedByText
 			}));
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 179d818e90f..67017778632 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,7 +14,7 @@
 	}
 
 	var TEMPLATE_BASE =
-		'{{{resharerInfo}}}' +
+		'<div class="resharerInfo"></div>' +
 		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
@@ -135,11 +135,8 @@
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
-			this.resharerInfoView.render();
-
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
-				resharerInfo: this.resharerInfoView.el.innerHTML,
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 				linkShare: this._renderLinkSharePart(),
@@ -148,6 +145,9 @@
 				expiration: this._renderExpirationPart()
 			}));
 
+			this.resharerInfoView.$el = this.$el.find('.resharerInfo');
+			this.resharerInfoView.render();
+
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 0d2bce8b2ef..9c4a8141cda 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -90,7 +90,8 @@
 		 * @returns {boolean}
 		 */
 		hasReshare: function() {
-			return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
+			var reshare = this.get('reshare');
+			return _.isObject(reshare) && !_.isUndefined(reshare.uid_owner);
 		},
 
 		/**
-- 
cgit v1.2.3


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

---
 core/js/sharedialoglinkshareview.js | 143 ++++++++++++++++++++++++++++++++++++
 core/js/sharedialogview.js          |  94 ++++--------------------
 lib/private/share/share.php         |   1 +
 3 files changed, 158 insertions(+), 80 deletions(-)
 create mode 100644 core/js/sharedialoglinkshareview.js

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

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
new file mode 100644
index 00000000000..ccd705803f6
--- /dev/null
+++ b/core/js/sharedialoglinkshareview.js
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+			'<div id="link" class="linkShare">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'    <br />' +
+			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
+			'    <input id="linkText" type="text" readonly="readonly" />' +
+			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'    <div id="linkPass">' +
+			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
+			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'    </div>' +
+			'    {{#if publicUpload}}' +
+			'    <div id="allowPublicUploadWrapper" class="hidden">' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'    </div>' +
+			'    {{/if}}' +
+			'    {{#if mailPublicNotificationEnabled}}' +
+			'    <form id="emailPrivateLink">' +
+			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'    </form>' +
+			'    {{/if}}' +
+			'</div>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogLinkShareView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogLinkShareView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogLinkShare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		/** @type {boolean} **/
+		showLink: true,
+
+		initialize: function(options) {
+			var view = this;
+
+			this.model.on('change:permissions', function() {
+				view.render();
+			});
+
+			this.model.on('change:itemType', function() {
+				view.render();
+			});
+
+			this.model.on('change:allowPublicUploadStatus', function() {
+				view.render();
+			});
+
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
+		},
+
+		render: function() {
+			if(    !this.model.hasSharePermission()
+				|| !this.showLink
+				|| !this.configModel.isShareWithLinkAllowed())
+			{
+				this.$el.empty();
+				return this;
+			}
+
+			var publicUpload =
+				this.model.isFolder()
+				&& this.model.hasCreatePermission()
+				&& this.configModel.isPublicUploadEnabled();
+
+			var publicUploadChecked = '';
+			if(this.model.isPublicUploadAllowed()) {
+				publicUploadChecked = 'checked="checked"';
+			}
+
+			var linkShareTemplate = this.template();
+			this.$el.empty();
+			this.$el.append(linkShareTemplate({
+				linkShareLabel: t('core', 'Share link'),
+				urlLabel: t('core', 'Link'),
+				enablePasswordLabel: t('core', 'Password protect'),
+				passwordLabel: t('core', 'Password'),
+				passwordPlaceholder: t('core', 'Choose a password for the public link'),
+				publicUpload: publicUpload,
+				publicUploadChecked: publicUploadChecked,
+				publicUploadLabel: t('core', 'Allow editing'),
+				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+				mailPrivatePlaceholder: t('core', 'Email link to person'),
+				mailButtonText: t('core', 'Send')
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogLinkShareView = ShareDialogLinkShareView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 67017778632..cc9590815a7 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -25,7 +25,7 @@
 		'<ul id="shareWithList">' +
 		'</ul>' +
 		'{{#if shareAllowed}}' +
-		'{{{linkShare}}}' +
+		'<div class="linkShare"></div>' +
 		'{{else}}' +
 		'{{{noSharing}}}' +
 		'{{/if}}' +
@@ -36,35 +36,6 @@
 		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
 
-	var TEMPLATE_LINK_SHARE =
-			'<div id="link" class="linkShare">' +
-			'    <span class="icon-loading-small hidden"></span>' +
-			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
-			'    <br />' +
-			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
-			'    <input id="linkText" type="text" readonly="readonly" />' +
-			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
-			'    <div id="linkPass">' +
-			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
-			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'    </div>' +
-			'    {{#if publicUpload}}' +
-			'    <div id="allowPublicUploadWrapper" class="hidden">' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
-			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
-			'    </div>' +
-			'    {{/if}}' +
-			'    {{#if mailPublicNotificationEnabled}}' +
-			'    <form id="emailPrivateLink">' +
-			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
-			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
-			'    </form>' +
-			'    {{/if}}' +
-			'</div>'
-		;
-
 	var TEMPLATE_NO_SHARING =
 		'<input id="shareWith" type="text" placeholder="{{placeholder}}" disabled="disabled"/>'
 	;
@@ -105,6 +76,9 @@
 		/** @type {object} **/
 		resharerInfoView: undefined,
 
+		/** @type {object} **/
+		linkShareView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -130,6 +104,10 @@
 				? new OC.Share.ShareDialogResharerInfoView(subViewOptions)
 				: options.resharerInfoView;
 
+			this.linkShareView = _.isUndefined(options.linkShareView)
+				? new OC.Share.ShareDialogLinkShareView(subViewOptions)
+				: options.linkShareView;
+
 		},
 
 		render: function() {
@@ -139,7 +117,6 @@
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
-				linkShare: this._renderLinkSharePart(),
 				shareAllowed: this.model.hasSharePermission(),
 				noSharing: this._renderNoSharing(),
 				expiration: this._renderExpirationPart()
@@ -148,6 +125,11 @@
 			this.resharerInfoView.$el = this.$el.find('.resharerInfo');
 			this.resharerInfoView.render();
 
+			if(this.model.hasSharePermission()) {
+				this.linkShareView.$el = this.$el.find('.linkShare');
+				this.linkShareView.render();
+			}
+
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
@@ -164,6 +146,7 @@
 		 */
 		setShowLink: function(showLink) {
 			this._showLink = (typeof showLink === 'boolean') ? showLink : true;
+			this.linkShareView.showLink = this._showLink;
 		},
 
 		_renderRemoteShareInfoPart: function() {
@@ -179,41 +162,6 @@
 			return remoteShareInfo;
 		},
 
-		_renderLinkSharePart: function() {
-			var linkShare = '';
-			if(    this.model.hasSharePermission()
-				&& this._showLink
-				&& this.configModel.isShareWithLinkAllowed())
-			{
-				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'),
-					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;
-		},
-
 		_renderSharePlaceholderPart: function () {
 			var sharePlaceholder = t('core', 'Share with users or groups …');
 			if (this.configModel.isRemoteShareAllowed()) {
@@ -278,20 +226,6 @@
 		 */
 		_getRemoteShareInfoTemplate: function() {
 			return this._getTemplate('remoteShareInfo', TEMPLATE_REMOTE_SHARE_INFO);
-		},
-
-		/**
-		 * returns the info template for link sharing
-		 *
-		 * @returns {Function}
-		 * @private
-		 */
-		_getLinkShareTemplate: function() {
-			return this._getTemplate('linkShare', TEMPLATE_LINK_SHARE);
-		},
-
-		_getReshareTemplate: function() {
-			return this._getTemplate('reshare', TEMPLATE_RESHARER_INFO);
 		}
 	});
 
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 10d0480ab89..ea4f01c0a95 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -86,6 +86,7 @@ class Share extends Constants {
 					\OC_Util::addScript('core', 'shareconfigmodel');
 					\OC_Util::addScript('core', 'shareitemmodel');
 					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
+					\OC_Util::addScript('core', 'sharedialoglinkshareview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
cgit v1.2.3


From ffd4e0dc5a1977885b639b3ba1bb87a533e6a75a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 19:35:13 +0200
Subject: split off expirationView

---
 core/js/sharedialogexpirationview.js | 93 ++++++++++++++++++++++++++++++++++++
 core/js/sharedialogview.js           | 54 ++++++---------------
 lib/private/share/share.php          |  1 +
 3 files changed, 109 insertions(+), 39 deletions(-)
 create mode 100644 core/js/sharedialogexpirationview.js

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

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
new file mode 100644
index 00000000000..e752c66bf35
--- /dev/null
+++ b/core/js/sharedialogexpirationview.js
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+			'<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>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogExpirationView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the expiration part in the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogExpirationView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogLinkShare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		/** @type {boolean} **/
+		showLink: true,
+
+		initialize: function(options) {
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
+		},
+
+		render: function() {
+			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 expirationTemplate = this.template();
+			this.$el.empty();
+			this.$el.append(expirationTemplate({
+				setExpirationLabel: t('core', 'Set expiration date'),
+				expirationLabel: t('core', 'Expiration'),
+				expirationDatePlaceholder: t('core', 'Expiration date'),
+				defaultExpireMessage: defaultExpireMessage
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogExpirationView = ShareDialogExpirationView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cc9590815a7..cdf5214fa65 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,7 +14,7 @@
 	}
 
 	var TEMPLATE_BASE =
-		'<div class="resharerInfo"></div>' +
+		'<div class="resharerInfoView"></div>' +
 		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
@@ -25,11 +25,11 @@
 		'<ul id="shareWithList">' +
 		'</ul>' +
 		'{{#if shareAllowed}}' +
-		'<div class="linkShare"></div>' +
+		'<div class="linkShareView"></div>' +
 		'{{else}}' +
 		'{{{noSharing}}}' +
 		'{{/if}}' +
-		'{{{expiration}}}'
+		'<div class="expirationView"></div>'
 		;
 
 	var TEMPLATE_REMOTE_SHARE_INFO =
@@ -40,16 +40,6 @@
 		'<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
@@ -79,6 +69,9 @@
 		/** @type {object} **/
 		linkShareView: undefined,
 
+		/** @type {object} **/
+		expirationView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -108,6 +101,10 @@
 				? new OC.Share.ShareDialogLinkShareView(subViewOptions)
 				: options.linkShareView;
 
+			this.expirationView = _.isUndefined(options.expirationView)
+				? new OC.Share.ShareDialogExpirationView(subViewOptions)
+				: options.expirationView;
+
 		},
 
 		render: function() {
@@ -119,14 +116,16 @@
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 				shareAllowed: this.model.hasSharePermission(),
 				noSharing: this._renderNoSharing(),
-				expiration: this._renderExpirationPart()
 			}));
 
-			this.resharerInfoView.$el = this.$el.find('.resharerInfo');
+			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
 
+			this.expirationView.$el = this.$el.find('.expirationView');
+			this.expirationView.render();
+
 			if(this.model.hasSharePermission()) {
-				this.linkShareView.$el = this.$el.find('.linkShare');
+				this.linkShareView.$el = this.$el.find('.linkShareView');
 				this.linkShareView.render();
 			}
 
@@ -181,29 +180,6 @@
 			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/lib/private/share/share.php b/lib/private/share/share.php
index ea4f01c0a95..b5d508b30ba 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -87,6 +87,7 @@ class Share extends Constants {
 					\OC_Util::addScript('core', 'shareitemmodel');
 					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
 					\OC_Util::addScript('core', 'sharedialoglinkshareview');
+					\OC_Util::addScript('core', 'sharedialogexpirationview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
cgit v1.2.3


From 8f3884145e3992ec5195d6bdd7c4c97926c0c582 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 20:05:50 +0200
Subject: less stupid initalization of subviews

---
 core/js/sharedialogview.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cdf5214fa65..b33130a83dc 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -93,18 +93,18 @@
 				configModel: this.configModel
 			};
 
-			this.resharerInfoView = _.isUndefined(options.resharerInfoView)
-				? new OC.Share.ShareDialogResharerInfoView(subViewOptions)
-				: options.resharerInfoView;
-
-			this.linkShareView = _.isUndefined(options.linkShareView)
-				? new OC.Share.ShareDialogLinkShareView(subViewOptions)
-				: options.linkShareView;
-
-			this.expirationView = _.isUndefined(options.expirationView)
-				? new OC.Share.ShareDialogExpirationView(subViewOptions)
-				: options.expirationView;
+			var subViews = {
+				resharerInfoView: 'ShareDialogResharerInfoView',
+				linkShareView: 'ShareDialogLinkShareView',
+				expirationView: 'ShareDialogExpirationView'
+			};
 
+			for(var name in subViews) {
+				var className = subViews[name];
+				this[name] = _.isUndefined(options[name])
+					? new OC.Share[className](subViewOptions)
+					: options[name];
+			}
 		},
 
 		render: function() {
-- 
cgit v1.2.3


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

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

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

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


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

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

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

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


From f62a3be59069510f4afa479316a665011cd014f5 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Aug 2015 14:41:52 +0200
Subject: cleanup

---
 core/js/sharedialogview.js | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index e07a5cee49a..8cd68962d42 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -32,10 +32,6 @@
 		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
 
-	var TEMPLATE_NO_SHARING =
-		'<input id="shareWith" type="text" placeholder="{{placeholder}}" disabled="disabled"/>'
-	;
-
 	/**
 	 * @class OCA.Share.ShareDialogView
 	 * @member {OC.Share.ShareItemModel} model
-- 
cgit v1.2.3


From c17d022ca42dda31f321276f2c4973ca2e43c8a4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Aug 2015 16:07:14 +0200
Subject: started to implement sharee list view. not completed yet, do not cry
 please.

---
 core/js/shareconfigmodel.js          |   7 +++
 core/js/sharedialogshareelistview.js | 111 +++++++++++++++++++++++++++++++++++
 core/js/sharedialogview.js           |   9 ++-
 lib/private/share/share.php          |   1 +
 4 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 core/js/sharedialogshareelistview.js

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

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 857e356a351..e948c57cbac 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -55,6 +55,13 @@
 			return oc_appconfig.core.remoteShareAllowed;
 		},
 
+		/**
+		 * @returns {boolean}
+		 */
+		isResharingAllowed: function() {
+			return oc_appconfig.core.resharingAllowed
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
new file mode 100644
index 00000000000..177e0b4a899
--- /dev/null
+++ b/core/js/sharedialogshareelistview.js
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+			'<ul id="shareWithList">' +
+			'{{#each sharees}}' +
+			'    <li data-share-type="{{shareType}}" data-share-with="{{shareWith}}" title="{{shareWith}}">' +
+			'        <a href="#" class="unshare"><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' +
+			'        {{#if avatarEnabled}}' +
+			'        <div class="avatar"></div>' +
+			'        {{/if}}' +
+			'        <span class="username">{{shareWithDisplayName}}</span>' +
+			'        {{#if mailPublicNotificationEnabled}} {{#unless isRemoteShare}}' +
+			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{isMailSent}} />{{notifyByMailLabel}}</label>' +
+			'        {{/unless}} {{/if}}' +
+			'        {{#if isResharingAllowed}} {{#if hasSharePermission}}' +
+			'        {{/if}} {{/if}}' +
+			'    </li>' +
+			'{{/each}}' +
+			'</ul>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogShareeListView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the sharee list part in the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogShareeListView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogLinkShare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		/** @type {boolean} **/
+		showLink: true,
+
+		initialize: function(options) {
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				throw 'missing OC.Share.ShareConfigModel';
+			}
+		},
+
+		getShareeList: function() {
+			var universal = {
+				avatarEnabled: this.configModel.areAvatarsEnabled(),
+				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+				notifyByMailLabel: t('core', 'notify by email'),
+				unshareLabel: t('core', 'Unshare'),
+				unshareImage: OC.imagePath('core', 'actions/delete')
+			};
+
+			// TODO: sharess must have following attributes
+			// shareType
+			// shareWith
+			// shareWithDisplayName
+			// isRemoteShare
+			// isMailSent
+
+			var list = _.extend({}, universal);
+
+			return list;
+		},
+
+		render: function() {
+			var shareeListTemplate = this.template();
+			this.$el.html(shareeListTemplate({
+				sharees: this.getShareeList()
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogShareeListView = ShareDialogShareeListView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 8cd68962d42..2348c14bb88 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -22,8 +22,7 @@
 		'</div>' +
 			// FIXME: find a good position for remoteShareInfo
 		'{{{remoteShareInfo}}}' +
-		'<ul id="shareWithList">' +
-		'</ul>' +
+		'<div class="shareeListView"></div>' +
 		'<div class="linkShareView"></div>' +
 		'<div class="expirationView"></div>'
 		;
@@ -88,7 +87,8 @@
 			var subViews = {
 				resharerInfoView: 'ShareDialogResharerInfoView',
 				linkShareView: 'ShareDialogLinkShareView',
-				expirationView: 'ShareDialogExpirationView'
+				expirationView: 'ShareDialogExpirationView',
+				shareeListView: 'ShareDialogShareeListView'
 			};
 
 			for(var name in subViews) {
@@ -117,6 +117,9 @@
 			this.expirationView.$el = this.$el.find('.expirationView');
 			this.expirationView.render();
 
+			this.shareeListView.$el = this.$el.find('.shareeListView');
+			this.shareeListView.redner();
+
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b5d508b30ba..802b146cfb6 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -88,6 +88,7 @@ class Share extends Constants {
 					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
 					\OC_Util::addScript('core', 'sharedialoglinkshareview');
 					\OC_Util::addScript('core', 'sharedialogexpirationview');
+					\OC_Util::addScript('core', 'sharedialogshareelistview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
cgit v1.2.3


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

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

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

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


From 858a2a4e6c42f8cc68212439930c16029a6bba36 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 4 Sep 2015 15:31:45 +0200
Subject: display expiration info

---
 core/js/shareconfigmodel.js          | 18 ++----------
 core/js/sharedialogexpirationview.js | 57 +++++++++++++++++++++++++++++++-----
 core/js/sharedialogview.js           |  1 +
 core/js/shareitemmodel.js            |  7 ++++-
 4 files changed, 60 insertions(+), 23 deletions(-)

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

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 846b2692ecb..472fdcc75d7 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -17,7 +17,9 @@
 	var ShareConfigModel = OC.Backbone.Model.extend({
 		defaults: {
 			publicUploadEnabled: false,
-			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink
+			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
+			isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
+			defaultExpireDate: oc_appconfig.core.defaultExpireDate,
 		},
 
 		/**
@@ -42,13 +44,6 @@
 			return $('input:hidden[name=mailPublicNotificationEnabled]').val() === 'yes';
 		},
 
-		/**
-		 * @returns {boolean}
-		 */
-		isDefaultExpireDateEnforced: function() {
-			return oc_appconfig.core.defaultExpireDateEnforced === true;
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
@@ -75,13 +70,6 @@
 		 */
 		getFederatedShareDocLink: function() {
 			return oc_appconfig.core.federatedCloudShareDoc;
-		},
-
-		/**
-		 * @returns {number}
-		 */
-		getDefaultExpireDate: function () {
-			return oc_appconfig.core.defaultExpireDate;
 		}
 	});
 
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 9fb404a090e..56473cdb1fa 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -14,13 +14,22 @@
 	}
 
 	var TEMPLATE =
-			// well that could go to linkShareView…
+			// currently expiration is only effective for link share.
+			// this is about to change in future. Therefore this is not included
+			// in the LinkShareView to ease reusing it in future. Then,
+			// modifications (getting rid of IDs) are still necessary.
 			'{{#if isLinkShare}}' +
-			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" />' +
+			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" ' +
+				'{{#if isExpirationSet}}checked="checked"{{/if}} {{#if disableCheckbox}}disabled="disabled"{{/if}} />' +
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
-			'<label for="expirationDate" class="hidden-visually">{{expirationLabel}}</label>' +
-			'<input id="expirationDate" type="text" placeholder="{{expirationDatePlaceholder}}" class="hidden" />' +
+			'    {{#if isExpirationSet}}' +
+			'<label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
+			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" />' +
+			'    {{/if}}' +
+			'    {{#if isExpirationEnforced}}' +
+				// originally the expire message was shown when a default date was set, however it never had text
 			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
+			'    {{/if}}' +
 			'{{/if}}'
 		;
 
@@ -59,24 +68,58 @@
 
 		render: function() {
 			var defaultExpireMessage = '';
+			var defaultExpireDays = this.configModel.get('defaultExpireDate');
 			if(    (this.model.isFolder() || this.model.isFile())
-				&& this.configModel.isDefaultExpireDateEnforced()) {
+				&& this.configModel.get('isDefaultExpireDateEnforced')) {
 				defaultExpireMessage = t(
 					'core',
 					'The public link will expire no later than {days} days after it is created',
-					{'days': this.configModel.getDefaultExpireDate()}
+					{'days': defaultExpireDays }
 				);
 			}
 
+			var isExpirationSet = !!this.model.get('linkShare').expiration;
+			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
 				setExpirationLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
 				expirationDatePlaceholder: t('core', 'Expiration date'),
 				defaultExpireMessage: defaultExpireMessage,
-				isLinkShare: this.model.get('linkShare').isLinkShare
+				isLinkShare: this.model.get('linkShare').isLinkShare,
+				isExpirationSet: isExpirationSet,
+				isExpirationEnforced: isExpirationEnforced,
+				disableCheckbox: isExpirationEnforced && isExpirationSet,
+				expirationValue: this.model.get('linkShare').expiration
 			}));
 
+			if(isExpirationSet) {
+				// what if there is another date picker on that page?
+				var minDate = new Date();
+				// min date should always be the next day
+				minDate.setDate(minDate.getDate()+1);
+
+				var maxDate = null;
+				if(isExpirationEnforced) {
+					// TODO: hack: backend returns string instead of integer
+					var shareTime = this.model.get('linkShare').stime;
+					if (_.isNumber(shareTime)) {
+						shareTime = new Date(shareTime * 1000);
+					}
+					if (!shareTime) {
+						shareTime = new Date(); // now
+					}
+					shareTime = OC.Util.stripTime(shareTime).getTime();
+					maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000);
+				}
+
+				$.datepicker.setDefaults({
+					minDate: minDate,
+					maxDate: maxDate
+				});
+			}
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 9bfe38eea3c..12e682a3b82 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -134,6 +134,7 @@
 					$this.imageplaceholder($this.data('seed'));
 				});
 			}
+			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
 			return this;
 		},
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index e8371e16e0a..24aa5fe344d 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -20,6 +20,8 @@
 	 * @property {string} token
 	 * @property {string|null} password
 	 * @property {string} link
+	 * @property {Date} expiration
+	 * @property {number} stime share time
 	 */
 
 	/**
@@ -445,7 +447,10 @@
 							isLinkShare: true,
 							token: share.token,
 							password: share.share_with,
-							link: link
+							link: link,
+							// currently expiration is only effective for link shares.
+							expiration: share.expiration,
+							stime: share.stime
 						};
 
 						return share;
-- 
cgit v1.2.3


From 258a2e2696c0c2a1e784fe27cbd8ca9a4dc8b8ca Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 5 Sep 2015 02:02:55 +0200
Subject: now you even can share

---
 apps/files_sharing/appinfo/app.php      |  1 +
 apps/files_sharing/css/sharetabview.css |  1 -
 core/js/shareconfigmodel.js             |  8 +-----
 core/js/sharedialogshareelistview.js    |  8 +++---
 core/js/sharedialogview.js              | 46 +++++++++++++++++++++++++++++++++
 core/js/shareitemmodel.js               | 41 +++++++++++++++++++++++++++++
 6 files changed, 94 insertions(+), 11 deletions(-)

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

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 2bb872eaad6..8d919d1466f 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -61,6 +61,7 @@ $eventDispatcher->addListener(
 		\OCP\Util::addScript('files_sharing', 'share');
 		\OCP\Util::addScript('files_sharing', 'sharetabview');
 		\OCP\Util::addScript('files_sharing', 'external');
+		\OCP\Util::addStyle('files_sharing', 'sharetabview');
 	}
 );
 
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 8b9af852531..96a75717c53 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -5,7 +5,6 @@
 .shareTabView .oneline { white-space: nowrap; }
 
 .shareTabView .shareWithLoading {
-	display: inline-block !important;
 	padding-left: 10px;
 	position: relative;
 	right: 30px;
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 472fdcc75d7..98280e01eb6 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -20,6 +20,7 @@
 			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
 			isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
 			defaultExpireDate: oc_appconfig.core.defaultExpireDate,
+			isResharingAllowed: oc_appconfig.core.resharingAllowed
 		},
 
 		/**
@@ -51,13 +52,6 @@
 			return oc_appconfig.core.remoteShareAllowed;
 		},
 
-		/**
-		 * @returns {boolean}
-		 */
-		isResharingAllowed: function() {
-			return oc_appconfig.core.resharingAllowed
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 6a356b8144c..4ac669ee2b9 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -161,7 +161,7 @@
 				deletePermissionLabel: t('core', 'delete'),
 				crudsLabel: t('core', 'access control'),
 				triangleSImage: OC.imagePath('core', 'actions/triangle-s'),
-				isResharingAllowed: this.configModel.isResharingAllowed(),
+				isResharingAllowed: this.configModel.get('isResharingAllowed'),
 				sharePermissionPossible: this.model.sharePermissionPossible(),
 				editPermissionPossible: this.model.editPermissionPossible(),
 				createPermissionPossible: this.model.createPermissionPossible(),
@@ -185,10 +185,12 @@
 				if(this.model.isCollection(index)) {
 					this.processCollectionShare(index);
 				} else {
-					list.push(_.extend(universal, this.getShareeObject(index)))
+					// first empty {} is necessary, otherwise we get in trouble
+					// with references
+					list.push(_.extend({}, universal, this.getShareeObject(index)));
 				}
-				list = _.union(_.values(this._collections), list);
 			}
+			list = _.union(_.values(this._collections), list);
 
 			return list;
 		},
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 12e682a3b82..e3da0384fa4 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -100,6 +100,36 @@
 					? new OC.Share[className](subViewOptions)
 					: options[name];
 			}
+
+			_.bindAll(this, 'autocompleteHandler');
+		},
+
+		autocompleteHandler: function (search, response) {
+			var view = this;
+			var $loading = this.$el.find('.shareWithLoading');
+			$loading.removeClass('hidden');
+			$loading.addClass('inlineblock');
+			$.get(OC.filePath('core', 'ajax', 'share.php'), {
+				fetch: 'getShareWith',
+				search: search.term.trim(),
+				limit: 200,
+				itemShares: OC.Share.itemShares,
+				itemType: view.model.get('itemType')
+			}, function (result) {
+				$loading.addClass('hidden');
+				$loading.removeClass('inlineblock');
+				if (result.status == 'success' && result.data.length > 0) {
+					$("#shareWith").autocomplete("option", "autoFocus", true);
+					response(result.data);
+				} else {
+					response();
+				}
+			}).fail(function () {
+				$loading.addClass('hidden');
+				$loading.removeClass('inlineblock');
+				OC.Notification.show(t('core', 'An error occured. Please try again'));
+				window.setTimeout(OC.Notification.hide, 5000);
+			});
 		},
 
 		render: function() {
@@ -111,6 +141,22 @@
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 			}));
 
+			var view = this;
+			this.$el.find('#shareWith').autocomplete({
+				minLength: 2,
+				delay: 750,
+				source: this.autocompleteHandler,
+				select: function(e, s) {
+					var expiration = '';
+					if($('#expirationCheckbox').is(':checked') === true) {
+						expiration = view.$el.find('#expirationDate').val()
+					}
+					view.model.addShare(e, s, {
+						expiration: expiration
+					});
+				}
+			});
+
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 24aa5fe344d..81e905b082e 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -79,6 +79,8 @@
 				/** @type {OC.Files.FileInfo} **/
 				this.fileInfoModel = options.fileInfoModel;
 			}
+
+			_.bindAll(this, 'addShare');
 		},
 
 		defaults: {
@@ -87,6 +89,45 @@
 			linkShare: {}
 		},
 
+		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');
+			options = options || {};
+
+			// 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 (this.updatePermissionPossible()) {
+					permissions = permissions | OC.PERMISSION_UPDATE;
+				}
+				if (this.createPermissionPossible()) {
+					permissions = permissions | OC.PERMISSION_CREATE;
+				}
+				if (this.deletePermissionPossible()) {
+					permissions = permissions | OC.PERMISSION_DELETE;
+				}
+				if (this.configModel.get('isResharingAllowed') && (this.sharePermissionPossible())) {
+					permissions = permissions | OC.PERMISSION_SHARE;
+				}
+			}
+
+			var model = this;
+			OC.Share.share(this.get('itemType'), this.get('itemSource'), shareType, shareWith, permissions, fileName, options.expiration, function() {
+				model.fetch()
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-- 
cgit v1.2.3


From 4c702aa8fdfb28bea4b021e55e7df5eeeb6999d2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 12:17:15 +0200
Subject: format groups and remotes in autocomplete list

---
 core/js/sharedialogview.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index e3da0384fa4..6588da7d429 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -132,6 +132,24 @@
 			});
 		},
 
+		autocompleteRenderItem: 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);
+		},
+
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
@@ -155,7 +173,7 @@
 						expiration: expiration
 					});
 				}
-			});
+			}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
-- 
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/sharedialogview.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 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/sharedialogview.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 06b11dd602b5073d383d14e10072708907513cb3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 17:47:47 +0200
Subject: Fix shares list events

Some events need preventing default like unshare, but setting
permissions doesn't.
---
 core/js/sharedialogshareelistview.js | 34 ++++++++++++++++++----------------
 core/js/sharedialogview.js           | 17 +++++++----------
 core/js/shareitemmodel.js            |  9 ++++-----
 3 files changed, 29 insertions(+), 31 deletions(-)

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

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index cf8905ff982..8f68231398e 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -81,6 +81,12 @@
 		/** @type {object} **/
 		_collections: {},
 
+		events: {
+			'click .unshare': 'onUnshare',
+			'click .permissions': 'onPermissionChange',
+			'click .showCruds': 'onCrudsToggle'
+		},
+
 		initialize: function(options) {
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
@@ -212,10 +218,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);
+			this.delegateEvents();
 
 			return this;
 		},
@@ -231,8 +234,8 @@
 			return this._template;
 		},
 
-		onUnshare: function(element, view) {
-			var $element = $(element);
+		onUnshare: function(event) {
+			var $element = $(event.target);
 
 			if($element.hasClass('icon-loading-small')) {
 				// in process
@@ -244,26 +247,27 @@
 			var shareType = $li.data('share-type');
 			var shareWith = $li.attr('data-share-with');
 
-			view.model.removeShare(shareType, shareWith);
+			this.model.removeShare(shareType, shareWith);
 
 			return false;
 		},
 
-		onPermissionChange: function(element, view) {
-			var $element = $(element);
+		onPermissionChange: function(event) {
+			var $element = $(event.target);
 			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"]');
+			var checked;
 			if ($element.attr('name') === 'edit') {
-				var checked = $element.is(':checked');
+				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;
+				checked = numberChecked > 0;
 				$('input[name="edit"]', $li).attr('checked', checked);
 			}
 
@@ -272,13 +276,11 @@
 				permissions |= $(checkbox).data('permissions');
 			});
 
-			view.model.setPermissions(shareType, shareWith, permissions);
-
-			return false;
+			this.model.setPermissions(shareType, shareWith, permissions);
 		},
 
-		onCrudsToggle: function() {
-			$(this).siblings('.cruds').toggleClass('hidden');
+		onCrudsToggle: function(event) {
+			this.$el.find('.cruds').toggleClass('hidden');
 			return false;
 		}
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 416fff53de4..c0020d5b031 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -102,7 +102,7 @@
 					: options[name];
 			}
 
-			_.bindAll(this, 'autocompleteHandler');
+			_.bindAll(this, 'autocompleteHandler', '_onSelectRecipient');
 		},
 
 		autocompleteHandler: function (search, response) {
@@ -151,6 +151,11 @@
 				.appendTo(ul);
 		},
 
+		_onSelectRecipient: function(e, s) {
+			e.preventDefault();
+			this.model.addShare(s.item.value);
+		},
+
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
@@ -165,15 +170,7 @@
 				minLength: 2,
 				delay: 750,
 				source: this.autocompleteHandler,
-				select: function(e, s) {
-					var expiration = '';
-					if($('#expirationCheckbox').is(':checked') === true) {
-						expiration = view.$el.find('#expirationDate').val()
-					}
-					view.model.addShare(e, s, {
-						expiration: expiration
-					});
-				}
+				select: this._onSelectRecipient
 			}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 949c86599bc..877b3cb230d 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -201,11 +201,9 @@
 			this.get('linkShare').password = password;
 		},
 
-		addShare: function(event, selected, options) {
-			event.preventDefault();
-
-			var shareType = selected.item.value.shareType;
-			var shareWith = selected.item.value.shareWith;
+		addShare: function(attributes, options) {
+			var shareType = attributes.shareType;
+			var shareWith = attributes.shareWith;
 			var fileName = this.fileInfoModel.get('name');
 			options = options || {};
 
@@ -241,6 +239,7 @@
 			var itemType = this.get('itemType');
 			var itemSource = this.get('itemSource');
 
+			// TODO: in the future, only set the permissions on the model but don't save directly
 			OC.Share.setPermissions(itemType, itemSource, shareType, shareWith, permissions);
 		},
 
-- 
cgit v1.2.3


From e0a2004f4ca647f7d20ec885045ec9e2e899ea03 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 17:49:48 +0200
Subject: Clear field after adding user

---
 core/js/sharedialogview.js | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c0020d5b031..36e63993203 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -153,6 +153,7 @@
 
 		_onSelectRecipient: function(e, s) {
 			e.preventDefault();
+			$(e.target).val('');
 			this.model.addShare(s.item.value);
 		},
 
-- 
cgit v1.2.3


From 996639f4fbd4107851efc11ee34b24cead43e790 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 15:29:30 +0200
Subject: More unit tests for share dialog

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

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

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


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

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

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

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