Skip to content

Commit b80495d

Browse files
sorvellsorvell
committed
Merge branch 'master' into optimize-reflection
Conflicts: src/declaration/polymer-element.js test/html/attr-mustache.html test/html/bind-object-repeat.html test/html/callbacks.html test/html/element-import.html test/html/element-registration.html test/html/element-script.html test/html/event-path-declarative.html test/html/event-path.html test/html/mdv-syntax.html test/html/parser-rules-import.html test/html/parser-rules.html test/html/prop-attr-reflection.html test/html/prop-bind-oo.html test/html/publish-attributes.html test/html/styling/apply-reset-styles.html test/html/styling/sheet-main-doc.html test/html/styling/sheet-order.html test/html/styling/sheet-scope.html test/html/take-attributes.html test/html/template-distribute-dynamic.html test/html/unbind.html test/runner.html
2 parents 4945dbf + 46a0fe1 commit b80495d

23 files changed

+46
-27
lines changed

‎conf/karma.conf.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module.exports = function(karma) {
2-
var common = require('../tools/test/karma-common.conf.js');
2+
var common = require('../../tools/test/karma-common.conf.js');
33
karma.set(common.mixin_common_opts(karma, {
44
// base path, that will be used to resolve files and exclude
55
basePath: '../../',
66

77
// list of files / patterns to load in the browser
88
files: [
9-
'polymer/tools/test/mocha-htmltest.js',
9+
'tools/test/mocha-htmltest.js',
1010
'polymer/conf/mocha.conf.js',
1111
'polymer/node_modules/chai/chai.js',
1212
'polymer/polymer.js',
@@ -41,7 +41,7 @@ module.exports = function(karma) {
4141
{pattern: 'polymer/test/**/*.css', included: false},
4242
{pattern: 'polymer/test/**/*.html', included: false},
4343
{pattern: 'polymer/test/**/*.js', included: false},
44-
{pattern: 'polymer/tools/**/*.js', included: false}
44+
{pattern: 'tools/**/*.js', included: false}
4545
]
4646
}));
4747
};

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Polymer",
3-
"version": "0.0.20130905",
3+
"version": "0.0.20130912",
44
"devDependencies": {
55
"mocha": "*",
66
"chai": "*",

‎src/declaration/prototype.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,16 @@
135135
prototype[name] = extend({}, Object.getPrototypeOf(prototype)[name]);
136136
},
137137
// register 'prototype' to custom element 'name', store constructor
138-
registerPrototype: function(name) {
139-
// register the custom type
140-
this.ctor = document.register(name, {
138+
registerPrototype: function(name, extendee) {
139+
var info = {
141140
prototype: this.prototype
142-
});
141+
}
142+
// native element must be specified in extends
143+
if (extendee && extendee.indexOf('-') < 0) {
144+
info.extends = extendee;
145+
}
146+
// register the custom type
147+
this.ctor = document.register(name, info);
143148
// constructor shenanigans
144149
this.prototype.constructor = this.ctor;
145150
// register the prototype with HTMLElement for name lookup

‎test/html/attr-mustache.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>attribute mustaches</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010
<x-test id="test"></x-test>

‎test/html/bind-object-repeat.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>bind object + repeat</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010
<polymer-element name="x-foo" attributes="obj" noscript>

‎test/html/element-import.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>element script</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
<link rel="import" href="element-import/import.html">
99
</head>
1010
<body>

‎test/html/element-registration.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
<x-blarg></x-blarg>
3232
<hr>
33+
<li is="my-li"></li>
3334

3435
<!-- script follows declaration -->
3536
<polymer-element name="x-foo">
@@ -130,6 +131,17 @@
130131
</script>
131132
</polymer-element>
132133

134+
<polymer-element name="my-li" extends="li">
135+
<template>
136+
Hello World
137+
</template>
138+
<script>
139+
Polymer('my-li', {
140+
custom: true
141+
});
142+
</script>
143+
</polymer-element>
144+
133145
<script>
134146
var assert = chai.assert;
135147
function test() {
@@ -146,6 +158,8 @@
146158
assert.equal(fizz.squid, 'fink');
147159
var zzif = document.querySelector('x-zzif');
148160
assert.equal(zzif.squid, 'zink');
161+
var myLi = document.querySelector('[is=my-li]');
162+
assert.equal(myLi.custom, true);
149163
done();
150164
}
151165
</script>

‎test/html/element-script.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>element script</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
<script src="element-script/elements.js"></script>
99
</head>
1010
<body>

‎test/html/event-path-declarative.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<head>
88
<script src="../../polymer.js"></script>
99
<script src="../../../tools/test/htmltest.js"></script>
10-
<script src="../../../tools/test//chai/chai.js"></script>
10+
<script src="../../../tools/test/chai/chai.js"></script>
1111
</head>
1212
<body>
1313
<x-bar><div id="target">Test</div></x-bar>

‎test/html/event-path.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>event path</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010

‎test/html/mdv-syntax.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>mdv syntax</title>
1111
<script src="../../polymer.js"></script>
1212
<script src="../../../tools/test/htmltest.js"></script>
13-
<script src="../../../tools/test//chai/chai.js"></script>
13+
<script src="../../../tools/test/chai/chai.js"></script>
1414
</head>
1515
<body>
1616
<!-- bind -->

‎test/html/parser-rules-import.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>HTML Imports Test</title>
55
<script src="../../../tools/test/htmltest.js"></script>
6-
<script src="../../../tools/test//chai/chai.js"></script>
6+
<script src="../../../tools/test/chai/chai.js"></script>
77
<script src="../../custom-elements.js"></script>
88
</head>
99
<body>

‎test/html/parser-rules.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>HTML Imports Test</title>
55
<script src="../../../tools/test/htmltest.js"></script>
6-
<script src="../../../tools/test//chai/chai.js"></script>
6+
<script src="../../../tools/test/chai/chai.js"></script>
77
<script src="../../polymer.js"></script>
88
</head>
99
<body>

‎test/html/prop-attr-reflection.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>publish attributes</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010

‎test/html/prop-bind-oo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>bind properties compatible with object observe</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010
<x-test id="test"></x-test>

‎test/html/publish-attributes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>publish attributes</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010

‎test/html/styling/apply-reset-styles.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<title>applyAuthorStyles / resetStyleInheirtance</title>
1010
<script src="../../../polymer.js"></script>
1111
<script src="../../../../tools/test/htmltest.js"></script>
12-
<script src="../../../../tools/test//chai/chai.js"></script>
12+
<script src="../../../../tools/test/chai/chai.js"></script>
1313
<style>
1414
body {
1515
color: rgb(255, 0, 0);

‎test/html/styling/sheet-main-doc.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>loading sheets in elements defined in main document</title>
1111
<script src="../../../polymer.js"></script>
1212
<script src="../../../../tools/test/htmltest.js"></script>
13-
<script src="../../../../tools/test//chai/chai.js"></script>
13+
<script src="../../../../tools/test/chai/chai.js"></script>
1414
<link rel="import" href="x-sheet-main-doc.html">
1515
</head>
1616
<body>

‎test/html/styling/sheet-order.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>Sheet order</title>
1111
<script src="../../../polymer.js"></script>
1212
<script src="../../../../tools/test/htmltest.js"></script>
13-
<script src="../../../../tools/test//chai/chai.js"></script>
13+
<script src="../../../../tools/test/chai/chai.js"></script>
1414
<link rel="import" href="x-sheets.html">
1515
<style>
1616
div {

‎test/html/styling/sheet-scope.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<title>Sheet scope</title>
1010
<script src="../../../polymer.js"></script>
1111
<script src="../../../../tools/test/htmltest.js"></script>
12-
<script src="../../../../tools/test//chai/chai.js"></script>
12+
<script src="../../../../tools/test/chai/chai.js"></script>
1313
<style>
1414
</style>
1515
</head>

‎test/html/take-attributes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>take attributes</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010

‎test/html/template-distribute-dynamic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>template distribute</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010

‎test/html/unbind.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>unbind</title>
55
<script src="../../polymer.js"></script>
66
<script src="../../../tools/test/htmltest.js"></script>
7-
<script src="../../../tools/test//chai/chai.js"></script>
7+
<script src="../../../tools/test/chai/chai.js"></script>
88
</head>
99
<body>
1010

0 commit comments

Comments
 (0)