From 961a76c0bc931c3a484640f9fb1e3d6f7877857b Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Thu, 2 Jun 2016 16:03:24 +0200 Subject: [PATCH] Squashed 'libs/editor/' changes from fa030e4..10ae495 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 --- WordPressEditor/build.gradle | 4 ++-- .../main/res/drawable-hdpi/ic_close_white_24dp.png | Bin .../src/main/res/drawable-hdpi/media_icon_32dp.png | Bin .../main/res/drawable-xhdpi/ic_close_white_24dp.png | Bin .../src/main/res/drawable-xhdpi/media_icon_32dp.png | Bin .../res/drawable-xxhdpi/ic_close_white_24dp.png | Bin .../main/res/drawable-xxhdpi/media_icon_32dp.png | Bin libs/editor-common/assets/ZSSRichTextEditor.js | 5 +++++ libs/editor-common/assets/svg/delete-image.svg | 0 libs/editor-common/assets/svg/edit-image.svg | 0 10 files changed, 7 insertions(+), 2 deletions(-) mode change 100755 => 100644 WordPressEditor/src/main/res/drawable-hdpi/ic_close_white_24dp.png mode change 100755 => 100644 WordPressEditor/src/main/res/drawable-hdpi/media_icon_32dp.png mode change 100755 => 100644 WordPressEditor/src/main/res/drawable-xhdpi/ic_close_white_24dp.png mode change 100755 => 100644 WordPressEditor/src/main/res/drawable-xhdpi/media_icon_32dp.png mode change 100755 => 100644 WordPressEditor/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png mode change 100755 => 100644 WordPressEditor/src/main/res/drawable-xxhdpi/media_icon_32dp.png mode change 100755 => 100644 libs/editor-common/assets/svg/delete-image.svg mode change 100755 => 100644 libs/editor-common/assets/svg/edit-image.svg diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle index 708e47b730d8..1f8fe303afc0 100644 --- a/WordPressEditor/build.gradle +++ b/WordPressEditor/build.gradle @@ -22,8 +22,8 @@ android { buildToolsVersion "23.0.3" defaultConfig { - versionCode 10 - versionName "1.0" + versionCode 11 + versionName "1.1" minSdkVersion 14 targetSdkVersion 23 } diff --git a/WordPressEditor/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/WordPressEditor/src/main/res/drawable-hdpi/ic_close_white_24dp.png old mode 100755 new mode 100644 diff --git a/WordPressEditor/src/main/res/drawable-hdpi/media_icon_32dp.png b/WordPressEditor/src/main/res/drawable-hdpi/media_icon_32dp.png old mode 100755 new mode 100644 diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/WordPressEditor/src/main/res/drawable-xhdpi/ic_close_white_24dp.png old mode 100755 new mode 100644 diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/media_icon_32dp.png b/WordPressEditor/src/main/res/drawable-xhdpi/media_icon_32dp.png old mode 100755 new mode 100644 diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/WordPressEditor/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png old mode 100755 new mode 100644 diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/media_icon_32dp.png b/WordPressEditor/src/main/res/drawable-xxhdpi/media_icon_32dp.png old mode 100755 new mode 100644 diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/libs/editor-common/assets/ZSSRichTextEditor.js index 94c7d11f7805..2a915fd57b7c 100755 --- a/libs/editor-common/assets/ZSSRichTextEditor.js +++ b/libs/editor-common/assets/ZSSRichTextEditor.js @@ -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); diff --git a/libs/editor-common/assets/svg/delete-image.svg b/libs/editor-common/assets/svg/delete-image.svg old mode 100755 new mode 100644 diff --git a/libs/editor-common/assets/svg/edit-image.svg b/libs/editor-common/assets/svg/edit-image.svg old mode 100755 new mode 100644