activeadmin_trumbowyg 0.1.3 → 0.2.4

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/allowtagsfrompaste/trumbowyg.allowtagsfrompaste.min.js

@@ -0,0 +1 @@
+!function(e){"use strict";var a={allowedTags:[],removableTags:["a","abbr","address","b","bdi","bdo","blockquote","br","cite","code","del","dfn","details","em","h1","h2","h3","h4","h5","h6","hr","i","ins","kbd","mark","meter","pre","progress","q","rp","rt","ruby","s","samp","small","span","strong","sub","summary","sup","time","u","var","wbr","img","map","area","canvas","figcaption","figure","picture","audio","source","track","video","ul","ol","li","dl","dt","dd","table","caption","th","tr","td","thead","tbody","tfoot","col","colgroup","style","div","p","form","input","textarea","button","select","optgroup","option","label","fieldset","legend","datalist","keygen","output","iframe","link","nav","header","hgroup","footer","main","section","article","aside","dialog","script","noscript","embed","object","param"]};e.extend(!0,e.trumbowyg,{plugins:{allowTagsFromPaste:{init:function(t){if(t.o.removeformatPasted=!1,t.o.plugins.allowTagsFromPaste){var o=t.o.plugins.allowTagsFromPaste.allowedTags||a.allowedTags,r=t.o.plugins.allowTagsFromPaste.removableTags||a.removableTags;if(0!==o.length){var s=e(r).not(o).get();t.pasteHandlers.push(function(){setTimeout(function(){var a=t.$ed.html();e.each(s,function(e,t){a=a.replace(new RegExp("<\\/?"+t+"(\\s[^>]*)?>","gi"),"")}),t.$ed.html(a)},0)})}}}}}})}(jQuery);

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/base64/trumbowyg.base64.js

@@ -26,6 +26,12 @@
                 errFileReaderNotSupported: 'FileReader is not supported by your browser.',
                 errInvalidImage: 'Invalid image file.'
             },
+            da: {
+                base64: 'Billede som base64',
+                file: 'Fil',
+                errFileReaderNotSupported: 'FileReader er ikke understøttet af din browser.',
+                errInvalidImage: 'Ugyldig billedfil.'
+            },
             fr: {
                 base64: 'Image en base64',
                 file: 'Fichier'
@@ -39,6 +45,8 @@
                 file: '文件'
             },
             nl: {
+                base64: 'Afbeelding inline',
+                file: 'Bestand',
                 errFileReaderNotSupported: 'Uw browser ondersteunt deze functionaliteit niet.',
                 errInvalidImage: 'De gekozen afbeelding is ongeldig.'
             },
@@ -53,7 +61,31 @@
                 file: 'ファイル',
                 errFileReaderNotSupported: 'あなたのブラウザーはFileReaderをサポートしていません',
                 errInvalidImage: '画像形式が正しくありません'
-            }
+            },
+            tr: {
+                base64: 'Base64 olarak resim',
+                file: 'Dosya',
+                errFileReaderNotSupported: 'FileReader tarayıcınız tarafından desteklenmiyor.',
+                errInvalidImage: 'Geçersiz resim dosyası.'
+            },
+            zh_tw: {
+                base64: '圖片(base64編碼)',
+                file: '檔案',
+                errFileReaderNotSupported: '你的瀏覽器不支援FileReader',
+                errInvalidImage: '不正確的檔案格式'
+            },
+            pt_br: {
+                base64: 'Imagem em base64',
+                file: 'Arquivo',
+                errFileReaderNotSupported: 'FileReader não é suportado pelo seu navegador.',
+                errInvalidImage: 'Arquivo de imagem inválido.'
+            },
+            ko: {
+                base64: '그림 넣기(base64)',
+                file: '파일',
+                errFileReaderNotSupported: 'FileReader가 현재 브라우저를 지원하지 않습니다.',
+                errInvalidImage: '유효하지 않은 파일'
+            },
         },
         // jshint camelcase:true
 
