nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-12-10 05:35:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #527 from nextcloud/fix/526/url_not_opening

Browse source 
Updated link-detection in detailview and fixed link only redirecting …
This commit is contained in:
newhinton 2019-05-12 13:33:12 +02:00 • committed by GitHub
commit a765f32aa0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
js/app/directives/credentialfield.js
View file

@ -36,7 +36,8 @@
value: '=value', value: '=value',
secret: '=secret', secret: '=secret',
inputField: '=useInput', inputField: '=useInput',
inputFieldplaceholder: '=inputPlaceholder' inputFieldplaceholder: '=inputPlaceholder',
isURLFIELD: '=url',
}, },
restrict: 'A', restrict: 'A',
replace: 'true', replace: 'true',
@ -49,8 +50,9 @@
'</div>' + '</div>' +
'<div class="tools">' + '<div class="tools">' +
'<div class="cell" ng-if="toggle" tooltip="tggltxt" ng-click="toggleVisibility()"><i class="fa" ng-class="{\'fa-eye\': !valueVisible, \'fa-eye-slash\': valueVisible }"></i></div>' + '<div class="cell" ng-if="toggle" tooltip="tggltxt" ng-click="toggleVisibility()"><i class="fa" ng-class="{\'fa-eye\': !valueVisible, \'fa-eye-slash\': valueVisible }"></i></div>' +
'<div class="cell" ng-if="isLink"><a ng-href="{{value}}" target="_blank" rel="nofollow noopener noreferrer"><i tooltip="\'Open in new window\'" class="link fa fa-external-link"></i></a></div>' + '<div class="cell" ng-if="isURLFIELD && isLink"><a ng-href="{{value}}" target="_blank" rel="nofollow noopener noreferrer"><i tooltip="\'Open in new window\'" class="link fa fa-external-link"></i></a></div>' +
'<div class="cell" ngclipboard-success="onSuccess(e);" ngclipboard-error="onError(e);" ngclipboard data-clipboard-text="{{value}}"><i tooltip="copy_msg" class="fa fa-files-o"></i></div>' + '<div class="cell" ng-if="isURLFIELD && isPartialLink"><a ng-href="//{{value}}" target="_blank" rel="nofollow noopener noreferrer"><i tooltip="\'Open in new window\'" class="link fa fa-external-link"></i></a></div>' +
'<div class="cell" ngclipboard-success="onSuccess(e);" ngclipboard-error="onError(e);" ngclipboard data-clipboard-text="{{value}}"><i tooltip="copy_msg" class="fa fa-files-o"></i></div>' +
'</div></span>', '</div></span>',
link: function (scope) { link: function (scope) {
var expression = /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/gi; var expression = /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/gi;
@ -67,10 +69,13 @@
} }
if (regex.test(scope.value)) { if (regex.test(scope.value)) {
scope.isLink = true; scope.isLink = true;
if(scope.value.substr(0,4) !== 'http'){ } else {
scope.value = 'http://'+scope.value; scope.isLink = false;
if(regex.test('https://'+scope.value)){
scope.isPartialLink = true;
} }
} }
} }
}); });
if (!scope.toggle) { if (!scope.toggle) {

33
templates/views/partials/credential_template.html
View file

@ -1,8 +1,9 @@
<div class="credential-data"> <div class="credential-data">
<div class="row" ng-show="credential.label && showLabel"> <div class="row" ng-show="credential.label && showLabel">
<div class="col-xs-4 col-md-3 col-lg-3">{{ 'label' | translate }}</div> <div class="col-xs-4 col-md-3 col-lg-3">{{ 'label' | translate }}</div>
<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field <div class="col-xs-8 col-md-9 col-lg-9">
value="credential.label"></span></div> <span credential-field value="credential.label"></span>
</div>
</div> </div>
<div class="compromised-details" ng-show="credential.compromised"> <div class="compromised-details" ng-show="credential.compromised">
@ -12,42 +13,46 @@
<div class="row" ng-show="credential.username"> <div class="row" ng-show="credential.username">
<div class="col-xs-4 col-md-3 col-lg-3">{{ 'account' | translate }}</div> <div class="col-xs-4 col-md-3 col-lg-3">{{ 'account' | translate }}</div>
<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field <div class="col-xs-8 col-md-9 col-lg-9">
value="credential.username"></span></div> <span credential-field value="credential.username"></span>
</div>
</div> </div>
<div class="row" ng-show="credential.password"> <div class="row" ng-show="credential.password">
<div class="col-xs-4 col-md-3 col-lg-3">{{ 'password' | translate }}</div> <div class="col-xs-4 col-md-3 col-lg-3">{{ 'password' | translate }}</div>
<div class="col-xs-8 col-md-9 col-lg-9"> <div class="col-xs-8 col-md-9 col-lg-9">
<span credential-field value="credential.password" secret="'true'"> <span credential-field value="credential.password" secret="'true'"></span>
</span>
</div> </div>
</div> </div>
<div class="row" ng-show="credential.otp.secret"> <div class="row" ng-show="credential.otp.secret">
<div class="col-xs-4 col-md-3 col-lg-3">{{'otp' | translate}}</div> <div class="col-xs-4 col-md-3 col-lg-3">{{'otp' | translate}}</div>
<div class="col-xs-8 col-md-9 col-lg-9"><span otp-generator <div class="col-xs-8 col-md-9 col-lg-9">
secret="credential.otp.secret"></span></div> <span otp-generator secret="credential.otp.secret"></span>
</div>
</div> </div>
<div class="row" ng-show="credential.email"> <div class="row" ng-show="credential.email">
<div class="col-xs-4 col-md-3 col-lg-3">{{'email' | translate}}</div> <div class="col-xs-4 col-md-3 col-lg-3">{{'email' | translate}}</div>
<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field <div class="col-xs-8 col-md-9 col-lg-9">
value="credential.email"></span></div> <span credential-field value="credential.email"></span>
</div>
</div> </div>
<div class="row" ng-show="credential.url"> <div class="row" ng-show="credential.url">
<div class="col-xs-4 col-md-3 col-lg-3">{{ 'url' | translate}}</div> <div class="col-xs-4 col-md-3 col-lg-3">{{ 'url' | translate}}</div>
<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field <div class="col-xs-8 col-md-9 col-lg-9">
value="credential.url"></span></div> <span credential-field value="credential.url" url="true"></span>
</div>
</div> </div>
<div class="row" ng-show="credential.description"> <div class="row" ng-show="credential.description">
<div class="col-xs-4 col-md-3 col-lg-3">{{'notes' | translate}}</div> <div class="col-xs-4 col-md-3 col-lg-3">{{'notes' | translate}}</div>
<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field value="credential.description_html"></span></div> <div class="col-xs-8 col-md-9 col-lg-9">
<span credential-field value="credential.description_html"></span>
</div>
</div> </div>
<div class="row" ng-show="credential.files.length > 0"> <div class="row" ng-show="credential.files.length > 0">