activeadmin_trumbowyg 0.2.6 → 0.2.14

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."},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);
+!function(e){"use strict";var a=function(){return"undefined"!=typeof FileReader};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."},cs:{base64:"Vložit obrázek",file:"Soubor"},da:{base64:"Billede som base64",file:"Fil",errFileReaderNotSupported:"FileReader er ikke understøttet af din browser.",errInvalidImage:"Ugyldig billedfil."},et:{base64:"Pilt base64 formaadis",file:"Fail",errFileReaderNotSupported:"Teie veebilehitseja ei toeta FileReader funktsiooni.",errInvalidImage:"Vigane pildifail."},fr:{base64:"Image en base64",file:"Fichier"},hu:{base64:"Kép beszúrás inline",file:"Fájl",errFileReaderNotSupported:"Ez a böngésző nem támogatja a FileReader funkciót.",errInvalidImage:"Érvénytelen képfájl."},ja:{base64:"画像 (Base64形式)",file:"ファイル",errFileReaderNotSupported:"あなたのブラウザーはFileReaderをサポートしていません",errInvalidImage:"画像形式が正しくありません"},ko:{base64:"그림 넣기(base64)",file:"파일",errFileReaderNotSupported:"FileReader가 현재 브라우저를 지원하지 않습니다.",errInvalidImage:"유효하지 않은 파일"},nl:{base64:"Afbeelding inline",file:"Bestand",errFileReaderNotSupported:"Uw browser ondersteunt deze functionaliteit niet.",errInvalidImage:"De gekozen afbeelding is ongeldig."},pt_br:{base64:"Imagem em base64",file:"Arquivo",errFileReaderNotSupported:"FileReader não é suportado pelo seu navegador.",errInvalidImage:"Arquivo de imagem inválido."},ru:{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_cn:{base64:"图片（Base64编码）",file:"文件"},zh_tw:{base64:"圖片(base64編碼)",file:"檔案",errFileReaderNotSupported:"你的瀏覽器不支援FileReader",errInvalidImage:"不正確的檔案格式"}},plugins:{base64:{shouldInit:a,init:function(r){var i={isSupported:a,fn:function(){var a;r.saveRange();var i=r.openModalInsert(r.lang.base64,{file:{type:"file",required:!0,attributes:{accept:"image/*"}},alt:{label:"description",value:r.getRangeText()}},(function(l){var t=new FileReader;t.onloadend=function(a){var n;n=a.target.result,/^data:image\/[a-z]?/i.test(n)?(r.execCmd("insertImage",t.result,!1,!0),e(['img[src="',t.result,'"]:not([alt])'].join(""),r.$box).attr("alt",l.alt),r.closeModal()):r.addErrorOnModalField(e("input[type=file]",i),r.lang.errInvalidImage)},t.readAsDataURL(a)}));e("input[type=file]").on("change",(function(e){a=e.target.files[0]}))}};r.addBtnDef("base64",i)}}}})}(jQuery);

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

@@ -96,12 +96,48 @@
         plugins: {
             cleanPaste: {
                 init: function (trumbowyg) {
-                    trumbowyg.pasteHandlers.push(function () {
+                    trumbowyg.pasteHandlers.push(function (pasteEvent) {
                         setTimeout(function () {
-                          try {
-                              trumbowyg.$ed.html(cleanIt(trumbowyg.$ed.html()));
-                          } catch (c) {
-                          }
+                            try {
+                                trumbowyg.saveRange();
+
+                                var clipboardData = (pasteEvent.originalEvent || pasteEvent).clipboardData,
+                                pastedData = clipboardData.getData('Text'),
+                                node = trumbowyg.doc.getSelection().focusNode,
+                                range = trumbowyg.doc.createRange(),
+                                cleanedPaste = cleanIt(pastedData.trim()),
+                                newNode = $(cleanedPaste)[0] || trumbowyg.doc.createTextNode(cleanedPaste);
+
+                                if (trumbowyg.$ed.html() === '') {
+                                    // simply append if there is no content in editor
+                                    trumbowyg.$ed[0].appendChild(newNode);
+                                } else {
+                                    // insert pasted content behind last focused node
+                                    range.setStartAfter(node);
+                                    range.setEndAfter(node);
+                                    trumbowyg.doc.getSelection().removeAllRanges();
+                                    trumbowyg.doc.getSelection().addRange(range);
+
+                                    trumbowyg.range.insertNode(newNode);
+                                }
+
+                                // now set cursor right after pasted content
+                                range = trumbowyg.doc.createRange();
+                                range.setStartAfter(newNode);
+                                range.setEndAfter(newNode);
+                                trumbowyg.doc.getSelection().removeAllRanges();
+                                trumbowyg.doc.getSelection().addRange(range);
+
+                                // prevent defaults
+                                pasteEvent.stopPropagation();
+                                pasteEvent.preventDefault();
+
+                                // save new node as focused node
+                                trumbowyg.saveRange();
+                                trumbowyg.syncCode();
+                                trumbowyg.$c.trigger('tbwchange');
+                            } catch (c) {
+                            }
                         }, 0);
                     });
                 }

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

@@ -1 +1 @@
-!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);
+!function(e){"use strict";e.extend(!0,e.trumbowyg,{plugins:{cleanPaste:{init:function(t){t.pasteHandlers.push((function(r){setTimeout((function(){try{t.saveRange();var a=(r.originalEvent||r).clipboardData.getData("Text"),n=t.doc.getSelection().focusNode,c=t.doc.createRange(),g=((l=(l=(l=(l=(l=(l=(l=(l=(l=a.trim()).replace(/<[^> ]*/g,(function(e){return e.toLowerCase()})).replace(/<[^>]*>/g,(function(e){return e.replace(/ [^=]+=/g,(function(e){return e.toLowerCase()}))})).replace(/<[^>]*>/g,(function(e){return e.replace(/( [^=]+=)([^"][^ >]*)/g,'$1"$2"')}))).replace(/<b(\s+|>)/g,"<strong$1")).replace(/<\/b(\s+|>)/g,"</strong$1")).replace(/<i(\s+|>)/g,"<em$1")).replace(/<\/i(\s+|>)/g,"</em$1")).replace(/<!(?:--[\s\S]*?--\s*)?>\s*/g,"")).replace(/&nbsp;/gi," ")).replace(/ <\//gi,"</")).replace(/\s+/g," "),(l=(l=(l=(l=(l=l.replace(/^\s*|\s*$/g,"")).replace(/<[^>]*>/g,(function(e){return e.replace(/ ([^=]+)="[^"]*"/g,(function(e,t){return-1!==["alt","href","src","title"].indexOf(t)?e:""}))}))).replace(/<\?xml[^>]*>/g,"")).replace(/<[^ >]+:[^>]*>/g,"")).replace(/<\/[^ >]+:[^>]*>/g,"")).replace(/<(div|span|style|meta|link).*?>/gi,"")),o=e(g)[0]||t.doc.createTextNode(g);""===t.$ed.html()?t.$ed[0].appendChild(o):(c.setStartAfter(n),c.setEndAfter(n),t.doc.getSelection().removeAllRanges(),t.doc.getSelection().addRange(c),t.range.insertNode(o)),(c=t.doc.createRange()).setStartAfter(o),c.setEndAfter(o),t.doc.getSelection().removeAllRanges(),t.doc.getSelection().addRange(c),r.stopPropagation(),r.preventDefault(),t.saveRange(),t.syncCode(),t.$c.trigger("tbwchange")}catch(e){}var l}),0)}))}}}})}(jQuery);

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

