milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #871 from grafixeyehero/page.js

Browse source 
Move page.js to node
This commit is contained in:
dkanada 2020-03-09 12:55:04 +09:00 • committed by GitHub
commit ee69bb6807
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 1083 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -35,6 +35,7 @@
"libjass": "^0.11.0", "libjass": "^0.11.0",
"material-design-icons-iconfont": "^5.0.1", "material-design-icons-iconfont": "^5.0.1",
"native-promise-only": "^0.8.0-a", "native-promise-only": "^0.8.0-a",
"page": "^1.11.5",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"shaka-player": "^2.5.9", "shaka-player": "^2.5.9",
"sortablejs": "^1.10.2", "sortablejs": "^1.10.2",

6
src/bundle.js
View file

@ -101,3 +101,9 @@ var jellyfin_noto = require("jellyfin-noto");
_define("jellyfin-noto", function () { _define("jellyfin-noto", function () {
return jellyfin_noto; return jellyfin_noto;
}); });
// page.js
var page = require("page");
_define("page", function() {
return page;
});

12
src/components/appRouter.js
View file

@ -370,7 +370,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
} }
function enableNativeHistory() { function enableNativeHistory() {
return page.enableNativeHistory(); return false;
} }
function authenticate(ctx, route, callback) { function authenticate(ctx, route, callback) {
@ -562,7 +562,10 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
if (!document.querySelector('.dialogContainer') && startPages.indexOf(curr.type) !== -1) { if (!document.querySelector('.dialogContainer') && startPages.indexOf(curr.type) !== -1) {
return false; return false;
} }
return page.canGoBack(); if (enableHistory()) {
return history.length > 1;
}
return (page.len || 0) > 0;
} }
function showDirect(path) { function showDirect(path) {
@ -666,7 +669,8 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
function pushState(state, title, url) { function pushState(state, title, url) {
state.navigate = false; state.navigate = false;
page.pushState(state, title, url); history.pushState(state, title, url);
} }
function setBaseRoute() { function setBaseRoute() {
@ -716,7 +720,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
appRouter.getRoutes = getRoutes; appRouter.getRoutes = getRoutes;
appRouter.pushState = pushState; appRouter.pushState = pushState;
appRouter.enableNativeHistory = enableNativeHistory; appRouter.enableNativeHistory = enableNativeHistory;
appRouter.handleAnchorClick = page.handleAnchorClick; appRouter.handleAnchorClick = page.clickHandler;
appRouter.TransparencyLevel = { appRouter.TransparencyLevel = {
None: 0, None: 0,
Backdrop: 1, Backdrop: 1,

1077
src/libraries/pagejs/page.js
View file

File diff suppressed because it is too large Load diff

4
src/scripts/site.js
View file

@ -737,7 +737,8 @@ var AppInfo = {};
"libjass", "libjass",
"webcomponents", "webcomponents",
"material-icons", "material-icons",
"jellyfin-noto" "jellyfin-noto",
"page"
] ]
}, },
urlArgs: urlArgs, urlArgs: urlArgs,
@ -791,7 +792,6 @@ var AppInfo = {};
// TODO remove these libraries // TODO remove these libraries
// all of these have been modified so we need to fix that first // all of these have been modified so we need to fix that first
define("page", [bowerPath + "/pagejs/page"], returnFirstDependency);
define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency); define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
define("scroller", [componentsPath + "/scroller"], returnFirstDependency); define("scroller", [componentsPath + "/scroller"], returnFirstDependency);
define("navdrawer", [componentsPath + "/navdrawer/navdrawer"], returnFirstDependency); define("navdrawer", [componentsPath + "/navdrawer/navdrawer"], returnFirstDependency);