From bcac690fd51056935445b0a498c5459913c15045 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Thu, 26 Sep 2013 21:43:33 +0200
Subject: [PATCH] Media picker tinymce icon

---
 .../src/common/services/tinymce.service.js    | 34 +------------------
 .../propertyeditors/rte/rte.controller.js     |  3 --
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 13fe18e6a9..8616220008 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -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
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 338d6adbdf..1cf64e286f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -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);