Ian Clelland
22b1959333
Manually fix Android sdk location to support library projects without local.properties
2014-05-22 14:04:00 -04:00
Ian Clelland
97008305ff
Merge branch 'master' into pluggable_webview
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-05-15 15:59:11 -04:00
Ian Clelland
1a17083e8c
Add more required methods on CordovaWebView interface
2014-05-15 15:56:10 -04:00
Joe Bowser
b6664cc859
Added two more required methods to CordovaWebView to get the Junit tests running, removed tests that make no sense
2014-05-14 11:09:21 -07:00
Steven Gill
50c4aef873
Update JS snapshot to version 3.6.0-dev (via coho)
2014-05-08 15:32:28 -07:00
Joe Bowser
cf42d31214
Update JS snapshot to version 3.6.0-dev (via coho)
2014-05-06 15:51:17 -07:00
Joe Bowser
00caa1c0a0
Set VERSION to 3.6.0-dev (via coho)
2014-05-06 15:51:14 -07:00
Joe Bowser
93c8ba920a
Added dash to test push
2014-05-06 13:59:13 -07:00
Andrew Grieve
8702c04d39
Revert accidentally removed lines from NOTICE
2014-05-06 15:18:31 -04:00
Ian Clelland
e595c313a1
Use correct client object in recent versions of android again
2014-05-02 10:29:53 -04:00
Ian Clelland
955da2e360
Clean up merge commit
...
Reinstate fix for github issue #96 (b715d20
)
Re-remove extra calls to set up client objects (8e31ef7b
)
Reinstate license header in CordovaChromeClient.java
2014-05-02 10:22:38 -04:00
Joe Bowser
04b3fc0268
Outsmarted by vim, needed Eclipse to clean this up
2014-04-30 15:09:54 -07:00
Joe Bowser
105ccc81a5
This is an ugly merge commit, because the rebase made even less sense.
...
This should add the old setProperty methods required for the tests. We
decided to not deprecate them. I don't make a habit of doing merge
commits, due to their destructive nature, but I think I might have
merged too much stuff in.
Merge branch 'pluggable_webview' of https://git-wip-us.apache.org/repos/asf/cordova-android into pluggable_webview
Conflicts:
framework/src/org/apache/cordova/AndroidChromeClient.java
framework/src/org/apache/cordova/AndroidWebView.java
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-04-30 14:59:40 -07:00
Steven Gill
c349892c5b
CB-6552: updated author to apache software foundation in pacakge.json
2014-04-30 12:55:28 -07:00
Steven Gill
3d4b8ce99b
CB-6552: updated test field
2014-04-30 11:59:29 -07:00
Joe Bowser
3571307df5
Adding setIntegerProperty, setBooleanProperty and setStringProperty back, due to possible demand, and due to the fact that I don't want to rewrite my tests
2014-04-30 11:33:26 -07:00
Steven Gill
64fd87134f
CB-6552: added top level package.json
2014-04-30 10:54:58 -07:00
Marcel Kinard
82bba44538
CB-6491 add CONTRIBUTING.md
2014-04-30 08:44:21 -04:00
Ian Clelland
df05f3a3c0
Try other constructors besides first
2014-04-29 22:50:12 -04:00
Ian Clelland
8e31ef7be6
Defer construction of client objects to WebView
2014-04-29 22:50:12 -04:00
Joe Bowser
f4555f7c96
Removing the xwalk_core_library reference so we can use this with MozillaView
2014-04-29 22:50:11 -04:00
Ningxin Hu
8408da55ea
Add getView() API into CordovaWebView.
...
This API is to get the actual View.
The concrete webview implementation can use compositing instead of extending
underlying webview.
2014-04-29 22:50:11 -04:00
Ningxin Hu
4a67dd2e28
Crosswalk runtime needs the two permissions to auto detect connection status.
...
See more details at: https://crosswalk-project.org/jira/browse/XWALK-1324
2014-04-29 22:50:11 -04:00
Joe Bowser
bd806a34d8
Removing XWalkWebView and making it a plugin component
2014-04-29 22:50:11 -04:00
Joe Bowser
2f7e833a79
Got the bridge to work with Crosswalk
2014-04-29 22:50:11 -04:00
Joe Bowser
c17503ab78
w00t! Managed to get XWalk to work. Next Step: Make it installable
...
like a Cordova Plugin!
2014-04-29 22:50:11 -04:00
Joe Bowser
19f76d34db
Hurray! It runs! Now that we have the default WebView working, it's time
...
to make things a little more pluggable.
2014-04-29 22:50:11 -04:00
Joe Bowser
25c8b2fabb
Removing the deprecated setAttribute methods to clean up the codebase
2014-04-29 22:44:05 -04:00
Joe Bowser
bfd8bf9ca4
Merge pull request #3 from huningxin/pluggable_webview
...
Make correct webview client and chrome client for specific webview engin...
2014-04-29 13:25:19 -07:00
Ningxin Hu
e6adbb0e42
CB-6543 Fix cordova/run failure when no custom_rules.xml available
...
Github: Close #99
2014-04-28 22:50:22 -04:00
Fardjad Davari
11fc6be328
defaults.xml: Add AndroidLaunchMode preference
2014-04-25 00:27:33 +04:30
Ningxin Hu
7a5405d2ab
Delegate making WebViewClient and ChromeClient to webview engine.
...
Revert the change of webview preference name.
2014-04-24 09:42:51 +08:00
Joe Bowser
b9a24f00ad
Removing the xwalk_core_library reference so we can use this with MozillaView
2014-04-23 14:31:30 -07:00
Ningxin Hu
dbfc292353
Make correct webview client and chrome client for specific webview engine.
...
It changes the webview preference naming from full name to prefix, since the
prefix is also used to construct the name of WebView, WebViewClient and
ChromeClient.
For example, for Crosswalk webview, config.xml contains:
<preference name="webView" value="org.apache.cordova.engine.crosswalk.XWalkCordova" />
2014-04-23 16:33:31 +08:00
Joe Bowser
a09255b2ff
Merge pull request #2 from huningxin/pluggable_webview
...
Pluggable webview
2014-04-22 15:55:52 -07:00
Ningxin Hu
9d1c72cc07
Add getView() API into CordovaWebView.
...
This API is to get the actual View.
The concrete webview implementation can use compositing instead of extending
underlying webview.
2014-04-21 15:22:19 +08:00
Ningxin Hu
09ac30ef2e
Crosswalk runtime needs the two permissions to auto detect connection status.
...
See more details at: https://crosswalk-project.org/jira/browse/XWALK-1324
2014-04-21 15:17:23 +08:00
Andrew Grieve
0ec8f5d283
Add JavaDoc for CordovaResourceApi
2014-04-17 15:51:59 -04:00
Ian Clelland
b872df0f31
CB-6388: Handle binary data correctly in LOAD_URL bridge
2014-04-02 13:42:19 -04:00
Ian Clelland
0add4af208
Update JS snapshot to version 3.5.0-dev-81f9a00
2014-04-02 13:42:19 -04:00
Michal Mocny
298cd9e065
Fix CB-6048: Set launchMode=singleTop so tapping app icon does not always restart app
2014-04-01 11:33:40 -04:00
hadeslee
b715d20385
Remove incorrect usage of AlertDialog.Builder.create
...
AlertDialog.Builder.show() will create an AlertDialog before it show. This is the source code snippet:
/**
* Creates a {@link AlertDialog} with the arguments supplied to this builder and
* {@link Dialog#show()}'s the dialog.
*/
public AlertDialog show() {
AlertDialog dialog = create();
dialog.show();
return dialog;
}
github: close #96
2014-03-28 13:40:43 -04:00
Andrew Grieve
79e313a0c0
Catch uncaught exceptions in from plugins and turn them into error responses.
...
When a plugin throws an unchecked exception, we're not catching it
anywhere and so the error callback is not being called.
This change adds a try/catch to catch such exceptions.
2014-03-17 11:58:14 -07:00
Andrew Grieve
9f4c75d1c2
Add NOTICE file
2014-03-17 11:58:14 -07:00
Joe Bowser
b37492644c
Removing XWalkWebView and making it a plugin component
2014-03-12 15:04:28 -07:00
Joe Bowser
04a792a8c2
Got the bridge to work with Crosswalk
2014-03-10 14:39:43 -07:00
Joe Bowser
35ec24c3f0
w00t! Managed to get XWalk to work. Next Step: Make it installable
...
like a Cordova Plugin!
2014-03-07 15:03:22 -08:00
Andrew Grieve
9a00ccdacc
Catch uncaught exceptions in from plugins and turn them into error responses.
...
When a plugin throws an unchecked exception, we're not catching it
anywhere and so the error callback is not being called.
This change adds a try/catch to catch such exceptions.
2014-03-06 21:27:44 -05:00
Joe Bowser
61b23677d1
Hurray! It runs! Now that we have the default WebView working, it's time
...
to make things a little more pluggable.
2014-03-05 15:50:02 -08:00
Joe Bowser
90037dc6cd
Removing the deprecated setAttribute methods to clean up the codebase
2014-03-04 15:02:30 -08:00