From 97d64f4f3d7a1e4f5808ae739f3d20c1cf1a2cb9 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 15 Jan 2016 17:06:22 +0100 Subject: [PATCH] adds latest MB version --- .../App_Plugins/ModelsBuilder/modelsbuilder.controller.js | 4 ++-- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 ++++---- src/Umbraco.Web.UI/packages.config | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js index 2b42c1fdde..28dcf72010 100644 --- a/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js +++ b/src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js @@ -1,4 +1,4 @@ -function modelsBuilderController($scope, umbRequestHelper, $log, $http) { +function modelsBuilderController($scope, umbRequestHelper, $log, $http /*, $sce*/) { $scope.generate = function() { $scope.generating = true; @@ -15,7 +15,7 @@ $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")), 'Failed to get dashboard.') .then(function (result) { - //result.text = $sce.trustAsHtml(result.text); + //result.text = $sce.trustAsHtml(result.text); // accept html $scope.dashboard = result; $scope.ready = true; }); diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 87c2d97f51..94bf68375b 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -350,12 +350,12 @@ umbraco.providers - - ..\packages\Umbraco.ModelsBuilder.2.2.0-beta002\lib\Umbraco.ModelsBuilder.dll + + ..\packages\Umbraco.ModelsBuilder.2.2.0-beta003\lib\Umbraco.ModelsBuilder.dll True - - ..\packages\Umbraco.ModelsBuilder.AspNet.2.2.0-beta002\lib\Umbraco.ModelsBuilder.AspNet.dll + + ..\packages\Umbraco.ModelsBuilder.AspNet.2.2.0-beta003\lib\Umbraco.ModelsBuilder.AspNet.dll True diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index 2f0b60e4b2..2a510ad47c 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -37,7 +37,7 @@ - - + + \ No newline at end of file