Skip to content

Commit 33c59bc

Browse files
committed
Update js files for newer closure-compiler
1 parent 9523e67 commit 33c59bc

File tree

8 files changed

+99
-104
lines changed

8 files changed

+99
-104
lines changed

js/ui/BUILD.bazel

Lines changed: 68 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,28 @@ package(default_visibility = ["//visibility:public"])
44

55
closure_js_library(
66
name = "core",
7-
srcs = [
8-
"core.js",
9-
],
7+
srcs = ["core.js"],
108
deps = [
119
":history",
1210
":injector",
1311
":keyboard",
14-
"@com_google_javascript_closure_library//closure/goog/asserts",
15-
"@com_google_javascript_closure_library//closure/goog/asserts:dom",
16-
"@com_google_javascript_closure_library//closure/goog/dom",
17-
"@com_google_javascript_closure_library//closure/goog/events",
18-
"@com_google_javascript_closure_library//closure/goog/events:eventhandler",
19-
"@com_google_javascript_closure_library//closure/goog/events:eventtarget",
20-
"@com_google_javascript_closure_library//closure/goog/fx:dom",
21-
"@com_google_javascript_closure_library//closure/goog/fx:easing",
22-
"@com_google_javascript_closure_library//closure/goog/history:event",
23-
"@com_google_javascript_closure_library//closure/goog/history:eventtype",
24-
"@com_google_javascript_closure_library//closure/goog/object",
25-
"@com_google_javascript_closure_library//closure/goog/promise",
26-
"@com_google_javascript_closure_library//closure/goog/promise:resolver",
27-
"@com_google_javascript_closure_library//closure/goog/string",
28-
"@com_google_javascript_closure_library//closure/goog/style",
29-
"@com_google_javascript_closure_library//closure/goog/ui:component",
30-
"@com_google_javascript_closure_library//closure/goog/ui:control",
12+
"@io_bazel_rules_closure//closure/goog/asserts",
13+
"@io_bazel_rules_closure//closure/goog/asserts:dom",
14+
"@io_bazel_rules_closure//closure/goog/dom",
15+
"@io_bazel_rules_closure//closure/goog/events",
16+
"@io_bazel_rules_closure//closure/goog/events:eventhandler",
17+
"@io_bazel_rules_closure//closure/goog/events:eventtarget",
18+
"@io_bazel_rules_closure//closure/goog/fx:dom",
19+
"@io_bazel_rules_closure//closure/goog/fx:easing",
20+
"@io_bazel_rules_closure//closure/goog/history:event",
21+
"@io_bazel_rules_closure//closure/goog/history:eventtype",
22+
"@io_bazel_rules_closure//closure/goog/object",
23+
"@io_bazel_rules_closure//closure/goog/promise",
24+
"@io_bazel_rules_closure//closure/goog/promise:resolver",
25+
"@io_bazel_rules_closure//closure/goog/string",
26+
"@io_bazel_rules_closure//closure/goog/style",
27+
"@io_bazel_rules_closure//closure/goog/ui:component",
28+
"@io_bazel_rules_closure//closure/goog/ui:control",
3129
],
3230
)
3331

@@ -38,42 +36,38 @@ closure_js_library(
3836
"history/event.js",
3937
],
4038
deps = [
41-
"@com_google_javascript_closure_library//closure/goog/asserts:dom",
42-
"@com_google_javascript_closure_library//closure/goog/dom",
43-
"@com_google_javascript_closure_library//closure/goog/dom:tagname",
44-
"@com_google_javascript_closure_library//closure/goog/events",
45-
"@com_google_javascript_closure_library//closure/goog/events:event",
46-
"@com_google_javascript_closure_library//closure/goog/events:eventtarget",
47-
"@com_google_javascript_closure_library//closure/goog/events:eventtype",
48-
"@com_google_javascript_closure_library//closure/goog/history:event",
49-
"@com_google_javascript_closure_library//closure/goog/history:eventtype",
50-
"@com_google_javascript_closure_library//closure/goog/history:html5history",
51-
"@com_google_javascript_closure_library//closure/goog/string",
39+
"@io_bazel_rules_closure//closure/goog/asserts:dom",
40+
"@io_bazel_rules_closure//closure/goog/dom",
41+
"@io_bazel_rules_closure//closure/goog/dom:tagname",
42+
"@io_bazel_rules_closure//closure/goog/events",
43+
"@io_bazel_rules_closure//closure/goog/events:event",
44+
"@io_bazel_rules_closure//closure/goog/events:eventtarget",
45+
"@io_bazel_rules_closure//closure/goog/events:eventtype",
46+
"@io_bazel_rules_closure//closure/goog/history:event",
47+
"@io_bazel_rules_closure//closure/goog/history:eventtype",
48+
"@io_bazel_rules_closure//closure/goog/history:html5history",
49+
"@io_bazel_rules_closure//closure/goog/string",
5250
],
5351
)
5452

