1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2016-04-27 00:22:32 -04:00
parent ff79304dee
commit 2ff0f16136
11 changed files with 99 additions and 68 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.2.47", "version": "1.2.48",
"_release": "1.2.47", "_release": "1.2.48",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.47", "tag": "1.2.48",
"commit": "52f3790ed3d535fa00811d7922c899f85273b25c" "commit": "342107db8bbaa343a4c61be6fd2591121a83ffff"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -25,12 +25,17 @@
transition: transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1); transition: transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);
transition: transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1),-webkit-transform .3s cubic-bezier(.4,0,.2,1); transition: transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1),-webkit-transform .3s cubic-bezier(.4,0,.2,1);
z-index: -1;*/ z-index: -1;*/
max-height: 84%;
} }
.actionSheet.centered .actionSheetContent { .layout-tv .actionSheet {
text-align: center; max-height: none;
align-items: center; }
}
.actionSheet.centered .actionSheetContent {
text-align: center;
align-items: center;
}
.actionSheetContent { .actionSheetContent {
margin: 0 !important; margin: 0 !important;

View file

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-icon", "homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.8", "_release": "1.0.8",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb" "commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
}, },
"_source": "git://github.com/polymerelements/iron-icon.git", "_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon" "_originalSource": "PolymerElements/iron-icon"
} }

View file

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/polymerelements/iron-meta", "homepage": "https://github.com/PolymerElements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/polymerelements/iron-meta.git", "_source": "git://github.com/PolymerElements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-meta" "_originalSource": "PolymerElements/iron-meta"
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-overlay-behavior", "name": "iron-overlay-behavior",
"version": "1.6.3", "version": "1.6.4",
"license": "http://polymer.github.io/LICENSE.txt", "license": "http://polymer.github.io/LICENSE.txt",
"description": "Provides a behavior for making an element an overlay", "description": "Provides a behavior for making an element an overlay",
"private": true, "private": true,
@ -35,11 +35,11 @@
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-overlay-behavior", "homepage": "https://github.com/polymerelements/iron-overlay-behavior",
"_release": "1.6.3", "_release": "1.6.4",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.3", "tag": "v1.6.4",
"commit": "5b331ebaefe3214937b94ba19769154efee46244" "commit": "983654132fd8281c3da07d79eea8a0f5b28e7a4f"
}, },
"_source": "git://github.com/polymerelements/iron-overlay-behavior.git", "_source": "git://github.com/polymerelements/iron-overlay-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-overlay-behavior", "name": "iron-overlay-behavior",
"version": "1.6.3", "version": "1.6.4",
"license": "http://polymer.github.io/LICENSE.txt", "license": "http://polymer.github.io/LICENSE.txt",
"description": "Provides a behavior for making an element an overlay", "description": "Provides a behavior for making an element an overlay",
"private": true, "private": true,

View file

