mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update now playing
This commit is contained in:
parent
ad38cf4783
commit
b5a723314b
23 changed files with 229 additions and 66 deletions
|
@ -25,14 +25,14 @@
|
|||
"web-component-tester": "*",
|
||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
||||
},
|
||||
"homepage": "https://github.com/polymerelements/iron-meta",
|
||||
"homepage": "https://github.com/PolymerElements/iron-meta",
|
||||
"_release": "1.0.3",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.0.3",
|
||||
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
|
||||
},
|
||||
"_source": "git://github.com/polymerelements/iron-meta.git",
|
||||
"_source": "git://github.com/PolymerElements/iron-meta.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "polymerelements/iron-meta"
|
||||
"_originalSource": "PolymerElements/iron-meta"
|
||||
}
|
|
@ -42,7 +42,7 @@
|
|||
"tag": "v1.0.4",
|
||||
"commit": "a7ac7fbdb79b4d82416ec9b41613575386d0d226"
|
||||
},
|
||||
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
|
||||
"_source": "git://github.com/polymerelements/paper-behaviors.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "PolymerElements/paper-behaviors"
|
||||
"_originalSource": "polymerelements/paper-behaviors"
|
||||
}
|
|
@ -30,14 +30,14 @@
|
|||
"web-component-tester": "*",
|
||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
||||
},
|
||||
"homepage": "https://github.com/PolymerElements/paper-ripple",
|
||||
"homepage": "https://github.com/polymerelements/paper-ripple",
|
||||
"_release": "1.0.2",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.0.2",
|
||||
"commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc"
|
||||
},
|
||||
"_source": "git://github.com/PolymerElements/paper-ripple.git",
|
||||
"_source": "git://github.com/polymerelements/paper-ripple.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "PolymerElements/paper-ripple"
|
||||
"_originalSource": "polymerelements/paper-ripple"
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "velocity",
|
||||
"version": "1.2.2",
|
||||
"version": "1.2.3",
|
||||
"homepage": "http://velocityjs.org",
|
||||
"authors": [
|
||||
{
|
||||
|
@ -38,14 +38,13 @@
|
|||
"type": "git",
|
||||
"url": "http://github.com/julianshapiro/velocity.git"
|
||||
},
|
||||
"_release": "1.2.2",
|
||||
"_release": "1.2.3",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "1.2.2",
|
||||
"commit": "6b227928631aab5694255df3c219736c4c02449d"
|
||||
"tag": "1.2.3",
|
||||
"commit": "1ad0a8196fa973f96e347a9b7f5bdaf7498ed1a6"
|
||||
},
|
||||
"_source": "git://github.com/julianshapiro/velocity.git",
|
||||
"_target": "~1.2.2",
|
||||
"_originalSource": "velocity",
|
||||
"_direct": true
|
||||
"_originalSource": "velocity"
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "velocity",
|
||||
"version": "1.2.2",
|
||||
"version": "1.2.3",
|
||||
"homepage": "http://velocityjs.org",
|
||||
"authors": [
|
||||
{ "name" : "Julian Shapiro",
|
||||
|
@ -31,7 +31,7 @@
|
|||
"jquery": "*"
|
||||
},
|
||||
"repository" :
|
||||
{
|
||||
{
|
||||
"type" : "git",
|
||||
"url" : "http://github.com/julianshapiro/velocity.git"
|
||||
}
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
<script>
|
||||
|
||||
// Needed tests:
|
||||
// - "finish"
|
||||
// - new stop behvaior
|
||||
// - e/p/o shorthands
|
||||
|
||||
|
@ -986,6 +985,62 @@
|
|||
}, asyncCheckDuration);
|
||||
});
|
||||
|
||||
/******************
|
||||
Command: Finish
|
||||
******************/
|
||||
|
||||
QUnit.asyncTest("Command: Finish / FinishAll", function() {
|
||||
expect(9);
|
||||
|
||||
var $target1 = getTarget();
|
||||
/* Ensure an error isn't thrown when "finish" is called on a $target that isn't animating. */
|
||||
Velocity($target1, "finish");
|
||||
|
||||
/* Animate to defaultProperties, and then "finish" to jump to the end of it. */
|
||||
Velocity($target1, defaultProperties, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000}));
|
||||
Velocity($target1, "finish");
|
||||
|
||||
setTimeout(function() {
|
||||
/* Ensure "finish" has removed all queued animations. */
|
||||
/* We're using the element's queue length as a proxy. 0 and 1 both mean that the element's queue has been cleared -- a length of 1 just indicates that the animation is in progress. */
|
||||
equal(Velocity.Utilities.queue($target1).length <= 1, true, "Queue cleared.");
|
||||
|
||||
/* End result of the animation should be applied */
|
||||
equal(parseFloat(Velocity.CSS.getPropertyValue($target1, "width")), defaultProperties.width, "Standard end value #1 was set.");
|
||||
equal(parseFloat(Velocity.CSS.getPropertyValue($target1, "opacity")), defaultProperties.opacity, "Standard end value #2 was set.");
|
||||
}, asyncCheckDuration);
|
||||
|
||||
var $target2 = getTarget();
|
||||
Velocity($target2, { opacity: 0 }, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000 }));
|
||||
Velocity($target2, { width: 0 }, defaultOptions);
|
||||
Velocity($target2, "finish");
|
||||
|
||||
var $target3 = getTarget();
|
||||
Velocity($target3, { opacity: 0, width: 50 }, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000 }));
|
||||
Velocity($target3, { width: 0 }, defaultOptions);
|
||||
Velocity($target3, { width: 100 }, defaultOptions);
|
||||
Velocity($target3, "finish", true);
|
||||
|
||||
var $target4 = getTarget();
|
||||
Velocity($target4, { opacity: 0, width: 50 }, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000 }));
|
||||
Velocity($target4, { width: 0 }, defaultOptions);
|
||||
Velocity($target4, { width: 100 }, defaultOptions);
|
||||
Velocity($target4, "finishAll", true);
|
||||
|
||||
setTimeout(function() {
|
||||
equal(Data($target2, pluginName).tweensContainer.opacity, undefined, "Active call stopped.");
|
||||
notEqual(Data($target2, pluginName).tweensContainer.width, undefined, "Next queue item started.");
|
||||
|
||||
equal(Velocity.Utilities.queue($target3, "").length, 0, "Full queue array cleared.");
|
||||
equal(parseFloat(Velocity.CSS.getPropertyValue($target3, "width")), 50, "Just the first call's width was applied.");
|
||||
|
||||
equal(Velocity.Utilities.queue($target4, "").length, 0, "Full queue array cleared.");
|
||||
equal(parseFloat(Velocity.CSS.getPropertyValue($target4, "width")), 100, "The last call's width was applied.");
|
||||
|
||||
start();
|
||||
}, asyncCheckDuration);
|
||||
});
|
||||
|
||||
/***********************
|
||||
Feature: Redirects
|
||||
***********************/
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/*! VelocityJS.org (1.2.2). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */
|
||||
/*! VelocityJS.org (1.2.3). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */
|
||||
|
||||
/*************************
|
||||
Velocity jQuery Shim
|
||||
|
@ -2074,7 +2074,7 @@ return function (global, window, document, undefined) {
|
|||
/* Support is included for jQuery's argument overloading: $.animate(propertyMap [, duration] [, easing] [, complete]).
|
||||
Overloading is detected by checking for the absence of an object being passed into options. */
|
||||
/* Note: The stop and finish actions do not accept animation options, and are therefore excluded from this check. */
|
||||
if (!/^(stop|finish)$/i.test(propertiesMap) && !$.isPlainObject(options)) {
|
||||
if (!/^(stop|finish|finishAll)$/i.test(propertiesMap) && !$.isPlainObject(options)) {
|
||||
/* The utility function shifts all arguments one position to the right, so we adjust for that offset. */
|
||||
var startingArgumentPosition = argumentIndex + 1;
|
||||
|
||||
|
@ -2140,6 +2140,7 @@ return function (global, window, document, undefined) {
|
|||
break;
|
||||
|
||||
case "finish":
|
||||
case "finishAll":
|
||||
case "stop":
|
||||
/*******************
|
||||
Action: Stop
|
||||
|
@ -2158,6 +2159,22 @@ return function (global, window, document, undefined) {
|
|||
|
||||
delete Data(element).delayTimer;
|
||||
}
|
||||
|
||||
/* If we want to finish everything in the queue, we have to iterate through it
|
||||
and call each function. This will make them active calls below, which will
|
||||
cause them to be applied via the duration setting. */
|
||||
if (propertiesMap === "finishAll" && (options === true || Type.isString(options))) {
|
||||
/* Iterate through the items in the element's queue. */
|
||||
$.each($.queue(element, Type.isString(options) ? options : ""), function(_, item) {
|
||||
/* The queue array can contain an "inprogress" string, which we skip. */
|
||||
if (Type.isFunction(item)) {
|
||||
item();
|
||||
}
|
||||
});
|
||||
|
||||
/* Clearing the $.queue() array is achieved by resetting it to []. */
|
||||
$.queue(element, Type.isString(options) ? options : "", []);
|
||||
}
|
||||
});
|
||||
|
||||
var callsToStop = [];
|
||||
|
@ -2190,10 +2207,11 @@ return function (global, window, document, undefined) {
|
|||
}
|
||||
|
||||
/* Iterate through the calls targeted by the stop command. */
|
||||
$.each(elements, function(l, element) {
|
||||
$.each(elements, function(l, element) {
|
||||
/* Check that this call was applied to the target element. */
|
||||
if (element === activeElement) {
|
||||
/* Optionally clear the remaining queued calls. */
|
||||
/* Optionally clear the remaining queued calls. If we're doing "finishAll" this won't find anything,
|
||||
due to the queue-clearing above. */
|
||||
if (options === true || Type.isString(options)) {
|
||||
/* Iterate through the items in the element's queue. */
|
||||
$.each($.queue(element, Type.isString(options) ? options : ""), function(_, item) {
|
||||
|
@ -2221,7 +2239,7 @@ return function (global, window, document, undefined) {
|
|||
}
|
||||
|
||||
callsToStop.push(i);
|
||||
} else if (propertiesMap === "finish") {
|
||||
} else if (propertiesMap === "finish" || propertiesMap === "finishAll") {
|
||||
/* To get active tweens to finish immediately, we forcefully shorten their durations to 1ms so that
|
||||
they finish upon the next rAf tick then proceed with normal call completion logic. */
|
||||
activeCall[2].duration = 1;
|
||||
|
@ -3473,7 +3491,7 @@ return function (global, window, document, undefined) {
|
|||
tween.currentValue = currentValue;
|
||||
|
||||
/* If we're tweening a fake 'tween' property in order to log transition values, update the one-per-call variable so that
|
||||
it can be passed into the progress callback. */
|
||||
it can be passed into the progress callback. */
|
||||
if (property === "tween") {
|
||||
tweenDummyValue = currentValue;
|
||||
} else {
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue