Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'libs/editor/' changes from aec6410..77cb2fb
77cb2fb Merge pull request #162 from wordpress-mobile/issue/19-integrate-editor-wpandroid 39ea8ca Updated target sdk and support libraries to 22 50437ce Gradle version bump a756e1f Merge branch 'develop' into issue/19-integrate-editor-wpandroid 5c9e419 Merge pull request #153 from wordpress-mobile/issue/127-blockquote-fixes e3a2560 Switched editor layout from LinearLayout to RelativeLayout e6f7bb3 Added debug logging for callback-response-string in JsCallbackReceiver f1cf184 Added callback-response-string callback check to JsCallbackReceiverTest 3a1a158 Merge branch 'develop' into issue/19-integrate-editor-wpandroid c6af228 Removed duplicate drawables (added by mistake in earlier merge from main WPAndroid project) ff78748 Print a debug log whenever getTitle() and getContent() are called from the UI thread 6692740 Updated EditorFragment.getTitle() and getContent() to never return null aed719f Added Android Studio's captures/ folder to .gitignore 34854be Merge pull request #154 from wordpress-mobile/issue/122-scroll-fixes 855d545 Changed new editor frag layout to linear f31b6c2 Updated getAncestorElementForSettingBlockquote... 6bcf90a Fixed an issue where empty field contents would be turned into a 'null' literal string 4102f09 Fixed issue where CountDownLatches weren't always being called in EditorFragment.onGetHtmlResponse() f6091bc Added a toggle for action bar auto-hiding inside onConfigurationChanged for EditorFragment c17b0e0 Implemented getTitle() and getContent() for EditorFragment ca18067 Added support for retrieving the contents of the title and content fields from JavaScript d2bf496 Changed Utils.buildMapFromKeyValuePairs() to only treat the first = as a delimiter bf0f787 Added missing backslash in strings.xml 3f975f8 Merge branch 'develop' into issue/19-integrate-editor-wpandroid 38effc2 Fixed NPE caused by missing null check in Utils.escapeHtml() c6ec3aa Extracted test content loading code from EditorFragment to MainExampleActivity 56306f4 Selected JS ports from iOS 60f0509 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Editor-Android into issue/127-blockquote-fixes db547f6 Merge pull request #147 from wordpress-mobile/issue/130-landscape-viewport 6d80fbc Removed integration test exclusion from build.gradle a335a99 Updated README to reflect new test setup 35fab19 Moved integration tests to /src/androidTest/ f493649 Merge pull request #146 from maxme/issue/fix-travis-build a2a64f1 move tests from WordPressEditor/src/androidTest to WordPressEditor/src/test and remove unused DrawerLayoutImpl.file 2b1c6a1 fix compile issue by updating robolectric gradle plugin to 1.1.0 9ede8d9 SDK package refinements for travis. c502e01 travis.yml tweaks 98e8e7b Updated ANDROID_HOME path in travis.yml 562d444 Switched to older style travis setup ec31e41 Updated rangy to 1.3 873abaa Updated EditorFragment to only hide the action bar on landscape mode 6b92d5c Added a workaround to fix Travis failing for MockEditorActivity 0fce2f9 Changed MockEditorActivity to extend ActionBarActivity 41965b8 Merge branch 'develop' into issue/130-landscape-viewport 567abd0 Handled hiding and showing the action bar when the keyboard is shown and hidden (respectively) ac66521 Hide the action bar in the editor fragment 46586df Merge pull request #143 from wordpress-mobile/issue/128-integration-tests 1b253ba Merge pull request #141 from wordpress-mobile/issue/139-tablet-padding 52e8fbb Updated the README with information on integration tests 05c09d2 Added checks for all buttons states to testFormatBarToggledOnSelectedFieldChanged() 7a73e7c Added a test class for the ZSSEditor c6ef596 Renamed tests manifest entry for MockEditorActivity d39585a Added some integration tests for EditorFragment c3ea838 Added an EditorFragmentForTests class, overriding certain EditorFragment methods for more testing support 0dbbd5f Added a mock EditorActivity to attach an EditorFragment to for testing 88a202d Renamed JsCallbackHandlerTest to JsCallbackReceiverTest to match the class being tested 0a5dd94 Modified gradle build file to support integration tests 06c24ff Added extra padding between format bar buttons on screens over 800dp wide 8f88f67 Moved tablet padding rules to a separate css file f24d87d Merge branch 'develop' into issue/139-tablet-padding e40225a Removed duplicate import f820758 Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop 1bba03f update to wputils 1.6.0 2d2bd8e Update wpeditor ec1855d Increased editor side padding for tablets 40e798b Merge pull request #140 from wordpress-mobile/issue/18-format-bar-tablet 904cf27 Use a placeholder image when thumbnail can't be decoded d3bd3f8 Removing potential race condition with WP image loading threads. db80eef WP library images and local images working. f7bbaab Local images are maintained after fragment is re-created. a0e0615 Returning to the post editor won't crash if Activity was destroyed. 2fe6c3f Merge branch 'develop' into issue/18-format-bar-tablet 8a1bf41 Merge pull request #138 from wordpress-mobile/issue/124-separate-files 559b7d8 Style updates. 9b89d36 Added support for strikethrough tag in EditorFragment efcde28 Added editor layout for tablets (sw600dp) 5e59531 Added selector for strikethrough button 3bf29a2 Added bigger HTML button drawables for tablet format bar 9239f92 Removed a lot of inline JS/CSS from the main editor html file. 64b83d3 Merge pull request #136 from wordpress-mobile/issue/132-formatbar-keyboard-old-api 2d7c9c4 Moved some WebView config code from EditorFragment to EditorWebViewAbstract c5882ba Merge remote-tracking branch 'remotes/origin/develop' into issue/132-formatbar-keyboard-old-api 0699bb6 Suppressed NewApi lint check for EditorWebView.execJavaScriptFromString 8d5b424 Added compatibility WebView for API<19 with custom method for executing JS 4478cf3 Merge pull request #133 from wordpress-mobile/issue/10-format-bar-phone ba3c137 Pulled the EditorWebView layout element into a separate file b4a21f4 Modified EditorWebView to use WebView.evaluateJavascript on API>=19 ef8b078 Added EditorWebViewAbstract and replaced EditorWebView usage in EditorFragment 50524b9 Moved the format bar's left margin inside the scrollview 0d2a713 Shrank HTML button and tightened its margins baa00c8 Removed unnecessary HTML button code f144a88 Linked up format bar buttons to ZSSEditor methods 570ae57 Added unit test for Utils.buildMapFromKeyValuePairs bbba60a Added partial support for the callback-selection-changed JS callback bb8c537 Added format bar buttons and dividers to editor layout 6e340ac Renamed format button highlighted underline dimens 315bb50 Relabeled legacy editor color assets 14c3938 Added new format bar icons and selectors 8303e45 Renamed legacy editor button selectors and images 6195fe0 Merge pull request #129 from wordpress-mobile/issue/23-extract-callback-handler 228a563 Qualified Utils static imports in UtilsTest 418d4b3 Some EditorFragment cleanup db3bd70 Added units tests for Utils 53821d7 Added units tests for JsCallbackHandler 862e533 Added some callback placeholders to JsCallbackReceiver with logging b746221 Renamed callback classes for clarity bedf027 Merge branch 'develop' into issue/23-extract-callback-handler eaa2f17 Merge pull request #21 from wordpress-mobile/feature/test-framework 5346958 Added a lint rule ignoring the 'InvalidPackage' check for Robolectric 83c3108 Added notes and logging for some currently unused JS callbacks 4c2f2d1 Downgrading plugin, tests aren't working with the new tools. 17ec76c Updating robolectric-gradle-plugin and the Android gradle build plugin. 201f7e7 Merge branch 'develop' into feature/test-framework abcf3e3 Moved some utility methods from EditorFragment to Utils 7f336ea Added a WebView sublcass, EditorWebView, and switched the editor to use that b7be242 Added handling for the "callback-selection-style" JS callback e9c6401 Updated onDomLoaded() to enable multiline support for the content field f1f933b Moved JsCallbackHandler to its own file 5da8d79 Added example format bar with bold button ea71291 Fix #2406 - Load media file in the background fc5f50d Merge pull request #22 from wordpress-mobile/feature/14-main-editor 3666662 Cleaned up EditorFragment 9645409 Changed project license from MIT to GPLv2 cfa2fe4 Fixed issue with JavaScript not loading on API<19 32591e0 Switched WebChromeClient onConsoleMessage to use debug log messages instead of error 10b5506 Updated to use build tools 21.1.2 54d20a7 Added title to editor example content 124981c Added travis build status to README 200efb8 Adding Robolectric test framework and JaCoCo code coverage reports. ef0e582 README cleanup d16a6d5 Set default activity for example application 23fd043 Updated README with build instructions for Windows (fixes assets symlink) 87c8911 Added @SuppressLint for web debugging a5e31e8 Changed WordPress-Utils-Android dependency to maven artifact 88f29c5 JS to Java callback proof of concept d2aa4f3 Updated ZSSRichTextEditor to latest version ced12ea Auto-load an example HTML file in editor dd66e62 Updated common editor files and imported editor HTML file from iOS efa02b7 fix gallery placeholder icon a6b5ecf Tapping a media gallery span opens gallery editor. 912f81a Adding missing override annotation. 58c9ae7 Using isVideo to determine if a file is a video. 1721d30 enable gallery handling 3ca1d97 remove unused code 9c806b5 first step at introducing the new media picker 94e0f77 rename and update editor colors 1b3b384 Merge branch 'develop' into feature/modularize-editor f6ef4ce fix local draft style saving by introducing an awful "getSpannedContent()" method :( 8f9d5e4 EditLinkActivity is now independent from the EditPostActivity 1d7067e add local draft / remote post example d33a9be make the legacy editor works in the example project 6f0d297 LegacyEditorFragment now lives in the editor subproject 777635b split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils 0c60b07 move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils 11e6f7f use setFeaturedImageSupported instead of using WordPress.getCurrentBlog().isFeaturedImageCapable() fb3a66d appendMediaFile now able to load local media 068e0df reenable appendMedia in LegacyEditorFragment d847975 split methods to be usable on MediaFile instead of WPImageSpan 8978cb1 move WPEditImageSpan bitmap loading to the constructor 8141509 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class 839f755 first step to remove getContentEditText/getTitleEditText git-subtree-dir: libs/editor git-subtree-split: 77cb2fb13d1df4e392670f763bcb12d57d2fe851
- Loading branch information