Resovled merge conflicts

platform/commonUI/edit/bundle.js

@@ -40,6 +40,10 @@ define([
     "./src/policies/EditContextualActionPolicy",
     "./src/representers/EditRepresenter",
     "./src/representers/EditToolbarRepresenter",
+    "./src/capabilities/EditorCapability",
+    "./src/capabilities/TransactionDecorator",
+    "./src/services/TransactionService",
+    "./src/services/DirtyModelCache",
     "text!./res/templates/library.html",
     "text!./res/templates/edit-object.html",
     "text!./res/templates/edit-action-buttons.html",
@@ -66,6 +70,10 @@ define([
     EditContextualActionPolicy,
     EditRepresenter,
     EditToolbarRepresenter,
+    EditorCapability,
+    TransactionDecorator,
+    TransactionService,
+    DirtyModelCache,
     libraryTemplate,
     editObjectTemplate,
     editActionButtonsTemplate,
@@ -261,6 +269,35 @@ define([
                     "template": topbarEditTemplate
                 }
             ],
+            "components": [
+                {
+                    "type": "decorator",
+                    "provides": "capabilityService",
+                    "implementation": TransactionDecorator,
+                    "depends": [
+                        "$q",
+                        "transactionService",
+                        "dirtyModelCache"
+                    ]
+                },
+                {
+                    "type": "provider",
+                    "provides": "transactionService",
+                    "implementation": TransactionService,
+                    "depends": [
+                        "$q",
+                        "dirtyModelCache"
+                    ]
+                },
+                {
+                    "type": "provider",
+                    "provides": "dirtyModelCache",
+                    "implementation": DirtyModelCache,
+                    "depends": [
+                        "topic"
+                    ]
+                }
+            ],
             "representers": [
                 {
                     "implementation": EditRepresenter,
@@ -282,7 +319,19 @@ define([
                     "key": "nonEditContextBlacklist",
                     "value": ["copy", "follow", "properties", "move", "link", "remove", "locate"]
                 }
-            ]
+            ],
+            "capabilities": [
+                {
+                    "key": "editor",
+                    "name": "Editor Capability",
+                    "description": "Provides transactional editing capabilities",
+                    "implementation": EditorCapability,
+                    "depends": [
+                        "transactionService",
+                        "dirtyModelCache"
+                    ]
+                }
+            ],
         }
     });
 });