Skip to content

Commit f2193c6

Browse files
GuillaumeGomezGuillaumeGomez
committed
Completely remove angular and generate parts of settings in JS
1 parent 574e3dd commit f2193c6

File tree

2 files changed

+102
-447
lines changed

2 files changed

+102
-447
lines changed

‎util/gh-pages/index_template.html‎

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<link id="styleAyu" rel="stylesheet" href="https://rust-lang.github.io/mdBook/ayu-highlight.css" disabled="true">
2626
<link rel="stylesheet" href="style.css">
2727
</head>
28-
<body ng-app="clippy" ng-controller="lintList">
28+
<body>
2929
<div id="settings-dropdown">
3030
<div class="settings-icon" tabindex="-1"></div>
3131
<div class="settings-menu" tabindex="-1">
@@ -59,121 +59,90 @@ <h1>Clippy Lints</h1>
5959
<div class="panel panel-default">
6060
<div class="panel-body row">
6161
<div id="upper-filters" class="col-12 col-md-5">
62-
<div class="btn-group" filter-dropdown>
62+
<div class="btn-group">
6363
<button type="button" class="btn btn-default dropdown-toggle">
64-
Lint levels <span class="badge">{{selectedValuesCount(levels)}}</span> <span class="caret"></span>
64+
Lint levels <span class="badge" id="selected-levels">4</span> <span class="caret"></span>
6565
</button>
66-
<ul class="dropdown-menu">
66+
<ul class="dropdown-menu" id="lint-levels">
6767
<li class="checkbox">
68-
<label ng-click="toggleLevels(true)">
68+
<label onclick="toggleLevels(true)">
6969
<input type="checkbox" class="invisible" />
7070
All
7171
</label>
7272
</li>
7373
<li class="checkbox">
74-
<label ng-click="toggleLevels(false)">
74+
<label onclick="toggleLevels(false)">
7575
<input type="checkbox" class="invisible" />
7676
None
7777
</label>
7878
</li>
7979
<li role="separator" class="divider"></li>
80-
<li class="checkbox" ng-repeat="(level, enabled) in levels">
81-
<label class="text-capitalize">
82-
<input type="checkbox" ng-model="levels[level]" />
83-
{{level}}
84-
</label>
85-
</li>
8680
</ul>
8781
</div>
88-
<div class="btn-group" filter-dropdown>
82+
<div class="btn-group">
8983
<button type="button" class="btn btn-default dropdown-toggle">
90-
Lint groups <span class="badge">{{selectedValuesCount(groups)}}</span> <span class="caret"></span>
84+
Lint groups <span class="badge" id="selected-groups"></span> <span class="caret"></span>
9185
</button>
92-
<ul class="dropdown-menu">
86+
<ul class="dropdown-menu" id="lint-groups">
9387
<li class="checkbox">
94-
<label ng-click="toggleGroups(true)">
88+
<label onclick="toggleGroups(true)">
9589
<input type="checkbox" class="invisible" />
9690
All
9791
</label>
9892
</li>
9993
<li class="checkbox">
100-
<label ng-click="resetGroupsToDefault()">
94+
<label onclick="resetGroupsToDefault()">
10195
<input type="checkbox" class="invisible" />
10296
Default
10397
</label>
10498
</li>
10599
<li class="checkbox">
106-
<label ng-click="toggleGroups(false)">
100+
<label onclick="toggleGroups(false)">
107101
<input type="checkbox" class="invisible" />
108102
None
109103
</label>
110104
</li>
111105
<li role="separator" class="divider"></li>
112-
<li class="checkbox" ng-repeat="(group, enabled) in groups">
113-
<label class="text-capitalize">
114-
<input type="checkbox" ng-model="groups[group]" />
115-
{{group}}
116-
</label>
117-
</li>
118106
</ul>
119107
</div>
120108
<div id="version-filter">
121-
<div class="btn-group" filter-dropdown>
109+
<div class="btn-group">
122110
<button type="button" class="btn btn-default dropdown-toggle">
123111
Version
124-
<span id="version-filter-count" class="badge">
125-
{{versionFilterCount(versionFilters)}}
126-
</span>
112+
<span id="version-filter-count" class="badge">0</span>
127113
<span class="caret"></span>
128114
</button>
129115
<ul id="version-filter-selector" class="dropdown-menu">
130116
<li class="checkbox">
131-
<label ng-click="clearVersionFilters()">
117+
<label onclick="clearVersionFilters()">
132118
<input type="checkbox" class="invisible" />
133119
Clear filters
134120
</label>
135121
</li>
136122
<li role="separator" class="divider"></li>
137-
<li class="checkbox" ng-repeat="(filter, vars) in versionFilters">
138-
<label ng-attr-for="filter-{filter}">{{filter}}</label>
139-
<span>1.</span>
140-
<input type="number"
141-
min="29"
142-
ng-attr-id="filter-{filter}"
143-
class="version-filter-input form-control filter-input"
144-
maxlength="2"
145-
ng-model="versionFilters[filter].minorVersion"
146-
ng-model-options="{debounce: 50}"
147-
ng-change="updateVersionFilters()" />
148-
<span>.0</span>
149-
</li>
150123
</ul>
151124
</div>
152125
</div>
153-
<div class="btn-group" filter-dropdown>
126+
<div class="btn-group">
154127
<button type="button" class="btn btn-default dropdown-toggle">
155-
Applicability <span class="badge">{{selectedValuesCount(applicabilities)}}</span> <span class="caret"></span>
128+
Applicability
129+
<span class="badge"></span>
130+
<span class="caret"></span>
156131
</button>
157-
<ul class="dropdown-menu">
132+
<ul class="dropdown-menu" id="lint-applicabilities">
158133
<li class="checkbox">
159-
<label ng-click="toggleApplicabilities(true)">
134+
<label onclick="toggleApplicabilities(true)">
160135
<input type="checkbox" class="invisible" />
161136
All
162137
</label>
163138
</li>
164139
<li class="checkbox">
165-
<label ng-click="toggleApplicabilities(false)">
140+
<label onclick="toggleApplicabilities(false)">
166141
<input type="checkbox" class="invisible" />
167142
None
168143
</label>
169144
</li>
170145
<li role="separator" class="divider"></li>
171-
<li class="checkbox" ng-repeat="(applicability, enabled) in applicabilities">
172-
<label class="text-capitalize">
173-
<input type="checkbox" ng-model="applicabilities[applicability]" />
174-
{{applicability}}
175-
</label>
176-
</li>
177146
</ul>
178147
</div>
179148
</div>
@@ -189,10 +158,10 @@ <h1>Clippy Lints</h1>
189158
</div>
190159
</div>
191160
<div class="col-12 col-md-2 btn-group expansion-group">
192-
<button title="Collapse All" class="btn btn-default expansion-control" type="button" ng-click="toggleExpansion(data, false)">
161+
<button title="Collapse All" class="btn btn-default expansion-control" type="button" onclick="toggleExpansion(false)">
193162
<span class="glyphicon glyphicon-collapse-up"></span>
194163
</button>
195-
<button title="Expand All" class="btn btn-default expansion-control" type="button" ng-click="toggleExpansion(data, true)">
164+
<button title="Expand All" class="btn btn-default expansion-control" type="button" onclick="toggleExpansion(true)">
196165
<span class="glyphicon glyphicon-collapse-down"></span>
197166
</button>
198167
</div>
@@ -315,7 +284,6 @@ <h2 class="panel-title">
315284

316285
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/highlight.min.js"></script>
317286
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/languages/rust.min.js"></script>
318-
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.12/angular.min.js"></script>
319287
<script src="script.js"></script>
320288
</body>
321289
</html>

0 commit comments

Comments
 (0)