diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json
index f71a2109e..308b8000d 100644
--- a/dashboard-ui/bower_components/emby-apiclient/.bower.json
+++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json
@@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
- "version": "1.0.31",
- "_release": "1.0.31",
+ "version": "1.0.33",
+ "_release": "1.0.33",
"_resolution": {
"type": "version",
- "tag": "1.0.31",
- "commit": "8d350054f19ad1d9cdfc1258baf0f907bcdfb1ae"
+ "tag": "1.0.33",
+ "commit": "18b04408e1d07fa162db92fa30eec77adfeb0e44"
},
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3",
diff --git a/dashboard-ui/bower_components/emby-apiclient/apiclient.js b/dashboard-ui/bower_components/emby-apiclient/apiclient.js
index 40afd45ec..690e24621 100644
--- a/dashboard-ui/bower_components/emby-apiclient/apiclient.js
+++ b/dashboard-ui/bower_components/emby-apiclient/apiclient.js
@@ -275,6 +275,8 @@
if (request.dataType == 'json' || request.headers.accept == 'application/json') {
return response.json();
+ } else if (request.dataType == 'text' || (response.headers.get('Content-Type') || '').toLowerCase().indexOf('text/') == 0) {
+ return response.text();
} else {
return response;
}
@@ -398,6 +400,8 @@
if (request.dataType == 'json' || request.headers.accept == 'application/json') {
return response.json();
+ } else if (request.dataType == 'text' || (response.headers.get('Content-Type') || '').toLowerCase().indexOf('text/') == 0) {
+ return response.text();
} else {
return response;
}
@@ -1300,6 +1304,9 @@
if (!path) {
throw new Error("null path");
}
+ if (typeof (path) !== 'string') {
+ throw new Error('invalid path');
+ }
options = options || {};
@@ -1343,7 +1350,8 @@
return self.ajax({
type: "GET",
- url: url
+ url: url,
+ dataType: 'text'
});
};
diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 2fa5e27ff..d469c6190 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
- "version": "1.0.29",
- "_release": "1.0.29",
+ "version": "1.0.31",
+ "_release": "1.0.31",
"_resolution": {
"type": "version",
- "tag": "1.0.29",
- "commit": "2e60e59d116fee68281235ba19f1e74073565c50"
+ "tag": "1.0.31",
+ "commit": "ca58e91f3f9285e81214f6e8cc6f1f04e9c505ed"
},
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/fetchhelper.js b/dashboard-ui/bower_components/emby-webcomponents/fetchhelper.js
index 79b0eb05b..b777f3a91 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/fetchhelper.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/fetchhelper.js
@@ -109,6 +109,8 @@
if (request.dataType == 'json' || request.headers.accept == 'application/json') {
return response.json();
+ } else if (request.dataType == 'text' || (response.headers.get('Content-Type') || '').toLowerCase().indexOf('text/') == 0) {
+ return response.text();
} else {
return response;
}
diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json
index 17f68b335..db08f2170 100644
--- a/dashboard-ui/bower_components/iron-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json
@@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"ignore": [],
- "homepage": "https://github.com/polymerelements/iron-behaviors",
+ "homepage": "https://github.com/PolymerElements/iron-behaviors",
"_release": "1.0.12",
"_resolution": {
"type": "version",
"tag": "v1.0.12",
"commit": "657f526a2382a659cdf4e13be87ecc89261588a3"
},
- "_source": "git://github.com/polymerelements/iron-behaviors.git",
+ "_source": "git://github.com/PolymerElements/iron-behaviors.git",
"_target": "^1.0.0",
- "_originalSource": "polymerelements/iron-behaviors"
+ "_originalSource": "PolymerElements/iron-behaviors"
}
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json
index b15293512..01365c0ce 100644
--- a/dashboard-ui/bower_components/polymer/.bower.json
+++ b/dashboard-ui/bower_components/polymer/.bower.json
@@ -26,14 +26,14 @@
"web-component-tester": "*"
},
"private": true,
- "homepage": "https://github.com/polymer/polymer",
+ "homepage": "https://github.com/Polymer/polymer",
"_release": "1.2.4",
"_resolution": {
"type": "version",
"tag": "v1.2.4",
"commit": "284332a905ddd60eab11901a82ac037976175cf8"
},
- "_source": "git://github.com/polymer/polymer.git",
+ "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0",
- "_originalSource": "polymer/polymer"
+ "_originalSource": "Polymer/polymer"
}
\ No newline at end of file
diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js
index d4f88f446..cee3c1dae 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.js
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.js
@@ -25,6 +25,9 @@
function refreshDirectoryBrowser(page, path, fileOptions) {
+ if (path && typeof(path) !== 'string') {
+ throw new Error('invalid path');
+ }
Dashboard.showLoadingMsg();
if (path) {
@@ -33,27 +36,20 @@
$('.networkHeadline').show();
}
- var promise;
-
- var parentPathPromise = null;
+ var promises = [];
if (path === "Network") {
- promise = ApiClient.getNetworkDevices();
+ promises.push(ApiClient.getNetworkDevices());
}
else if (path) {
- promise = ApiClient.getDirectoryContents(path, fileOptions);
- parentPathPromise = ApiClient.getParentPath(path);
+
+ promises.push(ApiClient.getDirectoryContents(path, fileOptions));
+ promises.push(ApiClient.getParentPath(path));
} else {
- promise = ApiClient.getDrives();
+ promises.push(ApiClient.getDrives());
}
- if (!parentPathPromise) {
- parentPathPromise = new Promise(function (resolve, reject) {
- resolve();
- });
- }
-
- Promise.all([promise, parentPathPromise]).then(function (responses) {
+ Promise.all(promises).then(function (responses) {
var folders = responses[0];
var parentPath = responses[1] || '';
@@ -167,8 +163,6 @@
} else {
refreshDirectoryBrowser(content, path, fileOptions);
}
-
-
}).on("click", ".btnRefreshDirectories", function () {
var path = $('#txtDirectoryPickerPath', content).val();
diff --git a/dashboard-ui/components/testermessage.js b/dashboard-ui/components/testermessage.js
deleted file mode 100644
index 0fda714b2..000000000
--- a/dashboard-ui/components/testermessage.js
+++ /dev/null
@@ -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 += "
";
- msg += 'Visit Emby community';
-
- Dashboard.alert({
- message: msg,
- title: 'Hello Emby Beta Tester!',
- callback: function () {
- appStorage.setItem(settingsKey, expectedValue);
- }
- });
-
- }
-
- pageClassOn('pageshow', "homePage", onPageShow);
-
-})();
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 5521b7e1a..c38397221 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2285,8 +2285,6 @@ var AppInfo = {};
}
}
- //postInitDependencies.push('components/testermessage');
-
} else if (browserInfo.chrome) {
postInitDependencies.push('scripts/chromecast');
}