Skip to content

Commit a1e2cff

Browse files
committed
Aligned assignments
1 parent 2b644b9 commit a1e2cff

2 files changed

Lines changed: 25 additions & 23 deletions

File tree

OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<style type="text/css">
88
.Content div.x-tab-panel {
9-
margin-top: 30px;
9+
margin-top : 30px;
1010
}
1111
1212
.Content ul.x-tab-strip {
13-
list-style-image: none;
14-
padding-left: 0px;
13+
list-style-image : none;
14+
padding-left : 0px;
1515
}
1616
</style>
1717

@@ -28,7 +28,7 @@
2828
<script type="text/javascript">
2929
(function ($) {
3030
31-
var textareaId = '@Html.IdFor(m => m.Value)';
31+
var textareaId = '@Html.IdFor(m => m.Value)';
3232
3333
$('[id*="EditorModal"]').on('shown.bs.modal', function(e) {
3434
$('.Modal [id*="@Html.IdFor(m => m.Value)"]').attr('id', '@Html.IdFor(m => m.Value)_Modal');
@@ -44,11 +44,10 @@
4444
})(jQuery);
4545
4646
function setEditorInstance(textareaId) {
47-
//console.log(textareaId + ' on setEditorInstance');
4847
CKEDITOR.replace(textareaId, {
49-
height : '@Model.AttributeDescriptor.Height',
50-
resize_maxHeight : '@(Model.AttributeDescriptor.Height+300)',
51-
customConfig : '/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/CkEditor/customConfig.js'
48+
height : '@Model.AttributeDescriptor.Height',
49+
resize_maxHeight : '@(Model.AttributeDescriptor.Height+300)',
50+
customConfig : '/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/CkEditor/customConfig.js'
5251
});
5352
}
5453
</script>

OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,37 @@
22

33
@{
44
Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
5-
var rootTopicKey = Model.AttributeDescriptor.RootTopic?.UniqueKey.Replace(":", "/") ?? Model.AttributeDescriptor.RootTopicKey?.Replace(":", "/") ?? "Root";
5+
6+
var descriptor = Model.AttributeDescriptor;
7+
var rootTopicKey = descriptor.RootTopic?.UniqueKey.Replace(":", "/")?? descriptor.RootTopicKey?.Replace(":", "/") ?? "Root";
8+
69
}
710

811
<div>
912
<input
10-
asp-for ="Value"
11-
class ="@Model.AttributeDescriptor.CssClass"
12-
disabled =@(!Model.AttributeDescriptor.IsEnabled)
13-
required =@Model.AttributeDescriptor.IsRequired
13+
asp-for ="Value"
14+
class ="@descriptor.CssClass"
15+
disabled =@(!descriptor.IsEnabled)
16+
required =@descriptor.IsRequired
1417
/>
1518
</div>
1619

1720
<script>
1821
$(function() {
1922
2023
//Create new instance of TokenizedTopics and set relevant properties
21-
var tokenizedTopics = new TokenizedTopics();
22-
tokenizedTopics.selector = '#@Html.IdFor(m => m.Value)';
23-
tokenizedTopics.scope = '@rootTopicKey';
24-
tokenizedTopics.attributeName = '@Model.AttributeDescriptor.AttributeKey';
25-
tokenizedTopics.attributeValue = '@Model.AttributeDescriptor.AttributeValue';
26-
tokenizedTopics.resultLimit = '@Model.AttributeDescriptor.ResultLimit';
27-
tokenizedTopics.tokenLimit = @Model.AttributeDescriptor.TokenLimit;
28-
tokenizedTopics.isAutoPostBack = @((Model.AttributeDescriptor.AutoPostBack?? false).ToString().ToLower());
29-
tokenizedTopics.selectedTopics = @Html.Raw(Model.SelectedTopics);
24+
var topics = new TokenizedTopics();
25+
topics.selector = '#@Html.IdFor(m => m.Value)';
26+
topics.scope = '@rootTopicKey';
27+
topics.attributeName = '@descriptor.AttributeKey';
28+
topics.attributeValue = '@descriptor.AttributeValue';
29+
topics.resultLimit = '@descriptor.ResultLimit';
30+
topics.tokenLimit = @descriptor.TokenLimit;
31+
topics.isAutoPostBack = @((descriptor.AutoPostBack?? false).ToString().ToLower());
32+
topics.selectedTopics = @Html.Raw(Model.SelectedTopics);
3033
3134
//Fire TokenizedTopics.prototype.getTokenizedTopics() (and $([selector]).tokenInput())
32-
tokenizedTopics.getTokenizedTopics();
35+
topics.getTokenizedTopics();
3336
3437
});
3538

0 commit comments

Comments
 (0)