merge from dev
This commit is contained in:
parent
1c8f02ce0f
commit
33b01d778c
911 changed files with 34157 additions and 57125 deletions
|
@ -140,7 +140,6 @@ context. You should place this element as a child of `<body>` whenever possible.
|
|||
},
|
||||
|
||||
listeners: {
|
||||
'tap': '_onClick',
|
||||
'iron-resize': '_onIronResize'
|
||||
},
|
||||
|
||||
|
@ -162,6 +161,10 @@ context. You should place this element as a child of `<body>` whenever possible.
|
|||
|
||||
ready: function() {
|
||||
this._ensureSetup();
|
||||
},
|
||||
|
||||
attached: function() {
|
||||
// Call _openedChanged here so that position can be computed correctly.
|
||||
if (this._callOpenedWhenReady) {
|
||||
this._openedChanged();
|
||||
}
|
||||
|
@ -393,20 +396,10 @@ context. You should place this element as a child of `<body>` whenever possible.
|
|||
},
|
||||
|
||||
_onCaptureClick: function(event) {
|
||||
// attempt to close asynchronously and prevent the close of a tap event is immediately heard
|
||||
// on target. This is because in shadow dom due to event retargetting event.target is not
|
||||
// useful.
|
||||
if (!this.noCancelOnOutsideClick && (this._manager.currentOverlay() == this)) {
|
||||
this._cancelJob = this.async(function() {
|
||||
this.cancel();
|
||||
}, 10);
|
||||
}
|
||||
},
|
||||
|
||||
_onClick: function(event) {
|
||||
if (this._cancelJob) {
|
||||
this.cancelAsync(this._cancelJob);
|
||||
this._cancelJob = null;
|
||||
if (!this.noCancelOnOutsideClick &&
|
||||
this._manager.currentOverlay() === this &&
|
||||
Polymer.dom(event).path.indexOf(this) === -1) {
|
||||
this.cancel();
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -415,6 +408,7 @@ context. You should place this element as a child of `<body>` whenever possible.
|
|||
if (!this.noCancelOnEscKey && (event.keyCode === ESC)) {
|
||||
this.cancel();
|
||||
event.stopPropagation();
|
||||
event.stopImmediatePropagation();
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -433,6 +427,12 @@ context. You should place this element as a child of `<body>` whenever possible.
|
|||
* @event iron-overlay-opened
|
||||
*/
|
||||
|
||||
/**
|
||||
* Fired when the `iron-overlay` is canceled, but before it is closed.
|
||||
* Cancel the event to prevent the `iron-overlay` from closing.
|
||||
* @event iron-overlay-canceled
|
||||
*/
|
||||
|
||||
/**
|
||||
* Fired after the `iron-overlay` closes.
|
||||
* @event iron-overlay-closed
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue