yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added removal of isMedia whenever a contentnode is selected

Browse Source
This commit is contained in:
Jackie Nagel
2014-04-15 19:59:31 +02:00
parent e4f63c0576
commit 4890e97168
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/lib/tinymce/plugins/umbracolink/plugin.min.js vendored
View File

@@ -181,7 +181,6 @@ tinymce.PluginManager.add('umbracolink', function(editor) {
currentTarget: currentTarget,
callback: function (data) {
if (data) {
console.log(data);
var href = data.url;
function insertLink() {

20
src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
View File

@@ -26,13 +26,16 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
}
}
$scope.switchToMediaPicker = function(){
dialogService.mediaPicker({callback: function(media){
$scope.target.id = media.id;
$scope.target.isMedia = true;
$scope.target.name = media.name;
$scope.target.url = mediaHelper.resolveFile(media);
}});
$scope.switchToMediaPicker = function () {
dialogService.mediaPicker(
{
callback: function (media) {
$scope.target.id = media.id;
$scope.target.isMedia = true;
$scope.target.name = media.name;
$scope.target.url = mediaHelper.resolveFile(media);
}
});
};
@@ -75,5 +78,8 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
}
}
if (!angular.isUndefined($scope.target.isMedia)) {
delete $scope.target.isMedia;
}
});
});