@@ -14,38 +14,74 @@
     $.extend(true, $.trumbowyg, {
         langs: {
             // jshint camelcase:false
-            cs: {
-                foreColor: 'Barva textu',
-                backColor: 'Barva pozadí'
-            },
             en: {
                 foreColor: 'Text color',
                 backColor: 'Background color',
                 foreColorRemove: 'Remove text color',
                 backColorRemove: 'Remove background color'
             },
+            cs: {
+                foreColor: 'Barva textu',
+                backColor: 'Barva pozadí'
+            },
             da: {
                 foreColor: 'Tekstfarve',
                 backColor: 'Baggrundsfarve'
             },
+            de: {
+                foreColor: 'Textfarbe',
+                backColor: 'Hintergrundfarbe'
+            },
+            et: {
+                foreColor: 'Teksti värv',
+                backColor: 'Taustavärv',
+                foreColorRemove: 'Eemalda teksti värv',
+                backColorRemove: 'Eemalda taustavärv'
+            },
             fr: {
                 foreColor: 'Couleur du texte',
                 backColor: 'Couleur de fond',
                 foreColorRemove: 'Supprimer la couleur du texte',
                 backColorRemove: 'Supprimer la couleur de fond'
             },
-            de: {
-                foreColor: 'Textfarbe',
-                backColor: 'Hintergrundfarbe'
+            hu: {
+                foreColor: 'Betű szín',
+                backColor: 'Háttér szín',
+                foreColorRemove: 'Betű szín eltávolítása',
+                backColorRemove: 'Háttér szín eltávolítása'
+            },
+            ja: {
+                foreColor: '文字色',
+                backColor: '背景色'
+            },
+            ko: {
+                foreColor: '글자색',
+                backColor: '배경색',
+                foreColorRemove: '글자색 지우기',
+                backColorRemove: '배경색 지우기'
             },
             nl: {
                 foreColor: 'Tekstkleur',
                 backColor: 'Achtergrondkleur'
             },
+            pt_br: {
+                foreColor: 'Cor de fonte',
+                backColor: 'Cor de fundo'
+            },
+            ru: {
+                foreColor: 'Цвет текста',
+                backColor: 'Цвет выделения текста'
+            },
             sk: {
                 foreColor: 'Farba textu',
                 backColor: 'Farba pozadia'
             },
+            tr: {
+                foreColor: 'Yazı rengi',
+                backColor: 'Arka plan rengi',
+                foreColorRemove: 'Yazı rengini kaldır',
+                backColorRemove: 'Arka plan rengini kaldır'
+            },
             zh_cn: {
                 foreColor: '文字颜色',
                 backColor: '背景颜色'
@@ -54,28 +90,6 @@
                 foreColor: '文字顏色',
                 backColor: '背景顏色'
             },
-            ru: {
-                foreColor: 'Цвет текста',
-                backColor: 'Цвет выделения текста'
-            },
-            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: '배경색 지우기'
-            },
         }
     });
 
@@ -92,7 +106,7 @@
         } else if (rgb === 'rgba(0, 0, 0, 0)') {
             return 'transparent';
         } else {
-            rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/);
+            rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d?(.\d+)))?\)$/);
             return hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
         }
     }

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

