[go: nahoru, domu]
Skip to content

Commit

Permalink
Squashed 'libs/editor/' changes from b207f3f..5ee37c8
Browse files Browse the repository at this point in the history 
5ee37c8 Merge pull request #419 from wordpress-mobile/js-tests
3c6a922 s/functional/unit/
04b81e3 Updated README with Mocha test instructions
4d75715 Comment cleanup
ef276fc Merge branch 'develop' into js-tests
8f06353 Added mocha tests for HTML to visual conversion
d03ea19 Merge pull request #418 from wordpress-mobile/issue/415-media-delete-paragraphs
30a3c66 Exported some Visual -> HTML conversion methods to editor-utils-formatter for testability
a53706d Merge pull request #414 from wordpress-mobile/issue/411-edit-overlay-stuck
8f3f816 Added editor-utils-formatter.js file and exported HTML->Visual formatting methods from the ZSSEditor JS
aa4bb12 Don't add extraneous break tag after videos when converting from HTML
dcbdbf1 Fix paragraph wrapping around media items when loading from HTML
7948e95 Fix duplicate src tag for videos
6470a4e Don't delete the paragraph div when deleting a media item
d189b09 Merge pull request #410 from wordpress-mobile/issue/377-video-remove-button
e13f5fc Fixed edit containers not being cleared when switching to HTML mode
eff160c Fixed #408
0acaa82 Extend contenteditable=false to the entire edit container for videos
9774ef0 Merge pull request #404 from wordpress-mobile/issue/update-html-toolbar-icon
531f368 When adding edit containers for videos in ZSSEditor.applyVisualFormatting, track them for mutation
5f0444c Add edit containers to videos when applying visual formatting
9c89dfc Remove edit containers wrapping videos when stripping visual formatting
b91317f Fixed trackNodeForMutation usage when video upload completes
3c6f61f Added a null check to ZSSEditor.sendEnabledStyles
86923d2 Track video edit containers for mutation
1a07cbf Fixed paragraph issues when adding remote videos at the start of a post
0917a1b Add delete button overlay for videos added directly (without being uploaded)
d370041 Show delete button overlay for videos that have finished uploading
546d4c6 update with new HTML icons / using a solid background on highlighted version

git-subtree-dir: libs/editor
git-subtree-split: 5ee37c8c995994edeb87651efebce57b870ff3b7
  • Loading branch information
@maxme
maxme committed Jun 20, 2016
1 parent 19320ef commit 2fc5d53
Show file tree
Hide file tree
Showing 10 changed files with 415 additions and 187 deletions.
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,7 @@ WordPress/src/main/res/values/com_crashlytics_export_strings.xml

# libs
libs/utils

