Skip to content

Commit 309cdef

Browse files
authored
Merge pull request apache#253 from surajpindoria/removePlatforms
CB-13662: remove deprecated platforms
2 parents 0f2f14a + 2c547a1 commit 309cdef

22 files changed

+14
-2594
lines changed

README.md

Lines changed: 8 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -144,66 +144,23 @@ instance, or the system browser.
144144

145145
### Supported Platforms
146146

147-
- Amazon Fire OS
148147
- Android
149-
- BlackBerry 10
150148
- Browser
151-
- Firefox OS
152149
- iOS
153150
- OSX
154-
- Windows 8 and 8.1
155-
- Windows Phone 7 and 8
151+
- Windows
156152

157153
### Example
158154

159155
var ref = cordova.InAppBrowser.open('http://apache.org', '_blank', 'location=yes');
160156
var ref2 = cordova.InAppBrowser.open(encodeURI('http://ja.m.wikipedia.org/wiki/ハングル'), '_blank', 'location=yes');
161157

162-
### Firefox OS Quirks
163-
164-
As plugin doesn't enforce any design there is a need to add some CSS rules if
165-
opened with `target='_blank'`. The rules might look like these
166-
167-
``` css
168-
.inAppBrowserWrap {
169-
background-color: rgba(0,0,0,0.75);
170-
color: rgba(235,235,235,1.0);
171-
}
172-
.inAppBrowserWrap menu {
173-
overflow: auto;
174-
list-style-type: none;
175-
padding-left: 0;
176-
}
177-
.inAppBrowserWrap menu li {
178-
font-size: 25px;
179-
height: 25px;
180-
float: left;
181-
margin: 0 10px;
182-
padding: 3px 10px;
183-
text-decoration: none;
184-
color: #ccc;
185-
display: block;
186-
background: rgba(30,30,30,0.50);
187-
}
188-
.inAppBrowserWrap menu li.disabled {
189-
color: #777;
190-
}
191-
```
192-
193158
### OSX Quirks
194159

195160
At the moment the only supported target in OSX is `_system`.
196161

197162
`_blank` and `_self` targets are not yet implemented and are ignored silently. Pull requests and patches to get these to work are greatly appreciated.
198163

199-
### Windows Quirks
200-
201-
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'`.
202-
203-
On Windows 10 if the URL is NOT in the white list and is opened with `target='_self'` it will be showed in the system's web browser instead of InAppBrowser popup.
204-
205-
Similar to Firefox OS IAB window visual behaviour can be overridden via `inAppBrowserWrap`/`inAppBrowserWrapFullscreen` CSS classes
206-
207164
### Browser Quirks
208165

