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

Media picker tinymce icon

Browse Source
This commit is contained in:
perploug
2013-09-26 21:43:33 +02:00
parent 757178b90b
commit bcac690fd5
2 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -47,7 +47,7 @@ function tinyMceService(dialogService, $log, imageHelper, assetsService, $timeou
*/
createMediaPicker: function (editor, $scope) {
editor.addButton('umbmediapicker', {
icon: 'media',
icon: 'custom icon-picture',
tooltip: 'Media Picker',
onclick: function () {
dialogService.mediaPicker({
@@ -82,38 +82,6 @@ function tinyMceService(dialogService, $log, imageHelper, assetsService, $timeou
});
},
/**
* @ngdoc method
* @name umbraco.services.tinyMceService#createIconPicker
* @methodOf umbraco.services.tinyMceService
*
* @description
* Creates the umbrco insert icon tinymce plugin
*
* @param {Object} editor the TinyMCE editor instance
* @param {Object} $scope the current controller scope
*/
createIconPicker: function (editor, $scope) {
editor.addButton('umbiconpicker', {
icon: 'media',
tooltip: 'Icon Picker',
onclick: function () {
dialogService.open({
show: true, template: "views/common/dialogs/iconpicker.html", scope: $scope, callback: function (c) {
var data = {
style: 'font-size: 60px'
};
var i = editor.dom.createHTML('i', data);
tinyMCE.activeEditor.dom.addClass(i, c);
editor.insertContent(i);
}
});
}
});
},
/**
* @ngdoc method
* @name umbraco.services.tinyMceService#createUmbracoMacro

3
src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
View File

@@ -81,9 +81,6 @@ angular.module("umbraco")
//Create the insert media plugin
tinyMceService.createMediaPicker(editor, $scope);
//Create the insert icon plugin
tinyMceService.createIconPicker(editor, $scope);
//Create the insert icon plugin
tinyMceService.createInsertEmbeddedMedia(editor, $scope);