javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename Platform to IonicPlatform

Browse Source 
Make IonicPlatform an injectable. Closes #99
This commit is contained in:
Adam Bradley
2015-09-13 00:39:19 -05:00
parent 0039647515
commit 8fbf53e1b7
18 changed files with 288 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
ionic/platform/platform.ts
View File

@@ -5,17 +5,14 @@ import * as dom from '../util/dom';
/**
* TODO
*/
export class PlatformCtrl {
export class IonicPlatform {
constructor() {
constructor(window) {
this._window = window;
this._settings = {};
this._platforms = [];
this._versions = {};
this._registry = {};
this._default = null;
this._onResizes = [];
this._dimensions = {};
this._dimIds = 0;
this._readyPromise = new Promise(res => { this._readyResolve = res; } );
}
@@ -67,6 +64,7 @@ export class PlatformCtrl {
}
/**
* @private
* TODO
* @param {TODO} config TODO
* @returns {TODO} TODO
@@ -89,24 +87,6 @@ export class PlatformCtrl {
}
}
/**
* TODO
* @returns {TODO} TODO
*/
domReady() {
// convenience method so its easy to access on Platform
return dom.ready.apply(this, arguments);
}
/**
* TODO
* @returns {TODO} TODO
*/
windowLoad() {
// convenience method so its easy to access on Platform
return dom.windowLoad.apply(this, arguments);
}
// Methods meant to be overridden by the engine
// **********************************************
@@ -152,16 +132,16 @@ export class PlatformCtrl {
width() {
if (!this._w) {
this._w = window.innerWidth;
this._h = window.innerHeight;
this._w = this._window.innerWidth;
this._h = this._window.innerHeight;
}
return this._w;
}
height() {
if (!this._h) {
this._w = window.innerWidth;
this._h = window.innerHeight;
this._w = this._window.innerWidth;
this._h = this._window.innerHeight;
}
return this._h;
}
@@ -175,14 +155,16 @@ export class PlatformCtrl {
}
winResize() {
clearTimeout(Platform._resizeTimer);
let self = this;
clearTimeout(self._resizeTimer);
Platform._resizeTimer = setTimeout(() => {
Platform.flushDimensions();
self._resizeTimer = setTimeout(() => {
this._w = this._h = 0;
dom.flushDimensionCache();
for (let i = 0; i < Platform._onResizes.length; i++) {
for (let i = 0; i < self._onResizes.length; i++) {
try {
Platform._onResizes[i]();
self._onResizes[i]();
} catch (e) {
console.error(e);
}
@@ -195,53 +177,33 @@ export class PlatformCtrl {
this._onResizes.push(cb);
}
/**
* Get the element offsetWidth and offsetHeight. Values are cached to
* reduce DOM reads, and reset on a window resize.
* @param {TODO} platformConfig TODO
*/
getDimensions(component) {
// cache
if (!component._dimId) {
component._dimId = ++this._dimIds;
}
let dimensions = this._dimensions[component._dimId];
if (!dimensions) {
let ele = component.getNativeElement();
dimensions = this._dimensions[component._dimId] = {
w: ele.offsetWidth,
h: ele.offsetHeight
};
}
return dimensions;
}
flushDimensions() {
this._dimensions = {};
this._w = this._h = 0;
}
// Registry
// Platform Registry
// **********************************************
/**
* TODO
* @param {TODO} platformConfig TODO
*/
register(platformConfig) {
this._registry[platformConfig.name] = platformConfig;
static register(platformConfig) {
platformRegistry[platformConfig.name] = platformConfig;
}
registry() {
return this._registry;
static registry() {
return platformRegistry;
}
setDefault(platformName) {
this._default = platformName;
/**
* TODO
* @param {TODO} platformName TODO
* @returns {string} TODO
*/
static get(platformName) {
return platformRegistry[platformName] || {};
}
static setDefault(platformName) {
platformDefault = platformName;
}
/**
@@ -314,7 +276,7 @@ export class PlatformCtrl {
// figure out the most specific platform and active engine
let tmpPlatform = null;
for (let platformName in this._registry) {
for (let platformName in platformRegistry) {
tmpPlatform = this.matchPlatform(platformName);
if (tmpPlatform) {
@@ -336,7 +298,7 @@ export class PlatformCtrl {
}
if (!rootPlatformNode) {
rootPlatformNode = new PlatformNode(this._default);
rootPlatformNode = new PlatformNode(platformDefault);
}
// build a Platform instance filled with the
@@ -423,15 +385,6 @@ export class PlatformCtrl {
return this._settings;
}
/**
* TODO
* @param {TODO} platformName TODO
* @returns {string} TODO
*/
get(platformName) {
return this._registry[platformName] || {};
}
}
function insertSuperset(platformNode) {
@@ -453,7 +406,7 @@ function insertSuperset(platformNode) {
class PlatformNode {
constructor(platformName) {
this.c = Platform.get(platformName);
this.c = IonicPlatform.get(platformName);
this.isEngine = this.c.isEngine;
}
@@ -543,13 +496,13 @@ class PlatformNode {
}
getSubsetParents(subsetPlatformName) {
let registry = Platform.registry();
let platformRegistry = IonicPlatform.registry();
let parentPlatformNames = [];
let platform = null;
for (let platformName in registry) {
platform = registry[platformName];
for (let platformName in platformRegistry) {
platform = platformRegistry[platformName];
if (platform.subsets && platform.subsets.indexOf(subsetPlatformName) > -1) {
parentPlatformNames.push(platformName);
@@ -561,4 +514,6 @@ class PlatformNode {
}
export let Platform = new PlatformCtrl();
let platformRegistry = {};
let platformDefault = null;

43
ionic/platform/registry.ts
View File

@@ -1,22 +1,23 @@
import {Platform} from './platform';
import {IonicPlatform} from './platform';
import {windowLoad} from '../util/dom';
Platform.register({
IonicPlatform.register({
name: 'core',
settings: {
mode: 'ios',
keyboardHeight: 290,
}
});
Platform.setDefault('core');
IonicPlatform.setDefault('core');
Platform.register({
IonicPlatform.register({
name: 'mobile'
});
Platform.register({
IonicPlatform.register({
name: 'phablet',
isMatch(p) {
let smallest = Math.min(p.width(), p.height());
@@ -27,7 +28,7 @@ Platform.register({
});
Platform.register({
IonicPlatform.register({
name: 'tablet',
isMatch(p) {
let smallest = Math.min(p.width(), p.height());
@@ -38,7 +39,7 @@ Platform.register({
});
Platform.register({
IonicPlatform.register({
name: 'android',
superset: 'mobile',
subsets: [
@@ -60,7 +61,7 @@ Platform.register({
Platform.register({
IonicPlatform.register({
name: 'ios',
superset: 'mobile',
subsets: [
@@ -69,11 +70,11 @@ Platform.register({
],
settings: {
mode: 'ios',
tapPolyfill: function() {
return /iphone|ipad|ipod/i.test(Platform.navigatorPlatform());
tapPolyfill: function(p) {
return /iphone|ipad|ipod/i.test(p.navigatorPlatform());
},
keyboardScrollAssist: function() {
return /iphone|ipad|ipod/i.test(Platform.navigatorPlatform());
keyboardScrollAssist: function(p) {
return /iphone|ipad|ipod/i.test(p.navigatorPlatform());
},
keyboardHeight: 290,
},
@@ -86,7 +87,7 @@ Platform.register({
});
Platform.register({
IonicPlatform.register({
name: 'ipad',
superset: 'tablet',
settings: {
@@ -98,7 +99,7 @@ Platform.register({
});
Platform.register({
IonicPlatform.register({
name: 'iphone',
subsets: [
'phablet'
@@ -109,7 +110,7 @@ Platform.register({
});
Platform.register({
IonicPlatform.register({
name: 'windowsphone',
superset: 'mobile',
subsets: [
@@ -128,17 +129,21 @@ Platform.register({
});
Platform.register({
IonicPlatform.register({
name: 'cordova',
isEngine: true,
methods: {
ready: function(resolve) {
Platform.windowLoad(() => {
document.addEventListener("deviceready", resolve);
function isReady() {
document.removeEventListener('deviceready', isReady);
resolve();
}
windowLoad(function() {
document.addEventListener('deviceready', isReady);
});
}
},
isMatch(p) {
isMatch() {
return !!(window.cordova || window.PhoneGap || window.phonegap);
}
});