dave/cordova-plugin-run-in-background
1
0
Fork 0
forked from Github/cordova-plugin-run-in-background
Code Issues Pull Requests Projects Releases Wiki Activity

Previously configured settings got overwritten by defaults [Fixes #179]

Browse Source
This commit is contained in:
Sebastián Katzer 2017-02-10 16:33:38 +01:00
parent 0f94708c7a
commit 5fdfb9885c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
www/background-mode.js
View File

@ -88,6 +88,15 @@ exports.getDefaults = function () {
return this._defaults; return this._defaults;
}; };
/**
* The actual applied settings.
*
* @return [ Object ]
*/
exports.getSettings = function () {
return this._settings || {};
};
/** /**
* Overwrite the default settings. * Overwrite the default settings.
* *
@ -118,10 +127,15 @@ exports.setDefaults = function (overrides) {
* @return [ Void ] * @return [ Void ]
*/ */
exports.configure = function (options) { exports.configure = function (options) {
var settings = this.mergeWithDefaults(options); var settings = this.getSettings(),
defaults = this.getDefaults();
this.mergeObjects(options, settings);
this.mergeObjects(options, defaults);
this._settings = options;
if (this._isAndroid) { if (this._isAndroid) {
cordova.exec(null, null, 'BackgroundMode', 'configure', [settings, true]); cordova.exec(null, null, 'BackgroundMode', 'configure', [options, true]);
} }
}; };
@ -348,15 +362,14 @@ exports.onfailure = function () {};
* Merge settings with default values. * Merge settings with default values.
* *
* @param [ Object ] options The custom options. * @param [ Object ] options The custom options.
* @param [ Object ] toMergeIn The options to merge in.
* *
* @return [ Object ] Default values merged with custom values. * @return [ Object ] Default values merged with custom values.
*/ */
exports.mergeWithDefaults = function (options) { exports.mergeObjects = function (options, toMergeIn) {
var defaults = this.getDefaults(); for (var key in toMergeIn) {
for (var key in defaults) {
if (!options.hasOwnProperty(key)) { if (!options.hasOwnProperty(key)) {
options[key] = defaults[key]; options[key] = toMergeIn[key];
continue; continue;
} }
} }