Resolved merge conflicts

2016-05-12 16:14:31 -07:00
parent 5bf750c90c
commit 44f4a82fa1
37 changed files with 741 additions and 332 deletions
--- a/platform/search/src/services/GenericSearchProvider.js
+++ b/platform/search/src/services/GenericSearchProvider.js
@@ -120,8 +120,8 @@ define([
            provider = this;

        mutationTopic.listen(function (mutatedObject) {
-            var status = mutatedObject.getCapability('status');
-            if (!status || !status.get('editing')) {
+            var editor = mutatedObject.getCapability('editor');
+            if (!editor || !editor.inEditContext()) {
                provider.index(
                    mutatedObject.getId(),
                    mutatedObject.getModel()