5553
closure_js_library(
5654
name = "keyboard",
57-
srcs = [
58-
"keyboard.js",
59-
],
55+
srcs = ["keyboard.js"],
6056
deps = [
61-
"@com_google_javascript_closure_library//closure/goog/disposable",
62-
"@com_google_javascript_closure_library//closure/goog/events",
63-
"@com_google_javascript_closure_library//closure/goog/object",
64-
"@com_google_javascript_closure_library//closure/goog/ui:keyboardshortcuthandler",
57+
"@io_bazel_rules_closure//closure/goog/disposable",
58+
"@io_bazel_rules_closure//closure/goog/events",
59+
"@io_bazel_rules_closure//closure/goog/object",
60+
"@io_bazel_rules_closure//closure/goog/ui:keyboardshortcuthandler",
6561
],
6662
)
6763

6864
closure_js_library(
6965
name = "template",
70-
srcs = [
71-
"template.js",
72-
],
66+
srcs = ["template.js"],
7367
deps = [
7468
":core",
75-
"@com_google_javascript_closure_library//closure/goog/dom",
76-
"@com_google_javascript_closure_library//closure/goog/soy",
69+
"@io_bazel_rules_closure//closure/goog/dom",
70+
"@io_bazel_rules_closure//closure/goog/soy",
7771
],
7872
)
7973

@@ -88,31 +82,29 @@ closure_js_library(
8882
deps = [
8983
":core",
9084
":template",
91-
"@com_google_javascript_closure_library//closure/goog/asserts",
92-
"@com_google_javascript_closure_library//closure/goog/dom",
93-
"@com_google_javascript_closure_library//closure/goog/dom:classlist",
94-
"@com_google_javascript_closure_library//closure/goog/dom:dataset",
95-
"@com_google_javascript_closure_library//closure/goog/dom:tagname",
96-
"@com_google_javascript_closure_library//closure/goog/events:event",
85+
"@io_bazel_rules_closure//closure/goog/asserts",
86+
"@io_bazel_rules_closure//closure/goog/dom",
87+
"@io_bazel_rules_closure//closure/goog/dom:classlist",
88+
"@io_bazel_rules_closure//closure/goog/dom:dataset",
89+
"@io_bazel_rules_closure//closure/goog/dom:tagname",
90+
"@io_bazel_rules_closure//closure/goog/events:event",
9791
],
9892
)
9993

10094
closure_js_library(
10195
name = "menushield",
102-
srcs = [
103-
"menushield.js",
104-
],
96+
srcs = ["menushield.js"],
10597
deps = [
106-
"@com_google_javascript_closure_library//closure/goog/asserts",
107-
"@com_google_javascript_closure_library//closure/goog/dom",
108-
"@com_google_javascript_closure_library//closure/goog/events",
109-
"@com_google_javascript_closure_library//closure/goog/math:coordinate",
110-
"@com_google_javascript_closure_library//closure/goog/style",
111-
"@com_google_javascript_closure_library//closure/goog/ui:component",
112-
"@com_google_javascript_closure_library//closure/goog/ui:container",
113-
"@com_google_javascript_closure_library//closure/goog/ui:menu",
114-
"@com_google_javascript_closure_library//closure/goog/ui:menubutton",
115-
"@com_google_javascript_closure_library//closure/goog/ui:submenu",
98+
"@io_bazel_rules_closure//closure/goog/asserts",
99+
"@io_bazel_rules_closure//closure/goog/dom",
100+
"@io_bazel_rules_closure//closure/goog/events",
101+
"@io_bazel_rules_closure//closure/goog/math:coordinate",
102+
"@io_bazel_rules_closure//closure/goog/style",
103+
"@io_bazel_rules_closure//closure/goog/ui:component",
104+
"@io_bazel_rules_closure//closure/goog/ui:container",
105+
"@io_bazel_rules_closure//closure/goog/ui:menu",
106+
"@io_bazel_rules_closure//closure/goog/ui:menubutton",
107+
"@io_bazel_rules_closure//closure/goog/ui:submenu",
116108
],
117109
)
118110

@@ -124,17 +116,15 @@ closure_js_library(
124116
],
125117
deps = [
126118
":core",
127-
"@com_google_javascript_closure_library//closure/goog/asserts",
128-
"@com_google_javascript_closure_library//closure/goog/asserts:dom",
129-
"@com_google_javascript_closure_library//closure/goog/dom",
119+
"@io_bazel_rules_closure//closure/goog/asserts",
120+
"@io_bazel_rules_closure//closure/goog/asserts:dom",
121+
"@io_bazel_rules_closure//closure/goog/dom",
130122
],
131123
)
132124

