From 8c64473541f2199f74480f309d2821c8018c79a1 Mon Sep 17 00:00:00 2001 From: Alex Forcier Date: Mon, 11 Jul 2016 07:24:19 -0400 Subject: [PATCH] Squashed 'libs/editor/' changes from 7dcc1a9..eb069ba eb069ba 1.3 version bump 0130742 Merge pull request #436 from wordpress-mobile/issue/383-drop-editor-common c017777 Moved JS tests out of editor assets folder, to test/js 7072c80 Moved example JS folder to example app assets 012ef21 Deleted unused ios-editor.html e7ae18d Moved 'read-only' JS libraries to libs/ folder 4fc87bf Updated README bb0f8ec Deleted libs/editor-common, moving its assets into the main project's assets folder (and deleting the symlink that was previously used) git-subtree-dir: libs/editor git-subtree-split: eb069ba15f0a810d08d646858914bac7dfa596ea --- README.md | 24 +- WordPressEditor/build.gradle | 4 +- WordPressEditor/src/main/assets | 1 - .../src/main}/assets/ZSSRichTextEditor.js | 0 .../src/main}/assets/android-editor.html | 26 +- .../src/main}/assets/editor-android.css | 0 .../main}/assets/editor-utils-formatter.js | 0 .../src/main}/assets/editor-utils.js | 0 .../src/main}/assets/editor.css | 0 .../main}/assets/fonts/Merriweather-Bold.ttf | Bin .../assets/fonts/Merriweather-BoldItalic.ttf | Bin .../assets/fonts/Merriweather-Italic.ttf | Bin .../main}/assets/fonts/Merriweather-Light.ttf | Bin .../assets/fonts/Merriweather-Regular.ttf | Bin .../src/main/assets/libs}/fastclick.js | 0 .../src/main/assets/libs}/jquery-2.1.3.min.js | 0 .../assets/libs}/jquery.mobile-events.min.js | 0 .../src/main/assets/libs}/js-beautifier.js | 0 .../main/assets/libs}/rangy-classapplier.js | 0 .../src/main/assets/libs}/rangy-core.js | 0 .../assets/libs}/rangy-cssclassapplier.js | 0 .../main/assets/libs}/rangy-highlighter.js | 0 .../libs}/rangy-selectionsaverestore.js | 0 .../src/main/assets/libs}/rangy-serializer.js | 0 .../src/main/assets/libs}/rangy-textrange.js | 0 .../src/main/assets/libs}/shortcode.js | 0 .../src/main/assets/libs}/underscore-min.js | 0 .../src/main/assets/libs}/wpload.js | 0 .../src/main/assets/libs}/wpsave.js | 0 .../src/main}/assets/svg/delete-image.svg | 0 .../src/main}/assets/svg/edit-image.svg | 0 .../src/main}/assets/svg/more-2x.png | Bin .../src/main}/assets/svg/pagebreak-2x.png | Bin .../main}/assets/svg/retry-image-large.svg | 0 .../src/main}/assets/svg/retry-image.svg | 0 .../src/main}/assets/svg/wpposter.svg | 0 .../src/test/js}/test-formatter.js | 10 +- .../src/main}/assets/example/cowboy-cat.jpg | Bin .../main}/assets/example/example-content.html | 0 libs/editor-common/LICENSE-MIT | 21 - libs/editor-common/README.md | 5 - libs/editor-common/assets/ios-editor.html | 1087 ----------------- 42 files changed, 23 insertions(+), 1155 deletions(-) delete mode 120000 WordPressEditor/src/main/assets rename {libs/editor-common => WordPressEditor/src/main}/assets/ZSSRichTextEditor.js (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/android-editor.html (65%) rename {libs/editor-common => WordPressEditor/src/main}/assets/editor-android.css (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/editor-utils-formatter.js (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/editor-utils.js (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/editor.css (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/fonts/Merriweather-Bold.ttf (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/fonts/Merriweather-BoldItalic.ttf (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/fonts/Merriweather-Italic.ttf (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/fonts/Merriweather-Light.ttf (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/fonts/Merriweather-Regular.ttf (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/fastclick.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/jquery-2.1.3.min.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/jquery.mobile-events.min.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/js-beautifier.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/rangy-classapplier.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/rangy-core.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/rangy-cssclassapplier.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/rangy-highlighter.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/rangy-selectionsaverestore.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/rangy-serializer.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/rangy-textrange.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/shortcode.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/underscore-min.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/wpload.js (100%) rename {libs/editor-common/assets => WordPressEditor/src/main/assets/libs}/wpsave.js (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/svg/delete-image.svg (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/svg/edit-image.svg (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/svg/more-2x.png (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/svg/pagebreak-2x.png (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/svg/retry-image-large.svg (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/svg/retry-image.svg (100%) rename {libs/editor-common => WordPressEditor/src/main}/assets/svg/wpposter.svg (100%) rename {libs/editor-common/assets/test => WordPressEditor/src/test/js}/test-formatter.js (95%) rename {libs/editor-common => example/src/main}/assets/example/cowboy-cat.jpg (100%) rename {libs/editor-common => example/src/main}/assets/example/example-content.html (100%) delete mode 100644 libs/editor-common/LICENSE-MIT delete mode 100644 libs/editor-common/README.md delete mode 100644 libs/editor-common/assets/ios-editor.html diff --git a/README.md b/README.md index f2df59d9239f..8429ed033574 100644 --- a/README.md +++ b/README.md @@ -6,24 +6,6 @@ WordPress-Editor-Android is the text editor used in the [WordPress Android app](https://github.com/wordpress-mobile/WordPress-Android) to create and edit pages & posts. In short it's a simple, straightforward way to visually edit HTML. -## Build Instructions ## - -Post-checkout instructions for Windows, necessary to convert the assets symlink to a Windows symlink: - -From git bash, inside the cloned project root: - - $ rm WordPressEditor/src/main/assets - $ git ls-files --deleted -z | git update-index --assume-unchanged -z --stdin - -Then, from a Windows command prompt: - - mklink /D [PROJECT_ROOT]\WordPressEditor\src\main\assets %PROJECT_ROOT%\libs\editor-common\assets - -Finally, update `[PROJECT_ROOT]\.git\info\exclude` to ignore the symlink locally: - - # assets symlink - WordPressEditor/src/main/assets - ## Testing ## This project has both unit testing and integration testing, maintained and run separately. @@ -40,13 +22,13 @@ This project also has unit tests for the JS part of the editor using [Mocha](htt 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: +With npm and Mocha installed, from within `WordPressEditor/src/test/js`, run: npm install chai -And then run `mocha` inside `libs/editor-common/assets`: +And then run `mocha` inside the same folder: - cd libs/editor-common/assets; mocha; cd - + cd WordPressEditor/src/test/js; mocha test*; cd - ## LICENSE ## diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle index 5f7ac2750e4a..eb1cec5dfbe3 100644 --- a/WordPressEditor/build.gradle +++ b/WordPressEditor/build.gradle @@ -22,8 +22,8 @@ android { buildToolsVersion "24.0.0" defaultConfig { - versionCode 12 - versionName "1.2" + versionCode 13 + versionName "1.3" minSdkVersion 16 targetSdkVersion 24 } diff --git a/WordPressEditor/src/main/assets b/WordPressEditor/src/main/assets deleted file mode 120000 index a4ba2eff27f2..000000000000 --- a/WordPressEditor/src/main/assets +++ /dev/null @@ -1 +0,0 @@ -../../../libs/editor-common/assets \ No newline at end of file diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/WordPressEditor/src/main/assets/ZSSRichTextEditor.js similarity index 100% rename from libs/editor-common/assets/ZSSRichTextEditor.js rename to WordPressEditor/src/main/assets/ZSSRichTextEditor.js diff --git a/libs/editor-common/assets/android-editor.html b/WordPressEditor/src/main/assets/android-editor.html similarity index 65% rename from libs/editor-common/assets/android-editor.html rename to WordPressEditor/src/main/assets/android-editor.html index 91674c0fe142..d70c11face74 100755 --- a/libs/editor-common/assets/android-editor.html +++ b/WordPressEditor/src/main/assets/android-editor.html @@ -8,22 +8,22 @@ nativeState.androidApiLevel=%%ANDROID_API_LEVEL%%; %%LOCALIZED_STRING_INIT%% - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
- -