mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
bundle jquery and enable animations for metadata page
This commit is contained in:
parent
26644c06c4
commit
0aca394e1e
6 changed files with 8 additions and 2635 deletions
|
@ -15,9 +15,10 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jstree": "^3.3.7",
|
"jstree": "^3.3.7",
|
||||||
|
"jquery": "^3.4.1",
|
||||||
"hls.js": "^0.12.4",
|
"hls.js": "^0.12.4",
|
||||||
"howler": "^2.1.2",
|
"howler": "^2.1.2",
|
||||||
"libjass": "0.11.0"
|
"libjass": "^0.11.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "webpack --mode development",
|
"dev": "webpack --mode development",
|
||||||
|
|
2607
src/bower_components/jquery/dist/jquery.slim.min.js
vendored
2607
src/bower_components/jquery/dist/jquery.slim.min.js
vendored
File diff suppressed because it is too large
Load diff
|
@ -7,7 +7,11 @@ var _define = window.define;
|
||||||
// jstree
|
// jstree
|
||||||
var jstree = require("jstree");
|
var jstree = require("jstree");
|
||||||
require("jstree/dist/themes/default/style.css");
|
require("jstree/dist/themes/default/style.css");
|
||||||
_define("jstree", ["jQuery"], function() { return jstree; });
|
_define("jstree", function() { return jstree; });
|
||||||
|
|
||||||
|
// jquery
|
||||||
|
var jquery = require("jquery");
|
||||||
|
_define("jQuery", function() { return jquery; });
|
||||||
|
|
||||||
// hlsjs
|
// hlsjs
|
||||||
var hlsjs = require("hls.js");
|
var hlsjs = require("hls.js");
|
||||||
|
|
|
@ -241,8 +241,6 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
|
||||||
$(".libraryTree", page).jstree({
|
$(".libraryTree", page).jstree({
|
||||||
"plugins": ["wholerow"],
|
"plugins": ["wholerow"],
|
||||||
core: {
|
core: {
|
||||||
// Disable animations because jQuery slim does not support them
|
|
||||||
animation: false,
|
|
||||||
check_callback: true,
|
check_callback: true,
|
||||||
data: function (node, callback) {
|
data: function (node, callback) {
|
||||||
loadNode(page, this, node, openItems, selectedId, currentUser, callback);
|
loadNode(page, this, node, openItems, selectedId, currentUser, callback);
|
||||||
|
|
|
@ -227,12 +227,6 @@ var AppInfo = {};
|
||||||
!function () {
|
!function () {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
function onApiClientCreated(e, newApiClient) {
|
|
||||||
if (window.$) {
|
|
||||||
$.ajax = newApiClient.ajax;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function defineConnectionManager(connectionManager) {
|
function defineConnectionManager(connectionManager) {
|
||||||
window.ConnectionManager = connectionManager;
|
window.ConnectionManager = connectionManager;
|
||||||
define("connectionManager", [], function () {
|
define("connectionManager", [], function () {
|
||||||
|
@ -242,7 +236,6 @@ var AppInfo = {};
|
||||||
|
|
||||||
function bindConnectionManagerEvents(connectionManager, events, userSettings) {
|
function bindConnectionManagerEvents(connectionManager, events, userSettings) {
|
||||||
window.Events = events;
|
window.Events = events;
|
||||||
events.on(ConnectionManager, "apiclientcreated", onApiClientCreated);
|
|
||||||
|
|
||||||
connectionManager.currentApiClient = function () {
|
connectionManager.currentApiClient = function () {
|
||||||
if (!localApiClient) {
|
if (!localApiClient) {
|
||||||
|
@ -805,7 +798,7 @@ var AppInfo = {};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
bundles: {
|
bundles: {
|
||||||
bundle: ["jstree", "hlsjs", "howler", "libjass"]
|
bundle: ["jstree", "jQuery", "hlsjs", "howler", "libjass"]
|
||||||
},
|
},
|
||||||
urlArgs: urlArgs,
|
urlArgs: urlArgs,
|
||||||
paths: paths,
|
paths: paths,
|
||||||
|
@ -854,13 +847,6 @@ var AppInfo = {};
|
||||||
define("queryString", [bowerPath + "/query-string/index"], function () {
|
define("queryString", [bowerPath + "/query-string/index"], function () {
|
||||||
return queryString;
|
return queryString;
|
||||||
});
|
});
|
||||||
define("jQuery", [bowerPath + "/jquery/dist/jquery.slim.min"], function () {
|
|
||||||
if (window.ApiClient) {
|
|
||||||
jQuery.ajax = ApiClient.ajax;
|
|
||||||
}
|
|
||||||
|
|
||||||
return jQuery;
|
|
||||||
});
|
|
||||||
define("fnchecked", ["legacy/fnchecked"], returnFirstDependency);
|
define("fnchecked", ["legacy/fnchecked"], returnFirstDependency);
|
||||||
define("dialogHelper", [componentsPath + "/dialogHelper/dialogHelper"], returnFirstDependency);
|
define("dialogHelper", [componentsPath + "/dialogHelper/dialogHelper"], returnFirstDependency);
|
||||||
define("inputmanager", ["inputManager"], returnFirstDependency);
|
define("inputmanager", ["inputManager"], returnFirstDependency);
|
||||||
|
|
|
@ -9,19 +9,11 @@ module.exports = {
|
||||||
path: path.resolve(__dirname, 'dist'),
|
path: path.resolve(__dirname, 'dist'),
|
||||||
libraryTarget: 'amd-require'
|
libraryTarget: 'amd-require'
|
||||||
},
|
},
|
||||||
|
|
||||||
externals: [{
|
|
||||||
jquery: {
|
|
||||||
amd: "jQuery"
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
|
|
||||||
resolve: {
|
resolve: {
|
||||||
modules: [
|
modules: [
|
||||||
path.resolve(__dirname, 'node_modules')
|
path.resolve(__dirname, 'node_modules')
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
|
@ -34,7 +26,6 @@ module.exports = {
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
plugins: [
|
plugins: [
|
||||||
new CopyPlugin([{
|
new CopyPlugin([{
|
||||||
from: '**/*',
|
from: '**/*',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue