+
+ +
diff --git a/ionic/config/config.ts b/ionic/config/config.ts index 15677f89ff..7d1cb7ab94 100644 --- a/ionic/config/config.ts +++ b/ionic/config/config.ts @@ -117,88 +117,16 @@ export class Config { this._s = config && isObject(config) && !isArray(config) ? config : {}; } - /** - * For setting and getting multiple config values - */ -/** - * @private - * @name settings() - * @description - */ - settings() { - const args = arguments; - - switch (args.length) { - - case 0: - return this._s; - - case 1: - // settings({...}) - this._s = args[0]; - this._c = {}; // clear cache - break; - - case 2: - // settings('ios', {...}) - this._s.platforms = this._s.platforms || {}; - this._s.platforms[args[0]] = args[1]; - this._c = {}; // clear cache - break; - } - - return this; - } - - -/** - * @name set - * @description - * Sets a single config value. - * - * @param {string} [platform] - The platform (either 'ios' or 'android') that the config value should apply to. Leaving this blank will apply the config value to all platforms. - * @param {string} [key] - The key used to look up the value at a later point in time. - * @param {string} [value] - The config value being stored. - */ - set() { - const args = arguments; - const arg0 = args[0]; - const arg1 = args[1]; - - switch (args.length) { - case 2: - // set('key', 'value') = set key/value pair - // arg1 = value - this._s[arg0] = arg1; - delete this._c[arg0]; // clear cache - break; - - case 3: - // setting('ios', 'key', 'value') = set key/value pair for platform - // arg0 = platform - // arg1 = key - // arg2 = value - this._s.platforms = this._s.platforms || {}; - this._s.platforms[arg0] = this._s.platforms[arg0] || {}; - this._s.platforms[arg0][arg1] = args[2]; - delete this._c[arg1]; // clear cache - break; - - } - - return this; - } - - -/** - * @name get - * @description - * Returns a single config value, given a key. - * - * @param {string} [key] - the key for the config value - */ - get(key: string): any { + /** + * @name get + * @description + * Returns a single config value, given a key. + * + * @param {string} [key] - the key for the config value + * @param {any} [fallbackValue] - a fallback value to use when the config value was not found, or is config value is `null`. Fallback value defaults to `null`. + */ + get(key: string, fallbackValue: any = null): any { if (!isDefined(this._c[key])) { if (!isDefined(key)) { @@ -289,13 +217,18 @@ export class Config { // or it was from the users platform configs // or it was from the default platform configs // in that order + let rtnVal; if (isFunction(this._c[key])) { - return this._c[key](this.platform); + rtnVal = this._c[key](this.platform); + + } else { + rtnVal = this._c[key]; } - return this._c[key]; + return (rtnVal !== null ? rtnVal : fallbackValue); } + /** * @name getBoolean * @description @@ -308,6 +241,75 @@ export class Config { return (val || val === 'true') ? true : false; } + + /** + * @name set + * @description + * Sets a single config value. + * + * @param {string} [platform] - The platform (either 'ios' or 'android') that the config value should apply to. Leaving this blank will apply the config value to all platforms. + * @param {string} [key] - The key used to look up the value at a later point in time. + * @param {string} [value] - The config value being stored. + */ + set() { + const args = arguments; + const arg0 = args[0]; + const arg1 = args[1]; + + switch (args.length) { + case 2: + // set('key', 'value') = set key/value pair + // arg1 = value + this._s[arg0] = arg1; + delete this._c[arg0]; // clear cache + break; + + case 3: + // setting('ios', 'key', 'value') = set key/value pair for platform + // arg0 = platform + // arg1 = key + // arg2 = value + this._s.platforms = this._s.platforms || {}; + this._s.platforms[arg0] = this._s.platforms[arg0] || {}; + this._s.platforms[arg0][arg1] = args[2]; + delete this._c[arg1]; // clear cache + break; + + } + + return this; + } + + /** + * @private + * @name settings() + * @description + */ + settings() { + const args = arguments; + + switch (args.length) { + + case 0: + return this._s; + + case 1: + // settings({...}) + this._s = args[0]; + this._c = {}; // clear cache + break; + + case 2: + // settings('ios', {...}) + this._s.platforms = this._s.platforms || {}; + this._s.platforms[args[0]] = args[1]; + this._c = {}; // clear cache + break; + } + + return this; + } + /** * @private */ diff --git a/ionic/config/test/config.spec.ts b/ionic/config/test/config.spec.ts index 1f6acda7ae..b6178273f7 100644 --- a/ionic/config/test/config.spec.ts +++ b/ionic/config/test/config.spec.ts @@ -436,6 +436,14 @@ export function run() { expect(config.get('occupation')).toEqual('Weather Man'); }); + it('should get a fallback value', () => { + let config = new Config({ + name: 'Doc Brown' + }); + expect(config.get('name', 'Marty')).toEqual('Doc Brown'); + expect(config.get('occupation', 'Weather Man')).toEqual('Weather Man'); + }); + it('should get settings object', () => { let config = new Config({ name: 'Doc Brown', diff --git a/ionic/platform/registry.ts b/ionic/platform/registry.ts index 27f3d7c8c8..e776fa6cc1 100644 --- a/ionic/platform/registry.ts +++ b/ionic/platform/registry.ts @@ -70,6 +70,7 @@ Platform.register({ // fallback to always use ripple return 'ripple'; }, + autoFocusAssist: 'immediate', hoverCSS: false, keyboardHeight: 300, mode: 'md', @@ -93,6 +94,7 @@ Platform.register({ 'iphone' ], settings: { + autoFocusAssist: 'delay', clickBlock: true, hoverCSS: false, keyboardHeight: 300, diff --git a/ionic/util/dom.ts b/ionic/util/dom.ts index 5a625284fb..bc080d4693 100644 --- a/ionic/util/dom.ts +++ b/ionic/util/dom.ts @@ -199,13 +199,13 @@ export function hasFocusedTextInput() { return false; } -const skipInputAttrsReg = /^(value|checked|disabled|type|class|style|id)$/i +const skipInputAttrsReg = /^(value|checked|disabled|type|class|style|id|autofocus|autocomplete|autocorrect)$/i export function copyInputAttributes(srcElement, destElement) { // copy attributes from one element to another // however, skip over a few of them as they're already // handled in the angular world - let attrs = srcElement.attributes; - for (let i = 0; i < attrs.length; i++) { + var attrs = srcElement.attributes; + for (var i = 0; i < attrs.length; i++) { var attr = attrs[i]; if (!skipInputAttrsReg.test(attr.name)) { destElement.setAttribute(attr.name, attr.value); diff --git a/ionic/util/test/util.spec.ts b/ionic/util/test/util.spec.ts index 16fc339a16..fe314e63cc 100644 --- a/ionic/util/test/util.spec.ts +++ b/ionic/util/test/util.spec.ts @@ -15,6 +15,10 @@ export function run() { expect(util.isTrueProperty(' true ')).toBe(true); }); + it('should be true from string "on"', () => { + expect(util.isTrueProperty(true)).toBe(true); + }); + it('should be true from empty string ""', () => { expect(util.isTrueProperty('')).toBe(true); expect(util.isTrueProperty(' ')).toBe(true); @@ -29,6 +33,10 @@ export function run() { expect(util.isTrueProperty(false)).toBe(false); }); + it('should be false from string "off"', () => { + expect(util.isTrueProperty(true)).toBe(true); + }); + it('should be false from null', () => { expect(util.isTrueProperty(null)).toBe(false); }); diff --git a/ionic/util/util.ts b/ionic/util/util.ts index d3b5f79424..381608894f 100644 --- a/ionic/util/util.ts +++ b/ionic/util/util.ts @@ -113,7 +113,7 @@ export const isArray = Array.isArray; export const isTrueProperty = function(val: any): boolean { if (typeof val === 'string') { val = val.toLowerCase().trim(); - return (val === 'true' || val === ''); + return (val === 'true' || val === 'on' || val === ''); } return !!val; };