aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files_sharing/css/sharetabview.scss4
-rw-r--r--core/js/share/sharedialoglinkshareview_popover_menu.handlebars4
-rw-r--r--core/js/share/sharedialogshareelistview_popover_menu.handlebars7
-rw-r--r--core/js/sharedialoglinkshareview.js4
-rw-r--r--core/js/sharedialogshareelistview.js9
-rw-r--r--core/js/sharetemplates.js16
6 files changed, 28 insertions, 16 deletions
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index dd9dc70e239..be4d2635b7e 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -75,13 +75,15 @@
}
.share-add {
input.share-note-delete {
- display: none;
border: none;
background-color: transparent;
width: 44px !important;
padding: 0;
flex: 0 0 44px;
margin-left: auto;
+ &.hidden {
+ display: none;
+ }
}
}
// note
diff --git a/core/js/share/sharedialoglinkshareview_popover_menu.handlebars b/core/js/share/sharedialoglinkshareview_popover_menu.handlebars
index 3a370224437..ecbf69ffb77 100644
--- a/core/js/share/sharedialoglinkshareview_popover_menu.handlebars
+++ b/core/js/share/sharedialoglinkshareview_popover_menu.handlebars
@@ -87,14 +87,14 @@
<span class="icon-loading-small hidden"></span>
<span class="icon icon-edit"></span>
<span>{{addNoteLabel}}</span>
- <input type="button" class="share-note-delete icon-delete">
+ <input type="button" class="share-note-delete icon-delete {{#unless hasNote}}hidden{{/unless}}">
</a>
</li>
<li class="share-note-form share-note-link {{#unless hasNote}}hidden{{/unless}}">
<span class="menuitem icon-note">
<textarea class="share-note">{{shareNote}}</textarea>
<input type="submit" class="icon-confirm share-note-submit" value="" id="add-note-{{shareId}}" />
- </span>
+ </span>
</li>
{{#each social}}
<li>
diff --git a/core/js/share/sharedialogshareelistview_popover_menu.handlebars b/core/js/share/sharedialogshareelistview_popover_menu.handlebars
index c135d31b081..84b6c93dde5 100644
--- a/core/js/share/sharedialogshareelistview_popover_menu.handlebars
+++ b/core/js/share/sharedialogshareelistview_popover_menu.handlebars
@@ -86,13 +86,14 @@
</li>
{{#if isNoteAvailable}}
<li>
- <a href="#" class="share-add"><span class="icon-loading-small hidden"></span>
+ <a href="#" class="share-add">
+ <span class="icon-loading-small hidden"></span>
<span class="icon icon-edit"></span>
<span>{{addNoteLabel}}</span>
- <input type="button" class="share-note-delete icon-delete">
+ <input type="button" class="share-note-delete icon-delete {{#unless hasNote}}hidden{{/unless}}">
</a>
</li>
- <li class="share-note-form hidden">
+ <li class="share-note-form {{#unless hasNote}}hidden{{/unless}}">
<span class="menuitem icon-note">
<textarea class="share-note">{{shareNote}}</textarea>
<input type="submit" class="icon-confirm share-note-submit" value="" id="add-note-{{shareId}}" />
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index fc2292b4f46..f9af57ac2ab 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -329,7 +329,7 @@
var $form = $menu.next('li.share-note-form');
// show elements
- $menu.find('.share-note-delete').toggle();
+ $menu.find('.share-note-delete').toggleClass('hidden');
$form.toggleClass('hidden');
$form.find('textarea').focus();
},
@@ -347,7 +347,7 @@
$form.find('.share-note').val('');
$form.addClass('hidden');
- $menu.find('.share-note-delete').hide();
+ $menu.find('.share-note-delete').addClass('hidden');
self.sendNote('', shareId, $menu);
},
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 93373a54435..e2a7ae937c7 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -134,6 +134,8 @@
var hasPassword = password !== null && password !== '';
var sendPasswordByTalk = share.send_password_by_talk;
+ var shareNote = this.model.getNote(shareIndex);
+
return _.extend(hasPermissionOverride, {
cid: this.cid,
hasSharePermission: this.model.hasSharePermission(shareIndex),
@@ -159,7 +161,8 @@
isTalkEnabled: oc_appswebroots['spreed'] !== undefined,
secureDropMode: !this.model.hasReadPermission(shareIndex),
hasExpireDate: this.model.getExpireDate(shareIndex) !== null,
- shareNote: this.model.getNote(shareIndex),
+ shareNote: shareNote,
+ hasNote: shareNote !== '',
expireDate: moment(this.model.getExpireDate(shareIndex), 'YYYY-MM-DD').format('DD-MM-YYYY'),
// The password placeholder does not take into account if
// sending the password by Talk is enabled or not; when
@@ -384,7 +387,7 @@
var $form = $menu.next('li.share-note-form');
// show elements
- $menu.find('.share-note-delete').toggle();
+ $menu.find('.share-note-delete').toggleClass('hidden');
$form.toggleClass('hidden');
$form.find('textarea').focus();
},
@@ -403,7 +406,7 @@
$form.find('.share-note').val('');
$form.addClass('hidden');
- $menu.find('.share-note-delete').hide();
+ $menu.find('.share-note-delete').addClass('hidden');
self.sendNote('', shareId, $menu);
},
diff --git a/core/js/sharetemplates.js b/core/js/sharetemplates.js
index 9a7ff0caf3e..9d117a98a8d 100644
--- a/core/js/sharetemplates.js
+++ b/core/js/sharetemplates.js
@@ -209,13 +209,15 @@ templates['sharedialoglinkshareview_popover_menu'] = template({"1":function(cont
+ alias4(((helper = (helper = helpers.maxDate || (depth0 != null ? depth0.maxDate : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"maxDate","hash":{},"data":data}) : helper)))
+ "\" />\n </span>\n </li>\n <li>\n <a href=\"#\" class=\"share-add\">\n <span class=\"icon-loading-small hidden\"></span>\n <span class=\"icon icon-edit\"></span>\n <span>"
+ alias4(((helper = (helper = helpers.addNoteLabel || (depth0 != null ? depth0.addNoteLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"addNoteLabel","hash":{},"data":data}) : helper)))
- + "</span>\n <input type=\"button\" class=\"share-note-delete icon-delete\">\n </a>\n </li>\n <li class=\"share-note-form share-note-link "
+ + "</span>\n <input type=\"button\" class=\"share-note-delete icon-delete "
+ + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasNote : depth0),{"name":"unless","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + "\">\n </a>\n </li>\n <li class=\"share-note-form share-note-link "
+ ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasNote : depth0),{"name":"unless","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\">\n <span class=\"menuitem icon-note\">\n <textarea class=\"share-note\">"
+ alias4(((helper = (helper = helpers.shareNote || (depth0 != null ? depth0.shareNote : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareNote","hash":{},"data":data}) : helper)))
+ "</textarea>\n <input type=\"submit\" class=\"icon-confirm share-note-submit\" value=\"\" id=\"add-note-"
+ alias4(((helper = (helper = helpers.shareId || (depth0 != null ? depth0.shareId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareId","hash":{},"data":data}) : helper)))
- + "\" />\n </span>\n </li>\n"
+ + "\" />\n </span>\n </li>\n"
+ ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.social : depth0),{"name":"each","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ " <li>\n <a href=\"#\" class=\"unshare\"><span class=\"icon-loading-small hidden\"></span><span class=\"icon icon-delete\"></span><span>"
+ alias4(((helper = (helper = helpers.unshareLabel || (depth0 != null ? depth0.unshareLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"unshareLabel","hash":{},"data":data}) : helper)))
@@ -565,11 +567,15 @@ templates['sharedialogshareelistview_popover_menu'] = template({"1":function(con
return container.escapeExpression(((helper = (helper = helpers.defaultExpireDate || (depth0 != null ? depth0.defaultExpireDate : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"defaultExpireDate","hash":{},"data":data}) : helper)));
},"30":function(container,depth0,helpers,partials,data) {
- var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+ var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
- return " <li>\n <a href=\"#\" class=\"share-add\"><span class=\"icon-loading-small hidden\"></span>\n <span class=\"icon icon-edit\"></span>\n <span>"
+ return " <li>\n <a href=\"#\" class=\"share-add\">\n <span class=\"icon-loading-small hidden\"></span>\n <span class=\"icon icon-edit\"></span>\n <span>"
+ alias4(((helper = (helper = helpers.addNoteLabel || (depth0 != null ? depth0.addNoteLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"addNoteLabel","hash":{},"data":data}) : helper)))
- + "</span>\n <input type=\"button\" class=\"share-note-delete icon-delete\">\n </a>\n </li>\n <li class=\"share-note-form hidden\">\n <span class=\"menuitem icon-note\">\n <textarea class=\"share-note\">"
+ + "</span>\n <input type=\"button\" class=\"share-note-delete icon-delete "
+ + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasNote : depth0),{"name":"unless","hash":{},"fn":container.program(22, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + "\">\n </a>\n </li>\n <li class=\"share-note-form "
+ + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasNote : depth0),{"name":"unless","hash":{},"fn":container.program(22, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + "\">\n <span class=\"menuitem icon-note\">\n <textarea class=\"share-note\">"
+ alias4(((helper = (helper = helpers.shareNote || (depth0 != null ? depth0.shareNote : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareNote","hash":{},"data":data}) : helper)))
+ "</textarea>\n <input type=\"submit\" class=\"icon-confirm share-note-submit\" value=\"\" id=\"add-note-"
+ alias4(((helper = (helper = helpers.shareId || (depth0 != null ? depth0.shareId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareId","hash":{},"data":data}) : helper)))
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-05 07:10:10 +0000