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

fix directory browser parent path

This commit is contained in:
Luke Pulverenti 2016-01-29 23:55:05 -05:00
parent 0c696294ae
commit e4fcafe7aa
9 changed files with 35 additions and 68 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.31", "version": "1.0.33",
"_release": "1.0.31", "_release": "1.0.33",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.31", "tag": "1.0.33",
"commit": "8d350054f19ad1d9cdfc1258baf0f907bcdfb1ae" "commit": "18b04408e1d07fa162db92fa30eec77adfeb0e44"
}, },
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3", "_target": "~1.0.3",

View file

@ -275,6 +275,8 @@
if (request.dataType == 'json' || request.headers.accept == 'application/json') { if (request.dataType == 'json' || request.headers.accept == 'application/json') {
return response.json(); return response.json();
} else if (request.dataType == 'text' || (response.headers.get('Content-Type') || '').toLowerCase().indexOf('text/') == 0) {
return response.text();
} else { } else {
return response; return response;
} }
@ -398,6 +400,8 @@
if (request.dataType == 'json' || request.headers.accept == 'application/json') { if (request.dataType == 'json' || request.headers.accept == 'application/json') {
return response.json(); return response.json();
} else if (request.dataType == 'text' || (response.headers.get('Content-Type') || '').toLowerCase().indexOf('text/') == 0) {
return response.text();
} else { } else {
return response; return response;
} }
@ -1300,6 +1304,9 @@
if (!path) { if (!path) {
throw new Error("null path"); throw new Error("null path");
} }
if (typeof (path) !== 'string') {
throw new Error('invalid path');
}
options = options || {}; options = options || {};
@ -1343,7 +1350,8 @@
return self.ajax({ return self.ajax({
type: "GET", type: "GET",
url: url url: url,
dataType: 'text'
}); });
}; };

View file

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.29", "version": "1.0.31",
"_release": "1.0.29", "_release": "1.0.31",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.29", "tag": "1.0.31",
"commit": "2e60e59d116fee68281235ba19f1e74073565c50" "commit": "ca58e91f3f9285e81214f6e8cc6f1f04e9c505ed"
}, },
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git", "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0", "_target": "~1.0.0",

View file

@ -109,6 +109,8 @@
if (request.dataType == 'json' || request.headers.accept == 'application/json') { if (request.dataType == 'json' || request.headers.accept == 'application/json') {
return response.json(); return response.json();
} else if (request.dataType == 'text' || (response.headers.get('Content-Type') || '').toLowerCase().indexOf('text/') == 0) {
return response.text();
} else { } else {
return response; return response;
} }

View file

@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-behaviors", "homepage": "https://github.com/PolymerElements/iron-behaviors",
"_release": "1.0.12", "_release": "1.0.12",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.12", "tag": "v1.0.12",
"commit": "657f526a2382a659cdf4e13be87ecc89261588a3" "commit": "657f526a2382a659cdf4e13be87ecc89261588a3"
}, },
"_source": "git://github.com/polymerelements/iron-behaviors.git", "_source": "git://github.com/PolymerElements/iron-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-behaviors" "_originalSource": "PolymerElements/iron-behaviors"
} }

View file

@ -26,14 +26,14 @@
"web-component-tester": "*" "web-component-tester": "*"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.2.4", "_release": "1.2.4",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.2.4", "tag": "v1.2.4",
"commit": "284332a905ddd60eab11901a82ac037976175cf8" "commit": "284332a905ddd60eab11901a82ac037976175cf8"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }

View file

@ -25,6 +25,9 @@
function refreshDirectoryBrowser(page, path, fileOptions) { function refreshDirectoryBrowser(page, path, fileOptions) {
if (path && typeof(path) !== 'string') {
throw new Error('invalid path');
}
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
if (path) { if (path) {
@ -33,27 +36,20 @@
$('.networkHeadline').show(); $('.networkHeadline').show();
} }
var promise; var promises = [];
var parentPathPromise = null;
if (path === "Network") { if (path === "Network") {
promise = ApiClient.getNetworkDevices(); promises.push(ApiClient.getNetworkDevices());
} }
else if (path) { else if (path) {
promise = ApiClient.getDirectoryContents(path, fileOptions);
parentPathPromise = ApiClient.getParentPath(path); promises.push(ApiClient.getDirectoryContents(path, fileOptions));
promises.push(ApiClient.getParentPath(path));
} else { } else {
promise = ApiClient.getDrives(); promises.push(ApiClient.getDrives());
} }
if (!parentPathPromise) { Promise.all(promises).then(function (responses) {
parentPathPromise = new Promise(function (resolve, reject) {
resolve();
});
}
Promise.all([promise, parentPathPromise]).then(function (responses) {
var folders = responses[0]; var folders = responses[0];
var parentPath = responses[1] || ''; var parentPath = responses[1] || '';
@ -167,8 +163,6 @@
} else { } else {
refreshDirectoryBrowser(content, path, fileOptions); refreshDirectoryBrowser(content, path, fileOptions);
} }
}).on("click", ".btnRefreshDirectories", function () { }).on("click", ".btnRefreshDirectories", function () {
var path = $('#txtDirectoryPickerPath', content).val(); var path = $('#txtDirectoryPickerPath', content).val();

View file

@ -1,35 +0,0 @@
(function () {
function onPageShow() {
if (!browserInfo.android) {
return;
}
var msg;
var settingsKey = "betatester";
var expectedValue = new Date().toDateString() + "6";
if (appStorage.getItem(settingsKey) == expectedValue) {
return;
}
msg = 'At your convenience, please take a moment to visit the Emby Community and leave testing feedback related to this beta build. Your feedback will help us improve the release before it goes public. Thank you for being a part of the Emby beta test team.';
msg += "<br/><br/>";
msg += '<a href="http://emby.media/community/index.php?/topic/28144-android-mobile-25" target="_blank">Visit Emby community</a>';
Dashboard.alert({
message: msg,
title: 'Hello Emby Beta Tester!',
callback: function () {
appStorage.setItem(settingsKey, expectedValue);
}
});
}
pageClassOn('pageshow', "homePage", onPageShow);
})();

View file

@ -2290,8 +2290,6 @@ var AppInfo = {};
} }
} }
//postInitDependencies.push('components/testermessage');
} else if (browserInfo.chrome) { } else if (browserInfo.chrome) {
postInitDependencies.push('scripts/chromecast'); postInitDependencies.push('scripts/chromecast');
} }