javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 11:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

config can be value or function

Browse Source
This commit is contained in:
Adam Bradley
2015-06-26 22:00:37 -05:00
parent 8503e52c56
commit 94cf53cd3d
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ionic/config/config.js
View File

@ -1,4 +1,4 @@
import {isString, isObject, isDefined, extend} from '../util/util'; import {isString, isObject, isDefined, isFunction, extend} from '../util/util';
export class IonicConfig { export class IonicConfig {
@ -67,6 +67,9 @@ export class IonicConfig {
// or it was from the users platform configs // or it was from the users platform configs
// or it was from the default platform configs // or it was from the default platform configs
// in that order // in that order
if (isFunction(s[arg0])) {
return s[arg0]();
}
return s[arg0]; return s[arg0];

2
ionic/platform/registry.js
View File

@ -74,7 +74,7 @@ Platform.register({
}, },
isMatch(p) { isMatch(p) {
// SLEDGEHAMMER OVERRIDE FOR NOW // SLEDGEHAMMER OVERRIDE FOR NOW
//return true; return true;
return p.isPlatform('ios', 'iphone|ipad|ipod'); return p.isPlatform('ios', 'iphone|ipad|ipod');
}, },

1
ionic/util/tap.js
View File

@ -103,6 +103,7 @@ var tapEventListeners = {
Platform.ready().then(config => { Platform.ready().then(config => {
if (config.setting('tapPolyfill')) { if (config.setting('tapPolyfill')) {
console.log('Tap.register, tapPolyfill')
Tap.register(document); Tap.register(document);
} }