diff --git a/dashboard-ui/bower_components/doc-ready/.bower.json b/dashboard-ui/bower_components/doc-ready/.bower.json index adda4287b4..d4d75eca65 100644 --- a/dashboard-ui/bower_components/doc-ready/.bower.json +++ b/dashboard-ui/bower_components/doc-ready/.bower.json @@ -39,6 +39,6 @@ "commit": "cec8e49744a1e18b14a711eea77e201bb70de544" }, "_source": "git://github.com/desandro/doc-ready.git", - "_target": "1.0.x", + "_target": "~1.0.4", "_originalSource": "doc-ready" } \ No newline at end of file diff --git a/dashboard-ui/components/subtitleeditor/subtitleeditor.js b/dashboard-ui/components/subtitleeditor/subtitleeditor.js index 1ae2c353b8..86ef351e9f 100644 --- a/dashboard-ui/components/subtitleeditor/subtitleeditor.js +++ b/dashboard-ui/components/subtitleeditor/subtitleeditor.js @@ -11,7 +11,12 @@ var url = 'Videos/' + currentItem.Id + '/Subtitles/' + index; - $.get(ApiClient.getUrl(url)).done(function (result) { + ApiClient.ajax({ + + type: 'GET', + url: url + + }).then(function (result) { $('.subtitleContent', page).html(result); diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 7aa6067261..bb32dcce85 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1246,7 +1246,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .itemsContainerWithAlphaPicker { - margin-right: 15px; + margin-right: 20px; } } diff --git a/dashboard-ui/scripts/globalize.js b/dashboard-ui/scripts/globalize.js index b929614d30..2b2ebe9bc8 100644 --- a/dashboard-ui/scripts/globalize.js +++ b/dashboard-ui/scripts/globalize.js @@ -29,34 +29,32 @@ var url = getUrl(name, culture); var requestUrl = url + "?v=" + window.dashboardVersion; - fetch(requestUrl, { mode: 'no-cors' }).then(function (response) { + var xhr = new XMLHttpRequest(); + xhr.open('GET', requestUrl, true); - if (response.status < 400) { + xhr.onload = function (e) { - return response.json(); + if (this.status < 400) { + + dictionaries[url] = JSON.parse(this.response); + resolve(); } else { // Grab the english version - fetch(getUrl(name, 'en-US'), { mode: 'no-cors' }).then(function (response) { + var xhr2 = new XMLHttpRequest(); + xhr2.open('GET', getUrl(name, 'en-US'), true); - return response.json(); - - }).then(function (json) { - - dictionaries[url] = json; + xhr2.onload = function (e) { + dictionaries[url] = JSON.parse(this.response); resolve(); - }); + }; + + xhr2.send(); } + }; - }).then(function (json) { - - if (json) { - dictionaries[url] = json; - resolve(); - } - }); - + xhr.send(); }); } diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js index 725b9ae238..be1a532798 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js @@ -3123,13 +3123,14 @@ // success: successFn, // error: this._loadError(absUrl, triggerData, settings, deferred) //}); - fetch(fileUrl, { - mode: 'no-cors' + var xhr = new XMLHttpRequest(); + xhr.open('GET', fileUrl, true); - }).then(function (response) { + xhr.onload = function(e) { + successFn(this.response); + }; - return response.text(); - }).then(successFn); + xhr.send(); return deferred.promise(); },