Skip to content

Commit

Permalink
Squashed 'libs/editor/' changes from fa030e4..10ae495
Browse files Browse the repository at this point in the history
10ae495 Merge pull request #395 from wordpress-mobile/issue/394-mutationobserver-error-log
ebf1208 Continue to next removed node if an invalid node is detected
8a2589a Fix #394 (avoid undefined removedNode.attributes error in onMutationObserved)
e6015b2 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Editor-Android into develop
bbd044e 1.1 version bump
01a4329 update file modes

git-subtree-dir: libs/editor
git-subtree-split: 10ae495d48b8c97d92b4b02d30a13bb82c1b33e4
  • Loading branch information
maxme committed Jun 2, 2016
1 parent 5da21ed commit 961a76c
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions WordPressEditor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
buildToolsVersion "23.0.3"

defaultConfig {
versionCode 10
versionName "1.0"
versionCode 11
versionName "1.1"
minSdkVersion 14
targetSdkVersion 23
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified WordPressEditor/src/main/res/drawable-hdpi/media_icon_32dp.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified WordPressEditor/src/main/res/drawable-xhdpi/media_icon_32dp.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions libs/editor-common/assets/ZSSRichTextEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,11 @@ ZSSEditor.onMutationObserved = function(mutations) {
mutations.forEach(function(mutation) {
for (var i = 0; i < mutation.removedNodes.length; i++) {
var removedNode = mutation.removedNodes[i];
if (!removedNode.attributes) {
// Fix for https://github.com/wordpress-mobile/WordPress-Editor-Android/issues/394
// If removedNode doesn't have an attributes property, it's not of type Node and we shouldn't proceed
continue;
}
if (ZSSEditor.isMediaContainerNode(removedNode)) {
// An uploading or failed container node was deleted manually - notify native
var mediaIdentifier = ZSSEditor.extractMediaIdentifier(removedNode);
Expand Down
Empty file modified libs/editor-common/assets/svg/delete-image.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified libs/editor-common/assets/svg/edit-image.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 961a76c

Please sign in to comment.