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

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/playbackconfiguration.js
View file

@ -14,13 +14,13 @@
var form = this;
ApiClient.getServerConfiguration().done(function (config) {
ApiClient.getServerConfiguration().then(function (config) {
config.MinResumePct = $('#txtMinResumePct', form).val();
config.MaxResumePct = $('#txtMaxResumePct', form).val();
config.MinResumeDurationSeconds = $('#txtMinResumeDuration', form).val();
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
});
// Disable default form submission
@ -37,7 +37,7 @@
var page = this;
ApiClient.getServerConfiguration().done(function (config) {
ApiClient.getServerConfiguration().then(function (config) {
loadPage(page, config);