@@ -92,7 +124,7 @@
 
                                     fReader.onloadend = function (e) {
                                         if (isValidImage(e.target.result)) {
-                                            trumbowyg.execCmd('insertImage', fReader.result);
+                                            trumbowyg.execCmd('insertImage', fReader.result, false, true);
                                             $(['img[src="', fReader.result, '"]:not([alt])'].join(''), trumbowyg.$box).attr('alt', values.alt);
                                             trumbowyg.closeModal();
                                         } else {

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/base64/trumbowyg.base64.min.js

@@ -1 +1 @@
-!function(e){"use strict";var a=function(){return"undefined"!=typeof FileReader},r=function(e){return/^data:image\/[a-z]?/i.test(e)};e.extend(!0,e.trumbowyg,{langs:{en:{base64:"Image as base64",file:"File",errFileReaderNotSupported:"FileReader is not supported by your browser.",errInvalidImage:"Invalid image file."},fr:{base64:"Image en base64",file:"Fichier"},cs:{base64:"Vložit obrázek",file:"Soubor"},zh_cn:{base64:"图片（Base64编码）",file:"文件"},nl:{errFileReaderNotSupported:"Uw browser ondersteunt deze functionaliteit niet.",errInvalidImage:"De gekozen afbeelding is ongeldig."},ru:{base64:"Изображение как код в base64",file:"Файл",errFileReaderNotSupported:"FileReader не поддерживается вашим браузером.",errInvalidImage:"Недопустимый файл изображения."},ja:{base64:"画像 (Base64形式)",file:"ファイル",errFileReaderNotSupported:"あなたのブラウザーはFileReaderをサポートしていません",errInvalidImage:"画像形式が正しくありません"}},plugins:{base64:{shouldInit:a,init:function(i){var t={isSupported:a,fn:function(){i.saveRange();var a,t=i.openModalInsert(i.lang.base64,{file:{type:"file",required:!0,attributes:{accept:"image/*"}},alt:{label:"description",value:i.getRangeText()}},function(n){var l=new FileReader;l.onloadend=function(a){r(a.target.result)?(i.execCmd("insertImage",l.result),e(['img[src="',l.result,'"]:not([alt])'].join(""),i.$box).attr("alt",n.alt),i.closeModal()):i.addErrorOnModalField(e("input[type=file]",t),i.lang.errInvalidImage)},l.readAsDataURL(a)});e("input[type=file]").on("change",function(e){a=e.target.files[0]})}};i.addBtnDef("base64",t)}}}})}(jQuery);
+!function(e){"use strict";var a=function(){return"undefined"!=typeof FileReader},r=function(e){return/^data:image\/[a-z]?/i.test(e)};e.extend(!0,e.trumbowyg,{langs:{en:{base64:"Image as base64",file:"File",errFileReaderNotSupported:"FileReader is not supported by your browser.",errInvalidImage:"Invalid image file."},da:{base64:"Billede som base64",file:"Fil",errFileReaderNotSupported:"FileReader er ikke understøttet af din browser.",errInvalidImage:"Ugyldig billedfil."},fr:{base64:"Image en base64",file:"Fichier"},cs:{base64:"Vložit obrázek",file:"Soubor"},zh_cn:{base64:"图片（Base64编码）",file:"文件"},nl:{base64:"Afbeelding inline",file:"Bestand",errFileReaderNotSupported:"Uw browser ondersteunt deze functionaliteit niet.",errInvalidImage:"De gekozen afbeelding is ongeldig."},ru:{base64:"Изображение как код в base64",file:"Файл",errFileReaderNotSupported:"FileReader не поддерживается вашим браузером.",errInvalidImage:"Недопустимый файл изображения."},ja:{base64:"画像 (Base64形式)",file:"ファイル",errFileReaderNotSupported:"あなたのブラウザーはFileReaderをサポートしていません",errInvalidImage:"画像形式が正しくありません"},tr:{base64:"Base64 olarak resim",file:"Dosya",errFileReaderNotSupported:"FileReader tarayıcınız tarafından desteklenmiyor.",errInvalidImage:"Geçersiz resim dosyası."},zh_tw:{base64:"圖片(base64編碼)",file:"檔案",errFileReaderNotSupported:"你的瀏覽器不支援FileReader",errInvalidImage:"不正確的檔案格式"},pt_br:{base64:"Imagem em base64",file:"Arquivo",errFileReaderNotSupported:"FileReader não é suportado pelo seu navegador.",errInvalidImage:"Arquivo de imagem inválido."},ko:{base64:"그림 넣기(base64)",file:"파일",errFileReaderNotSupported:"FileReader가 현재 브라우저를 지원하지 않습니다.",errInvalidImage:"유효하지 않은 파일"}},plugins:{base64:{shouldInit:a,init:function(i){var t={isSupported:a,fn:function(){i.saveRange();var a,t=i.openModalInsert(i.lang.base64,{file:{type:"file",required:!0,attributes:{accept:"image/*"}},alt:{label:"description",value:i.getRangeText()}},function(l){var n=new FileReader;n.onloadend=function(a){r(a.target.result)?(i.execCmd("insertImage",n.result,!1,!0),e(['img[src="',n.result,'"]:not([alt])'].join(""),i.$box).attr("alt",l.alt),i.closeModal()):i.addErrorOnModalField(e("input[type=file]",t),i.lang.errInvalidImage)},n.readAsDataURL(a)});e("input[type=file]").on("change",function(e){a=e.target.files[0]})}};i.addBtnDef("base64",t)}}}})}(jQuery);

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/cleanpaste/trumbowyg.cleanpaste.js

@@ -3,24 +3,16 @@
  * Font Clean paste plugin for Trumbowyg
  * http://alex-d.github.com/Trumbowyg
  * ===========================================================
- * Author : Eric Radin
- */
-
-/**
+ * Authors : Eric Radin
+ *           Todd Graham (slackwalker)
+ *
  * This plugin will perform a "cleaning" on any paste, in particular
  * it will clean pasted content of microsoft word document tags and classes.
  */
+
 (function ($) {
     'use strict';
 
-    function reverse(sentString) {
-        var theString = '';
-        for (var i = sentString.length - 1; i >= 0; i -= 1) {
-            theString += sentString.charAt(i);
-        }
-        return theString;
-    }
-
     function checkValidTags(snippet) {
         var theString = snippet;
 
@@ -46,90 +38,36 @@
         return theString;
     }
 
-    function cleanIt(htmlBefore, htmlAfter) {
-        var matchedHead = '';
-        var matchedTail = '';
-        var afterStart;
-        var afterFinish;
-        var newSnippet;
-
-        // we need to extract the inserted block
-        for (afterStart = 0; htmlAfter.charAt(afterStart) === htmlBefore.charAt(afterStart); afterStart += 1) {
-            matchedHead += htmlAfter.charAt(afterStart);
-        }
-
-        // If afterStart is inside a HTML tag, move to opening brace of tag
-        for (var i = afterStart; i >= 0; i -= 1) {
-            if (htmlBefore.charAt(i) === '<') {
-                afterStart = i;
-                matchedHead = htmlBefore.substring(0, afterStart);
-                break;
-            } else if (htmlBefore.charAt(i) === '>') {
-                break;
-            }
-        }
-
-        // now reverse string and work from the end in
-        htmlAfter = reverse(htmlAfter);
-        htmlBefore = reverse(htmlBefore);
-
-        // Find end of both strings that matches
-        for (afterFinish = 0; htmlAfter.charAt(afterFinish) === htmlBefore.charAt(afterFinish); afterFinish += 1) {
-            matchedTail += htmlAfter.charAt(afterFinish);
-        }
-
-        // If afterFinish is inside a HTML tag, move to closing brace of tag
-        for (var j = afterFinish; j >= 0; j -= 1) {
-            if (htmlBefore.charAt(j) === '>') {
-                afterFinish = j;
-                matchedTail = htmlBefore.substring(0, afterFinish);
-                break;
-            } else if (htmlBefore.charAt(j) === '<') {
-                break;
-            }
-        }
-
-        matchedTail = reverse(matchedTail);
-
-        // If there's no difference in pasted content
-        if (afterStart === (htmlAfter.length - afterFinish)) {
-            return false;
-        }
-
-        htmlAfter = reverse(htmlAfter);
-        newSnippet = htmlAfter.substring(afterStart, htmlAfter.length - afterFinish);
-
+    function cleanIt(html) {
         // first make sure all tags and attributes are made valid
-        newSnippet = checkValidTags(newSnippet);
+        html = checkValidTags(html);
 
         // Replace opening bold tags with strong
-        newSnippet = newSnippet.replace(/<b(\s+|>)/g, '<strong$1');
+        html = html.replace(/<b(\s+|>)/g, '<strong$1');
         // Replace closing bold tags with closing strong
-        newSnippet = newSnippet.replace(/<\/b(\s+|>)/g, '</strong$1');
+        html = html.replace(/<\/b(\s+|>)/g, '</strong$1');
 
         // Replace italic tags with em
-        newSnippet = newSnippet.replace(/<i(\s+|>)/g, '<em$1');
+        html = html.replace(/<i(\s+|>)/g, '<em$1');
         // Replace closing italic tags with closing em
-        newSnippet = newSnippet.replace(/<\/i(\s+|>)/g, '</em$1');
+        html = html.replace(/<\/i(\s+|>)/g, '</em$1');
 
         // strip out comments -cgCraft
-        newSnippet = newSnippet.replace(/<!(?:--[\s\S]*?--\s*)?>\s*/g, '');
+        html = html.replace(/<!(?:--[\s\S]*?--\s*)?>\s*/g, '');
 
         // strip out &nbsp; -cgCraft
-        newSnippet = newSnippet.replace(/&nbsp;/gi, ' ');
+        html = html.replace(/&nbsp;/gi, ' ');
         // strip out extra spaces -cgCraft
-        newSnippet = newSnippet.replace(/ <\//gi, '</');
+        html = html.replace(/ <\//gi, '</');
 
-        while (newSnippet.indexOf('  ') !== -1) {
-            var anArray = newSnippet.split('  ');
-            newSnippet = anArray.join(' ');
-        }
+        // Remove multiple spaces
+        html.replace(/\s+/g, ' ');
 
         // strip &nbsp; -cgCraft
-        newSnippet = newSnippet.replace(/^\s*|\s*$/g, '');
+        html = html.replace(/^\s*|\s*$/g, '');
 
         // Strip out unaccepted attributes
-        newSnippet = newSnippet.replace(/<[^>]*>/g, function (match) {
+        html = html.replace(/<[^>]*>/g, function (match) {
             match = match.replace(/ ([^=]+)="[^"]*"/g, function (match2, attributeName) {
                 if (['alt', 'href', 'src', 'title'].indexOf(attributeName) !== -1) {
                     return match2;
@@ -139,16 +77,15 @@
             return match;
         });
 
-        // Final cleanout for MS Word crud
-        newSnippet = newSnippet.replace(/<\?xml[^>]*>/g, '');
-        newSnippet = newSnippet.replace(/<[^ >]+:[^>]*>/g, '');
-        newSnippet = newSnippet.replace(/<\/[^ >]+:[^>]*>/g, '');
+        // Final clean out for MS Word crud
+        html = html.replace(/<\?xml[^>]*>/g, '');
+        html = html.replace(/<[^ >]+:[^>]*>/g, '');
+        html = html.replace(/<\/[^ >]+:[^>]*>/g, '');
 
         // remove unwanted tags
-        newSnippet = newSnippet.replace(/<(div|span|style|meta|link){1}.*?>/gi, '');
+        html = html.replace(/<(div|span|style|meta|link).*?>/gi, '');
 
-        htmlAfter = matchedHead + newSnippet + matchedTail;
-        return htmlAfter;
+        return html;
     }
 
     // clean editor
@@ -160,20 +97,15 @@
             cleanPaste: {
                 init: function (trumbowyg) {
                     trumbowyg.pasteHandlers.push(function () {
-                        try {
-                            var contentBefore = trumbowyg.$ed.html();
-                            setTimeout(function () {
-                                var contentAfter = trumbowyg.$ed.html();
-                                contentAfter = cleanIt(contentBefore, contentAfter);
-                                trumbowyg.$ed.html(contentAfter);
-                            }, 0);
-                        } catch (c) {
-                        }
+                        setTimeout(function () {
+                          try {
+                              trumbowyg.$ed.html(cleanIt(trumbowyg.$ed.html()));
+                          } catch (c) {
+                          }
+                        }, 0);
                     });
                 }
             }
         }
     });
 })(jQuery);
-
-

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/cleanpaste/trumbowyg.cleanpaste.min.js

@@ -1 +1 @@
-!function(r){"use strict";function e(r){for(var e="",t=r.length-1;t>=0;t-=1)e+=r.charAt(t);return e}function t(r){var e=r;return e=e.replace(/<[^> ]*/g,function(r){return r.toLowerCase()}),e=e.replace(/<[^>]*>/g,function(r){return r=r.replace(/ [^=]+=/g,function(r){return r.toLowerCase()})}),e=e.replace(/<[^>]*>/g,function(r){return r=r.replace(/( [^=]+=)([^"][^ >]*)/g,'$1"$2"')})}function n(r,n){var a,c,i,l="",s="";for(a=0;n.charAt(a)===r.charAt(a);a+=1)l+=n.charAt(a);for(var u=a;u>=0;u-=1){if("<"===r.charAt(u)){a=u,l=r.substring(0,a);break}if(">"===r.charAt(u))break}for(n=e(n),r=e(r),c=0;n.charAt(c)===r.charAt(c);c+=1)s+=n.charAt(c);for(var g=c;g>=0;g-=1){if(">"===r.charAt(g)){c=g,s=r.substring(0,c);break}if("<"===r.charAt(g))break}if(s=e(s),a===n.length-c)return!1;for(n=e(n),i=n.substring(a,n.length-c),i=t(i),i=i.replace(/<b(\s+|>)/g,"<strong$1"),i=i.replace(/<\/b(\s+|>)/g,"</strong$1"),i=i.replace(/<i(\s+|>)/g,"<em$1"),i=i.replace(/<\/i(\s+|>)/g,"</em$1"),i=i.replace(/<!(?:--[\s\S]*?--\s*)?>\s*/g,""),i=i.replace(/&nbsp;/gi," "),i=i.replace(/ <\//gi,"</");-1!==i.indexOf("  ");){var o=i.split("  ");i=o.join(" ")}return i=i.replace(/^\s*|\s*$/g,""),i=i.replace(/<[^>]*>/g,function(r){return r=r.replace(/ ([^=]+)="[^"]*"/g,function(r,e){return-1!==["alt","href","src","title"].indexOf(e)?r:""})}),i=i.replace(/<\?xml[^>]*>/g,""),i=i.replace(/<[^ >]+:[^>]*>/g,""),i=i.replace(/<\/[^ >]+:[^>]*>/g,""),i=i.replace(/<(div|span|style|meta|link){1}.*?>/gi,""),n=l+i+s}r.extend(!0,r.trumbowyg,{plugins:{cleanPaste:{init:function(r){r.pasteHandlers.push(function(){try{var e=r.$ed.html();setTimeout(function(){var t=r.$ed.html();t=n(e,t),r.$ed.html(t)},0)}catch(t){}})}}}})}(jQuery);
+!function(e){"use strict";function r(e){var r=e;return r=r.replace(/<[^> ]*/g,function(e){return e.toLowerCase()}),r=r.replace(/<[^>]*>/g,function(e){return e=e.replace(/ [^=]+=/g,function(e){return e.toLowerCase()})}),r=r.replace(/<[^>]*>/g,function(e){return e=e.replace(/( [^=]+=)([^"][^ >]*)/g,'$1"$2"')})}function n(e){return e=r(e),e=e.replace(/<b(\s+|>)/g,"<strong$1"),e=e.replace(/<\/b(\s+|>)/g,"</strong$1"),e=e.replace(/<i(\s+|>)/g,"<em$1"),e=e.replace(/<\/i(\s+|>)/g,"</em$1"),e=e.replace(/<!(?:--[\s\S]*?--\s*)?>\s*/g,""),e=e.replace(/&nbsp;/gi," "),e=e.replace(/ <\//gi,"</"),e.replace(/\s+/g," "),e=e.replace(/^\s*|\s*$/g,""),e=e.replace(/<[^>]*>/g,function(e){return e=e.replace(/ ([^=]+)="[^"]*"/g,function(e,r){return["alt","href","src","title"].indexOf(r)!==-1?e:""})}),e=e.replace(/<\?xml[^>]*>/g,""),e=e.replace(/<[^ >]+:[^>]*>/g,""),e=e.replace(/<\/[^ >]+:[^>]*>/g,""),e=e.replace(/<(div|span|style|meta|link).*?>/gi,"")}e.extend(!0,e.trumbowyg,{plugins:{cleanPaste:{init:function(e){e.pasteHandlers.push(function(){setTimeout(function(){try{e.$ed.html(n(e.$ed.html()))}catch(r){}},0)})}}}})}(jQuery);

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/colors/trumbowyg.colors.js

@@ -20,11 +20,27 @@
             },
             en: {
                 foreColor: 'Text color',
-                backColor: 'Background color'
+                backColor: 'Background color',
+                foreColorRemove: 'Remove text color',
+                backColorRemove: 'Remove background color'
+            },
+            da: {
+                foreColor: 'Tekstfarve',
+                backColor: 'Baggrundsfarve'
             },
             fr: {
                 foreColor: 'Couleur du texte',
-                backColor: 'Couleur de fond'
+                backColor: 'Couleur de fond',
+                foreColorRemove: 'Supprimer la couleur du texte',
+                backColorRemove: 'Supprimer la couleur de fond'
+            },
+            de: {
+                foreColor: 'Textfarbe',
+                backColor: 'Hintergrundfarbe'
+            },
+            nl: {
+                foreColor: 'Tekstkleur',
+                backColor: 'Achtergrondkleur'
             },
             sk: {
                 foreColor: 'Farba textu',
@@ -34,6 +50,10 @@
                 foreColor: '文字颜色',
                 backColor: '背景颜色'
             },
+            zh_tw: {
+                foreColor: '文字顏色',
+                backColor: '背景顏色'
+            },
             ru: {
                 foreColor: 'Цвет текста',
                 backColor: 'Цвет выделения текста'
@@ -41,9 +61,24 @@
             ja: {
                 foreColor: '文字色',
                 backColor: '背景色'
-            }
+            },
+            tr: {
+                foreColor: 'Yazı rengi',
+                backColor: 'Arkaplan rengi'
+            },
+            pt_br: {
+                foreColor: 'Cor de fonte',
+                backColor: 'Cor de fundo'
+            },
+            ko: {
+                foreColor: '글자색',
+                backColor: '배경색',
+                foreColorRemove: '글자색 지우기',
+                backColorRemove: '배경색 지우기'
+            },
         }
     });
+
     // jshint camelcase:true
 
 
@@ -65,7 +100,7 @@
     function colorTagHandler(element, trumbowyg) {
         var tags = [];
 
-        if(!element.style){
+        if (!element.style) {
             return tags;
         }
 
@@ -98,7 +133,19 @@
     }
 
     var defaultOptions = {
-        colorList: ['ffffff', '000000', 'eeece1', '1f497d', '4f81bd', 'c0504d', '9bbb59', '8064a2', '4bacc6', 'f79646', 'ffff00', 'f2f2f2', '7f7f7f', 'ddd9c3', 'c6d9f0', 'dbe5f1', 'f2dcdb', 'ebf1dd', 'e5e0ec', 'dbeef3', 'fdeada', 'fff2ca', 'd8d8d8', '595959', 'c4bd97', '8db3e2', 'b8cce4', 'e5b9b7', 'd7e3bc', 'ccc1d9', 'b7dde8', 'fbd5b5', 'ffe694', 'bfbfbf', '3f3f3f', '938953', '548dd4', '95b3d7', 'd99694', 'c3d69b', 'b2a2c7', 'b7dde8', 'fac08f', 'f2c314', 'a5a5a5', '262626', '494429', '17365d', '366092', '953734', '76923c', '5f497a', '92cddc', 'e36c09', 'c09100', '7f7f7f', '0c0c0c', '1d1b10', '0f243e', '244061', '632423', '4f6128', '3f3151', '31859b', '974806', '7f6000']
+        colorList: [
+            'ffffff', '000000', 'eeece1', '1f497d', '4f81bd', 'c0504d', '9bbb59', '8064a2', '4bacc6', 'f79646', 'ffff00',
+            'f2f2f2', '7f7f7f', 'ddd9c3', 'c6d9f0', 'dbe5f1', 'f2dcdb', 'ebf1dd', 'e5e0ec', 'dbeef3', 'fdeada', 'fff2ca',
+            'd8d8d8', '595959', 'c4bd97', '8db3e2', 'b8cce4', 'e5b9b7', 'd7e3bc', 'ccc1d9', 'b7dde8', 'fbd5b5', 'ffe694',
+            'bfbfbf', '3f3f3f', '938953', '548dd4', '95b3d7', 'd99694', 'c3d69b', 'b2a2c7', 'b7dde8', 'fac08f', 'f2c314',
+            'a5a5a5', '262626', '494429', '17365d', '366092', '953734', '76923c', '5f497a', '92cddc', 'e36c09', 'c09100',
+            '7f7f7f', '0c0c0c', '1d1b10', '0f243e', '244061', '632423', '4f6128', '3f3151', '31859b', '974806', '7f6000'
+        ],
+        foreColorList: null, // fallbacks on colorList
+        backColorList: null, // fallbacks on colorList
+        allowCustomForeColor: true,
+        allowCustomBackColor: true,
+        displayAsList: false,
     };
 
     // Add all colors in two dropdowns
@@ -107,12 +154,16 @@
             color: {
                 init: function (trumbowyg) {
                     trumbowyg.o.plugins.colors = trumbowyg.o.plugins.colors || defaultOptions;
+                    var dropdownClass = trumbowyg.o.plugins.colors.displayAsList ? trumbowyg.o.prefix + 'dropdown--color-list' : '';
+
                     var foreColorBtnDef = {
-                            dropdown: buildDropdown('foreColor', trumbowyg)
-                        },
-                        backColorBtnDef = {
-                            dropdown: buildDropdown('backColor', trumbowyg)
-                        };
+                        dropdown: buildDropdown('foreColor', trumbowyg),
+                        dropdownClass: dropdownClass,
+                    },
+                    backColorBtnDef = {
+                        dropdown: buildDropdown('backColor', trumbowyg),
+                        dropdownClass: dropdownClass,
+                    };
 
                     trumbowyg.addBtnDef('foreColor', foreColorBtnDef);
                     trumbowyg.addBtnDef('backColor', backColorBtnDef);
@@ -123,53 +174,76 @@
     });
 
     function buildDropdown(fn, trumbowyg) {
-        var dropdown = [];
+        var dropdown = [],
+            trumbowygColorOptions = trumbowyg.o.plugins.colors,
+            colorList = trumbowygColorOptions[fn + 'List'] || trumbowygColorOptions.colorList;
 
-        $.each(trumbowyg.o.plugins.colors.colorList, function (i, color) {
+        $.each(colorList, function (i, color) {
             var btn = fn + color,
                 btnDef = {
                     fn: fn,
                     forceCss: true,
+                    hasIcon: false,
+                    text: trumbowyg.lang['#' + color] || ('#' + color),
                     param: '#' + color,
                     style: 'background-color: #' + color + ';'
                 };
+
+            if (trumbowygColorOptions.displayAsList && fn === 'foreColor') {
+                btnDef.style = 'color: #' + color + ' !important;';
+            }
+
             trumbowyg.addBtnDef(btn, btnDef);
             dropdown.push(btn);
         });
 
+        // Remove color
         var removeColorButtonName = fn + 'Remove',
             removeColorBtnDef = {
                 fn: 'removeFormat',
+                hasIcon: false,
                 param: fn,
                 style: 'background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAG0lEQVQIW2NkQAAfEJMRmwBYhoGBYQtMBYoAADziAp0jtJTgAAAAAElFTkSuQmCC);'
             };
+
+        if (trumbowygColorOptions.displayAsList) {
+            removeColorBtnDef.style = '';
+        }
+
         trumbowyg.addBtnDef(removeColorButtonName, removeColorBtnDef);
         dropdown.push(removeColorButtonName);
 
-        // add free color btn
-        var freeColorButtonName = fn + 'Free',
-            freeColorBtnDef = {
-                fn: function () {
-                    trumbowyg.openModalInsert(trumbowyg.lang[fn],
-                        {
-                            color: {
-                                label: fn,
-                                value: '#FFFFFF'
+        // Custom color
+        if (trumbowygColorOptions['allowCustom' + fn.charAt(0).toUpperCase() + fn.substr(1)]) {
+            // add free color btn
+            var freeColorButtonName = fn + 'Free',
+                freeColorBtnDef = {
+                    fn: function () {
+                        trumbowyg.openModalInsert(trumbowyg.lang[fn],
+                            {
+                                color: {
+                                    label: fn,
+                                    forceCss: true,
+                                    type: 'color',
+                                    value: '#FFFFFF'
+                                }
+                            },
+                            // callback
+                            function (values) {
+                                trumbowyg.execCmd(fn, values.color);
+                                return true;
                             }
-                        },
-                        // callback
-                        function (values) {
-                            trumbowyg.execCmd(fn, values.color);
-                            return true;
-                        }
-                    );
-                },
-                text: '#',
-                // style adjust for displaying the text
-                style: 'text-indent: 0;line-height: 20px;padding: 0 5px;'
-            };
-        trumbowyg.addBtnDef(freeColorButtonName, freeColorBtnDef);
-        dropdown.push(freeColorButtonName);
+                        );
+                    },
+                    hasIcon: false,
+                    text: '#',
+                    // style adjust for displaying the text
+                    style: 'text-indent: 0; line-height: 20px; padding: 0 5px;'
+                };
+
+            trumbowyg.addBtnDef(freeColorButtonName, freeColorBtnDef);
+            dropdown.push(freeColorButtonName);
+        }
 
         return dropdown;
     }