@ -113,7 +113,9 @@ context. You should place this element as a child of `<body>` whenever possible.
}, },
/** /**
* Returns the reason this dialog was last closed. * Contains the reason(s) this overlay was last closed (see `iron-overlay-closed`).
* `IronOverlayBehavior` provides the `canceled` reason; implementers of the
* behavior can provide other reasons in addition to `canceled`.
*/ */
closingReason: { closingReason: {
// was a getter before, but needs to be a property so other // was a getter before, but needs to be a property so other
@ -322,16 +324,23 @@ context. You should place this element as a child of `<body>` whenever possible.
this._manager.addOrRemoveOverlay(this); this._manager.addOrRemoveOverlay(this);
this.__isAnimating = true;
// requestAnimationFrame for non-blocking rendering
if (this.__openChangedAsync) { if (this.__openChangedAsync) {
window.cancelAnimationFrame(this.__openChangedAsync); window.cancelAnimationFrame(this.__openChangedAsync);
} }
// Defer any animation-related code on attached
// (_openedChanged gets called again on attached).
if (!this.isAttached) {
return;
}
this.__isAnimating = true;
if (this.opened) { if (this.opened) {
if (this.withBackdrop) { if (this.withBackdrop) {
this.backdropElement.prepare(); this.backdropElement.prepare();
} }
// requestAnimationFrame for non-blocking rendering
this.__openChangedAsync = window.requestAnimationFrame(function() { this.__openChangedAsync = window.requestAnimationFrame(function() {
this.__openChangedAsync = null; this.__openChangedAsync = null;
this._prepareRenderOpened(); this._prepareRenderOpened();
@ -574,24 +583,26 @@ context. You should place this element as a child of `<body>` whenever possible.
Polymer.IronOverlayBehavior = [Polymer.IronFitBehavior, Polymer.IronResizableBehavior, Polymer.IronOverlayBehaviorImpl]; Polymer.IronOverlayBehavior = [Polymer.IronFitBehavior, Polymer.IronResizableBehavior, Polymer.IronOverlayBehaviorImpl];
/** /**
* Fired after the `iron-overlay` opens. * Fired after the overlay opens.
* @event iron-overlay-opened * @event iron-overlay-opened
*/ */
/** /**
* Fired when the `iron-overlay` is canceled, but before it is closed. * Fired when the overlay is canceled, but before it is closed.
* Cancel the event to prevent the `iron-overlay` from closing. * @event iron-overlay-canceled
* @event iron-overlay-canceled * @param {Event} event The closing of the overlay can be prevented
* @param {Event} event The closing of the `iron-overlay` can be prevented * by calling `event.preventDefault()`.
* by calling `event.preventDefault()`. The `event.detail` is the original event that originated * @param {Event} event.detail It is the original event that originated
* the canceling (e.g. ESC keyboard event or click event outside the `iron-overlay`). * the canceling (e.g. ESC keyboard event or click event outside the overlay).
*/ */
/** /**
* Fired after the `iron-overlay` closes. * Fired after the overlay closes.
* @event iron-overlay-closed * @event iron-overlay-closed
* @param {{canceled: (boolean|undefined)}} closingReason Contains `canceled` (whether the overlay was canceled). * @param {Event} event The event
*/ * @param {Object} event.detail It is the `closingReason` property (contains
* `canceled`, whether the overlay was canceled).
*/
})(); })();
</script> </script>

View file

@ -339,6 +339,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
var overlay = /** @type {?} */ (this.currentOverlay()); var overlay = /** @type {?} */ (this.currentOverlay());
// Check if clicked outside of top overlay. // Check if clicked outside of top overlay.
if (overlay && this._overlayInPath(Polymer.dom(event).path) !== overlay) { if (overlay && this._overlayInPath(Polymer.dom(event).path) !== overlay) {
if (overlay.withBackdrop) {
// There's no need to stop the propagation as the backdrop element
// already got this mousedown/touchstart event. Calling preventDefault
// on this event ensures that click/tap won't be triggered at all.
event.preventDefault();
}
overlay._onCaptureClick(event); overlay._onCaptureClick(event);
} }
}, },

View file

@ -155,6 +155,21 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
assert.equal(getComputedStyle(overlay).display, 'none', 'overlay starts hidden'); assert.equal(getComputedStyle(overlay).display, 'none', 'overlay starts hidden');
}); });
test('_renderOpened called only after is attached', function(done) {
var overlay = document.createElement('test-overlay');
// The overlay is ready at this point, but not yet attached.
var spy = sinon.spy(overlay, '_renderOpened');
// This triggers _openedChanged.
overlay.opened = true;
// Even if not attached yet, overlay should be the current overlay!
assert.equal(overlay, overlay._manager.currentOverlay(), 'currentOverlay ok');
// Wait long enough for requestAnimationFrame callback.
overlay.async(function() {
assert.isFalse(spy.called, '_renderOpened not called');
done();
}, 100);
});
test('overlay open/close events', function(done) { test('overlay open/close events', function(done) {
var nevents = 0; var nevents = 0;
@ -751,6 +766,27 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
done(); done();
}); });
}); });
test('withBackdrop = true prevents click outside event', function(done) {
runAfterOpen(overlay, function() {
overlay.addEventListener('iron-overlay-canceled', function(event) {
assert.isTrue(event.detail.defaultPrevented, 'click event prevented');
done();
});
MockInteractions.tap(document.body);
});
});
test('withBackdrop = false does not prevent click outside event', function(done) {
overlay.withBackdrop = false;
runAfterOpen(overlay, function() {
overlay.addEventListener('iron-overlay-canceled', function(event) {
assert.isFalse(event.detail.defaultPrevented, 'click event not prevented');
done();
});
MockInteractions.tap(document.body);
});
});
}); });
suite('multiple overlays', function() { suite('multiple overlays', function() {

View file

@ -54,7 +54,7 @@
"tag": "v1.1.11", "tag": "v1.1.11",
"commit": "8cfe5c5bf8c2e40d243443d046a94b6fe371983c" "commit": "8cfe5c5bf8c2e40d243443d046a94b6fe371983c"
}, },
"_source": "git://github.com/PolymerElements/paper-input.git", "_source": "git://github.com/polymerelements/paper-input.git",
"_target": "^1.0.0", "_target": "^1.0.9",
"_originalSource": "PolymerElements/paper-input" "_originalSource": "polymerelements/paper-input"
} }

View file

@ -1,28 +1,4 @@
define(['tvguide', 'events'], function (tvguide, events) { define(['tvguide'], function (tvguide) {
function onGuideLoaded() {
var context = this.options.element;
require(["headroom"], function () {
// construct an instance of Headroom, passing the element
var headroom = new Headroom(context.querySelector('.tvGuideHeader'), {
// or scroll tolerance per direction
scroller: context.querySelector('.guideVerticalScroller'),
onPin: function () {
context.classList.remove('headroomUnpinned');
},
// callback when unpinned, `this` is headroom object
onUnpin: function () {
context.classList.add('headroomUnpinned');
}
});
// initialise
headroom.init();
});
}
window.LiveTvPage.initGuideTab = function (page, tabContent) { window.LiveTvPage.initGuideTab = function (page, tabContent) {
@ -35,9 +11,6 @@
page.guideInstance = new tvguide({ page.guideInstance = new tvguide({
element: tabContent element: tabContent
}); });
events.on(page.guideInstance, 'load', onGuideLoaded);
} }
}; };