Merge branch 'dev' into dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/13fcb649 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/13fcb649 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/13fcb649
Branch: refs/heads/dev Commit: 13fcb6492ee0f5b18c83a49244bb8ffa9a4105e9 Parents: e2fbc5a eeaf303 Author: acton393 <acton...@users.noreply.github.com> Authored: Tue May 16 11:09:03 2017 +0800 Committer: GitHub <nore...@github.com> Committed: Tue May 16 11:09:03 2017 +0800 ---------------------------------------------------------------------- .../com/taobao/weex/adapter/DefaultUriAdapter.java | 15 +++++++++------ .../taobao/weex/adapter/DefaultUriAdapterTest.java | 9 ++++++--- 2 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/13fcb649/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java index c52162b,fb03b2f..fed57ef --- a/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java +++ b/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java @@@ -43,12 -43,15 +43,15 @@@ public class DefaultUriAdapter implemen Uri base = Uri.parse(instance.getBundleUrl()); Uri.Builder resultBuilder = uri.buildUpon(); -- - if(uri.getEncodedPath().length() == 0){ - return base; - }else if (uri.isRelative()) { - resultBuilder = buildRelativeURI(resultBuilder, base, uri); - return resultBuilder.build(); ++ + if (uri.isRelative()) { + //When uri is empty, means use the base url instead. Web broswer behave this way. + if(uri.getEncodedPath().length() == 0){ + return base; + } else { + resultBuilder = buildRelativeURI(resultBuilder, base, uri); + return resultBuilder.build(); + } } return uri; }
