Skip to content
This repository was archived by the owner on Oct 26, 2021. It is now read-only.

Commit 7e8b357

Browse files
Merge pull request #2 from webcomponents/fixes
Fixes
2 parents e8b250b + ab12dff commit 7e8b357

File tree

9 files changed

+20
-35
lines changed

9 files changed

+20
-35
lines changed

CustomElements.min.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"name": "webcomponentsjs",
3-
"main": "webcomponents.js",
4-
"version": "0.7.22",
2+
"name": "custom-elements",
3+
"main": "custom-elements.min.js",
4+
"version": "1.0.0-alpha.2",
55
"homepage": "http://webcomponents.org",
66
"authors": [
77
"The Polymer Authors"
88
],
99
"repository": {
1010
"type": "git",
11-
"url": "https://github.com/webcomponents/webcomponentsjs.git"
11+
"url": "https://github.com/webcomponents/custom-elements.git"
1212
},
1313
"keywords": [
1414
"webcomponents"
Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

custom-elements.min.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ const sourcemaps = require('gulp-sourcemaps');
1717
const closureCompiler = compilerPackage.gulp();
1818

1919
gulp.task('default', () => {
20-
return gulp.src('./src/CustomElements.js', {base: './'})
20+
return gulp.src('./src/custom-elements.js', {base: './'})
2121
.pipe(sourcemaps.init())
2222
.pipe(closureCompiler({
2323
compilation_level: 'ADVANCED',
2424
warning_level: 'VERBOSE',
2525
language_in: 'ECMASCRIPT6_STRICT',
2626
language_out: 'ECMASCRIPT5_STRICT',
2727
externs: ['externs/html5.js', 'externs/custom-elements.js'],
28-
js_output_file: 'CustomElements.min.js',
28+
js_output_file: 'custom-elements.min.js',
2929
new_type_inf: true,
3030
rewrite_polyfills: false,
3131
}))

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@webcomponents/custom-elements",
3-
"version": "1.0.0-alpha.1",
3+
"version": "1.0.0-alpha.2",
44
"description": "HTML Custom Elements Polyfill",
55
"main": "custom-elements.min.js",
66
"directories": {
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,9 @@ let Deferred;
170170
/** @type {MutationObserver} **/
171171
this._mainDocumentObserver = this._observeRoot(doc);
172172

173-
// TODO(justinfagnani): Possibly remove WebComponentsReady event
174173
const onReady = () => {
175174
this._ready = true;
176175
this._addNodes(doc.childNodes);
177-
window.dispatchEvent(new CustomEvent('WebComponentsReady'));
178176
};
179177
if (window['HTMLImports']) {
180178
window['HTMLImports']['whenReady'](onReady);
@@ -768,9 +766,12 @@ let Deferred;
768766
}
769767
}
770768

771-
/** @type {CustomElementRegistry} */
772-
window['customElements'] = new CustomElementRegistry();
773-
769+
Object.defineProperty(window, 'customElements', {
770+
value: new CustomElementRegistry(),
771+
configurable: true,
772+
enumerable: true,
773+
});
774+
774775
// TODO(justinfagnani): Remove. Temporary for backward-compatibility
775776
window['CustomElements'] = {
776777
takeRecords() {

tests/html/imports.html

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<title>Custom Elements: imports integration</title>
1414
<script>
1515
var _HTMLImportsLoaded = false;
16-
var webComponentsReady = false;
1716

1817
addEventListener('HTMLImportsLoaded', function() {
1918
_HTMLImportsLoaded = true;
@@ -31,14 +30,10 @@
3130
}
3231
};
3332

34-
addEventListener('WebComponentsReady', function(e) {
35-
webComponentsReady = true;
36-
});
37-
3833
</script>
3934
<script src="../../../web-component-tester/browser.js"></script>
4035
<script src="../../../webcomponentsjs/HTMLImports.js"></script>
41-
<script src="../../CustomElements.min.js"></script>
36+
<script src="../../custom-elements.min.js"></script>
4237
<script>
4338
customElements.enableFlush = true;
4439
var elementsCreated = 0;
@@ -116,17 +111,6 @@
116111
chai.assert.equal(observedSubImports.length, 1);
117112
});
118113

119-
test('CustomElements fires WebComponentsReady event', function(done) {
120-
if (webComponentsReady) {
121-
done();
122-
return;
123-
}
124-
this.timeout(200);
125-
window.addEventListener('WebComponentsReady', function(e) {
126-
done();
127-
});
128-
});
129-
130114
});
131115
</script>
132116
</head>

tests/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title>Custom Elements Tests</title>
1212
<meta charset="utf-8">
1313

14-
<script src="../CustomElements.min.js"></script>
14+
<script src="../custom-elements.min.js"></script>
1515
<script src="../src/htmlelement-instanceof.js"></script>
1616
<script src="../../web-component-tester/browser.js"></script>
1717

0 commit comments

Comments
 (0)