@@ -1 +1 @@
-!function(o){"use strict";function r(o){return("0"+parseInt(o).toString(16)).slice(-2)}function e(o){return o.search("rgb")===-1?o.replace("#",""):"rgba(0, 0, 0, 0)"===o?"transparent":(o=o.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/),r(o[1])+r(o[2])+r(o[3]))}function l(o,r){var l=[];if(!o.style)return l;if(""!==o.style.backgroundColor){var a=e(o.style.backgroundColor);r.o.plugins.colors.colorList.indexOf(a)>=0?l.push("backColor"+a):l.push("backColorFree")}var c;return""!==o.style.color?c=e(o.style.color):o.hasAttribute("color")&&(c=e(o.getAttribute("color"))),c&&(r.o.plugins.colors.colorList.indexOf(c)>=0?l.push("foreColor"+c):l.push("foreColorFree")),l}function a(r,e){var l=[],a=e.o.plugins.colors,c=a[r+"List"]||a.colorList;o.each(c,function(o,c){var f=r+c,t={fn:r,forceCss:!0,hasIcon:!1,text:e.lang["#"+c]||"#"+c,param:"#"+c,style:"background-color: #"+c+";"};a.displayAsList&&"foreColor"===r&&(t.style="color: #"+c+" !important;"),e.addBtnDef(f,t),l.push(f)});var f=r+"Remove",t={fn:"removeFormat",hasIcon:!1,param:r,style:"background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAG0lEQVQIW2NkQAAfEJMRmwBYhoGBYQtMBYoAADziAp0jtJTgAAAAAElFTkSuQmCC);"};if(a.displayAsList&&(t.style=""),e.addBtnDef(f,t),l.push(f),a["allowCustom"+r.charAt(0).toUpperCase()+r.substr(1)]){var d=r+"Free",n={fn:function(){e.openModalInsert(e.lang[r],{color:{label:r,forceCss:!0,type:"color",value:"#FFFFFF"}},function(o){return e.execCmd(r,o.color),!0})},hasIcon:!1,text:"#",style:"text-indent: 0; line-height: 20px; padding: 0 5px;"};e.addBtnDef(d,n),l.push(d)}return l}o.extend(!0,o.trumbowyg,{langs:{cs:{foreColor:"Barva textu",backColor:"Barva pozadí"},en:{foreColor:"Text 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",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",backColor:"Farba pozadia"},zh_cn:{foreColor:"文字颜色",backColor:"背景颜色"},zh_tw:{foreColor:"文字顏色",backColor:"背景顏色"},ru:{foreColor:"Цвет текста",backColor:"Цвет выделения текста"},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:"배경색 지우기"}}});var c={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,backColorList:null,allowCustomForeColor:!0,allowCustomBackColor:!0,displayAsList:!1};o.extend(!0,o.trumbowyg,{plugins:{color:{init:function(o){o.o.plugins.colors=o.o.plugins.colors||c;var r=o.o.plugins.colors.displayAsList?o.o.prefix+"dropdown--color-list":"",e={dropdown:a("foreColor",o),dropdownClass:r},l={dropdown:a("backColor",o),dropdownClass:r};o.addBtnDef("foreColor",e),o.addBtnDef("backColor",l)},tagHandler:l}}})}(jQuery);
+!function(o){"use strict";function r(o){return("0"+parseInt(o).toString(16)).slice(-2)}function e(o){return-1===o.search("rgb")?o.replace("#",""):"rgba(0, 0, 0, 0)"===o?"transparent":r((o=o.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d?(.\d+)))?\)$/))[1])+r(o[2])+r(o[3])}o.extend(!0,o.trumbowyg,{langs:{en:{foreColor:"Text color",backColor:"Background color",foreColorRemove:"Remove text color",backColorRemove:"Remove background color"},cs:{foreColor:"Barva textu",backColor:"Barva pozadí"},da:{foreColor:"Tekstfarve",backColor:"Baggrundsfarve"},de:{foreColor:"Textfarbe",backColor:"Hintergrundfarbe"},et:{foreColor:"Teksti värv",backColor:"Taustavärv",foreColorRemove:"Eemalda teksti värv",backColorRemove:"Eemalda taustavärv"},fr:{foreColor:"Couleur du texte",backColor:"Couleur de fond",foreColorRemove:"Supprimer la couleur du texte",backColorRemove:"Supprimer la couleur de fond"},hu:{foreColor:"Betű szín",backColor:"Háttér szín",foreColorRemove:"Betű szín eltávolítása",backColorRemove:"Háttér szín eltávolítása"},ja:{foreColor:"文字色",backColor:"背景色"},ko:{foreColor:"글자색",backColor:"배경색",foreColorRemove:"글자색 지우기",backColorRemove:"배경색 지우기"},nl:{foreColor:"Tekstkleur",backColor:"Achtergrondkleur"},pt_br:{foreColor:"Cor de fonte",backColor:"Cor de fundo"},ru:{foreColor:"Цвет текста",backColor:"Цвет выделения текста"},sk:{foreColor:"Farba textu",backColor:"Farba pozadia"},tr:{foreColor:"Yazı rengi",backColor:"Arka plan rengi",foreColorRemove:"Yazı rengini kaldır",backColorRemove:"Arka plan rengini kaldır"},zh_cn:{foreColor:"文字颜色",backColor:"背景颜色"},zh_tw:{foreColor:"文字顏色",backColor:"背景顏色"}}});var l={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,backColorList:null,allowCustomForeColor:!0,allowCustomBackColor:!0,displayAsList:!1};function a(r,e){var l=[],a=e.o.plugins.colors,t=a[r+"List"]||a.colorList;o.each(t,(function(o,t){var c=r+t,f={fn:r,forceCss:!0,hasIcon:!1,text:e.lang["#"+t]||"#"+t,param:"#"+t,style:"background-color: #"+t+";"};a.displayAsList&&"foreColor"===r&&(f.style="color: #"+t+" !important;"),e.addBtnDef(c,f),l.push(c)}));var c=r+"Remove",f={fn:"removeFormat",hasIcon:!1,param:r,style:"background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAG0lEQVQIW2NkQAAfEJMRmwBYhoGBYQtMBYoAADziAp0jtJTgAAAAAElFTkSuQmCC);"};if(a.displayAsList&&(f.style=""),e.addBtnDef(c,f),l.push(c),a["allowCustom"+r.charAt(0).toUpperCase()+r.substr(1)]){var d=r+"Free",n={fn:function(){e.openModalInsert(e.lang[r],{color:{label:r,forceCss:!0,type:"color",value:"#FFFFFF"}},(function(o){return e.execCmd(r,o.color),!0}))},hasIcon:!1,text:"#",style:"text-indent: 0; line-height: 20px; padding: 0 5px;"};e.addBtnDef(d,n),l.push(d)}return l}o.extend(!0,o.trumbowyg,{plugins:{color:{init:function(o){o.o.plugins.colors=o.o.plugins.colors||l;var r=o.o.plugins.colors.displayAsList?o.o.prefix+"dropdown--color-list":"",e={dropdown:a("foreColor",o),dropdownClass:r},t={dropdown:a("backColor",o),dropdownClass:r};o.addBtnDef("foreColor",e),o.addBtnDef("backColor",t)},tagHandler:function(o,r){var l,a=[];if(!o.style)return a;if(""!==o.style.backgroundColor){var t=e(o.style.backgroundColor);r.o.plugins.colors.colorList.indexOf(t)>=0?a.push("backColor"+t):a.push("backColorFree")}return""!==o.style.color?l=e(o.style.color):o.hasAttribute("color")&&(l=e(o.getAttribute("color"))),l&&(r.o.plugins.colors.colorList.indexOf(l)>=0?a.push("foreColor"+l):a.push("foreColorFree")),a}}}})}(jQuery);

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/colors/ui/sass/trumbowyg.colors.scss

