diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index 17f68b3351..db08f2170c 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/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index e1304d174b..f4bfef4a7c 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-material/.bower.json b/dashboard-ui/bower_components/paper-material/.bower.json index b602394732..af7e846750 100644 --- a/dashboard-ui/bower_components/paper-material/.bower.json +++ b/dashboard-ui/bower_components/paper-material/.bower.json @@ -37,7 +37,7 @@ "tag": "v1.0.4", "commit": "05f3800d37f8c5cad63ac2cf279f01bffb7d4fe8" }, - "_source": "git://github.com/PolymerElements/paper-material.git", + "_source": "git://github.com/polymerelements/paper-material.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-material" + "_originalSource": "polymerelements/paper-material" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 157225ee71..2f654d71c6 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -32,14 +32,14 @@ "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/paper-ripple", + "homepage": "https://github.com/polymerelements/paper-ripple", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" }, - "_source": "git://github.com/PolymerElements/paper-ripple.git", + "_source": "git://github.com/polymerelements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-ripple" + "_originalSource": "polymerelements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js index 1bb2dbdcc6..eed304ca85 100644 --- a/dashboard-ui/scripts/device.js +++ b/dashboard-ui/scripts/device.js @@ -44,8 +44,7 @@ CameraUploadPath: $('#txtUploadPath', page).val() }), - contentType: "application/json", - dataType: 'json' + contentType: "application/json" }).then(Dashboard.processServerConfigurationUpdateResult); } diff --git a/dashboard-ui/scripts/globalize.js b/dashboard-ui/scripts/globalize.js index 8663d0d310..a6c080b482 100644 --- a/dashboard-ui/scripts/globalize.js +++ b/dashboard-ui/scripts/globalize.js @@ -35,6 +35,22 @@ var xhr = new XMLHttpRequest(); xhr.open('GET', requestUrl, true); + var onError = function () { + + Logger.log('Dictionary not found. Reverting to english'); + + // Grab the english version + var xhr2 = new XMLHttpRequest(); + xhr2.open('GET', getUrl(name, 'en-US'), true); + + xhr2.onload = function (e) { + dictionaries[url] = JSON.parse(this.response); + resolve(); + }; + + xhr2.send(); + }; + xhr.onload = function (e) { Logger.log('Globalize response status: ' + this.status); @@ -45,20 +61,12 @@ resolve(); } else { - - // Grab the english version - var xhr2 = new XMLHttpRequest(); - xhr2.open('GET', getUrl(name, 'en-US'), true); - - xhr2.onload = function (e) { - dictionaries[url] = JSON.parse(this.response); - resolve(); - }; - - xhr2.send(); + onError(); } }; + xhr.onerror = onError; + xhr.send(); }); } @@ -67,7 +75,6 @@ function setCulture(value) { Logger.log('Setting culture to ' + value); - currentCulture = value; return Promise.all([loadDictionary('html', value), loadDictionary('javascript', value)]); @@ -115,14 +122,11 @@ Logger.log('Entering Globalize.ensure'); - return new Promise(function (resolve, reject) { + return getDeviceCulture().then(function (culture) { - getDeviceCulture().then(function (culture) { + culture = normalizeLocaleName(culture || 'en-US'); - culture = normalizeLocaleName(culture || 'en-US'); - - setCulture(culture).then(resolve); - }); + return setCulture(culture); }); } diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index 0203ff4830..64b9bb0296 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -76,8 +76,12 @@ function renderForm(options) { - require(['paper-checkbox', 'paper-input'], function () { - renderFormInternal(options); + return new Promise(function (resolve, reject) { + + require(['paper-checkbox', 'paper-input'], function () { + renderFormInternal(options); + resolve(); + }); }); } diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js index f1c0868169..213f60a5e5 100644 --- a/dashboard-ui/scripts/syncjob.js +++ b/dashboard-ui/scripts/syncjob.js @@ -23,8 +23,9 @@ dialogOptionsFn: getTargetDialogOptionsFn(dialogOptions), showName: true, readOnlySyncTarget: true + }).then(function () { + fillJobValues(page, job, dialogOptions); }); - fillJobValues(page, job, dialogOptions); } function getTargetDialogOptionsFn(dialogOptions) { @@ -267,7 +268,11 @@ function fillJobValues(page, job, editOptions) { - $('#txtSyncJobName', page).val(job.Name); + var txtSyncJobName = page.querySelector('#txtSyncJobName'); + if (txtSyncJobName) { + txtSyncJobName.value = job.Name; + } + $('#selectProfile', page).val(job.Profile || '').trigger('change'); $('#selectQuality', page).val(job.Quality || '').trigger('change'); $('#chkUnwatchedOnly', page).checked(job.UnwatchedOnly);