Skip to content

Commit 9523e67

Browse files
authored
Merge pull request #6 from stackb/asserts.dom
migrate to goog.asserts.dom.assertIsElement
2 parents d9d81de + d6e2ae9 commit 9523e67

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

js/ui/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ closure_js_library(
1212
":injector",
1313
":keyboard",
1414
"@com_google_javascript_closure_library//closure/goog/asserts",
15+
"@com_google_javascript_closure_library//closure/goog/asserts:dom",
1516
"@com_google_javascript_closure_library//closure/goog/dom",
1617
"@com_google_javascript_closure_library//closure/goog/events",
1718
"@com_google_javascript_closure_library//closure/goog/events:eventhandler",
@@ -37,7 +38,7 @@ closure_js_library(
3738
"history/event.js",
3839
],
3940
deps = [
40-
"@com_google_javascript_closure_library//closure/goog/asserts",
41+
"@com_google_javascript_closure_library//closure/goog/asserts:dom",
4142
"@com_google_javascript_closure_library//closure/goog/dom",
4243
"@com_google_javascript_closure_library//closure/goog/dom:tagname",
4344
"@com_google_javascript_closure_library//closure/goog/events",
@@ -124,6 +125,7 @@ closure_js_library(
124125
deps = [
125126
":core",
126127
"@com_google_javascript_closure_library//closure/goog/asserts",
128+
"@com_google_javascript_closure_library//closure/goog/asserts:dom",
127129
"@com_google_javascript_closure_library//closure/goog/dom",
128130
],
129131
)

js/ui/component.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const BgColorTransform = goog.require('goog.fx.dom.BgColorTransform');
77
const ComponentEventType = goog.require('goog.ui.Component.EventType');
88
const GoogUiComponent = goog.require('goog.ui.Component');
99
const GoogUiControl = goog.require('goog.ui.Control');
10-
// const Route = goog.require('stack.ui.Route');
1110
const asserts = goog.require('goog.asserts');
11+
const assertsDom = goog.require('goog.asserts.dom');
1212
const easing = goog.require('goog.fx.easing');
1313
const strings = goog.require('goog.string');
1414
const style = goog.require('goog.style');
@@ -275,7 +275,7 @@ class Component extends GoogUiComponent {
275275
var end = opt_end || [256, 256, 256];
276276
var time = opt_time || 250;
277277
var accel = opt_accel || easing.easeOutLong;
278-
var element = opt_element || asserts.assertElement(this.getContentElement());
278+
var element = opt_element || assertsDom.assertIsElement(this.getContentElement());
279279

280280
fx = this.fx_ =
281281
new BgColorTransform(element, start, end, time, accel);

js/ui/core.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const Injector = goog.require('stack.ui.Injector');
1717
const Keyboard = goog.require('stack.ui.Keyboard');
1818
const Resolver = goog.require('goog.promise.Resolver');
1919
const asserts = goog.require('goog.asserts');
20+
const assertsDom = goog.require('goog.asserts.dom');
2021
const dom = goog.require('goog.dom');
2122
const easing = goog.require('goog.fx.easing');
2223
const events = goog.require('goog.events');
@@ -683,7 +684,7 @@ class Component extends GoogUiComponent {
683684
var end = opt_end || [256, 256, 256];
684685
var time = opt_time || 250;
685686
var accel = opt_accel || easing.easeOutLong;
686-
var element = opt_element || asserts.assertElement(this.getContentElement());
687+
var element = opt_element || assertsDom.assertIsElement(this.getContentElement());
687688

688689
fx = this.fx_ =
689690
new BgColorTransform(element, start, end, time, accel);

js/ui/history.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const HistoryEvent = goog.require('goog.history.Event');
1010
const HistoryEventType = goog.require('goog.history.EventType');
1111
const Html5History = goog.require('goog.history.Html5History');
1212
const TagName = goog.require('goog.dom.TagName');
13-
const asserts = goog.require('goog.asserts');
13+
const assertsDom = goog.require('goog.asserts.dom');
1414
const dom = goog.require('goog.dom');
1515
const events = goog.require('goog.events');
1616
const strings = goog.require('goog.string');
@@ -54,7 +54,7 @@ class History extends EventTarget {
5454
// Element that was clicked could be a child of of the <a>, so
5555
// look up through the ancestry chain.
5656
let anchor = /** @type {?HTMLAnchorElement} */ (
57-
dom.getAncestor(asserts.assertElement(e.target),
57+
dom.getAncestor(assertsDom.assertIsElement(e.target),
5858
el => el instanceof HTMLElement && el.tagName === TagName.A.toString(),
5959
true)
6060
);

js/ui/syntax.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
goog.module('stack.ui.Syntax');
55

66
const asserts = goog.require('goog.asserts');
7+
const assertsDom = goog.require('goog.asserts.dom');
78
const dom = goog.require('goog.dom');
89
const { Component } = goog.require('stack.ui');
910

@@ -43,7 +44,7 @@ class Syntax extends Component {
4344
*/
4445
getCodeElement() {
4546
return /** @type{!HTMLSpanElement} */(
46-
asserts.assertElement(
47+
assertsDom.assertIsElement(
4748
/** @type{!HTMLElement} */(
4849
this.getElementStrict()
4950
).firstElementChild

0 commit comments

Comments
 (0)