diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-10-04 19:54:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-04 19:54:16 +0200 |
commit | fbe62e198594fcb130884e7e98f669ff4516b90b (patch) | |
tree | 5f958a58626b547903d204895ba0fb6feab967f7 /core | |
parent | e0ed64366c0a6ddb68ebbc9ff3639257aab74d7e (diff) | |
parent | 363ec1d3c3031fa5b6cdaa2ead51cb20bc64fd49 (diff) | |
download | nextcloud-server-fbe62e198594fcb130884e7e98f669ff4516b90b.tar.gz nextcloud-server-fbe62e198594fcb130884e7e98f669ff4516b90b.zip |
Merge pull request #11615 from nextcloud/followup/11583
Remove leftover '
Diffstat (limited to 'core')
-rw-r--r-- | core/js/share/sharedialoglinkshareview.handlebars | 2 | ||||
-rw-r--r-- | core/js/share/sharedialogresharerinfoview.handlebars | 2 | ||||
-rw-r--r-- | core/js/share/sharedialogview.handlebars | 4 | ||||
-rw-r--r-- | core/js/sharetemplates.js | 9 | ||||
-rw-r--r-- | core/js/systemtags/templates.js | 2 | ||||
-rw-r--r-- | core/js/systemtags/templates/result.handlebars | 2 |
6 files changed, 10 insertions, 11 deletions
diff --git a/core/js/share/sharedialoglinkshareview.handlebars b/core/js/share/sharedialoglinkshareview.handlebars index e0787cc7d3b..bc7051683a2 100644 --- a/core/js/share/sharedialoglinkshareview.handlebars +++ b/core/js/share/sharedialoglinkshareview.handlebars @@ -22,4 +22,4 @@ </ul> {{else}} {{#if noSharingPlaceholder}}<input id="shareWith-{{cid}}" class="shareWithField" type="text" placeholder="{{noSharingPlaceholder}}" disabled="disabled"/>{{/if}} -{{/if}}' +{{/if}} diff --git a/core/js/share/sharedialogresharerinfoview.handlebars b/core/js/share/sharedialogresharerinfoview.handlebars index e2cfa13da96..502356b6332 100644 --- a/core/js/share/sharedialogresharerinfoview.handlebars +++ b/core/js/share/sharedialogresharerinfoview.handlebars @@ -1,5 +1,5 @@ <span class="reshare"> <div class="avatar" data-userName="{{reshareOwner}}"></div> {{sharedByText}} -</span>' + +</span> {{#if hasShareNote}}<div class="share-note">{{shareNote}}</div>{{/if}} diff --git a/core/js/share/sharedialogview.handlebars b/core/js/share/sharedialogview.handlebars index d364be901ab..d3d1a949be7 100644 --- a/core/js/share/sharedialogview.handlebars +++ b/core/js/share/sharedialogview.handlebars @@ -3,10 +3,10 @@ <label for="shareWith-{{cid}}" class="hidden-visually">{{shareLabel}}</label> <div class="oneline"> <input id="shareWith-{{cid}}" class="shareWithField" type="text" placeholder="{{sharePlaceholder}}" /> - <span class="shareWithLoading icon-loading-small hidden"></span>'+ + <span class="shareWithLoading icon-loading-small hidden"></span> <span class="shareWithConfirm icon icon-confirm"></span> </div> {{/if}} <div class="linkShareView subView"></div> <div class="shareeListView subView"></div> -<div class="loading hidden" style="height: 50px"></div>'; +<div class="loading hidden" style="height: 50px"></div> diff --git a/core/js/sharetemplates.js b/core/js/sharetemplates.js index 94700e1a06c..47bd2c9a142 100644 --- a/core/js/sharetemplates.js +++ b/core/js/sharetemplates.js @@ -56,8 +56,7 @@ templates['sharedialoglinkshareview'] = template({"1":function(container,depth0, },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1; - return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.shareAllowed : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "") - + "'\n"; + return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.shareAllowed : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : ""); },"useData":true}); templates['sharedialoglinkshareview_popover_menu'] = template({"1":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; @@ -236,7 +235,7 @@ templates['sharedialogresharerinfoview'] = template({"1":function(container,dept + alias4(((helper = (helper = helpers.reshareOwner || (depth0 != null ? depth0.reshareOwner : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"reshareOwner","hash":{},"data":data}) : helper))) + "\"></div>\n " + alias4(((helper = (helper = helpers.sharedByText || (depth0 != null ? depth0.sharedByText : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"sharedByText","hash":{},"data":data}) : helper))) - + "\n</span>' +\n" + + "\n</span>\n" + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.hasShareNote : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n"; },"useData":true}); @@ -618,12 +617,12 @@ templates['sharedialogview'] = template({"1":function(container,depth0,helpers,p + alias4(((helper = (helper = helpers.cid || (depth0 != null ? depth0.cid : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"cid","hash":{},"data":data}) : helper))) + "\" class=\"shareWithField\" type=\"text\" placeholder=\"" + alias4(((helper = (helper = helpers.sharePlaceholder || (depth0 != null ? depth0.sharePlaceholder : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"sharePlaceholder","hash":{},"data":data}) : helper))) - + "\" />\n <span class=\"shareWithLoading icon-loading-small hidden\"></span>'+\n <span class=\"shareWithConfirm icon icon-confirm\"></span>\n </div>\n"; + + "\" />\n <span class=\"shareWithLoading icon-loading-small hidden\"></span>\n <span class=\"shareWithConfirm icon icon-confirm\"></span>\n </div>\n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1; return "<div class=\"resharerInfoView subView\"></div>\n" + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.isSharingAllowed : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "<div class=\"linkShareView subView\"></div>\n<div class=\"shareeListView subView\"></div>\n<div class=\"loading hidden\" style=\"height: 50px\"></div>';\n"; + + "<div class=\"linkShareView subView\"></div>\n<div class=\"shareeListView subView\"></div>\n<div class=\"loading hidden\" style=\"height: 50px\"></div>\n"; },"useData":true}); })();
\ No newline at end of file diff --git a/core/js/systemtags/templates.js b/core/js/systemtags/templates.js index 0894d646829..b780e93977c 100644 --- a/core/js/systemtags/templates.js +++ b/core/js/systemtags/templates.js @@ -31,7 +31,7 @@ templates['result'] = template({"1":function(container,depth0,helpers,partials,d stack1 = ((helper = (helper = helpers.allowActions || (depth0 != null ? depth0.allowActions : depth0)) != null ? helper : alias2),(options={"name":"allowActions","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper)); if (!helpers.allowActions) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)} if (stack1 != null) { buffer += stack1; } - return buffer + "</span>';\n"; + return buffer + "</span>\n"; },"useData":true}); templates['result_form'] = template({"1":function(container,depth0,helpers,partials,data) { var helper; diff --git a/core/js/systemtags/templates/result.handlebars b/core/js/systemtags/templates/result.handlebars index ce69c8a21ff..faa7cc4d348 100644 --- a/core/js/systemtags/templates/result.handlebars +++ b/core/js/systemtags/templates/result.handlebars @@ -10,4 +10,4 @@ <a href="#" class="rename icon icon-rename" title="{{renameTooltip}}"></a> </span> {{/allowActions}} -</span>'; +</span> |