style(): minify/style updates

This commit is contained in:
Adam Bradley
2015-01-09 08:45:10 -06:00
parent b5935b5071
commit b8112aba2a

View File

@@ -10,40 +10,41 @@
var IOS = 'ios';
var ANDROID = 'android';
var WINDOWS_PHONE = 'windowsphone';
var requestAnimationFrame = ionic.requestAnimationFrame;
/**
* @ngdoc utility
* @name ionic.Platform
* @module ionic
* @description
* A set of utility methods that can be used to retrieve the device ready state and
* A set of utility methods that can be used to retrieve the device ready state and
* various other information such as what kind of platform the app is currently installed on.
*
* @usage
* ```js
* angular.module('PlatformApp', ['ionic'])
* .controller('PlatformCtrl', function($scope) {
*
*
* ionic.Platform.ready(function(){
* // will execute when device is ready, or immediately if the device is already ready.
* });
*
*
* var deviceInformation = ionic.Platform.device();
*
*
* var isWebView = ionic.Platform.isWebView();
* var isIPad = ionic.Platform.isIPad();
* var isIOS = ionic.Platform.isIOS();
* var isAndroid = ionic.Platform.isAndroid();
* var isWindowsPhone = ionic.Platform.isWindowsPhone();
*
*
* var currentPlatform = ionic.Platform.platform();
* var currentPlatformVersion = ionic.Platform.version();
*
*
* ionic.Platform.exit(); // stops the app
* });
* ```
*/
ionic.Platform = {
var self = ionic.Platform = {
// Put navigator on platform so it can be mocked and set
// the browser does not allow window.navigator to be set
@@ -91,7 +92,7 @@
*/
ready: function(cb) {
// run through tasks to complete now that the device is ready
if (this.isReady) {
if (self.isReady) {
cb();
} else {
// the platform isn't ready yet, add it to this array
@@ -104,12 +105,12 @@
* @private
*/
detect: function() {
ionic.Platform._checkPlatforms();
self._checkPlatforms();
ionic.requestAnimationFrame(function() {
requestAnimationFrame(function() {
// only add to the body class if we got platform info
for (var i = 0; i < ionic.Platform.platforms.length; i++) {
document.body.classList.add('platform-' + ionic.Platform.platforms[i]);
for (var i = 0; i < self.platforms.length; i++) {
document.body.classList.add('platform-' + self.platforms[i]);
}
});
},
@@ -123,9 +124,9 @@
* @param {string} grade The new grade to set.
*/
setGrade: function(grade) {
var oldGrade = this.grade;
this.grade = grade;
ionic.requestAnimationFrame(function() {
var oldGrade = self.grade;
self.grade = grade;
requestAnimationFrame(function() {
if (oldGrade) {
document.body.classList.remove('grade-' + oldGrade);
}
@@ -143,23 +144,23 @@
return window.device || {};
},
_checkPlatforms: function(platforms) {
this.platforms = [];
_checkPlatforms: function() {
self.platforms = [];
var grade = 'a';
if (this.isWebView()) {
this.platforms.push('webview');
this.platforms.push('cordova');
if (self.isWebView()) {
self.platforms.push('webview');
self.platforms.push('cordova');
} else {
this.platforms.push('browser');
self.platforms.push('browser');
}
if (this.isIPad()) this.platforms.push('ipad');
if (self.isIPad()) self.platforms.push('ipad');
var platform = this.platform();
var platform = self.platform();
if (platform) {
this.platforms.push(platform);
self.platforms.push(platform);
var version = this.version();
var version = self.version();
if (version) {
var v = version.toString();
if (v.indexOf('.') > 0) {
@@ -167,18 +168,18 @@
} else {
v += '_0';
}
this.platforms.push(platform + v.split('_')[0]);
this.platforms.push(platform + v);
self.platforms.push(platform + v.split('_')[0]);
self.platforms.push(platform + v);
if (this.isAndroid() && version < 4.4) {
if (self.isAndroid() && version < 4.4) {
grade = (version < 4 ? 'c' : 'b');
} else if (this.isWindowsPhone()) {
} else if (self.isWindowsPhone()) {
grade = 'b';
}
}
}
this.setGrade(grade);
self.setGrade(grade);
},
/**
@@ -195,10 +196,10 @@
* @returns {boolean} Whether we are running on iPad.
*/
isIPad: function() {
if (/iPad/i.test(ionic.Platform.navigator.platform)) {
if (/iPad/i.test(self.navigator.platform)) {
return true;
}
return /iPad/i.test(this.ua);
return /iPad/i.test(self.ua);
},
/**
* @ngdoc method
@@ -206,7 +207,7 @@
* @returns {boolean} Whether we are running on iOS.
*/
isIOS: function() {
return this.is(IOS);
return self.is(IOS);
},
/**
* @ngdoc method
@@ -214,7 +215,7 @@
* @returns {boolean} Whether we are running on Android.
*/
isAndroid: function() {
return this.is(ANDROID);
return self.is(ANDROID);
},
/**
* @ngdoc method
@@ -222,7 +223,7 @@
* @returns {boolean} Whether we are running on Windows Phone.
*/
isWindowsPhone: function() {
return this.is(WINDOWS_PHONE);
return self.is(WINDOWS_PHONE);
},
/**
@@ -232,7 +233,7 @@
*/
platform: function() {
// singleton to get the platform name
if (platformName === null) this.setPlatform(this.device().platform);
if (platformName === null) self.setPlatform(self.device().platform);
return platformName;
},
@@ -242,16 +243,16 @@
setPlatform: function(n) {
if (typeof n != 'undefined' && n !== null && n.length) {
platformName = n.toLowerCase();
} else if(getParameterByName('ionicplatform')) {
} else if (getParameterByName('ionicplatform')) {
platformName = getParameterByName('ionicplatform');
} else if (this.ua.indexOf('Android') > 0) {
} else if (self.ua.indexOf('Android') > 0) {
platformName = ANDROID;
} else if (this.ua.indexOf('iPhone') > -1 || this.ua.indexOf('iPad') > -1 || this.ua.indexOf('iPod') > -1) {
} else if (self.ua.indexOf('iPhone') > -1 || self.ua.indexOf('iPad') > -1 || self.ua.indexOf('iPod') > -1) {
platformName = IOS;
} else if (this.ua.indexOf('Windows Phone') > -1) {
} else if (self.ua.indexOf('Windows Phone') > -1) {
platformName = WINDOWS_PHONE;
} else {
platformName = ionic.Platform.navigator.platform && navigator.platform.toLowerCase().split(' ')[0] || '';
platformName = self.navigator.platform && navigator.platform.toLowerCase().split(' ')[0] || '';
}
},
@@ -262,7 +263,7 @@
*/
version: function() {
// singleton to get the platform version
if (platformVersion === null) this.setVersion(this.device().version);
if (platformVersion === null) self.setVersion(self.device().version);
return platformVersion;
},
@@ -282,14 +283,14 @@
platformVersion = 0;
// fallback to user-agent checking
var pName = this.platform();
var pName = self.platform();
var versionMatch = {
'android': /Android (\d+).(\d+)?/,
'ios': /OS (\d+)_(\d+)?/,
'windowsphone': /Windows Phone (\d+).(\d+)?/
};
if (versionMatch[pName]) {
v = this.ua.match(versionMatch[pName]);
v = self.ua.match(versionMatch[pName]);
if (v && v.length > 2) {
platformVersion = parseFloat(v[1] + '.' + v[2]);
}
@@ -300,19 +301,19 @@
is: function(type) {
type = type.toLowerCase();
// check if it has an array of platforms
if (this.platforms) {
for (var x = 0; x < this.platforms.length; x++) {
if (this.platforms[x] === type) return true;
if (self.platforms) {
for (var x = 0; x < self.platforms.length; x++) {
if (self.platforms[x] === type) return true;
}
}
// exact match
var pName = this.platform();
var pName = self.platform();
if (pName) {
return pName === type.toLowerCase();
}
// A quick hack for to check userAgent
return this.ua.toLowerCase().indexOf(type) >= 0;
return self.ua.toLowerCase().indexOf(type) >= 0;
},
/**
@@ -321,7 +322,7 @@
* @description Exit the app.
*/
exitApp: function() {
this.ready(function() {
self.ready(function() {
navigator.app && navigator.app.exitApp && navigator.app.exitApp();
});
},
@@ -334,11 +335,11 @@
*/
showStatusBar: function(val) {
// Only useful when run within cordova
this._showStatusBar = val;
this.ready(function() {
self._showStatusBar = val;
self.ready(function() {
// run this only when or if the platform (cordova) is ready
ionic.requestAnimationFrame(function() {
if (ionic.Platform._showStatusBar) {
requestAnimationFrame(function() {
if (self._showStatusBar) {
// they do not want it to be full screen
window.StatusBar && window.StatusBar.show();
document.body.classList.remove('status-bar-hide');
@@ -361,25 +362,25 @@
*/
fullScreen: function(showFullScreen, showStatusBar) {
// showFullScreen: default is true if no param provided
this.isFullScreen = (showFullScreen !== false);
self.isFullScreen = (showFullScreen !== false);
// add/remove the fullscreen classname to the body
ionic.DomUtil.ready(function() {
// run this only when or if the DOM is ready
ionic.requestAnimationFrame(function() {
requestAnimationFrame(function() {
// fixing pane height before we adjust this
panes = document.getElementsByClassName('pane');
var panes = document.getElementsByClassName('pane');
for (var i = 0; i < panes.length; i++) {
panes[i].style.height = panes[i].offsetHeight + "px";
}
if (ionic.Platform.isFullScreen) {
if (self.isFullScreen) {
document.body.classList.add('fullscreen');
} else {
document.body.classList.remove('fullscreen');
}
});
// showStatusBar: default is false if no param provided
ionic.Platform.showStatusBar((showStatusBar === true));
self.showStatusBar((showStatusBar === true));
});
}
@@ -392,7 +393,7 @@
// setup listeners to know when the device is ready to go
function onWindowLoad() {
if (ionic.Platform.isWebView()) {
if (self.isWebView()) {
// the window and scripts are fully loaded, and a cordova/phonegap
// object exists then let's listen for the deviceready
document.addEventListener("deviceready", onPlatformReady, false);
@@ -416,8 +417,8 @@
function onPlatformReady() {
// the device is all set to go, init our own stuff then fire off our event
ionic.Platform.isReady = true;
ionic.Platform.detect();
self.isReady = true;
self.detect();
for (var x = 0; x < readyCallbacks.length; x++) {
// fire off all the callbacks that were added before the platform was ready
readyCallbacks[x]();
@@ -425,7 +426,7 @@
readyCallbacks = [];
ionic.trigger('platformready', { target: document });
ionic.requestAnimationFrame(function() {
requestAnimationFrame(function() {
document.body.classList.add('platform-ready');
});
}