Skip to content

Commit

Permalink
release v1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
dfreedm committed Oct 8, 2015
1 parent eaedcbc commit 4c94736
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 18 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.1.4",
"version": "1.1.5",
"main": [
"polymer.html"
],
Expand Down
14 changes: 7 additions & 7 deletions build.log
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
BUILD LOG
---------
Build Time: 2015-09-25T15:52:57-0700
Build Time: 2015-10-08T14:06:39-0700

NODEJS INFORMATION
==================
nodejs: v4.1.1
nodejs: v4.1.2
del: 1.2.0
gulp-rename: 1.2.2
gulp: 3.9.0
gulp-audit: 1.0.0
gulp-rename: 1.2.2
gulp-replace: 0.5.3
gulp-vulcanize: 6.0.1
lazypipe: 0.2.4
polyclean: 1.2.0
lazypipe: 0.2.4
run-sequence: 1.1.1

REPO REVISIONS
==============
polymer: fe467cd62d8a2dc585606da282cd477b03e46468
polymer: 574855a644bcc25ee26c30e0dd881a395fad67b6

BUILD HASHES
============
polymer-mini.html: 72c032eacc45c63431054c111d0ce86357eb07f3
polymer-micro.html: f598c7c5fb99ded0fa8d680a417c2610b2aa6409
polymer.html: 8e4c3244201c0b0557f14cba56a625b4cd99c208
polymer-micro.html: 62d773e546d387df86bc1b33a3cb61c3c1c9bc76
polymer.html: 5c626b1aba3107c12cee378876d13b8780fdec67
2 changes: 1 addition & 1 deletion polymer-micro.html
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
}
}
});
Polymer.version = '1.1.4';
Polymer.version = '1.1.5';
Polymer.Base._addFeature({
_registerFeatures: function () {
this._prepIs();
Expand Down
55 changes: 46 additions & 9 deletions polymer.html
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,15 @@
}
},
listen: function (node, eventName, methodName) {
this._listen(node, eventName, this._createEventHandler(node, eventName, methodName));
var handler = this._recallEventHandler(this, eventName, node, methodName);
if (!handler) {
handler = this._createEventHandler(node, eventName, methodName);
}
if (handler._listening) {
return;
}
this._listen(node, eventName, handler);
handler._listening = true;
},
_boundListenerKey: function (eventName, methodName) {
return eventName + ':' + methodName;
Expand Down Expand Up @@ -396,13 +404,15 @@
host._warn(host._logf('_createEventHandler', 'listener method `' + methodName + '` not defined'));
}
};
handler._listening = false;
this._recordEventHandler(host, eventName, node, methodName, handler);
return handler;
},
unlisten: function (node, eventName, methodName) {
var handler = this._recallEventHandler(this, eventName, node, methodName);
if (handler) {
this._unlisten(node, eventName, handler);
handler._listening = false;
}
},
_listen: function (node, eventName, handler) {
Expand Down Expand Up @@ -1250,6 +1260,12 @@
}
}
return elt;
},
isLightDescendant: function (node) {
return this.contains(node) && Polymer.dom(this).getOwnerRoot() === Polymer.dom(node).getOwnerRoot();
},
isLocalDescendant: function (node) {
return this.root === Polymer.dom(node).getOwnerRoot();
}
});
Polymer.Bind = {
Expand Down Expand Up @@ -2051,6 +2067,22 @@
this._notifySplice(array, path, 0, args.length, []);
}
return ret;
},
prepareModelNotifyPath: function (model) {
this.mixin(model, {
fire: Polymer.Base.fire,
notifyPath: Polymer.Base.notifyPath,
_EVENT_CHANGED: Polymer.Base._EVENT_CHANGED,
_notifyPath: Polymer.Base._notifyPath,
_pathEffector: Polymer.Base._pathEffector,
_annotationPathEffect: Polymer.Base._annotationPathEffect,
_complexObserverPathEffect: Polymer.Base._complexObserverPathEffect,
_annotatedComputationPathEffect: Polymer.Base._annotatedComputationPathEffect,
_computePathEffect: Polymer.Base._computePathEffect,
_modelForPath: Polymer.Base._modelForPath,
_pathMatchesEffect: Polymer.Base._pathMatchesEffect,
_notifyBoundPaths: Polymer.Base._notifyBoundPaths
});
}
});
}());
Expand Down Expand Up @@ -3258,6 +3290,7 @@
_instanceProps: Polymer.nob,
_parentPropPrefix: '_parent_',
templatize: function (template) {
this._templatized = template;
if (!template._content) {
template._content = template.content;
}
Expand All @@ -3268,11 +3301,11 @@
}
var archetype = Object.create(Polymer.Base);
this._customPrepAnnotations(archetype, template);
this._prepParentProperties(archetype, template);
archetype._prepEffects();
this._customPrepEffects(archetype);
archetype._prepBehaviors();
archetype._prepBindings();
this._prepParentProperties(archetype, template);
archetype._notifyPath = this._notifyPathImpl;
archetype._scopeElementClass = this._scopeElementClassImpl;
archetype.listen = this._listenImpl;
Expand Down Expand Up @@ -3355,6 +3388,7 @@
proto = archetype._parentPropProto = Object.create(null);
if (template != this) {
Polymer.Bind.prepareModel(proto);
Polymer.Base.prepareModelNotifyPath(proto);
}
for (prop in parentProps) {
var parentProp = this._parentPropPrefix + prop;
Expand All @@ -3373,6 +3407,7 @@
template._forwardParentProp = this._forwardParentProp.bind(this);
}
this._extendTemplate(template, proto);
template._pathEffector = this._pathEffectorImpl.bind(this);
}
},
_createForwardPropEffector: function (prop) {
Expand All @@ -3383,7 +3418,7 @@
_createHostPropEffector: function (prop) {
var prefix = this._parentPropPrefix;
return function (source, value) {
this.dataHost[prefix + prop] = value;
this.dataHost._templatized[prefix + prop] = value;
};
},
_createInstancePropEffector: function (prop) {
Expand Down Expand Up @@ -3415,16 +3450,17 @@
var root = dot < 0 ? path : path.slice(0, dot);
dataHost._forwardInstancePath.call(dataHost, this, path, value);
if (root in dataHost._parentProps) {
dataHost.notifyPath(dataHost._parentPropPrefix + path, value);
dataHost._templatized.notifyPath(dataHost._parentPropPrefix + path, value);
}
},
_pathEffector: function (path, value, fromAbove) {
_pathEffectorImpl: function (path, value, fromAbove) {
if (this._forwardParentPath) {
if (path.indexOf(this._parentPropPrefix) === 0) {
this._forwardParentPath(path.substring(8), value);
var subPath = path.substring(this._parentPropPrefix.length);
this._forwardParentPath(subPath, value);
}
}
Polymer.Base._pathEffector.apply(this, arguments);
Polymer.Base._pathEffector.call(this._templatized, path, value, fromAbove);
},
_constructorImpl: function (model, host) {
this._rootDataHost = host._getRootDataHost();
Expand Down Expand Up @@ -3467,8 +3503,9 @@
stamp: function (model) {
model = model || {};
if (this._parentProps) {
var templatized = this._templatized;
for (var prop in this._parentProps) {
model[prop] = this[this._parentPropPrefix + prop];
model[prop] = templatized[this._parentPropPrefix + prop];
}
}
return new this.ctor(model, this);
Expand Down Expand Up @@ -4076,7 +4113,7 @@
}
} else {
this.push('selected', item);
skey = this._selectedColl.getKey(item);
var skey = this._selectedColl.getKey(item);
this.linkPaths('selected.' + skey, 'items.' + key);
}
} else {
Expand Down

0 comments on commit 4c94736

Please sign in to comment.