' +
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
index 64cbfc3d33..3cac289133 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
@@ -81,16 +81,16 @@ angular.module('umbraco.services')
var callback = options.callback;
//Modal dom obj and unique id
- var $modal = $('
');
var id = templateUrl.replace('.html', '').replace('.aspx', '').replace(/[\/|\.|:\&\?\=]/g, "-") + '-' + scope.$id;
- if(options.inline){
+ if(options.inline){
animationClass = "";
modalClass = "";
- }else{
- $modal.addClass("modal");
- $modal.addClass("hide");
- }
+ }else{
+ $modal.addClass("modal");
+ $modal.addClass("hide");
+ }
//set the id and add classes
$modal
diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html
index f1368c2847..7b1800850e 100644
--- a/src/Umbraco.Web.UI.Client/src/index.html
+++ b/src/Umbraco.Web.UI.Client/src/index.html
@@ -9,7 +9,7 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js
index 66890f5b6e..d63b2f15fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js
@@ -9,11 +9,9 @@
*
*/
function MainController($scope, $routeParams, $rootScope, $timeout, $http, $log, notificationsService, userService, navigationService, legacyJsLoader) {
- //debugmode so I can easily turn on/off json output of property models:
- //TODO: find a better way
- $scope.$umbdebugmode = true;
- //set default properties
+ //detect if the current device is touch-enabled
+ $scope.touchDevice = (true === ("ontouchstart" in window || window.DocumentTouch && document instanceof DocumentTouch));
//the null is important because we do an explicit bool check on this in the view
//the avatar is by default the umbraco logo
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html
index 327458f24e..dc16d0ed1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html
@@ -1,4 +1,5 @@