Index: polymer_0.5.0/bower_components/core-animated-pages/core-animated-pages.html |
diff --git a/bower_components/core-animated-pages/core-animated-pages.html b/polymer_0.5.0/bower_components/core-animated-pages/core-animated-pages.html |
similarity index 94% |
rename from bower_components/core-animated-pages/core-animated-pages.html |
rename to polymer_0.5.0/bower_components/core-animated-pages/core-animated-pages.html |
index 96cd5ebc4d4a22f3e37c78b4a2a5faf5cf07ac79..aea4b43f3c421d54f5d85f9ee156829c343d91a8 100644 |
--- a/bower_components/core-animated-pages/core-animated-pages.html |
+++ b/polymer_0.5.0/bower_components/core-animated-pages/core-animated-pages.html |
@@ -8,6 +8,7 @@ |
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt |
--> |
<link href="../core-selector/core-selector.html" rel="import"> |
+<link href="../core-resizable/core-resizable.html" rel="import"> |
<link href="transitions/hero-transition.html" rel="import"> |
<link href="transitions/cross-fade.html" rel="import"> |
@@ -245,7 +246,7 @@ Fired when a page transition completes. |
<script> |
- Polymer({ |
+ Polymer(Polymer.mixin({ |
eventDelegates: { |
'core-transitionend': 'transitionEnd' |
@@ -283,6 +284,14 @@ Fired when a page transition completes. |
this.transitioning = []; |
}, |
+ attached: function() { |
+ this.resizerAttachedHandler(); |
+ }, |
+ |
+ detached: function() { |
+ this.resizerDetachedHandler(); |
+ }, |
+ |
transitionsChanged: function() { |
this._transitions = this.transitions.split(' '); |
}, |
@@ -318,7 +327,7 @@ Fired when a page transition completes. |
this.animating = null; |
} |
- Platform.flush(); |
+ Polymer.flush(); |
if (this.transitioning.indexOf(src) === -1) { |
this.transitioning.push(src); |
@@ -334,7 +343,7 @@ Fired when a page transition completes. |
src: src, |
dst: dst, |
easing: 'cubic-bezier(0.4, 0, 0.2, 1)' |
- } |
+ }; |
// fire an event so clients have a chance to do something when the |
// new page becomes visible but before it draws. |
@@ -416,20 +425,32 @@ Fired when a page transition completes. |
if (this.hasAttribute('no-transition') || !this._transitionElements || !this._transitionElements.length) { |
this.applySelection(oldItem, false); |
this.applySelection(this.selectedItem, true); |
+ this.notifyResize(); |
return; |
} |
if (oldItem && this.selectedItem) { |
// TODO(sorvell): allow bindings to update first? |
var self = this; |
- Platform.flush(); |
- Platform.endOfMicrotask(function() { |
+ Polymer.flush(); |
+ Polymer.endOfMicrotask(function() { |
self.applyTransition(oldItem, self.selectedItem); |
+ self.notifyResize(); |
}); |
} |
+ }, |
+ |
+ resizerShouldNotify: function(el) { |
+ // Only notify descendents of selected item |
+ while (el && (el != this)) { |
+ if (el == this.selectedItem) { |
+ return true; |
+ } |
+ el = el.parentElement || (el.parentNode && el.parentNode.host); |
+ } |
} |
- }); |
+ }, Polymer.CoreResizer)); |
</script> |