Skip to content

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dfreedm committed Aug 14, 2015
1 parent 8e89484 commit 67fb2f8
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 61 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "polymer",
"version": "1.0.9",
"version": "1.1.0",
"main": [
"polymer.html"
],
Expand Down
12 changes: 6 additions & 6 deletions build.log
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
BUILD LOG
---------
Build Time: 2015-08-07T17:47:46-0700
Build Time: 2015-08-13T16:56:33-0700

NODEJS INFORMATION
==================
nodejs: v2.5.0
nodejs: v0.12.7
del: 1.2.0
gulp: 3.9.0
gulp-audit: 1.0.0
Expand All @@ -17,10 +17,10 @@ run-sequence: 1.1.1

REPO REVISIONS
==============
polymer: bf703cbb384157b9306ab2e9882abbd474f30a84
polymer: a42ca09c3b99749b1407d5fa68cd957c2eaf5ca6

BUILD HASHES
============
polymer-mini.html: 9265f74d0c21712f45cfe9e05a8d13af752f6969
polymer-micro.html: 90a73dcfe37eada97a45a0a19ac790dd9e84c226
polymer.html: 0aad0f21a3c4c4ec0ce3e4acc7e8d08b10dd6a05
polymer-mini.html: b40016f458e85bb815c898378b7bcd5c8abe5661
polymer-micro.html: ef8ebb2dc40697c845c2b8ec64ee69838d0d7bfc
polymer.html: 2f874995a3a3ada9e87da48a01d10c6d3ee297bb
15 changes: 5 additions & 10 deletions polymer-micro.html
Original file line number Diff line number Diff line change
Expand Up @@ -247,19 +247,14 @@
}
});
var cePolyfill = window.CustomElements && !CustomElements.useNative;
if (cePolyfill) {
var ready = CustomElements.ready;
CustomElements.ready = true;
}
document.registerElement('dom-module', DomModule);
if (cePolyfill) {
CustomElements.ready = ready;
}
function forceDocumentUpgrade() {
if (cePolyfill) {
var script = document._currentScript || document.currentScript;
if (script) {
CustomElements.upgradeAll(script.ownerDocument);
var doc = script && script.ownerDocument;
if (doc && !doc.__customElementsForceUpgraded) {
doc.__customElementsForceUpgraded = true;
CustomElements.upgradeAll(doc);
}
}
}
Expand Down Expand Up @@ -563,7 +558,7 @@
}
}
});
Polymer.version = '1.0.9';
Polymer.version = '1.1.0';
Polymer.Base._addFeature({
_registerFeatures: function () {
this._prepIs();
Expand Down
43 changes: 34 additions & 9 deletions polymer-mini.html
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,14 @@
},
appendChild: function (node) {
var handled;
this._ensureContentLogicalInfo(node);
this._removeNodeFromHost(node, true);
if (this._nodeIsInLogicalTree(this.node)) {
this._addLogicalInfo(node, this.node);
this._addNodeToHost(node);
handled = this._maybeDistribute(node, this.node);
} else {
this._addNodeToHost(node);
}
if (!handled && !this._tryRemoveUndistributedNode(node)) {
var container = this.node._isShadyRoot ? this.node.host : this.node;
Expand All @@ -476,9 +479,9 @@
return this.appendChild(node);
}
var handled;
this._ensureContentLogicalInfo(node);
this._removeNodeFromHost(node, true);
if (this._nodeIsInLogicalTree(this.node)) {
saveLightChildrenIfNeeded(this.node);
var children = this.childNodes;
var index = children.indexOf(ref_node);
if (index < 0) {
Expand All @@ -487,6 +490,8 @@
this._addLogicalInfo(node, this.node, index);
this._addNodeToHost(node);
handled = this._maybeDistribute(node, this.node);
} else {
this._addNodeToHost(node);
}
if (!handled && !this._tryRemoveUndistributedNode(node)) {
ref_node = ref_node.localName === CONTENT ? this._firstComposedNode(ref_node) : ref_node;
Expand All @@ -504,6 +509,8 @@
if (this._nodeIsInLogicalTree(this.node)) {
this._removeNodeFromHost(node);
handled = this._maybeDistribute(node, this.node);
} else {
this._removeNodeFromHost(node);
}
if (!handled) {
var container = this.node._isShadyRoot ? this.node.host : this.node;
Expand Down Expand Up @@ -572,10 +579,27 @@
}
},
_updateInsertionPoints: function (host) {
host.shadyRoot._insertionPoints = factory(host.shadyRoot).querySelectorAll(CONTENT);
var i$ = host.shadyRoot._insertionPoints = factory(host.shadyRoot).querySelectorAll(CONTENT);
for (var i = 0, c; i < i$.length; i++) {
c = i$[i];
saveLightChildrenIfNeeded(c);
saveLightChildrenIfNeeded(factory(c).parentNode);
}
},
_nodeIsInLogicalTree: function (node) {
return Boolean(node._lightParent !== undefined || node._isShadyRoot || this._ownerShadyRootForNode(node) || node.shadyRoot);
return Boolean(node._lightParent !== undefined || node._isShadyRoot || node.shadyRoot);
},
_ensureContentLogicalInfo: function (node) {
if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
saveLightChildrenIfNeeded(this.node);
var c$ = Array.prototype.slice.call(node.childNodes);
for (var i = 0, n; i < c$.length && (n = c$[i]); i++) {
this._ensureContentLogicalInfo(n);
}
} else if (node.localName === CONTENT) {
saveLightChildrenIfNeeded(this.node);
saveLightChildrenIfNeeded(node);
}
},
_parentNeedsDistribution: function (parent) {
return parent && parent.shadyRoot && hasInsertionPoint(parent.shadyRoot);
Expand Down Expand Up @@ -629,14 +653,12 @@
}
},
_addNodeToHost: function (node) {
var checkNode = node.nodeType === Node.DOCUMENT_FRAGMENT_NODE ? node.firstChild : node;
var root = this._ownerShadyRootForNode(checkNode);
var root = this.getOwnerRoot();
if (root) {
root.host._elementAdd(node);
}
},
_addLogicalInfo: function (node, container, index) {
saveLightChildrenIfNeeded(container);
var children = factory(container).childNodes;
index = index === undefined ? children.length : index;
if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
Expand Down Expand Up @@ -1163,8 +1185,13 @@
this.shadyRoot._distributionClean = false;
this.shadyRoot._isShadyRoot = true;
this.shadyRoot._dirtyRoots = [];
this.shadyRoot._insertionPoints = !this._notes || this._notes._hasContent ? this.shadyRoot.querySelectorAll('content') : [];
var i$ = this.shadyRoot._insertionPoints = !this._notes || this._notes._hasContent ? this.shadyRoot.querySelectorAll('content') : [];
saveLightChildrenIfNeeded(this.shadyRoot);
for (var i = 0, c; i < i$.length; i++) {
c = i$[i];
saveLightChildrenIfNeeded(c);
saveLightChildrenIfNeeded(c.parentNode);
}
this.shadyRoot.host = this;
},
get domHost() {
Expand Down Expand Up @@ -1399,14 +1426,12 @@
removeFromComposedParent(newChildParent, newChild);
}
remove(newChild);
saveLightChildrenIfNeeded(parentNode);
nativeInsertBefore.call(parentNode, newChild, refChild || null);
newChild._composedParent = parentNode;
}
function remove(node) {
var parentNode = getComposedParent(node);
if (parentNode) {
saveLightChildrenIfNeeded(parentNode);
node._composedParent = null;
nativeRemoveChild.call(parentNode, node);
}
Expand Down
Loading

0 comments on commit 67fb2f8

Please sign in to comment.