[TIMOB-3370][TIMOB-9593] webview fixes #3909
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
| String baseUrl = "data://"; | ||
| reloadMethod = reloadTypes.HTML; | ||
| reloadData = d; | ||
| String baseUrl = "TiC.URL_ANDROID_ASSET_RESOURCES"; |
There was a problem hiding this comment.
TiC.URL_ANDROID_ASSET_RESOURCES does not need quotes.
| @@ -165,6 +166,7 @@ -(UIWebView*)webview | |||
| [spinner sizeToFit]; | |||
| [spinner startAnimating]; | |||
| } | |||
| lastValidLoad = nil; | |||
There was a problem hiding this comment.
Initialization. Not even required.
|
Code reviewed and functionally tested for Android. Ran all the test cases in TIMOB-9593. All passed. Request Accepted |
|
Code reviewed. APPROVED |
|
Functionally tested TIMOB-3370 on iPhone Simulator. Accepted |
pingwang2011
added a commit
that referenced
this pull request
Mar 6, 2013
[TIMOB-3370][TIMOB-9593] webview fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
iOS fixes:
Load will fire only for unique urls
Test case is in TIMOB-3370
Android Fixes:
refactor of reload method to properly fix TIMOB-9593 and do setHtml with baseURL pointing to resources dir.
setData now checks for type file and loads from there to get correct baseUrl for relative paths in files
changeProxyUrl now does not fire property change for url.
Note that setting HTML still sets the wrong URL in history and so goBack() will always fail once you navigate away from page(existing behavior)
Test case attached to TIMOB-9593
Regress against KS Webview