From e4f63c0576fd1a1aa4f0e18e23ce8c7d22bcdc57 Mon Sep 17 00:00:00 2001
From: Jackie Nagel <jackie.nagel@eksponent.com>
Date: Tue, 15 Apr 2014 18:07:40 +0200
Subject: [PATCH] Now inserting mediaId in the link picker and setting the
 isMedia flag so that you can get mediaId's from the linkPicker dialogservice

---
 .../lib/tinymce/plugins/umbracolink/plugin.min.js            | 5 +++--
 .../src/views/common/dialogs/linkpicker.controller.js        | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js
index 82a882cddd..cf4afdb573 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js
@@ -181,6 +181,7 @@ tinymce.PluginManager.add('umbracolink', function(editor) {
 			currentTarget: currentTarget,
             callback: function (data) {
                 if (data) {
+                    console.log(data);
                     var href = data.url;
                     
                     function insertLink() {
@@ -208,8 +209,8 @@ tinymce.PluginManager.add('umbracolink', function(editor) {
     					return;
     				}
 
-    				//if we have an id, it must be a locallink:id
-    				if(data.id){
+    				//if we have an id, it must be a locallink:id, aslong as the isMedia flag is not set
+    				if(data.id && (angular.isUndefined(data.isMedia) || !data.isMedia)){
     					href = "/{localLink:" + data.id + "}";
     					insertLink();
     					return;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index 8fdc828ffc..1e7a379d3a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -28,7 +28,8 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 
 	$scope.switchToMediaPicker = function(){
 		dialogService.mediaPicker({callback: function(media){
-					$scope.target.id = undefined;
+					$scope.target.id = media.id;
+		            $scope.target.isMedia = true;
 					$scope.target.name = media.name;
 					$scope.target.url = mediaHelper.resolveFile(media);
 				}});