133125
closure_js_library(
134126
name = "injector",
135-
srcs = [
136-
"injector.js",
137-
],
127+
srcs = ["injector.js"],
138128
deps = [
139129
# ":core",
140130
],
@@ -151,11 +141,11 @@ closure_js_library(
151141
":select",
152142
":syntax",
153143
":template",
154-
"@com_google_javascript_closure_library//closure/goog/asserts",
155-
"@com_google_javascript_closure_library//closure/goog/dom",
156-
"@com_google_javascript_closure_library//closure/goog/history:eventtype",
157-
"@com_google_javascript_closure_library//closure/goog/object",
158-
"@com_google_javascript_closure_library//closure/goog/promise",
144+
"@io_bazel_rules_closure//closure/goog/asserts",
145+
"@io_bazel_rules_closure//closure/goog/dom",
146+
"@io_bazel_rules_closure//closure/goog/history:eventtype",
147+
"@io_bazel_rules_closure//closure/goog/object",
148+
"@io_bazel_rules_closure//closure/goog/promise",
159149
],
160150
)
161151

@@ -167,22 +157,17 @@ closure_js_test(
167157
entry_points = ["goog:stack.ui.ComponentTest"],
168158
deps = [
169159
":ui",
170-
"@io_bazel_rules_closure//closure/library",
171160
"@io_bazel_rules_closure//closure/library:testing",
172161
],
173162
)
174163

175164
closure_js_test(
176165
name = "route_test",
177-
srcs = [
178-
"route_test.js",
179-
],
166+
srcs = ["route_test.js"],
180167
entry_points = ["goog:stack.ui.RouteTest"],
181168
deps = [
182169
":core",
183170
":select",
184-
":app",
185-
# "@io_bazel_rules_closure//closure/library",
186171
"@io_bazel_rules_closure//closure/library:testing",
187172
],
188173
)
@@ -195,10 +180,10 @@ closure_js_test(
195180
entry_points = ["goog:stack.ui.HistoryTest"],
196181
deps = [
197182
":history",
198-
"@com_google_javascript_closure_library//closure/goog/dom",
199-
"@com_google_javascript_closure_library//closure/goog/dom:tagname",
200-
"@com_google_javascript_closure_library//closure/goog/events",
201-
"@com_google_javascript_closure_library//closure/goog/string",
183+
"@io_bazel_rules_closure//closure/goog/dom",
184+
"@io_bazel_rules_closure//closure/goog/dom:tagname",
185+
"@io_bazel_rules_closure//closure/goog/events",
186+
"@io_bazel_rules_closure//closure/goog/string",
202187
"@io_bazel_rules_closure//closure/library:testing",
203188
],
204189
)

js/ui/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class App extends Component {
166166
* @param {!Array<string>} path
167167
*/
168168
setLocation(path) {
169-
//console.log('setLocation', path);
169+
// console.log('setLocation', path);
170170
this.history_.setLocation(path.join('/'));
171171
}
172172

js/ui/core.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -710,13 +710,10 @@ class Component extends GoogUiComponent {
710710
getMenuItems() {
711711
return null;
712712
}
713-
714713
}
715-
716714
exports.Component = Component;
717715

718716
class App extends Component {
719-
720717
/**
721718
* @param {?dom.DomHelper=} opt_domHelper
722719
*/
@@ -823,7 +820,10 @@ class App extends Component {
823820
return asserts.assertObject(this.components_[name]);
824821
}
825822

826-
/** @override */
823+
/**
824+
* @override
825+
* @param {!Route} route
826+
*/
827827
go(route) {
828828
//route.touch(this);
829829
super.go(route);

js/ui/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class Route extends EventTarget {
220220
this.assertInProgress();
221221
var index = this.index_++;
222222
this.progress_[index] = component;
223-
//console.log(`progress made: ${index}, ${this.path_[index]} ${this.unmatchedPath()}`, component);
223+
// console.log(`progress made: ${index}, ${this.path_[index]} ${this.unmatchedPath()}`, component);
224224
component.show();
225225
this.notifyEvent(Route.EventType.PROGRESS, component);
226226
}

js/ui/router.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class Router extends EventTarget {
4949
* @type {boolean}
5050
*/
5151
this.strict_ = true;
52-
5352
}
5453

5554
/**

js/ui/select.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ class Select extends Component {
136136

137137
/**
138138
* @override
139+
* @param {!Route} route
139140
*/
140141
goHere(route) {
141142
if (this.current_) {
@@ -154,6 +155,7 @@ class Select extends Component {
154155

155156
/**
156157
* @override
158+
* @param {!Route} route
157159
*/
158160
goDown(route) {
159161
var name = route.peek();

js/ui/tab.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class Tab extends Select {
2929

3030
/**
3131
* @override
32+
* @param {string} name
33+
* @param {!Route} route
3234
*/
3335
selectFail(name, route) {
3436
this.failHandler_(name, route);

0 commit comments

Comments
 (0)