CB-11955 Added Initial OSX platform support
- Added src/osx plugin folder structure. - Added OSX platform to plugin.xml and package.json files. - Added _system target functionality for OSX. - Modified README.md to include information about OSX support. - Disabled 'open method' jasmine tests for OSX. This closes #190
This commit is contained in:
parent
d4156fb19e
commit
32253b96a6
@ -69,7 +69,7 @@ Although `window.open` is in the global scope, InAppBrowser is not available unt
|
|||||||
Report issues with this plugin on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20InAppBrowser%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
|
Report issues with this plugin on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20InAppBrowser%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
|
||||||
|
|
||||||
|
|
||||||
## <a id="reference">Reference
|
## <a id="reference">Reference</a>
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
cordova plugin add cordova-plugin-inappbrowser
|
cordova plugin add cordova-plugin-inappbrowser
|
||||||
@ -145,6 +145,7 @@ instance, or the system browser.
|
|||||||
- BlackBerry 10
|
- BlackBerry 10
|
||||||
- Firefox OS
|
- Firefox OS
|
||||||
- iOS
|
- iOS
|
||||||
|
- OSX
|
||||||
- Windows 8 and 8.1
|
- Windows 8 and 8.1
|
||||||
- Windows Phone 7 and 8
|
- Windows Phone 7 and 8
|
||||||
- Browser
|
- Browser
|
||||||
@ -185,6 +186,12 @@ opened with `target='_blank'`. The rules might look like these
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### OSX Quirks
|
||||||
|
|
||||||
|
At the moment the only supported target in OSX is `_system`.
|
||||||
|
|
||||||
|
`_blank` and `_self` targets are not yet implemented and are ignored silently. Pull requests and patches to get these to work are greatly appreciated.
|
||||||
|
|
||||||
### Windows Quirks
|
### Windows Quirks
|
||||||
|
|
||||||
Windows 8.0, 8.1 and Windows Phone 8.1 don't support remote urls to be opened in the Cordova WebView so remote urls are always showed in the system's web browser if opened with `target='_self'`.
|
Windows 8.0, 8.1 and Windows Phone 8.1 don't support remote urls to be opened in the Cordova WebView so remote urls are always showed in the system's web browser if opened with `target='_self'`.
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
"amazon-fireos",
|
"amazon-fireos",
|
||||||
"ubuntu",
|
"ubuntu",
|
||||||
"ios",
|
"ios",
|
||||||
|
"osx",
|
||||||
"wp7",
|
"wp7",
|
||||||
"wp8",
|
"wp8",
|
||||||
"windows8",
|
"windows8",
|
||||||
@ -31,6 +32,7 @@
|
|||||||
"cordova-amazon-fireos",
|
"cordova-amazon-fireos",
|
||||||
"cordova-ubuntu",
|
"cordova-ubuntu",
|
||||||
"cordova-ios",
|
"cordova-ios",
|
||||||
|
"cordova-osx",
|
||||||
"cordova-wp7",
|
"cordova-wp7",
|
||||||
"cordova-wp8",
|
"cordova-wp8",
|
||||||
"cordova-windows8",
|
"cordova-windows8",
|
||||||
|
16
plugin.xml
16
plugin.xml
@ -131,6 +131,22 @@
|
|||||||
<framework src="CoreGraphics.framework" />
|
<framework src="CoreGraphics.framework" />
|
||||||
</platform>
|
</platform>
|
||||||
|
|
||||||
|
<!-- osx -->
|
||||||
|
<platform name="osx">
|
||||||
|
<js-module src="www/inappbrowser.js" name="inappbrowser">
|
||||||
|
<clobbers target="cordova.InAppBrowser.open" />
|
||||||
|
<clobbers target="window.open" />
|
||||||
|
</js-module>
|
||||||
|
<config-file target="config.xml" parent="/*">
|
||||||
|
<feature name="InAppBrowser">
|
||||||
|
<param name="osx-package" value="CDVInAppBrowser" />
|
||||||
|
</feature>
|
||||||
|
</config-file>
|
||||||
|
|
||||||
|
<header-file src="src/osx/CDVInAppBrowser.h" />
|
||||||
|
<source-file src="src/osx/CDVInAppBrowser.m" />
|
||||||
|
</platform>
|
||||||
|
|
||||||
<!-- wp7 -->
|
<!-- wp7 -->
|
||||||
<platform name="wp7">
|
<platform name="wp7">
|
||||||
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
|
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
|
||||||
|
30
src/osx/CDVInAppBrowser.h
Normal file
30
src/osx/CDVInAppBrowser.h
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
/*
|
||||||
|
Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
or more contributor license agreements. See the NOTICE file
|
||||||
|
distributed with this work for additional information
|
||||||
|
regarding copyright ownership. The ASF licenses this file
|
||||||
|
to you under the Apache License, Version 2.0 (the
|
||||||
|
"License"); you may not use this file except in compliance
|
||||||
|
with the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing,
|
||||||
|
software distributed under the License is distributed on an
|
||||||
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
KIND, either express or implied. See the License for the
|
||||||
|
specific language governing permissions and limitations
|
||||||
|
under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import <Cordova/CDVPlugin.h>
|
||||||
|
|
||||||
|
@interface CDVInAppBrowser : CDVPlugin {
|
||||||
|
}
|
||||||
|
|
||||||
|
@property (nonatomic, copy) NSString* callbackId;
|
||||||
|
|
||||||
|
- (void)open:(CDVInvokedUrlCommand*)command;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
89
src/osx/CDVInAppBrowser.m
Normal file
89
src/osx/CDVInAppBrowser.m
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
/*
|
||||||
|
Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
or more contributor license agreements. See the NOTICE file
|
||||||
|
distributed with this work for additional information
|
||||||
|
regarding copyright ownership. The ASF licenses this file
|
||||||
|
to you under the Apache License, Version 2.0 (the
|
||||||
|
"License"); you may not use this file except in compliance
|
||||||
|
with the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing,
|
||||||
|
software distributed under the License is distributed on an
|
||||||
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
KIND, either express or implied. See the License for the
|
||||||
|
specific language governing permissions and limitations
|
||||||
|
under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import "CDVInAppBrowser.h"
|
||||||
|
#import <Cordova/CDVPluginResult.h>
|
||||||
|
|
||||||
|
#define kInAppBrowserTargetSelf @"_self"
|
||||||
|
#define kInAppBrowserTargetSystem @"_system"
|
||||||
|
#define kInAppBrowserTargetBlank @"_blank"
|
||||||
|
|
||||||
|
@interface CDVInAppBrowser () {
|
||||||
|
}
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation CDVInAppBrowser
|
||||||
|
|
||||||
|
- (void)pluginInitialize
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL) isSystemUrl:(NSURL*)url
|
||||||
|
{
|
||||||
|
if ([[url host] isEqualToString:@"itunes.apple.com"]) {
|
||||||
|
return YES;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NO;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)open:(CDVInvokedUrlCommand*)command
|
||||||
|
{
|
||||||
|
CDVPluginResult* pluginResult;
|
||||||
|
|
||||||
|
NSString* url = [command argumentAtIndex:0];
|
||||||
|
NSString* target = [command argumentAtIndex:1 withDefault:kInAppBrowserTargetSelf];
|
||||||
|
|
||||||
|
self.callbackId = command.callbackId;
|
||||||
|
|
||||||
|
if (url != nil) {
|
||||||
|
|
||||||
|
NSURL* baseUrl = [NSURL URLWithString:url];
|
||||||
|
|
||||||
|
NSURL* absoluteUrl = [[NSURL URLWithString:url relativeToURL:baseUrl] absoluteURL];
|
||||||
|
|
||||||
|
if ([self isSystemUrl:absoluteUrl]) {
|
||||||
|
target = kInAppBrowserTargetSystem;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([target isEqualToString:kInAppBrowserTargetSelf]) {
|
||||||
|
//[self openInCordovaWebView:absoluteUrl withOptions:options];
|
||||||
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Not Yet Implemented for OSX: [self openInCordovaWebView:absoluteUrl withOptions:options]"];
|
||||||
|
} else if ([target isEqualToString:kInAppBrowserTargetSystem]) {
|
||||||
|
[self openInSystem:absoluteUrl];
|
||||||
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
|
||||||
|
} else { // _blank or anything else
|
||||||
|
//[self openInInAppBrowser:absoluteUrl withOptions:options];
|
||||||
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Not Yet Implemented for OSX: [self openInInAppBrowser:absoluteUrl withOptions:options]"];
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"incorrect number of arguments"];
|
||||||
|
}
|
||||||
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
||||||
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)openInSystem:(NSURL*)url
|
||||||
|
{
|
||||||
|
[[NSWorkspace sharedWorkspace] openURL:url];
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
@ -43,6 +43,11 @@ exports.defineAutoTests = function () {
|
|||||||
|
|
||||||
describe('open method', function () {
|
describe('open method', function () {
|
||||||
|
|
||||||
|
if (cordova.platformId == 'osx') {
|
||||||
|
pending('Open method not fully supported on OSX.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var iabInstance;
|
var iabInstance;
|
||||||
var originalTimeout;
|
var originalTimeout;
|
||||||
var url = 'https://dist.apache.org/repos/dist/dev/cordova/';
|
var url = 'https://dist.apache.org/repos/dist/dev/cordova/';
|
||||||
|
Loading…
Reference in New Issue
Block a user