Merge branch 'temp-template-editor' into temp-U4-9324

# Conflicts: # src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
2017-01-10 11:52:03 +01:00
parent b2815d5e63 77d47f0b28
commit 82ab7c4a01
18 changed files with 339 additions and 38 deletions
--- a/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js
@@ -47,6 +47,7 @@
                    getCursorPosition: function() {},
                    getValue: function() {},
                    setValue: function() {},
+                    focus: function() {},
                    clearSelection: function() {},
                    navigateFileStart: function() {}
                };