chore(): rename IonicConfig to Config

This commit is contained in:
Adam Bradley
2015-10-16 11:53:11 -05:00
parent 3037c369c4
commit 4c53a4b554
38 changed files with 145 additions and 145 deletions

View File

@@ -1,5 +1,5 @@
import {App, IonicApp, IonicPlatform, ActionSheet} from 'ionic/ionic';
import {Page, IonicConfig, Events} from 'ionic/ionic';
import {Page, Config, Events} from 'ionic/ionic';
import {ActionSheetPage} from './actionSheet/actionSheet';
import * as helpers from './helpers';

View File

@@ -1,4 +1,4 @@
import {App, IonicView, IonicApp, IonicConfig, IonicPlatform} from 'ionic/ionic';
import {App, IonicView, IonicApp, Config, IonicPlatform} from 'ionic/ionic';
import {Modal, ActionSheet, NavController, NavParams, Animation} from 'ionic/ionic';
@@ -7,7 +7,7 @@ import {Modal, ActionSheet, NavController, NavParams, Animation} from 'ionic/ion
})
class MyAppCmp {
constructor(modal: Modal, app: IonicApp, config: IonicConfig, platform: IonicPlatform) {
constructor(modal: Modal, app: IonicApp, config: Config, platform: IonicPlatform) {
this.modal = modal;
console.log('platforms', platform.platforms());

View File

@@ -1,5 +1,5 @@
import {App, NavController} from 'ionic/ionic';
import {IonicView, IonicConfig, IonicApp} from 'ionic/ionic';
import {IonicView, Config, IonicApp} from 'ionic/ionic';
import {NavParams, NavController} from 'ionic/ionic';
@@ -19,7 +19,7 @@ class FirstPage {
constructor(
nav: NavController,
app: IonicApp,
config: IonicConfig
config: Config
) {
this.nav = nav;
this.title = 'First Page';

View File

@@ -9,7 +9,7 @@
import {Component, Injectable, NgFor, NgIf} from 'angular2/angular2';
import {OverlayController} from '../overlay/overlay-controller';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {Icon} from '../icon/icon';
import {Animation} from '../../animations/animation';
import * as util from 'ionic/util';
@@ -104,7 +104,7 @@ class ActionSheetCmp {
@Injectable()
export class ActionSheet {
constructor(ctrl: OverlayController, config: IonicConfig) {
constructor(ctrl: OverlayController, config: Config) {
this.ctrl = ctrl;
this._defaults = {
enterAnimation: config.get('actionSheetEnter'),

View File

@@ -1,6 +1,6 @@
import {Directive, ElementRef, Renderer, Attribute} from 'angular2/angular2';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
/**
@@ -12,7 +12,7 @@ import {IonicConfig} from '../../config/config';
export class Button {
constructor(
config: IonicConfig,
config: Config,
elementRef: ElementRef,
renderer: Renderer,
@Attribute('type') type: string

View File

@@ -1,7 +1,7 @@
import {Component, ElementRef, Optional} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {IonicKeyboard} from '../../util/keyboard';
import {ViewController} from '../nav/view-controller';
import {Animation} from '../../animations/animation';
@@ -33,9 +33,9 @@ import {ScrollTo} from '../../animations/scroll-to';
export class Content extends Ion {
/**
* @param {ElementRef} elementRef A reference to the component's DOM element.
* @param {IonicConfig} config The config object to change content's default settings.
* @param {Config} config The config object to change content's default settings.
*/
constructor(elementRef: ElementRef, config: IonicConfig, keyboard: IonicKeyboard, @Optional() viewCtrl: ViewController) {
constructor(elementRef: ElementRef, config: Config, keyboard: IonicKeyboard, @Optional() viewCtrl: ViewController) {
super(elementRef, config);
this.scrollPadding = 0;
this.keyboard = keyboard;

View File

@@ -1,6 +1,6 @@
import {Directive, ElementRef, Attribute, Renderer} from 'angular2/angular2';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
@Directive({
@@ -19,7 +19,7 @@ export class Icon {
constructor(
private elementRef: ElementRef,
config: IonicConfig,
config: Config,
private renderer: Renderer
) {
this.eleRef = elementRef;

View File

@@ -1,4 +1,4 @@
import {IonicConfig} from '../config/config';
import {Config} from '../config/config';
import {isArray} from 'ionic/util';
import * as dom from 'ionic/util/dom';
@@ -9,7 +9,7 @@ import * as dom from 'ionic/util/dom';
* sending/receiving app-level events.
*/
export class Ion {
constructor(elementRef: ElementRef, config: IonicConfig) {
constructor(elementRef: ElementRef, config: Config) {
this.elementRef = elementRef;
this.config = config;
}

View File

@@ -3,7 +3,7 @@ import {Content} from '../content/content';
import {throttle} from '../../util/util';
import {position, offset, CSS, raf} from '../../util/dom';
import {FeatureDetect} from '../../util/feature-detect';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
/**
* TODO
@@ -39,7 +39,7 @@ export class ItemGroupTitle {
* TODO
* @param {ElementRef} elementRef TODO
*/
constructor(elementRef: ElementRef, config: IonicConfig, content: Content, featureDetect: FeatureDetect) {
constructor(elementRef: ElementRef, config: Config, content: Content, featureDetect: FeatureDetect) {
this.isSticky = true;
this.content = content;
this.ele = elementRef.nativeElement;

View File

@@ -1,7 +1,7 @@
import {Directive, ElementRef, Renderer} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {ListVirtualScroll} from './virtual';
import * as util from 'ionic/util';
@@ -28,9 +28,9 @@ export class List extends Ion {
/**
* TODO
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
*/
constructor(elementRef: ElementRef, config: IonicConfig, renderer: Renderer) {
constructor(elementRef: ElementRef, config: Config, renderer: Renderer) {
super(elementRef, config);
renderer.setElementClass(elementRef, 'list', true);
this.ele = elementRef.nativeElement;

View File

@@ -2,7 +2,7 @@ import {forwardRef, Directive, Host, EventEmitter, ElementRef} from 'angular2/an
import {Ion} from '../ion';
import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {ConfigComponent} from '../../config/decorators';
import {IonicPlatform} from '../../platform/platform';
import {IonicKeyboard} from '../../util/keyboard';
@@ -67,7 +67,7 @@ export class Menu extends Ion {
constructor(
app: IonicApp,
elementRef: ElementRef,
config: IonicConfig,
config: Config,
platform: IonicPlatform,
keyboard: IonicKeyboard
) {

View File

@@ -1,7 +1,7 @@
import {Injectable} from 'angular2/angular2';
import {OverlayController} from '../overlay/overlay-controller';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {Animation} from '../../animations/animation';
import {makeComponent} from '../../config/decorators';
import * as util from 'ionic/util';
@@ -14,7 +14,7 @@ import * as util from 'ionic/util';
* ```ts
* class MyApp {
*
* constructor(modal: Modal, app: IonicApp, ionicConfig: IonicConfig) {
* constructor(modal: Modal, app: IonicApp, Config: Config) {
* this.modal = modal;
* }
*
@@ -31,7 +31,7 @@ import * as util from 'ionic/util';
@Injectable()
export class Modal {
constructor(ctrl: OverlayController, config: IonicConfig) {
constructor(ctrl: OverlayController, config: Config) {
this.ctrl = ctrl;
this._defaults = {
enterAnimation: config.get('modalEnter') || 'modal-slide-in',

View File

@@ -1,4 +1,4 @@
import {App, Page, IonicApp, IonicConfig, IonicPlatform} from 'ionic/ionic';
import {App, Page, IonicApp, Config, IonicPlatform} from 'ionic/ionic';
import {Modal, ActionSheet, NavController, NavParams, Animation} from 'ionic/ionic';
@@ -7,7 +7,7 @@ import {Modal, ActionSheet, NavController, NavParams, Animation} from 'ionic/ion
})
class MyAppCmp {
constructor(modal: Modal, app: IonicApp, config: IonicConfig, platform: IonicPlatform) {
constructor(modal: Modal, app: IonicApp, config: Config, platform: IonicPlatform) {
this.modal = modal;
console.log('platforms', platform.platforms());

View File

@@ -3,7 +3,7 @@ import {Component, Directive, Optional, ElementRef, Renderer, TemplateRef, forwa
import {Ion} from '../ion';
import {Icon} from '../icon/icon';
import {ToolbarBase} from '../toolbar/toolbar';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {Page} from '../../config/decorators';
import {IonicApp} from '../app/app';
import {ViewController} from '../nav/view-controller';
@@ -72,7 +72,7 @@ export class Navbar extends ToolbarBase {
app: IonicApp,
@Optional() viewCtrl: ViewController,
elementRef: ElementRef,
config: IonicConfig,
config: Config,
renderer: Renderer
) {
super(elementRef, config);

View File

@@ -3,7 +3,7 @@ import {Compiler, ElementRef, Injector, provide, NgZone, DynamicComponentLoader,
import {Ion} from '../ion';
import {makeComponent} from '../../config/decorators';
import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {ViewController} from './view-controller';
import {Transition} from '../../transitions/transition';
import {SwipeBackGesture} from './swipe-back';
@@ -105,7 +105,7 @@ export class NavController extends Ion {
constructor(
parentnavCtrl: NavController,
app: IonicApp,
config: IonicConfig,
config: Config,
elementRef: ElementRef,
compiler: Compiler,
loader: DynamicComponentLoader,
@@ -776,7 +776,7 @@ export class NavController extends Ion {
} else {
let isActiveView = (view === activeView);
let isPreviousView = (view === previousView);
view.domCache(isActiveView, isPreviousView);
view.domCache && view.domCache(isActiveView, isPreviousView);
}
}
});

View File

@@ -1,7 +1,7 @@
import {Component, Directive, ElementRef, Host, Optional, forwardRef, Inject, NgZone, Compiler, AppViewManager, DynamicComponentLoader, Renderer, ViewContainerRef} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {ConfigComponent} from '../../config/decorators';
import {NavController} from './nav-controller';
@@ -145,7 +145,7 @@ export class Nav extends NavController {
constructor(
@Optional() hostNavCtrl: NavController,
app: IonicApp,
config: IonicConfig,
config: Config,
elementRef: ElementRef,
compiler: Compiler,
loader: DynamicComponentLoader,

View File

@@ -1,5 +1,5 @@
import {App, NavController} from 'ionic/ionic';
import {Page, IonicConfig, IonicApp} from 'ionic/ionic';
import {Page, Config, IonicApp} from 'ionic/ionic';
import {NavParams, NavController} from 'ionic/ionic';
@@ -31,7 +31,7 @@ class FirstPage {
constructor(
nav: NavController,
app: IonicApp,
config: IonicConfig
config: Config
) {
this.nav = nav;
this.title = 'First Page';

View File

@@ -17,7 +17,7 @@
import {
NavController,
IonicConfig,
Config,
Page,
ViewController
} from 'ionic/ionic';
@@ -58,7 +58,7 @@ export function run() {
// beforeEach(inject([Compiler], compiler => {
beforeEach(() => {
nav = new NavController(null, null, new IonicConfig(), null, null, null, null, null);
nav = new NavController(null, null, new Config(), null, null, null, null, null);
});
it('should exist', () => {

View File

@@ -2,7 +2,7 @@ import {FORM_DIRECTIVES, NgControl, NgControlGroup,
Component, ElementRef, Injectable, NgClass, NgIf, NgFor} from 'angular2/angular2';
import {OverlayController} from '../overlay/overlay-controller';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {Animation} from '../../animations/animation';
import {Button} from '../button/button';
import * as util from 'ionic/util';
@@ -64,7 +64,7 @@ import * as util from 'ionic/util';
@Injectable()
export class Popup {
constructor(ctrl: OverlayController, config: IonicConfig) {
constructor(ctrl: OverlayController, config: Config) {
this.ctrl = ctrl;
this._defaults = {
enterAnimation: config.get('popupPopIn'),

View File

@@ -1,6 +1,6 @@
import {Component, Directive, ElementRef, Renderer, Host, Optional, NgControl, Query, QueryList} from 'angular2/angular2';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {Ion} from '../ion';
import {ListHeader} from '../list/list';
@@ -56,13 +56,13 @@ export class RadioGroup extends Ion {
/**
* TODO
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
* @param {NgControl=} ngControl TODO
* @param {QueryList<ListHeader>} headerQuery TODO
*/
constructor(
elementRef: ElementRef,
config: IonicConfig,
config: Config,
renderer: Renderer,
@Optional() ngControl: NgControl,
@Query(ListHeader) private headerQuery: QueryList<ListHeader>
@@ -194,12 +194,12 @@ export class RadioButton extends Ion {
* Radio button constructor.
* @param {RadioGroup=} group The parent radio group, if any.
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
*/
constructor(
@Host() @Optional() group: RadioGroup,
elementRef: ElementRef,
config: IonicConfig,
config: Config,
renderer: Renderer
) {
super(elementRef, config);

View File

@@ -1,7 +1,7 @@
import {Component, ElementRef, onInit} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {Gesture} from '../../gestures/gesture';
import {CSS} from '../../util/dom';
import {Animation} from '../../animations/animation';
@@ -32,10 +32,10 @@ export class Scroll extends Ion {
/**
* TODO
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
*/
constructor(elementRef: ElementRef, ionicConfig: IonicConfig) {
super(elementRef, ionicConfig);
constructor(elementRef: ElementRef, Config: Config) {
super(elementRef, Config);
this.maxScale = 3;
this.zoomDuration = 250;

View File

@@ -1,7 +1,7 @@
import {ElementRef, Pipe, NgControl, Renderer, FORM_DIRECTIVES, NgIf, NgClass} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {ConfigComponent} from '../../config/decorators';
/**
@@ -41,11 +41,11 @@ export class SearchBar extends Ion {
/**
* TODO
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
*/
constructor(
elementRef: ElementRef,
config: IonicConfig,
config: Config,
ngControl: NgControl,
renderer: Renderer
) {

View File

@@ -2,7 +2,7 @@ import {Component, Directive, Renderer, ElementRef, EventEmitter, Host, forwardR
import {Control, NgControl, NgFormControl, ControlGroup, ControlDirective} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {dom} from 'ionic/util';
/**
@@ -34,16 +34,16 @@ export class Segment extends Ion {
* TODO
* @param {NgControl} ngControl TODO
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
* @param {Renderer} renderer TODO
*/
constructor(
@Optional() ngControl: NgControl,
elementRef: ElementRef,
ionicConfig: IonicConfig,
config: Config,
renderer: Renderer
) {
super(elementRef, ionicConfig);
super(elementRef, config);
this.ele = elementRef.nativeElement
this.elementRef = elementRef;
@@ -237,7 +237,7 @@ export class SegmentButton {
// selector: 'tab-highlight'
// })
// class TabHighlight {
// constructor(@Host() tabs: Tabs, config: IonicConfig, elementRef: ElementRef) {
// constructor(@Host() tabs: Tabs, config: Config, elementRef: ElementRef) {
// if (config.get('mode') === 'md') {
// tabs.highlight = this;
// this.elementRef = elementRef;

View File

@@ -4,7 +4,7 @@ import {Ion} from '../ion';
import {Animation} from 'ionic/animations/animation';
import {Gesture} from 'ionic/gestures/gesture';
import {DragGesture} from 'ionic/gestures/drag-gesture';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {dom} from 'ionic/util';
import {CSS} from '../../util/dom';
import * as util from 'ionic/util';
@@ -55,7 +55,7 @@ export class Slides extends Ion {
* TODO
* @param {ElementRef} elementRef TODO
*/
constructor(elementRef: ElementRef, config: IonicConfig) {
constructor(elementRef: ElementRef, config: Config) {
super(elementRef, config);
this.rapidUpdate = util.debounce(() => {
this.update();

View File

@@ -1,7 +1,7 @@
import {Component, Directive, ElementRef, Renderer, Host, Optional, NgControl, Inject, forwardRef} from 'angular2/angular2';
import {IonicForm} from '../../util/form';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {pointerCoord} from '../../util/dom';
/**
@@ -19,7 +19,7 @@ class MediaSwitch {
* TODO
* @param {Switch} swtch TODO
* @param {} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
*/
constructor(
@Host() @Inject(forwardRef(() => Switch)) swtch: Switch,
@@ -99,13 +99,13 @@ export class Switch {
/**
* TODO
* @param {ElementRef} elementRef TODO
* @param {IonicConfig} config TODO
* @param {Config} config TODO
* @param {NgControl=} ngControl TODO
*/
constructor(
form: IonicForm,
elementRef: ElementRef,
config: IonicConfig,
config: Config,
renderer: Renderer,
@Optional() private ngControl: NgControl
) {

View File

@@ -1,7 +1,7 @@
import {Component, Directive, Host, ElementRef, Compiler, DynamicComponentLoader, AppViewManager, forwardRef, NgZone, Renderer} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {NavController} from '../nav/nav-controller';
import {ViewController} from '../nav/view-controller';
import {Tabs} from './tabs';
@@ -72,7 +72,7 @@ export class Tab extends NavController {
constructor(
@Host() tabs: Tabs,
app: IonicApp,
config: IonicConfig,
config: Config,
elementRef: ElementRef,
compiler: Compiler,
loader: DynamicComponentLoader,

View File

@@ -2,7 +2,7 @@ import {Directive, ElementRef, Optional, Host, NgFor, forwardRef, ViewContainerR
import {Ion} from '../ion';
import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {ViewController} from '../nav/view-controller';
import {ConfigComponent} from '../../config/decorators';
import {Icon} from '../icon/icon';
@@ -101,7 +101,7 @@ export class Tabs extends Ion {
*/
constructor(
app: IonicApp,
config: IonicConfig,
config: Config,
elementRef: ElementRef,
@Optional() viewCtrl: ViewController
) {
@@ -247,7 +247,7 @@ let _tabIds = -1;
}
})
class TabButton extends Ion {
constructor(@Host() tabs: Tabs, config: IonicConfig, elementRef: ElementRef) {
constructor(@Host() tabs: Tabs, config: Config, elementRef: ElementRef) {
super(elementRef, config);
this.tabs = tabs;
@@ -279,7 +279,7 @@ class TabButton extends Ion {
selector: 'tab-highlight'
})
class TabHighlight {
constructor(@Host() tabs: Tabs, config: IonicConfig, elementRef: ElementRef) {
constructor(@Host() tabs: Tabs, config: Config, elementRef: ElementRef) {
if (config.get('mode') === 'md') {
tabs.highlight = this;
this.elementRef = elementRef;

View File

@@ -1,7 +1,7 @@
import {Injectable} from 'angular2/angular2';
import {IonicApp} from '../app/app';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {pointerCoord, hasPointerMoved, transitionEnd} from '../../util/dom';
import {Activator} from './activator';
import {RippleActivator} from './ripple';
@@ -10,7 +10,7 @@ import {RippleActivator} from './ripple';
@Injectable()
export class TapClick {
constructor(app: IonicApp, config: IonicConfig) {
constructor(app: IonicApp, config: Config) {
const self = this;
self.app = app;

View File

@@ -1,6 +1,6 @@
import {Directive, Optional} from 'angular2/angular2';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {TextInput} from './text-input';
import {pointerCoord, hasPointerMoved} from '../../util/dom';
@@ -23,9 +23,9 @@ import {pointerCoord, hasPointerMoved} from '../../util/dom';
export class Label {
/**
* TODO
* @param {IonicConfig} config
* @param {Config} config
*/
constructor(config: IonicConfig, @Optional() container: TextInput) {
constructor(config: Config, @Optional() container: TextInput) {
this.scrollAssist = config.get('scrollAssist');
if (!this.id) {
this.id = 'lbl-' + (++labelIds);

View File

@@ -1,6 +1,6 @@
import {Component, Directive, NgIf, forwardRef, Host, Optional, ElementRef, Renderer, Attribute, Query, QueryList, NgZone} from 'angular2/angular2';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {IonicForm} from '../../util/form';
import {Label} from './label';
import {IonicApp} from '../app/app';
@@ -29,7 +29,7 @@ export class TextInput {
constructor(
form: IonicForm,
elementRef: ElementRef,
config: IonicConfig,
config: Config,
renderer: Renderer,
app: IonicApp,
zone: NgZone,

View File

@@ -1,7 +1,7 @@
import {Component, Directive, Host, ElementRef, Renderer, Optional, forwardRef, Inject} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';
import {Config} from '../../config/config';
import {MenuToggle} from '../menu/menu-toggle';
import {Navbar} from '../nav-bar/nav-bar';
@@ -13,7 +13,7 @@ export class ToolbarBase extends Ion {
constructor(
elementRef: ElementRef,
config: IonicConfig
config: Config
) {
super(elementRef, config);
this.itemRefs = [];
@@ -69,7 +69,7 @@ export class ToolbarBase extends Ion {
export class Toolbar extends ToolbarBase {
constructor(
elementRef: ElementRef,
config: IonicConfig,
config: Config,
renderer: Renderer
) {
super(elementRef, config);

View File

@@ -2,7 +2,7 @@ import {bootstrap, provide} from 'angular2/angular2';
import {ROUTER_PROVIDERS, LocationStrategy, HashLocationStrategy} from 'angular2/router';
import {IonicApp} from '../components/app/app';
import {IonicConfig} from './config';
import {Config} from './config';
import {IonicPlatform} from '../platform/platform';
import {OverlayController} from '../components/overlay/overlay-controller';
import {IonicForm} from '../util/form';
@@ -23,8 +23,8 @@ export function ionicProviders(config) {
let app = new IonicApp();
let platform = new IonicPlatform();
if (!(config instanceof IonicConfig)) {
config = new IonicConfig(config);
if (!(config instanceof Config)) {
config = new Config(config);
}
platform.url(window.location.href);
@@ -45,7 +45,7 @@ export function ionicProviders(config) {
return [
provide(IonicApp, {useValue: app}),
provide(IonicConfig, {useValue: config}),
provide(Config, {useValue: config}),
provide(IonicPlatform, {useValue: platform}),
provide(TapClick, {useValue: tapClick}),
provide(FeatureDetect, {useValue: featureDetect}),

View File

@@ -3,7 +3,7 @@
* @name Config
* @module ionic
* @description
* IonicConfig allows you to set the modes of your components
* Config allows you to set the modes of your components
*/
import {IonicPlatform} from '../platform/platform';
@@ -12,7 +12,7 @@ import {isObject, isDefined, isFunction, isArray, extend} from '../util/util';
/**
* TODO
*/
export class IonicConfig {
export class Config {
/**
* TODO
@@ -30,12 +30,12 @@ export class IonicConfig {
/**
* @name settings()
* @description
* IonicConfig lets you change multiple or a single value in an apps mode configuration. Things such as tab placement, icon changes, and view animations can be set here.
* Config lets you change multiple or a single value in an apps mode configuration. Things such as tab placement, icon changes, and view animations can be set here.
*
*
* @usage
* ```ts
* import {IonicConfig} from 'ionic/ionic';
* import {Config} from 'ionic/ionic';
* @App({
* template: `<ion-nav [root]="root"></ion-nav>`
* config: {
@@ -144,7 +144,7 @@ export class IonicConfig {
if (isDefined(configObj[key])) {
userPlatformValue = configObj[key];
}
configObj = IonicConfig.getModeConfig(configObj.mode);
configObj = Config.getModeConfig(configObj.mode);
if (configObj && isDefined(configObj[key])) {
userPlatformModeValue = configObj[key];
}
@@ -160,7 +160,7 @@ export class IonicConfig {
platformValue = configObj.settings[key];
}
configObj = IonicConfig.getModeConfig(configObj.settings.mode);
configObj = Config.getModeConfig(configObj.settings.mode);
if (configObj && isDefined(configObj[key])) {
// found setting for this platform's mode
platformModeValue = configObj[key];
@@ -172,7 +172,7 @@ export class IonicConfig {
}
configObj = IonicConfig.getModeConfig(this._s.mode);
configObj = Config.getModeConfig(this._s.mode);
if (configObj && isDefined(configObj[key])) {
userDefaultModeValue = configObj[key];
}

View File

@@ -1,9 +1,9 @@
import {IonicConfig} from './config';
import {Config} from './config';
// iOS Mode Settings
IonicConfig.setModeConfig('ios', {
Config.setModeConfig('ios', {
actionSheetEnter: 'action-sheet-slide-in',
actionSheetLeave: 'action-sheet-slide-out',
@@ -27,7 +27,7 @@ IonicConfig.setModeConfig('ios', {
// Material Design Mode Settings
IonicConfig.setModeConfig('md', {
Config.setModeConfig('md', {
actionSheetEnter: 'action-sheet-md-slide-in',
actionSheetLeave: 'action-sheet-md-slide-out',

View File

@@ -1,38 +1,38 @@
import {IonicConfig, IonicPlatform, ionicProviders} from 'ionic/ionic';
import {Config, IonicPlatform, ionicProviders} from 'ionic/ionic';
export function run() {
it('should create a new IonicConfig instace when no confg passed in ionicProviders', () => {
it('should create a new Config instace when no confg passed in ionicProviders', () => {
let providers = ionicProviders();
let config = providers.find(provider => provider.useValue instanceof IonicConfig).useValue;
let config = providers.find(provider => provider.useValue instanceof Config).useValue;
expect(config.get('mode')).toEqual('ios');
});
it('should used passed in IonicConfig instance in ionicProviders', () => {
let userConfig = new IonicConfig({
it('should used passed in Config instance in ionicProviders', () => {
let userConfig = new Config({
mode: 'configInstance'
})
let providers = ionicProviders(userConfig);
let config = providers.find(provider => provider.useValue instanceof IonicConfig).useValue;
let config = providers.find(provider => provider.useValue instanceof Config).useValue;
expect(config.get('mode')).toEqual('configInstance');
});
it('should create new IonicConfig instance from config object in ionicProviders', () => {
it('should create new Config instance from config object in ionicProviders', () => {
let providers = ionicProviders({
mode: 'configObj'
});
let config = providers.find(provider => provider.useValue instanceof IonicConfig).useValue;
let config = providers.find(provider => provider.useValue instanceof Config).useValue;
expect(config.get('mode')).toEqual('configObj');
});
it('should override mode settings', () => {
let config = new IonicConfig({
let config = new Config({
mode: 'md'
});
let platform = new IonicPlatform(['ios']);
@@ -43,7 +43,7 @@ export function run() {
});
it('should override mode settings from platforms setting', () => {
let config = new IonicConfig({
let config = new Config({
platforms: {
ios: {
mode: 'md'
@@ -58,7 +58,7 @@ export function run() {
});
it('should override mode platform', () => {
let config = new IonicConfig({
let config = new Config({
mode: 'modeA',
platforms: {
mobile: {
@@ -76,7 +76,7 @@ export function run() {
});
it('should override mode', () => {
let config = new IonicConfig({
let config = new Config({
mode: 'modeA'
});
let platform = new IonicPlatform(['core']);
@@ -86,7 +86,7 @@ export function run() {
});
it('should get user settings after user platform settings', () => {
let config = new IonicConfig({
let config = new Config({
hoverCSS: true
});
let platform = new IonicPlatform(['ios']);
@@ -96,7 +96,7 @@ export function run() {
});
it('should get ios mode for core platform', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['core']);
config.setPlatform(platform);
@@ -104,7 +104,7 @@ export function run() {
});
it('should get ios mode for ipad platform', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['mobile', 'ios', 'ipad', 'tablet']);
config.setPlatform(platform);
@@ -112,7 +112,7 @@ export function run() {
});
it('should get md mode for windowsphone platform', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['mobile', 'windowsphone']);
config.setPlatform(platform);
@@ -120,7 +120,7 @@ export function run() {
});
it('should get md mode for android platform', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['mobile', 'android']);
config.setPlatform(platform);
@@ -128,7 +128,7 @@ export function run() {
});
it('should override ios mode config with user platform setting', () => {
let config = new IonicConfig({
let config = new Config({
tabBarPlacement: 'hide',
platforms: {
ios: {
@@ -143,7 +143,7 @@ export function run() {
});
it('should override ios mode config with user setting', () => {
let config = new IonicConfig({
let config = new Config({
tabBarPlacement: 'top'
});
let platform = new IonicPlatform(['ios']);
@@ -153,7 +153,7 @@ export function run() {
});
it('should get setting from md mode', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['android']);
config.setPlatform(platform);
@@ -161,7 +161,7 @@ export function run() {
});
it('should get setting from ios mode', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['ios']);
config.setPlatform(platform);
@@ -169,7 +169,7 @@ export function run() {
});
it('should set/get platform setting from set()', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['ios']);
config.setPlatform(platform);
@@ -180,7 +180,7 @@ export function run() {
});
it('should set/get setting from set()', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['ios']);
config.setPlatform(platform);
@@ -190,7 +190,7 @@ export function run() {
});
it('should set ios platform settings from settings()', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['ios']);
config.setPlatform(platform);
@@ -202,7 +202,7 @@ export function run() {
});
it('should set/get mobile setting even w/ higher priority ios', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['mobile', 'ios']);
config.setPlatform(platform);
@@ -219,7 +219,7 @@ export function run() {
});
it('should set/get mobile setting even w/ higher priority ios', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['mobile', 'ios']);
config.setPlatform(platform);
@@ -236,7 +236,7 @@ export function run() {
});
it('should set/get android setting w/ higher priority than mobile', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['mobile', 'android']);
config.setPlatform(platform);
@@ -256,7 +256,7 @@ export function run() {
});
it('should set/get ios setting w/ platforms set', () => {
let config = new IonicConfig();
let config = new Config();
let platform = new IonicPlatform(['ios']);
config.setPlatform(platform);
@@ -276,7 +276,7 @@ export function run() {
});
it('should set/get default setting w/ platforms set, but no platform match', () => {
let config = new IonicConfig();
let config = new Config();
config.settings({
key: 'defaultValue',
platforms: {
@@ -293,7 +293,7 @@ export function run() {
});
it('should set setting object', () => {
let config = new IonicConfig();
let config = new Config();
config.settings({
name: 'Doc Brown',
occupation: 'Weather Man'
@@ -306,7 +306,7 @@ export function run() {
});
it('should get null setting', () => {
let config = new IonicConfig();
let config = new Config();
expect(config.get('name')).toEqual(null);
expect(config.get('name')).toEqual(null);
@@ -315,7 +315,7 @@ export function run() {
});
it('should set/get single setting', () => {
let config = new IonicConfig();
let config = new Config();
config.set('name', 'Doc Brown');
config.set('occupation', 'Weather Man');
@@ -326,7 +326,7 @@ export function run() {
});
it('should init w/ given config settings', () => {
let config = new IonicConfig({
let config = new Config({
name: 'Doc Brown',
occupation: 'Weather Man'
});
@@ -335,7 +335,7 @@ export function run() {
});
it('should get settings object', () => {
let config = new IonicConfig({
let config = new Config({
name: 'Doc Brown',
occupation: 'Weather Man'
});
@@ -347,34 +347,34 @@ export function run() {
});
it('should create default config w/ bad settings value', () => {
let config = new IonicConfig(null);
let config = new Config(null);
expect(config.settings()).toEqual({});
config = new IonicConfig(undefined);
config = new Config(undefined);
expect(config.settings()).toEqual({});
config = new IonicConfig();
config = new Config();
expect(config.settings()).toEqual({});
config = new IonicConfig([1,2,3]);
config = new Config([1,2,3]);
expect(config.settings()).toEqual({});
config = new IonicConfig('im bad, you know it');
config = new Config('im bad, you know it');
expect(config.settings()).toEqual({});
config = new IonicConfig(8675309);
config = new Config(8675309);
expect(config.settings()).toEqual({});
config = new IonicConfig(true);
config = new Config(true);
expect(config.settings()).toEqual({});
config = new IonicConfig(false);
config = new Config(false);
expect(config.settings()).toEqual({});
config = new IonicConfig(1);
config = new Config(1);
expect(config.settings()).toEqual({});
config = new IonicConfig(function(){});
config = new Config(function(){});
expect(config.settings()).toEqual({});
});

View File

@@ -1,6 +1,6 @@
import {Injectable, NgZone} from 'angular2/angular2';
import {IonicConfig} from '../config/config';
import {Config} from '../config/config';
/**
@@ -17,7 +17,7 @@ import {IonicConfig} from '../config/config';
@Injectable()
export class IonicForm {
constructor(config: IonicConfig, zone: NgZone) {
constructor(config: Config, zone: NgZone) {
this._config = config;
this._zone = zone;

View File

@@ -1,6 +1,6 @@
import {Injectable, NgZone} from 'angular2/angular2';
import {IonicConfig} from '../config/config';
import {Config} from '../config/config';
import {IonicForm} from './form';
import * as dom from './dom';
@@ -8,7 +8,7 @@ import * as dom from './dom';
@Injectable()
export class IonicKeyboard {
constructor(config: IonicConfig, form: IonicForm, zone: NgZone) {
constructor(config: Config, form: IonicForm, zone: NgZone) {
this.form = form;
this.zone = zone;

View File

@@ -560,13 +560,13 @@
<!-- Config -->
<li class="menu-section">
<a href="{{ page.versionHref }}/api/config/IonicConfig/" class="api-section">
<a href="{{ page.versionHref }}/api/config/Config/" class="api-section">
Config
</a>
<ul>
<li>
<a href="{{ page.versionHref }}/api/config/IonicConfig/">
IonicConfig
<a href="{{ page.versionHref }}/api/config/Config/">
Config
</a>
</li>