@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.21.0 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.25.0 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/colors/ui/trumbowyg.colors.css

@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.21.0 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.25.0 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg
@@ -37,7 +37,8 @@
       height: 27px;
       background: inherit;
       border: 1px solid #fff;
-      box-shadow: #000 0 0 2px;
+      -webkit-box-shadow: #000 0 0 2px;
+              box-shadow: #000 0 0 2px;
       z-index: 10; }
 
 .trumbowyg-dropdown-backColor.trumbowyg-dropdown--color-list button:not(.trumbowyg-backColorRemove-dropdown-button) {

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/colors/ui/trumbowyg.colors.min.css

@@ -1,2 +1,2 @@
-/** Trumbowyg v2.21.0 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */
-.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list),.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list){max-width:276px;padding:7px 5px;overflow:initial}.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list) button,.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list) button{display:block;position:relative;float:left;text-indent:-9999px;height:20px;width:20px;border:1px solid #333;padding:0;margin:2px}.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list) button:focus::after,.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list) button:hover::after,.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list) button:focus::after,.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list) button:hover::after{content:" ";display:block;position:absolute;top:-5px;left:-5px;width:27px;height:27px;background:inherit;border:1px solid #fff;box-shadow:#000 0 0 2px;z-index:10}.trumbowyg-dropdown-backColor.trumbowyg-dropdown--color-list button:not(.trumbowyg-backColorRemove-dropdown-button){position:relative;color:#fff!important}.trumbowyg-dropdown-backColor.trumbowyg-dropdown--color-list button:not(.trumbowyg-backColorRemove-dropdown-button):focus::after,.trumbowyg-dropdown-backColor.trumbowyg-dropdown--color-list button:not(.trumbowyg-backColorRemove-dropdown-button):hover::after{content:" ";display:block;position:absolute;top:13px;left:0;width:0;height:0;border:5px solid transparent;border-left-color:#fff}
+/** Trumbowyg v2.25.0 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */
+.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list),.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list){max-width:276px;padding:7px 5px;overflow:initial}.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list) button,.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list) button{display:block;position:relative;float:left;text-indent:-9999px;height:20px;width:20px;border:1px solid #333;padding:0;margin:2px}.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list) button:focus::after,.trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list) button:hover::after,.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list) button:focus::after,.trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list) button:hover::after{content:" ";display:block;position:absolute;top:-5px;left:-5px;width:27px;height:27px;background:inherit;border:1px solid #fff;-webkit-box-shadow:#000 0 0 2px;box-shadow:#000 0 0 2px;z-index:10}.trumbowyg-dropdown-backColor.trumbowyg-dropdown--color-list button:not(.trumbowyg-backColorRemove-dropdown-button){position:relative;color:#fff!important}.trumbowyg-dropdown-backColor.trumbowyg-dropdown--color-list button:not(.trumbowyg-backColorRemove-dropdown-button):focus::after,.trumbowyg-dropdown-backColor.trumbowyg-dropdown--color-list button:not(.trumbowyg-backColorRemove-dropdown-button):hover::after{content:" ";display:block;position:absolute;top:13px;left:0;width:0;height:0;border:5px solid transparent;border-left-color:#fff}

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

@@ -90,6 +90,8 @@
             '&#x1F499',
             '&#x1F49C',
             '&#x1F5A4',
+            '&#x1F90E',
+            '&#x1F90D',
             '&#x1F494',
             '&#x1F495',
             '&#x1F49E',
@@ -116,7 +118,6 @@
             '&#x264F',
             '&#x1F194',
             '&#x269B',
-            '&#x267E',
             '&#x1F251',
             '&#x1F4F4',
             '&#x1F4F3',
@@ -241,6 +242,7 @@
             '&#x1F503',
             '&#x1F3B5',
             '&#x1F3B6',
+            '&#x267E',
             '&#x1F4B2',
             '&#x1F4B1',
             '&#x00A9',
@@ -257,6 +259,11 @@
             '&#x26AB',
             '&#x1F534',
             '&#x1F535',
+            '&#x1F7E4',
+            '&#x1F7E3',
+            '&#x1F7E2',
+            '&#x1F7E1',
+            '&#x1F7E0',
             '&#x1F53A',
             '&#x1F53B',
             '&#x1F538',
@@ -273,6 +280,13 @@
             '&#x25FB',
             '&#x2B1B',
             '&#x2B1C',
+            '&#x1F7E7',
+            '&#x1F7E6',
+            '&#x1F7E5',
+            '&#x1F7EB',
+            '&#x1F7EA',
+            '&#x1F7E9',
+            '&#x1F7E8',
             '&#x1F508',
             '&#x1F507',
             '&#x1F509',
@@ -321,25 +335,26 @@
             '&#x1F3BE',
             '&#x1F3D0',
             '&#x1F3C9',
+            '&#x1F94F',
             '&#x1F3B1',
             '&#x1F3D3',
             '&#x1F3F8',
-            '&#x1F945',
             '&#x1F3D2',
             '&#x1F3D1',
-            '&#x1F3CF',
             '&#x1F94D',
+            '&#x1F3CF',
+            '&#x1F945',
             '&#x26F3',
-            '&#x1F94F',
             '&#x1F3F9',
             '&#x1F3A3',
             '&#x1F94A',
             '&#x1F94B',
             '&#x1F3BD',
             '&#x1F6F9',
+            '&#x1F6F7',
+            '&#x1FA82',
             '&#x26F8',
             '&#x1F94C',
-            '&#x1F6F7',
             '&#x1F3BF',
             '&#x26F7',
             '&#x1F3C2',
@@ -381,13 +396,18 @@
             '&#x1F941',
             '&#x1F3B7',
             '&#x1F3BA',
+            '&#x1FA95',
             '&#x1F3B8',
             '&#x1F3BB',
             '&#x1F3B2',
+            '&#x265F',
             '&#x1F3AF',
+            '&#x1FA81',
+            '&#x1FA80',
             '&#x1F3B3',
             '&#x1F3AE',
             '&#x1F3B0',
+            '&#x1F9E9',
             '&#x231A',
             '&#x1F4F1',
             '&#x1F4F2',
@@ -397,8 +417,6 @@
             '&#x1F5B1',
             '&#x1F5B2',
             '&#x1F579',
-            '&#x265F',
-            '&#x1F9E9',
             '&#x1F5DC',
             '&#x1F4BD',
             '&#x1F4BE',
@@ -420,6 +438,7 @@
             '&#x1F399',
             '&#x1F39A',
             '&#x1F39B',
+            '&#x1F9ED',
             '&#x23F1',
             '&#x23F2',
             '&#x23F0',
@@ -427,15 +446,12 @@
             '&#x231B',
             '&#x23F3',
             '&#x1F4E1',
-            '&#x1F9ED',
             '&#x1F50B',
             '&#x1F50C',
-            '&#x1F9F2',
             '&#x1F4A1',
             '&#x1F526',
             '&#x1F56F',
             '&#x1F9EF',
-            '&#x1F5D1',
             '&#x1F6E2',
             '&#x1F4B8',
             '&#x1F4B5',
@@ -445,17 +461,20 @@
             '&#x1F4B0',
             '&#x1F4B3',
             '&#x1F48E',
-            '&#x1F9FF',
-            '&#x1F9F1',
             '&#x1F9F0',
             '&#x1F527',
             '&#x1F528',
             '&#x1F6E0',
             '&#x26CF',
             '&#x1F529',
+            '&#x1F9F1',
             '&#x26D3',
+            '&#x1F9F2',
             '&#x1F52B',
             '&#x1F4A3',
+            '&#x1F9E8',
+            '&#x1FA93',
+            '&#x1FA92',
             '&#x1F52A',
             '&#x1F5E1',
             '&#x1F6E1',
@@ -463,32 +482,37 @@
             '&#x26B0',
             '&#x26B1',
             '&#x1F3FA',
+            '&#x1FA94',
             '&#x1F52E',
             '&#x1F4FF',
+            '&#x1F9FF',
             '&#x1F488',
-            '&#x1F9EA',
-            '&#x1F9EB',
-            '&#x1F9EC',
-            '&#x1F9EE',
             '&#x1F52D',
             '&#x1F52C',
             '&#x1F573',
+            '&#x1F9AF',
+            '&#x1FA7A',
+            '&#x1FA79',
             '&#x1F48A',
             '&#x1F489',
+            '&#x1FA78',
+            '&#x1F9EC',
+            '&#x1F9A0',
+            '&#x1F9EB',
+            '&#x1F9EA',
             '&#x1F321',
+            '&#x1FA91',
+            '&#x1F9F9',
+            '&#x1F9FA',
+            '&#x1F9FB',
             '&#x1F6BD',
             '&#x1F6B0',
             '&#x1F6BF',
             '&#x1F6C1',
             '&#x1F6C0',
-            '&#x1F9F9',
-            '&#x1F9FA',
-            '&#x1F9FB',
             '&#x1F9FC',
             '&#x1F9FD',
             '&#x1F9F4',
-            '&#x1F9F5',
-            '&#x1F9F6',
             '&#x1F6CE',
             '&#x1F511',
             '&#x1F5DD',
@@ -527,8 +551,8 @@
             '&#x1F4DC',
             '&#x1F4C3',
             '&#x1F4C4',
-            '&#x1F9FE',
             '&#x1F4D1',
+            '&#x1F9FE',
             '&#x1F4CA',
             '&#x1F4C8',
             '&#x1F4C9',
@@ -536,6 +560,7 @@
             '&#x1F5D3',
             '&#x1F4C6',
             '&#x1F4C5',
+            '&#x1F5D1',
             '&#x1F4C7',
             '&#x1F5C3',
             '&#x1F5F3',
@@ -556,12 +581,13 @@
             '&#x1F4DA',
             '&#x1F4D6',
             '&#x1F516',
+            '&#x1F9F7',
             '&#x1F517',
             '&#x1F4CE',
             '&#x1F587',
             '&#x1F4D0',
             '&#x1F4CF',
-            '&#x1F9F7',
+            '&#x1F9EE',
             '&#x1F4CC',
             '&#x1F4CD',
             '&#x1F58A',
@@ -574,17 +600,16 @@
             '&#x1F50E',
             '&#x1F50F',
             '&#x1F510',
+            '&#x1F512',
+            '&#x1F513',
             '&#x1F436',
             '&#x1F431',
             '&#x1F42D',
             '&#x1F439',
             '&#x1F430',
             '&#x1F98A',
-            '&#x1F99D',
             '&#x1F43B',
             '&#x1F43C',
-            '&#x1F998',
-            '&#x1F9A1',
             '&#x1F428',
             '&#x1F42F',
             '&#x1F981',
@@ -604,11 +629,8 @@
             '&#x1F423',
             '&#x1F425',
             '&#x1F986',
-            '&#x1F9A2',
             '&#x1F985',
             '&#x1F989',
-            '&#x1F99C',
-            '&#x1F99A',
             '&#x1F987',
             '&#x1F43A',
             '&#x1F417',
@@ -621,12 +643,11 @@
             '&#x1F41A',
             '&#x1F41E',
             '&#x1F41C',
+            '&#x1F99F',
             '&#x1F997',
             '&#x1F577',
             '&#x1F578',
             '&#x1F982',
-            '&#x1F99F',
-            '&#x1F9A0',
             '&#x1F422',
             '&#x1F40D',
             '&#x1F98E',
@@ -635,8 +656,9 @@
             '&#x1F419',
             '&#x1F991',
             '&#x1F990',
-            '&#x1F980',
             '&#x1F99E',
+            '&#x1F9AA',
+            '&#x1F980',
             '&#x1F421',
             '&#x1F420',
             '&#x1F41F',
@@ -649,29 +671,41 @@
             '&#x1F406',
             '&#x1F993',
             '&#x1F98D',
+            '&#x1F9A7',
             '&#x1F418',
-            '&#x1F98F',
             '&#x1F99B',
+            '&#x1F98F',
             '&#x1F42A',
             '&#x1F42B',
             '&#x1F992',
-            '&#x1F999',
+            '&#x1F998',
             '&#x1F403',
             '&#x1F402',
             '&#x1F404',
             '&#x1F40E',
             '&#x1F416',
             '&#x1F40F',
+            '&#x1F999',
             '&#x1F411',
             '&#x1F410',
             '&#x1F98C',
             '&#x1F415',
+            '&#x1F9AE',
             '&#x1F429',
             '&#x1F408',
             '&#x1F413',
             '&#x1F983',
+            '&#x1F99A',
+            '&#x1F99C',
+            '&#x1F9A2',
+            '&#x1F9A9',
             '&#x1F54A',
             '&#x1F407',
+            '&#x1F9A5',
+            '&#x1F9A6',
+            '&#x1F9A8',
+            '&#x1F99D',
+            '&#x1F9A1',
             '&#x1F401',
             '&#x1F400',
             '&#x1F43F',
@@ -719,6 +753,7 @@
             '&#x1F30E',
             '&#x1F30D',
             '&#x1F30F',
+            '&#x1FA90',
             '&#x1F4AB',
             '&#x2B50',
             '&#x1F31F',
@@ -767,17 +802,20 @@
             '&#x1F336',
             '&#x1F33D',
             '&#x1F955',
+            '&#x1F9C5',
+            '&#x1F9C4',
             '&#x1F954',
             '&#x1F360',
             '&#x1F950',
+            '&#x1F96F',
             '&#x1F35E',
             '&#x1F956',
             '&#x1F968',
-            '&#x1F96F',
             '&#x1F9C0',
             '&#x1F95A',
             '&#x1F373',
             '&#x1F95E',
+            '&#x1F9C7',
             '&#x1F953',
             '&#x1F969',
             '&#x1F357',
@@ -787,6 +825,7 @@
             '&#x1F35F',
             '&#x1F355',
             '&#x1F96A',
+            '&#x1F9C6',
             '&#x1F959',
             '&#x1F32E',
             '&#x1F32F',
@@ -799,38 +838,41 @@
             '&#x1F35B',
             '&#x1F363',
             '&#x1F371',
+            '&#x1F95F',
             '&#x1F364',
             '&#x1F359',
             '&#x1F35A',
             '&#x1F358',
             '&#x1F365',
             '&#x1F960',
+            '&#x1F96E',
             '&#x1F362',
             '&#x1F361',
             '&#x1F367',
             '&#x1F368',
             '&#x1F366',
             '&#x1F967',
+            '&#x1F9C1',
             '&#x1F370',
             '&#x1F382',
-            '&#x1F96E',
-            '&#x1F9C1',
             '&#x1F36E',
             '&#x1F36D',
             '&#x1F36C',
             '&#x1F36B',
             '&#x1F37F',
-            '&#x1F9C2',
             '&#x1F369',
-            '&#x1F95F',
             '&#x1F36A',
             '&#x1F330',
             '&#x1F95C',
             '&#x1F36F',
+            '&#x1F9C8',
             '&#x1F95B',
             '&#x1F37C',
             '&#x1F375',
+            '&#x1F9C9',
             '&#x1F964',
+            '&#x1F9C3',
+            '&#x1F9CA',
             '&#x1F376',
             '&#x1F37A',
             '&#x1F37B',
@@ -846,6 +888,7 @@
             '&#x1F963',
             '&#x1F961',
             '&#x1F962',
+            '&#x1F9C2',
             '&#x1F600',
             '&#x1F603',
             '&#x1F604',
@@ -862,8 +905,8 @@
             '&#x1F609',
             '&#x1F60C',
             '&#x1F60D',
-            '&#x1F618',
             '&#x1F970',
+            '&#x1F618',
             '&#x1F617',
             '&#x1F619',
             '&#x1F61A',
@@ -889,6 +932,7 @@
             '&#x1F616',
             '&#x1F62B',
             '&#x1F629',
+            '&#x1F97A',
             '&#x1F622',
             '&#x1F62D',
             '&#x1F624',
@@ -897,17 +941,17 @@
             '&#x1F92C',
             '&#x1F92F',
             '&#x1F633',
+            '&#x1F975',
+            '&#x1F976',
             '&#x1F631',
             '&#x1F628',
             '&#x1F630',
-            '&#x1F975',
-            '&#x1F976',
-            '&#x1F97A',
             '&#x1F625',
             '&#x1F613',
             '&#x1F917',
             '&#x1F914',
             '&#x1F92D',
+            '&#x1F971',
             '&#x1F92B',
             '&#x1F925',
             '&#x1F636',
@@ -971,6 +1015,7 @@
             '&#x1F91F',
             '&#x1F918',
             '&#x1F44C',
+            '&#x1F90F',
             '&#x1F448',
             '&#x1F449',
             '&#x1F446',
@@ -983,23 +1028,25 @@
             '&#x1F44B',
             '&#x1F919',
             '&#x1F4AA',
-            '&#x1F9B5',
-            '&#x1F9B6',
+            '&#x1F9BE',
             '&#x1F595',
             '&#x270D',
             '&#x1F64F',
-            '&#x1F48D',
+            '&#x1F9B6',
+            '&#x1F9B5',
+            '&#x1F9BF',
             '&#x1F484',
             '&#x1F48B',
             '&#x1F444',
+            '&#x1F9B7',
+            '&#x1F9B4',
             '&#x1F445',
             '&#x1F442',
+            '&#x1F9BB',
             '&#x1F443',
             '&#x1F463',
             '&#x1F440',
             '&#x1F9E0',
-            '&#x1F9B4',
-            '&#x1F9B7',
             '&#x1F5E3',
             '&#x1F464',
             '&#x1F465',
@@ -1026,10 +1073,10 @@
             '&#x1F935',
             '&#x1F478',
             '&#x1F934',
-            '&#x1F936',
-            '&#x1F385',
             '&#x1F9B8',
             '&#x1F9B9',
+            '&#x1F936',
+            '&#x1F385',
             '&#x1F9D9',
             '&#x1F9DD',
             '&#x1F9DB',
@@ -1045,6 +1092,7 @@
             '&#x1F645',
             '&#x1F646',
             '&#x1F64B',
+            '&#x1F9CF',
             '&#x1F926',
             '&#x1F937',
             '&#x1F64E',
@@ -1060,28 +1108,38 @@
             '&#x1F574',
             '&#x1F6B6',
             '&#x1F3C3',
+            '&#x1F9CD',
+            '&#x1F9CE',
             '&#x1F46B',
             '&#x1F46D',
             '&#x1F46C',
             '&#x1F491',
             '&#x1F48F',
             '&#x1F46A',
+            '&#x1F9F6',
+            '&#x1F9F5',
             '&#x1F9E5',
+            '&#x1F97C',
+            '&#x1F9BA',
             '&#x1F45A',
             '&#x1F455',
             '&#x1F456',
+            '&#x1FA73',
             '&#x1F454',
             '&#x1F457',
             '&#x1F459',
+            '&#x1FA71',
             '&#x1F458',
-            '&#x1F97C',
+            '&#x1F97B',
+            '&#x1F97F',
             '&#x1F460',
             '&#x1F461',
             '&#x1F462',
+            '&#x1FA70',
             '&#x1F45E',
             '&#x1F45F',
             '&#x1F97E',
-            '&#x1F97F',
+            '&#x1FA72',
             '&#x1F9E6',
             '&#x1F9E4',
             '&#x1F9E3',
@@ -1091,45 +1149,22 @@
             '&#x1F393',
             '&#x26D1',
             '&#x1F451',
+            '&#x1F48D',
             '&#x1F45D',
             '&#x1F45B',
             '&#x1F45C',
             '&#x1F4BC',
             '&#x1F392',
+            '&#x1F9F3',
             '&#x1F453',
             '&#x1F576',
             '&#x1F97D',
+            '&#x1F93F',
             '&#x1F302',
-            '&#x1F9B0',
             '&#x1F9B1',
+            '&#x1F9B0',
             '&#x1F9B3',
             '&#x1F9B2',
-            '&#x1F1FF',
-            '&#x1F1FE',
-            '&#x1F1FD',
-            '&#x1F1FC',
-            '&#x1F1FB',
-            '&#x1F1FA',
-            '&#x1F1F9',
-            '&#x1F1F8',
-            '&#x1F1F7',
-            '&#x1F1F6',
-            '&#x1F1F5',
-            '&#x1F1F4',
-            '&#x1F1F3',
-            '&#x1F1F2',
-            '&#x1F1F1',
-            '&#x1F1F0',
-            '&#x1F1EF',
-            '&#x1F1EE',
-            '&#x1F1ED',
-            '&#x1F1EC',
-            '&#x1F1EB',
-            '&#x1F1EA',
-            '&#x1F1E9',
-            '&#x1F1E8',
-            '&#x1F1E7',
-            '&#x1F1E6',
             '&#x1F697',
             '&#x1F695',
             '&#x1F699',
@@ -1143,10 +1178,13 @@
             '&#x1F69A',
             '&#x1F69B',
             '&#x1F69C',
-            '&#x1F6F4',
-            '&#x1F6B2',
+            '&#x1F6FA',
             '&#x1F6F5',
             '&#x1F3CD',
+            '&#x1F6F4',
+            '&#x1F6B2',
+            '&#x1F9BC',
+            '&#x1F9BD',
             '&#x1F6A8',
             '&#x1F694',
             '&#x1F68D',
@@ -1171,7 +1209,6 @@
             '&#x1F6EC',
             '&#x1F6E9',
             '&#x1F4BA',
-            '&#x1F9F3',
             '&#x1F6F0',
             '&#x1F680',
             '&#x1F6F8',
@@ -1229,6 +1266,7 @@
             '&#x1F3DB',
             '&#x26EA',
             '&#x1F54C',
+            '&#x1F6D5',
             '&#x1F54D',
             '&#x1F54B',
             '&#x26E9',
@@ -1242,16 +1280,39 @@
             '&#x1F320',
             '&#x1F387',
             '&#x1F386',
-            '&#x1F9E8',
             '&#x1F307',
             '&#x1F306',
             '&#x1F3D9',
             '&#x1F303',
             '&#x1F30C',
             '&#x1F309',
-            '&#x1F512',
-            '&#x1F513',
             '&#x1F301',
+            '&#x1F1FF',
+            '&#x1F1FE',
+            '&#x1F1FD',
+            '&#x1F1FC',
+            '&#x1F1FB',
+            '&#x1F1FA',
+            '&#x1F1F9',
+            '&#x1F1F8',
+            '&#x1F1F7',
+            '&#x1F1F6',
+            '&#x1F1F5',
+            '&#x1F1F4',
+            '&#x1F1F3',
+            '&#x1F1F2',
+            '&#x1F1F1',
+            '&#x1F1F0',
+            '&#x1F1EF',
+            '&#x1F1EE',
+            '&#x1F1ED',
+            '&#x1F1EC',
+            '&#x1F1EB',
+            '&#x1F1EA',
+            '&#x1F1E9',
+            '&#x1F1E8',
+            '&#x1F1E7',
+            '&#x1F1E6',
             '&#x1F3F3',
             '&#x1F3F4',
             '&#x1F3C1',
@@ -1278,23 +1339,29 @@
             de: {
                 emoji: 'Emoticon einfügen'
             },
+            et: {
+                emoji: 'Lisa emotikon'
+            },
             fr: {
                 emoji: 'Ajouter un emoji'
             },
-            zh_cn: {
-                emoji: '添加表情'
-            },
-            ru: {
-                emoji: 'Вставить emoji'
+            hu: {
+                emoji: 'Emoji beszúrás'
             },
             ja: {
                 emoji: '絵文字の挿入'
             },
+            ko: {
+                emoji: '이모지 넣기'
+            },
+            ru: {
+                emoji: 'Вставить emoji'
+            },
             tr: {
                 emoji: 'Emoji ekle'
             },
-            ko: {
-                emoji: '이모지 넣기'
+            zh_cn: {
+                emoji: '添加表情'
             },
         },
         // jshint camelcase:true