# Node-based JS Tests
node_modules
npm-debug.log*
12 changes: 12 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ Integration testing is done with the [Android testing framework](http://develope

Add new unit tests to `src/test/java/` and integration tests to `stc/androidTest/java/`.

### JavaScript Tests ###

This project also has unit tests for the JS part of the editor using [Mocha](https://mochajs.org/).

To be able to run the tests, [npm](https://www.npmjs.com/) and Mocha (`npm install -g mocha`) are required.

With npm and Mocha installed, from within `libs/editor-common/assets/test`, run:

npm install chai

It should now be possible to run the tests using `mocha` inside `libs/editor-common/assets`.

## LICENSE ##

WordPress-Editor-Android is an Open Source project covered by the [GNU General Public License version 2](LICENSE.md).
29 changes: 13 additions & 16 deletions WordPressEditor/src/main/res/drawable/format_bar_button_html.xml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="44dp"
android:height="44dp"
android:viewportWidth="44"
android:viewportHeight="44">

android:width="44dp"
android:height="44dp"
android:viewportWidth="44.0"
android:viewportHeight="44.0">
<path
android:fillColor="#87A6BC"
android:pathData="M16.294,25h-1.288v-2.738h-1.907V25h-1.292v-6.398h1.292v2.588h1.907v-2.588h1.288V25z" />
android:pathData="M13.93,26H12.79v-4.16H9.17V26H8.04v-9h1.13v3.87h3.62V17h1.14V26z"
android:fillColor="#A6BCCC"/>
<path
android:fillColor="#87A6BC"
android:pathData="M21.348,19.678h-1.582V25h-1.297v-5.322h-1.555v-1.077h4.434V19.678z" />
android:pathData="M20.97,17.97H18.6V26h-1.13v-8.03h-2.36V17h5.86V17.97z"
android:fillColor="#A6BCCC"/>
<path
android:fillColor="#87A6BC"
android:pathData="M23.777,18.602l1.209,4.627l1.204-4.627h1.688V25h-1.296v-1.731l0.118-2.667L25.422,25h-0.879
l-1.279-4.399l0.119,2.667V25H22.09v-6.398H23.777z" />
android:pathData="M23.75,17l2.35,7.34L28.45,17h1.46v9h-1.13v-3.51l0.1,-3.51L26.53,26h-0.87l-2.34,-6.99l0.1,3.49V26h-1.13v-9H23.75z"
android:fillColor="#A6BCCC"/>
<path
android:fillColor="#87A6BC"
android:pathData="M30.207,23.928h2.268V25h-3.561v-6.398h1.293V23.928z" />
</vector>
android:pathData="M33,25.03h3.53V26h-4.67v-9h1.14V25.03z"
android:fillColor="#A6BCCC"/>
</vector>
31 changes: 17 additions & 14 deletions WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="44dp"
android:height="44dp"
android:viewportWidth="44"
android:viewportHeight="44">

<path
android:fillColor="#E8EEF2"
android:pathData="M15.006,21.19h-1.907v-2.588h-1.292V25h1.292v-2.738h1.907V25h1.288v-6.398h-1.288V21.19z
M16.914,19.678h1.555V25h1.297v-5.322h1.582v-1.077h-4.434V19.678z
M24.986,23.229l-1.209-4.627H22.09V25h1.293v-1.731
l-0.119-2.667L24.543,25h0.879l1.278-4.399l-0.118,2.667V25h1.296v-6.398H26.19L24.986,23.229z
M30.207,23.928v-5.326h-1.293V25 h3.561v-1.072H30.207z" />
</vector>
android:width="44dp"
android:height="44dp"
android:viewportWidth="44.0"
android:viewportHeight="44.0">
<path
android:pathData="M13.93,26H12.79v-4.16H9.17V26H8.04v-9h1.13v3.87h3.62V17h1.14V26z"
android:fillColor="#E8EEF2"/>
<path
android:pathData="M20.97,17.97H18.6V26h-1.13v-8.03h-2.36V17h5.86V17.97z"
android:fillColor="#E8EEF2"/>
<path
android:pathData="M23.75,17l2.35,7.34L28.45,17h1.46v9h-1.13v-3.51l0.1,-3.51L26.53,26h-0.87l-2.34,-6.99l0.1,3.49V26h-1.13v-9H23.75z"
android:fillColor="#E8EEF2"/>
<path
android:pathData="M33,25.03h3.53V26h-4.67v-9h1.14V25.03z"
android:fillColor="#E8EEF2"/>
</vector>
32 changes: 18 additions & 14 deletions WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="44dp"
android:height="44dp"
android:viewportWidth="44"
android:viewportHeight="44">

<path
android:fillColor="#0084BC"
android:pathData="M15.006,21.19h-1.907v-2.588h-1.292V25h1.292v-2.738h1.907V25h1.288v-6.398h-1.288V21.19z
M16.914,19.678h1.555V25h1.297v-5.322h1.582v-1.077h-4.434V19.678z
M24.986,23.229l-1.209-4.627H22.09V25h1.293v-1.731
l-0.119-2.667L24.543,25h0.879l1.278-4.399l-0.118,2.667V25h1.296v-6.398H26.19L24.986,23.229z
M30.207,23.928v-5.326h-1.293V25 h3.561v-1.072H30.207z" />
</vector>
android:width="44dp"
android:height="44dp"
android:viewportWidth="44.0"
android:viewportHeight="44.0">
<path android:fillColor="#E1EBF1" android:pathData="M0,0h44v44h-44z"/>
<path
android:pathData="M13.93,26H12.79v-4.16H9.17V26H8.04v-9h1.13v3.87h3.62V17h1.14V26z"
android:fillColor="#A6BCCC"/>
<path
android:pathData="M20.97,17.97H18.6V26h-1.13v-8.03h-2.36V17h5.86V17.97z"
android:fillColor="#A6BCCC"/>
<path
android:pathData="M23.75,17l2.35,7.34L28.45,17h1.46v9h-1.13v-3.51l0.1,-3.51L26.53,26h-0.87l-2.34,-6.99l0.1,3.49V26h-1.13v-9H23.75z"
android:fillColor="#A6BCCC"/>
<path
android:pathData="M33,25.03h3.53V26h-4.67v-9h1.14V25.03z"
android:fillColor="#A6BCCC"/>
</vector>
Loading

0 comments on commit 2fc5d53

Please sign in to comment.