From ec2589f5170d1d2157a78fec1f23ce0790992087 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 4 Oct 2017 11:35:30 +0200
Subject: [PATCH 1/2] add global data attribute to all main editors

---
 src/Umbraco.Web.UI.Client/src/views/content/edit.html           | 2 +-
 src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html         | 2 +-
 src/Umbraco.Web.UI.Client/src/views/media/edit.html             | 2 +-
 src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html        | 2 +-
 src/Umbraco.Web.UI.Client/src/views/member/edit.html            | 2 +-
 src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html       | 2 +-
 src/Umbraco.Web.UI.Client/src/views/packager/overview.html      | 2 +-
 src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html | 2 +-
 src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html      | 2 +-
 src/Umbraco.Web.UI.Client/src/views/scripts/edit.html           | 2 +-
 src/Umbraco.Web.UI.Client/src/views/templates/edit.html         | 2 +-
 src/Umbraco.Web.UI.Client/src/views/users/overview.html         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index 2ad4534115..c1a17662a2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.Content.EditController">
+<div data-element="editor-content" ng-controller="Umbraco.Editors.Content.EditController">
   <content-editor create-options="createOptions"
                   content-id="contentId"
                   page="page"
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
index f35f511053..686ac2ef57 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.DataType.EditController">
+<div data-element="editor-data-types" ng-controller="Umbraco.Editors.DataType.EditController">
 
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index 8929d143b7..3c135fb231 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.Media.EditController">
+<div data-element="editor-media" ng-controller="Umbraco.Editors.Media.EditController">
 
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
index f0d3a8fbf6..5124c9706f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.MediaTypes.EditController as vm">
+<div data-element="editor-media-types" ng-controller="Umbraco.Editors.MediaTypes.EditController as vm">
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index 51b937cd85..d72750c770 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.Member.EditController">
+<div data-element="editor-members" ng-controller="Umbraco.Editors.Member.EditController">
 
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
index eb34aae6cc..c2c2ebfb81 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.MemberTypes.EditController as vm">
+<div data-element="editor-member-types" ng-controller="Umbraco.Editors.MemberTypes.EditController as vm">
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/overview.html b/src/Umbraco.Web.UI.Client/src/views/packager/overview.html
index b9857ac53a..43f08a9882 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/overview.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.Packages.OverviewController as vm" class="clearfix">
+<div data-element="editor-packages" ng-controller="Umbraco.Editors.Packages.OverviewController as vm" class="clearfix">
 
     <form name="packagesForm" ng-submit="save()" novalidate val-form-manager>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
index 2c56655569..8f093a5924 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.PartialViewMacros.EditController as vm">
+<div data-element="editor-partial-view-macros" ng-controller="Umbraco.Editors.PartialViewMacros.EditController as vm">
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
index 3d9c9c4a9e..6ecc2b2d89 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.PartialViews.EditController as vm">
+<div data-element="editor-partial-views" ng-controller="Umbraco.Editors.PartialViews.EditController as vm">
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.html b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.html
index 4c58356732..fc80f78507 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.Scripts.EditController as vm">
+<div data-element="editor-scripts" ng-controller="Umbraco.Editors.Scripts.EditController as vm">
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index 2d59b644d0..d952947c3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.Templates.EditController as vm">
+<div data-element="editor-templates" ng-controller="Umbraco.Editors.Templates.EditController as vm">
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/overview.html b/src/Umbraco.Web.UI.Client/src/views/users/overview.html
index 2816e80e09..f58339a937 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/overview.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.Editors.Users.OverviewController as vm" class="clearfix">
+<div data-element="editor-users" ng-controller="Umbraco.Editors.Users.OverviewController as vm" class="clearfix">
 
     <umb-editor-view footer="false">
 

From 1c39c741b683c4c045b1d8372ceb1b201cb9883f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 4 Oct 2017 13:01:33 +0200
Subject: [PATCH 2/2] get outerWidth and outerHeight

---
 .../directives/components/application/umbtour.directive.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
index 827ad44089..b1ef4002a8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
@@ -73,8 +73,8 @@
                     
                     var element = $(scope.currentStep.element);
                     var offset = element.offset();
-                    var width = element.width();
-                    var height = element.height();
+                    var width = element.outerWidth(true);
+                    var height = element.outerHeight(true);
     
                     console.log("This element", element);                    
                     console.log("width", width);