209166
- Plugin is implemented via iframe,
@@ -324,12 +281,11 @@ function executeScriptCallBack(params) {
324281

325282
### Supported Platforms
326283

327-
- Amazon Fire OS
328284
- Android
329285
- Browser
330286
- iOS
331-
- Windows 8 and 8.1
332-
- Windows Phone 7 and 8
287+
- Windows
288+
- OSX
333289

334290
### Browser Quirks
335291

@@ -360,12 +316,10 @@ The function is passed an `InAppBrowserEvent` object.
360316

361317
### Supported Platforms
362318

363-
- Amazon Fire OS
364319
- Android
365320
- Browser
366321
- iOS
367-
- Windows 8 and 8.1
368-
- Windows Phone 7 and 8
322+
- Windows
369323

370324
### Quick Example
371325

@@ -384,13 +338,10 @@ The function is passed an `InAppBrowserEvent` object.
384338

385339
### Supported Platforms
386340

387-
- Amazon Fire OS
388341
- Android
389342
- Browser
390-
- Firefox OS
391343
- iOS
392-
- Windows 8 and 8.1
393-
- Windows Phone 7 and 8
344+
- Windows
394345

395346
### Quick Example
396347

@@ -407,11 +358,10 @@ The function is passed an `InAppBrowserEvent` object.
407358

408359
### Supported Platforms
409360

410-
- Amazon Fire OS
411361
- Android
412362
- Browser
413363
- iOS
414-
- Windows 8 and 8.1
364+
- Windows
415365

416366
### Quick Example
417367

@@ -429,10 +379,9 @@ The function is passed an `InAppBrowserEvent` object.
429379

430380
### Supported Platforms
431381

432-
- Amazon Fire OS
433382
- Android
434383
- iOS
435-
- Windows 8 and 8.1
384+
- Windows
436385

437386
### Quick Example
438387

@@ -461,11 +410,10 @@ The function is passed an `InAppBrowserEvent` object.
461410

462411
### Supported Platforms
463412

464-
- Amazon Fire OS
465413
- Android
466414
- Browser
467415
- iOS
468-
- Windows 8 and 8.1
416+
- Windows
469417

470418
### Quick Example
471419

@@ -498,7 +446,6 @@ Due to [MSDN docs](https://msdn.microsoft.com/en-us/library/windows.ui.xaml.cont
498446

499447
### Supported Platforms
500448

501-
- Amazon Fire OS
502449
- Android
503450
- iOS
504451
- Windows

package.json

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
{
22
"name": "cordova-plugin-inappbrowser",
3-
"version": "1.7.3-dev",
3+
"version": "2.0.0-dev",
44
"description": "Cordova InAppBrowser Plugin",
55
"types": "./types/index.d.ts",
66
"cordova": {
77
"id": "cordova-plugin-inappbrowser",
88
"platforms": [
99
"android",
10-
"amazon-fireos",
11-
"ubuntu",
10+
"browser",
1211
"ios",
1312
"osx",
14-
"wp7",
15-
"wp8",
16-
"windows8",
17-
"windows",
18-
"firefoxos"
13+
"windows"
1914
]
2015
},
2116
"repository": {
@@ -33,15 +28,10 @@
3328
"inappbrowser",
3429
"ecosystem:cordova",
3530
"cordova-android",
36-
"cordova-amazon-fireos",
37-
"cordova-ubuntu",
31+
"cordova-browser",
3832
"cordova-ios",
3933
"cordova-osx",
40-
"cordova-wp7",
41-
"cordova-wp8",
42-
"cordova-windows8",
43-
"cordova-windows",
44-
"cordova-firefoxos"
34+
"cordova-windows"
4535
],
4636
"scripts": {
4737
"test": "npm run eslint",

plugin.xml

Lines changed: 1 addition & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2222
id="cordova-plugin-inappbrowser"
23-
version="1.7.3-dev">
23+
version="2.0.0-dev">
2424

2525
<name>InAppBrowser</name>
2626
<description>Cordova InAppBrowser Plugin</description>
@@ -67,52 +67,6 @@
6767

6868
</platform>
6969

70-
<!-- amazon-fireos -->
71-
<platform name="amazon-fireos">
72-
<js-module src="www/inappbrowser.js" name="inappbrowser">
73-
<clobbers target="cordova.InAppBrowser.open" />
74-
<clobbers target="window.open" />
75-
</js-module>
76-
<config-file target="res/xml/config.xml" parent="/*">
77-
<feature name="InAppBrowser">
78-
<param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
79-
</feature>
80-
</config-file>
81-
82-
<source-file src="src/amazon/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
83-
<source-file src="src/android/InAppBrowserDialog.java" target-dir="src/org/apache/cordova/inappbrowser" />
84-
<source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
85-
86-
<!-- drawable src/android/resources -->
87-
<resource-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target="res/drawable-hdpi/ic_action_next_item.png" />
88-
<resource-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target="res/drawable-mdpi/ic_action_next_item.png" />
89-
<resource-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target="res/drawable-xhdpi/ic_action_next_item.png" />
90-
<resource-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target="res/drawable-xxhdpi/ic_action_next_item.png" />
91-
92-
<resource-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target="res/drawable-hdpi/ic_action_previous_item.png" />
93-
<resource-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target="res/drawable-mdpi/ic_action_previous_item.png" />
94-
<resource-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target="res/drawable-xhdpi/ic_action_previous_item.png" />
95-
<resource-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target="res/drawable-xxhdpi/ic_action_previous_item.png" />
96-
97-
<resource-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target="res/drawable-hdpi/ic_action_remove.png" />
98-
<resource-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target="res/drawable-mdpi/ic_action_remove.png" />
99-
<resource-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target="res/drawable-xhdpi/ic_action_remove.png" />
100-
<resource-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target="res/drawable-xxhdpi/ic_action_remove.png" />
101-
</platform>
102-
103-
<!-- ubuntu -->
104-
<platform name="ubuntu">
105-
<js-module src="www/inappbrowser.js" name="inappbrowser">
106-
<clobbers target="cordova.InAppBrowser.open" />
107-
<clobbers target="window.open" />
108-
</js-module>
109-
<header-file src="src/ubuntu/inappbrowser.h" />
110-
<source-file src="src/ubuntu/inappbrowser.cpp" />
111-
<resource-file src="src/ubuntu/InAppBrowser.qml" />
112-
<resource-file src="src/ubuntu/InAppBrowser_escapeScript.js" />
113-
<resource-file src="src/ubuntu/close.png" />
114-
</platform>
115-
11670
<!-- ios -->
11771
<platform name="ios">
11872
<js-module src="www/inappbrowser.js" name="inappbrowser">
@@ -147,63 +101,6 @@
147101
<source-file src="src/osx/CDVInAppBrowser.m" />
148102
</platform>
149103

150-
<!-- wp7 -->
151-
<platform name="wp7">
152-
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
153-
<Capability Name="ID_CAP_NETWORKING"/>
154-
</config-file>
155-
156-
<js-module src="www/inappbrowser.js" name="inappbrowser">
157-
<clobbers target="cordova.InAppBrowser.open" />
158-
<clobbers target="window.open" />
159-
</js-module>
160-
<config-file target="config.xml" parent="/*">
161-
<feature name="InAppBrowser">
162-
<param name="wp-package" value="InAppBrowser"/>
163-
</feature>
164-
</config-file>
165-
166-
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
167-
<Capability Name="ID_CAP_NETWORKING" />
168-
</config-file>
169-
170-
<source-file src="src/wp/InAppBrowser.cs" />
171-
</platform>
172-
173-
<!-- wp8 -->
174-
<platform name="wp8">
175-
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
176-
<Capability Name="ID_CAP_NETWORKING"/>
177-
</config-file>
178-
179-
<js-module src="www/inappbrowser.js" name="inappbrowser">
180-
<clobbers target="cordova.InAppBrowser.open" />
181-
<clobbers target="window.open" />
182-
</js-module>
183-
<config-file target="config.xml" parent="/*">
184-
<feature name="InAppBrowser">
185-
<param name="wp-package" value="InAppBrowser"/>
186-
</feature>
187-
</config-file>
188-
189-
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
190-
<Capability Name="ID_CAP_NETWORKING" />
191-
</config-file>
192-
193-
<source-file src="src/wp/InAppBrowser.cs" />
194-
</platform>
195-
196-
<!-- windows8 -->
197-
<platform name="windows8">
198-
<js-module src="www/inappbrowser.js" name="inappbrowser">
199-
<clobbers target="cordova.InAppBrowser.open" />
200-
<clobbers target="window.open" />
201-
</js-module>
202-
<js-module src="www/windows8/InAppBrowserProxy.js" name="InAppBrowserProxy">
203-
<merges target="" />
204-
</js-module>
205-
</platform>
206-
207104
<!-- windows universal apps (Windows 8.1, Windows Phone 8.1, Windows 8.0) -->
208105
<platform name="windows">
209106
<js-module src="www/inappbrowser.js" name="inappbrowser">
@@ -216,20 +113,6 @@
216113
<asset src="www/inappbrowser.css" target="css/inappbrowser.css" />
217114
</platform>
218115

219-
<!-- firefoxos -->
220-
<platform name="firefoxos">
221-
<config-file target="config.xml" parent="/*">
222-
<permission name="browser" description="Enables the app to implement a browser in an iframe." privileged="true"/>
223-
</config-file>
224-
<js-module src="www/inappbrowser.js" name="inappbrowser">
225-
<clobbers target="cordova.InAppBrowser.open" />
226-
<clobbers target="window.open" />
227-
</js-module>
228-
<js-module src="src/firefoxos/InAppBrowserProxy.js" name="InAppBrowserProxy">
229-
<runs />
230-
</js-module>
231-
</platform>
232-
233116
<!-- browser -->
234117
<platform name="browser">
235118
<js-module src="www/inappbrowser.js" name="inappbrowser">

0 commit comments

Comments
 (0)