Skip to content

Commit 5946eb2

Browse files
authored
Merge pull request #268 from isleofcode/feat/platform-service-updates
Feat/platform service updates
2 parents a47be8e + 3d94eaf commit 5946eb2

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

addon/services/device/platform.js renamed to addon/services/ember-cordova/platform.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default Ember.Service.extend({
3131
this._setPlatforms();
3232
},
3333

34-
isWebView: computed(function() {
34+
isHybrid: computed(function() {
3535
return !(
3636
!window.cordova &&
3737
!window.PhoneGap &&
@@ -40,6 +40,12 @@ export default Ember.Service.extend({
4040
);
4141
}),
4242

43+
isWebView: computed.alias('isHybrid'),
44+
45+
isCordova: computed(function() {
46+
return window.cordova !== undefined;
47+
}),
48+
4349
isIPad: computed(function() {
4450
if (/iPad/i.test(window.navigator.platform)) {
4551
return true;

app/services/device/platform.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
1-
export { default } from 'ember-cordova/services/device/platform';
1+
import PlatformService from 'ember-cordova/services/ember-cordova/platform';
2+
3+
export default PlatformService.extend({
4+
init() {
5+
this._super(...arguments);
6+
this._setPlatforms();
7+
8+
console.warn(
9+
'DEPRECATION WARNING (ember-cordova): \n' +
10+
'The device/platform service is now ember-cordova/platform \n' +
11+
'device.isWebView is now isHybrid. \n' +
12+
'Both old aliases will be discontinued as of March 1. \n' +
13+
'See http://embercordova.com/pages/service_platform for API info. '
14+
);
15+
}
16+
})
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from 'ember-cordova/services/ember-cordova/platform';

0 commit comments

Comments
 (0)