Skip to content

Commit abc93d0

Browse files
committed
Add back urlDefined and remove null checks
1 parent a9daee1 commit abc93d0

File tree

5 files changed

+8
-25
lines changed

5 files changed

+8
-25
lines changed

Diff for: src/plugins/conditionWidget/components/ConditionWidget.vue

+4-7
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,11 @@ export default {
4242
};
4343
},
4444
computed: {
45+
urlDefined() {
46+
return this.internalDomainObject.url && this.internalDomainObject.url.length > 0;
47+
},
4548
url() {
46-
const urlDefined = this.internalDomainObject.url && this.internalDomainObject.url.length > 0;
47-
let url = urlDefined ? this.internalDomainObject.url : null;
48-
if (url) {
49-
url = sanitizeUrl(url);
50-
}
51-
52-
return url;
49+
return this.urlDefined ? sanitizeUrl(this.internalDomainObject.url) : null;
5350
}
5451
},
5552
mounted() {

Diff for: src/plugins/hyperlink/HyperlinkLayout.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ export default {
4848
return true;
4949
},
5050
url() {
51-
let url = this.domainObject.url;
52-
if (url) {
53-
url = sanitizeUrl(url);
54-
}
55-
56-
return url;
51+
return sanitizeUrl(this.domainObject.url);
5752
}
5853
}
5954
};

Diff for: src/plugins/summaryWidget/src/SummaryWidget.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ define([
116116
*/
117117
SummaryWidget.prototype.addHyperlink = function (url, openNewTab) {
118118
if (url) {
119-
const sanitizeUrl = urlSanitizeLib.sanitizeUrl;
120-
url = sanitizeUrl(url);
121-
this.widgetButton.attr('href', url);
119+
this.widgetButton.attr('href', urlSanitizeLib.sanitizeUrl(url));
122120
} else {
123121
this.widgetButton.removeAttr('href');
124122
}

Diff for: src/plugins/summaryWidget/src/views/SummaryWidgetView.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ define([
3939

4040
let url = this.domainObject.url;
4141
if (url) {
42-
const sanitizeUrl = urlSanitizeLib.sanitizeUrl;
43-
url = sanitizeUrl(url);
44-
this.widget.setAttribute('href', url);
42+
this.widget.setAttribute('href', urlSanitizeLib.sanitizeUrl(url));
4543
} else {
4644
this.widget.removeAttribute('href');
4745
}

Diff for: src/plugins/webPage/components/WebPage.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ export default {
1616
},
1717
computed: {
1818
url() {
19-
let url = this.currentDomainObject.url;
20-
if (url) {
21-
url = sanitizeUrl(url);
22-
}
23-
24-
return url;
19+
return sanitizeUrl(this.currentDomainObject.url);
2520
}
2621
}
2722
};

0 commit comments

Comments
 (0)