diff --git a/UmbracoPackages/App_Plugins/brothers.uNesting/uNesting.js b/UmbracoPackages/App_Plugins/brothers.uNesting/uNesting.js
index 2abfe28..cc3f981 100644
--- a/UmbracoPackages/App_Plugins/brothers.uNesting/uNesting.js
+++ b/UmbracoPackages/App_Plugins/brothers.uNesting/uNesting.js
@@ -14,6 +14,10 @@ angular.module('umbraco.services').config(['$httpProvider', function ($httpProvi
{
request.url = '/App_Plugins/brothers.uNesting/uNesting.doctypepicker.html';
}
+ else if (request.url.indexOf(Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/views/propertyeditors/nestedcontent/nestedcontent.editor.html") === 0)
+ {
+ request.url = '/App_Plugins/brothers.uNesting/uNesting.editor.html';
+ }
return request || $q.when(request);
}
@@ -24,7 +28,7 @@ angular.module('umbraco.services').config(['$httpProvider', function ($httpProvi
-angular.module("umbraco").controller("brothers.uNesting.DocTypePickerController", function ($scope)
+angular.module("umbraco").controller("brothers.uNesting.DocTypePickerController", function ($scope, $controller)
{
angular.extend(this, $controller('Umbraco.PropertyEditors.NestedContent.DocTypePickerController', { $scope: $scope }));
});
@@ -33,6 +37,20 @@ angular.module("umbraco").controller("brothers.uNesting.DocTypePickerController"
angular.module("umbraco").controller("brothers.uNesting.PropertyEditorController", function ($scope, $controller, $http, $compile)
{
angular.extend(this, $controller('Umbraco.PropertyEditors.NestedContent.PropertyEditorController', { $scope: $scope }));
+
+ $scope.clickHide = function ($event, node)
+ {
+ //syncCurrentNode();
+ console.info(node);
+ $event.stopPropagation();
+ //clipboardService.copy("elementType", node.contentTypeAlias, node);
+ //$event.stopPropagation();
+ };
+
+ $scope.canHide = function (item)
+ {
+ return typeof item['uNestingHide'] !== 'undefined';
+ };
});
diff --git a/UmbracoPackages/MediaExtendedController.cs b/UmbracoPackages/MediaExtendedController.cs
new file mode 100644
index 0000000..2dfdd53
--- /dev/null
+++ b/UmbracoPackages/MediaExtendedController.cs
@@ -0,0 +1,52 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Http;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
+using Umbraco.Web;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
+
+namespace UmbracoPackages
+{
+ ///
+ /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
+ /// access to ALL of the methods on this controller will need access to the media application.
+ ///
+ [PluginController("UmbracoApi")]
+ [UmbracoApplicationAuthorize(Constants.Applications.Media)]
+ public class MediaExtendedController : ContentControllerBase
+ {
+ public MediaExtendedController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+ : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper) { }
+
+
+ ///
+ /// Return media for the specified UDIs
+ ///
+ ///
+ ///
+ public Dictionary
GetByUdis([FromUri]Udi[] ids)
+ {
+ var foundMedia = Services.MediaService.GetByIds(ids.Select(x => (x as GuidUdi).Guid));
+ return foundMedia.ToDictionary(media => (Udi)media.GetUdi(), media =>
+ {
+ string json = media.GetValue("umbracoFile");
+ return JsonConvert.DeserializeObject(json).Src;
+ });
+ }
+
+
+ class SrcData
+ {
+ public string Src { get; set; }
+ }
+ }
+}
diff --git a/UmbracoPackages/UmbracoPackages.csproj b/UmbracoPackages/UmbracoPackages.csproj
index 3bf90ef..31dfd2a 100644
--- a/UmbracoPackages/UmbracoPackages.csproj
+++ b/UmbracoPackages/UmbracoPackages.csproj
@@ -395,10 +395,10 @@
-
-
+
+
@@ -470,6 +470,7 @@
+
@@ -490,7 +491,6 @@
-
diff --git a/UmbracoPackages/config/ClientDependency.config b/UmbracoPackages/config/ClientDependency.config
index aea78e9..7e8c306 100644
--- a/UmbracoPackages/config/ClientDependency.config
+++ b/UmbracoPackages/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files
-->
-
+