activeadmin_trumbowyg 0.1.8 → 0.2.10

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

@@ -1 +1 @@
-!function(e){"use strict";function n(n){var i=[],l=["0.9","normal","1.5","2.0"];return e.each(l,function(l,r){n.addBtnDef("lineheight_"+r,{text:'<span style="line-height: '+r+';">'+n.lang.lineheights[r]+"</span>",hasIcon:!1,fn:function(){n.saveRange();var i=n.getRangeText();if(""!==i.replace(/\s/g,""))try{var l=t();e(l).css("lineHeight",r)}catch(a){}}}),i.push("lineheight_"+r)}),i}function t(){var e,n=null;return window.getSelection?(e=window.getSelection(),e.rangeCount&&(n=e.getRangeAt(0).commonAncestorContainer,1!==n.nodeType&&(n=n.parentNode))):(e=document.selection)&&"Control"!==e.type&&(n=e.createRange().parentElement()),n}e.extend(!0,e.trumbowyg,{langs:{en:{lineheight:"Line height",lineheights:{.9:"Small",normal:"Regular",1.5:"Large","2.0":"Extra large"}},da:{lineheight:"Linjehøjde",lineheights:{.9:"Lille",normal:"Normal",1.5:"Stor","2.0":"Ekstra stor"}},fr:{lineheight:"Hauteur de ligne",lineheights:{.9:"Petit",normal:"Regular",1.5:"Grand","2.0":"Très grand"}},nl:{lineheight:"Regelhoogte",lineheights:{.9:"Klein",normal:"Normaal",1.5:"Groot","2.0":"Extra groot"}},tr:{lineheight:"Satır yüksekliği",lineheights:{.9:"Küçük",normal:"Normal",1.5:"Büyük","2.0":"Çok Büyük"}},zh_tw:{lineheight:"文字間距",lineheights:{.9:"小",normal:"正常",1.5:"大","2.0":"特大"}}}}),e.extend(!0,e.trumbowyg,{plugins:{lineheight:{init:function(e){e.addBtnDef("lineheight",{dropdown:n(e)})}}}})}(jQuery);
+!function(e){"use strict";function n(n){var i=[];return e.each(n.o.plugins.lineheight.sizeList,function(l,a){n.addBtnDef("lineheight_"+a,{text:n.lang.lineheights[a]||a,hasIcon:!1,fn:function(){n.saveRange();var i=n.getRangeText();if(""!==i.replace(/\s/g,""))try{var l=t();e(l).css("lineHeight",a)}catch(h){}}}),i.push("lineheight_"+a)}),i}function t(){var e,n=null;return window.getSelection?(e=window.getSelection(),e.rangeCount&&(n=e.getRangeAt(0).commonAncestorContainer,1!==n.nodeType&&(n=n.parentNode))):(e=document.selection)&&"Control"!==e.type&&(n=e.createRange().parentElement()),n}e.extend(!0,e.trumbowyg,{langs:{en:{lineheight:"Line height",lineheights:{.9:"Small",normal:"Regular",1.5:"Large","2.0":"Extra large"}},da:{lineheight:"Linjehøjde",lineheights:{.9:"Lille",normal:"Normal",1.5:"Stor","2.0":"Ekstra stor"}},fr:{lineheight:"Hauteur de ligne",lineheights:{.9:"Petite",normal:"Normale",1.5:"Grande","2.0":"Très grande"}},nl:{lineheight:"Regelhoogte",lineheights:{.9:"Klein",normal:"Normaal",1.5:"Groot","2.0":"Extra groot"}},tr:{lineheight:"Satır yüksekliği",lineheights:{.9:"Küçük",normal:"Normal",1.5:"Büyük","2.0":"Çok Büyük"}},zh_tw:{lineheight:"文字間距",lineheights:{.9:"小",normal:"正常",1.5:"大","2.0":"特大"}},pt_br:{lineheight:"Altura de linha",lineheights:{.9:"Pequena",normal:"Regular",1.5:"Grande","2.0":"Extra grande"}},it:{lineheight:"Altezza linea",lineheights:{.9:"Bassa",normal:"Normale",1.5:"Alta","2.0":"Molto alta"}},ko:{lineheight:"줄 간격",lineheights:{.9:"좁게",normal:"보통",1.5:"넓게","2.0":"아주 넓게"}}}});var i={sizeList:["0.9","normal","1.5","2.0"]};e.extend(!0,e.trumbowyg,{plugins:{lineheight:{init:function(t){t.o.plugins.lineheight=e.extend({},i,t.o.plugins.lineheight||{}),t.addBtnDef("lineheight",{dropdown:n(t)})}}}})}(jQuery);

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

@@ -1,7 +1,7 @@
 /* ===========================================================
  * trumbowyg.mathMl.js v1.0
  * MathML plugin for Trumbowyg
- * https://github.com/loclamor/Trumbowyg/tree/mathml-plugin/plugins/mathml
+ * http://alex-d.github.com/Trumbowyg
  * ===========================================================
  * Author : loclamor
  */
@@ -11,6 +11,7 @@
     'use strict';
     $.extend(true, $.trumbowyg, {
         langs: {
+            // jshint camelcase:false
             en: {
                 mathml: 'Insert Formulas',
                 formulas: 'Formulas',
@@ -36,7 +37,19 @@
                 formulas: '方程式',
                 inline: '內嵌'
             },
+            pt_br: {
+                mathml: 'Inserir fórmulas',
+                formulas: 'Fórmulas',
+                inline: 'Em linha'
+            },
+            ko: {
+                mathml: '수식 넣기',
+                formulas: '수식',
+                inline: '글 안에 넣기'
+            },
         },
+        // jshint camelcase:true
+
         plugins: {
             mathml: {
                 init: function(trumbowyg) {
@@ -60,22 +73,28 @@
                             };
 
                             var mathmlCallback = function(v) {
-                                var delimitor = v.inline ? '$' : '$$';
+                                var delimiter = v.inline ? '$' : '$$';
                                 if (trumbowyg.currentMathNode) {
-                                    $(trumbowyg.currentMathNode).html(delimitor + ' ' + v.formulas + ' ' + delimitor).attr('formulas', v.formulas).attr('inline', (v.inline ? 'true' : 'false'));
+                                    $(trumbowyg.currentMathNode)
+                                        .html(delimiter + ' ' + v.formulas + ' ' + delimiter)
+                                        .attr('formulas', v.formulas)
+                                        .attr('inline', (v.inline ? 'true' : 'false'));
                                 } else {
-                                    var html = '<span class="mathMlContainer" contenteditable="false" formulas="' + v.formulas + '" inline="' + (v.inline ? 'true' : 'false') + '" >' + delimitor + ' ' + v.formulas + ' ' + delimitor + '</span>';
+                                    var html = '<span class="mathMlContainer" contenteditable="false" formulas="' + v.formulas + '" inline="' + (v.inline ? 'true' : 'false') + '" >' + delimiter + ' ' + v.formulas + ' ' + delimiter + '</span>';
                                     var node = $(html)[0];
-                                    node.onclick = function(e) {
+                                    node.onclick = function() {
                                         trumbowyg.currentMathNode = this;
                                         mathMLoptions.formulas.value = $(this).attr('formulas');
-                                        if ($(this).attr('inline') === "true") {
+
+                                        if ($(this).attr('inline') === 'true') {
                                             mathMLoptions.inline.attributes.checked = true;
                                         } else {
                                             delete mathMLoptions.inline.attributes.checked;
                                         }
+
                                         trumbowyg.openModalInsert(trumbowyg.lang.mathml, mathMLoptions, mathmlCallback);
                                     };
+
                                     trumbowyg.range.deleteContents();
                                     trumbowyg.range.insertNode(node);
                                 }

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

@@ -1 +1 @@
-!function(e){"use strict";e.extend(!0,e.trumbowyg,{langs:{en:{mathml:"Insert Formulas",formulas:"Formulas",inline:"Inline"},da:{mathml:"Indsæt formler",formulas:"Formler",inline:"Inline"},fr:{mathml:"Inserer une formule",formulas:"Formule",inline:"En ligne"},tr:{mathml:"Formül Ekle",formulas:"Formüller",inline:"Satır içi"},zh_tw:{mathml:"插入方程式",formulas:"方程式",inline:"內嵌"}},plugins:{mathml:{init:function(n){var l={fn:function(){n.saveRange();var l={formulas:{label:n.lang.formulas,required:!0,value:""},inline:{label:n.lang.inline,attributes:{checked:!0},type:"checkbox",required:!1}},t=function(a){var r=a.inline?"$":"$$";if(n.currentMathNode)e(n.currentMathNode).html(r+" "+a.formulas+" "+r).attr("formulas",a.formulas).attr("inline",a.inline?"true":"false");else{var i='<span class="mathMlContainer" contenteditable="false" formulas="'+a.formulas+'" inline="'+(a.inline?"true":"false")+'" >'+r+" "+a.formulas+" "+r+"</span>",u=e(i)[0];u.onclick=function(a){n.currentMathNode=this,l.formulas.value=e(this).attr("formulas"),"true"===e(this).attr("inline")?l.inline.attributes.checked=!0:delete l.inline.attributes.checked,n.openModalInsert(n.lang.mathml,l,t)},n.range.deleteContents(),n.range.insertNode(u)}return n.currentMathNode=!1,MathJax.Hub.Queue(["Typeset",MathJax.Hub]),!0};l.formulas.value=n.getRangeText(),l.inline.attributes.checked=!0,n.openModalInsert(n.lang.mathml,l,t)}};n.addBtnDef("mathml",l)}}}})}(jQuery);
+!function(e){"use strict";e.extend(!0,e.trumbowyg,{langs:{en:{mathml:"Insert Formulas",formulas:"Formulas",inline:"Inline"},da:{mathml:"Indsæt formler",formulas:"Formler",inline:"Inline"},fr:{mathml:"Inserer une formule",formulas:"Formule",inline:"En ligne"},tr:{mathml:"Formül Ekle",formulas:"Formüller",inline:"Satır içi"},zh_tw:{mathml:"插入方程式",formulas:"方程式",inline:"內嵌"},pt_br:{mathml:"Inserir fórmulas",formulas:"Fórmulas",inline:"Em linha"},ko:{mathml:"수식 넣기",formulas:"수식",inline:"글 안에 넣기"}},plugins:{mathml:{init:function(n){var l={fn:function(){n.saveRange();var l={formulas:{label:n.lang.formulas,required:!0,value:""},inline:{label:n.lang.inline,attributes:{checked:!0},type:"checkbox",required:!1}},a=function(t){var r=t.inline?"$":"$$";if(n.currentMathNode)e(n.currentMathNode).html(r+" "+t.formulas+" "+r).attr("formulas",t.formulas).attr("inline",t.inline?"true":"false");else{var i='<span class="mathMlContainer" contenteditable="false" formulas="'+t.formulas+'" inline="'+(t.inline?"true":"false")+'" >'+r+" "+t.formulas+" "+r+"</span>",u=e(i)[0];u.onclick=function(){n.currentMathNode=this,l.formulas.value=e(this).attr("formulas"),"true"===e(this).attr("inline")?l.inline.attributes.checked=!0:delete l.inline.attributes.checked,n.openModalInsert(n.lang.mathml,l,a)},n.range.deleteContents(),n.range.insertNode(u)}return n.currentMathNode=!1,MathJax.Hub.Queue(["Typeset",MathJax.Hub]),!0};l.formulas.value=n.getRangeText(),l.inline.attributes.checked=!0,n.openModalInsert(n.lang.mathml,l,a)}};n.addBtnDef("mathml",l)}}}})}(jQuery);

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

@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.11.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.21.0 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg
@@ -10,7 +10,6 @@
  */
 
 .mathMlContainer {
-	
 	position: relative;
 	
 	&[inline="false"] {
@@ -20,17 +19,18 @@
 	
 	&:hover {
 		pointer-events: none;
-		&:after {
+
+		&::after {
 			content: '\270E';
-			pointer-events: auto;
 			position: absolute;
-			left: 0px;
-			top: 0px;
-			background-color: #ffffffd4;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			background-color: rgba(255, 255, 255, 0.83);
+			box-shadow: 0 0 5px 5px rgba(255, 255, 255, 0.83);
 			cursor: pointer;
-			bottom: 0px;
-			right: 0px;
-			box-shadow: 0 0 5px 5px #ffffffd4;
+			pointer-events: auto;
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.11.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.21.0 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg
@@ -16,14 +16,14 @@
     width: 100%; }
   .mathMlContainer:hover {
     pointer-events: none; }
-    .mathMlContainer:hover:after {
+    .mathMlContainer:hover::after {
       content: '\270E';
-      pointer-events: auto;
       position: absolute;
-      left: 0px;
-      top: 0px;
-      background-color: #ffffffd4;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+      background-color: rgba(255, 255, 255, 0.83);
+      box-shadow: 0 0 5px 5px rgba(255, 255, 255, 0.83);
       cursor: pointer;
-      bottom: 0px;
-      right: 0px;
-      box-shadow: 0 0 5px 5px #ffffffd4; }
+      pointer-events: auto; }

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

@@ -1,2 +1,2 @@
-/** Trumbowyg v2.11.1 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */
-.mathMlContainer{position:relative}.mathMlContainer[inline=false]{display:block;width:100%}.mathMlContainer:hover{pointer-events:none}.mathMlContainer:hover:after{content:'\270E';pointer-events:auto;position:absolute;left:0;top:0;background-color:#fffd4;cursor:pointer;bottom:0;right:0;box-shadow:0 0 5px 5px #fffd4}
+/** Trumbowyg v2.21.0 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */
+.mathMlContainer{position:relative}.mathMlContainer[inline=false]{display:block;width:100%}.mathMlContainer:hover{pointer-events:none}.mathMlContainer:hover::after{content:'\270E';position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(255,255,255,.83);box-shadow:0 0 5px 5px rgba(255,255,255,.83);cursor:pointer;pointer-events:auto}

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

@@ -12,13 +12,14 @@
     'use strict';
 
     var defaultOptions = {
-        source: '',
+        source: [],
         formatDropdownItem: formatDropdownItem,
         formatResult: formatResult
     };
 
     $.extend(true, $.trumbowyg, {
         langs: {
+            // jshint camelcase:false
             en: {
                 mention: 'Mention'
             },
@@ -26,7 +27,7 @@
                 mention: 'Nævn'
             },
             fr: {
-                mention: 'Mentioner'
+                mention: 'Mentionner'
             },
             ru: {
                 mention: 'Упомянуть'
@@ -37,6 +38,13 @@
             zh_tw: {
                 mention: '標記'
             },
+            pt_br: {
+                mention: 'Menção'
+            },
+            ko: {
+                mention: '언급'
+            },
+            // jshint camelcase:true
         },
 
         plugins: {
@@ -57,32 +65,29 @@
     /**
      * Build dropdown list
      *
-     * @param   {Array}   items      Items
-     * @param   {object}  trumbowyg  Editor
+     * @param {Array}   items      Items
+     * @param {object}  trumbowyg  Editor
      *
-     * @return  {Array}
+     * @return {Array}
      */
     function buildDropdown(items, trumbowyg) {
         var dropdown = [];
 
-        // Check if source is an array
-        if (items.constructor === Array) {
-            $.each(items, function (i, item) {
-                var btn = 'mention-' + i,
-                    btnDef = {
-                        hasIcon: false,
-                        text: trumbowyg.o.plugins.mention.formatDropdownItem(item),
-                        fn: function () {
-                            trumbowyg.execCmd('insertHTML', trumbowyg.o.plugins.mention.formatResult(item));
+        $.each(items, function (i, item) {
+            var btn = 'mention-' + i,
+                btnDef = {
+                    hasIcon: false,
+                    text: trumbowyg.o.plugins.mention.formatDropdownItem(item),
+                    fn: function () {
+                        trumbowyg.execCmd('insertHTML', trumbowyg.o.plugins.mention.formatResult(item));
 
-                            return true;
-                        }
-                    };
+                        return true;
+                    }
+                };
 
-                trumbowyg.addBtnDef(btn, btnDef);
-                dropdown.push(btn);
-            });
-        }
+            trumbowyg.addBtnDef(btn, btnDef);
+            dropdown.push(btn);
+        });
 
         return dropdown;
     }

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

@@ -1 +1 @@
-!function(n){"use strict";function t(t,o){var e=[];return t.constructor===Array&&n.each(t,function(n,t){var i="mention-"+n,r={hasIcon:!1,text:o.o.plugins.mention.formatDropdownItem(t),fn:function(){return o.execCmd("insertHTML",o.o.plugins.mention.formatResult(t)),!0}};o.addBtnDef(i,r),e.push(i)}),e}function o(n){return n.login}function e(n){return"@"+n.login+" "}var i={source:"",formatDropdownItem:o,formatResult:e};n.extend(!0,n.trumbowyg,{langs:{en:{mention:"Mention"},da:{mention:"Nævn"},fr:{mention:"Mentioner"},ru:{mention:"Упомянуть"},tr:{mention:"Bahset"},zh_tw:{mention:"標記"}},plugins:{mention:{init:function(o){o.o.plugins.mention=n.extend(!0,{},i,o.o.plugins.mention||{});var e={dropdown:t(o.o.plugins.mention.source,o)};o.addBtnDef("mention",e)}}}})}(jQuery);
+!function(n){"use strict";function t(t,o){var e=[];return n.each(t,function(n,t){var i="mention-"+n,r={hasIcon:!1,text:o.o.plugins.mention.formatDropdownItem(t),fn:function(){return o.execCmd("insertHTML",o.o.plugins.mention.formatResult(t)),!0}};o.addBtnDef(i,r),e.push(i)}),e}function o(n){return n.login}function e(n){return"@"+n.login+" "}var i={source:[],formatDropdownItem:o,formatResult:e};n.extend(!0,n.trumbowyg,{langs:{en:{mention:"Mention"},da:{mention:"Nævn"},fr:{mention:"Mentionner"},ru:{mention:"Упомянуть"},tr:{mention:"Bahset"},zh_tw:{mention:"標記"},pt_br:{mention:"Menção"},ko:{mention:"언급"}},plugins:{mention:{init:function(o){o.o.plugins.mention=n.extend(!0,{},i,o.o.plugins.mention||{});var e={dropdown:t(o.o.plugins.mention.source,o)};o.addBtnDef("mention",e)}}}})}(jQuery);

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

@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.11.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.21.0 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg
@@ -10,16 +10,6 @@
  */
 
 .trumbowyg-dropdown-mention {
-    height: calc(75%);
-    width: 300px;
-    max-width: 300px;
-    overflow-y: scroll;
-    overflow-x: hidden;
-
-    svg {
-        display: none !important;
-    }
-
     button {
         position: relative;
         white-space: nowrap;

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

@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.11.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.21.0 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg
@@ -9,24 +9,16 @@
  *         Website : alex-d.fr
  */
 
-.trumbowyg-dropdown-mention {
-  height: calc(75%);
-  width: 300px;
-  max-width: 300px;
-  overflow-y: scroll;
-  overflow-x: hidden; }
-  .trumbowyg-dropdown-mention svg {
-    display: none !important; }
-  .trumbowyg-dropdown-mention button {
-    position: relative;
-    white-space: nowrap; }
-    .trumbowyg-dropdown-mention button:after {
-      content: "";
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 15%;
-      height: 100%;
-      background-size: 100%;
-      background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, #ffffff 80%, #ffffff 100%);
-      pointer-events: none; }
+.trumbowyg-dropdown-mention button {
+  position: relative;
+  white-space: nowrap; }
+  .trumbowyg-dropdown-mention button:after {
+    content: "";
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 15%;
+    height: 100%;
+    background-size: 100%;
+    background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, #ffffff 80%, #ffffff 100%);
+    pointer-events: none; }

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

@@ -1,2 +1,2 @@
-/** Trumbowyg v2.11.1 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */
-.trumbowyg-dropdown-mention{height:calc(75%);width:300px;max-width:300px;overflow-y:scroll;overflow-x:hidden}.trumbowyg-dropdown-mention svg{display:none!important}.trumbowyg-dropdown-mention button{position:relative;white-space:nowrap}.trumbowyg-dropdown-mention button:after{content:"";position:absolute;top:0;right:0;width:15%;height:100%;background-size:100%;background-image:linear-gradient(to right,rgba(255,255,255,0) 0,#fff 80%,#fff 100%);pointer-events:none}
+/** 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-mention button{position:relative;white-space:nowrap}.trumbowyg-dropdown-mention button:after{content:"";position:absolute;top:0;right:0;width:15%;height:100%;background-size:100%;background-image:linear-gradient(to right,rgba(255,255,255,0) 0,#fff 80%,#fff 100%);pointer-events:none}

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

@@ -19,6 +19,7 @@
 
     $.extend(true, $.trumbowyg, {
         langs: {
+            // jshint camelcase:false
             en: {
                 noembed: 'Noembed',
                 noembedError: 'Error'
@@ -48,6 +49,15 @@
                 noembed: '插入影片',
                 noembedError: '錯誤'
             },
+            pt_br: {
+                noembed: 'Incorporar',
+                noembedError: 'Erro'
+            },
+            ko: {
+                noembed: 'oEmbed 넣기',
+                noembedError: '에러'
+            },
+            // jshint camelcase:true
         },
 
         plugins: {
@@ -108,4 +118,4 @@
             }
         }
     });
-})(jQuery);
+})(jQuery);

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

@@ -1 +1 @@
-!function(e){"use strict";var r={proxy:"https://noembed.com/embed?nowrap=on",urlFiled:"url",data:[],success:void 0,error:void 0};e.extend(!0,e.trumbowyg,{langs:{en:{noembed:"Noembed",noembedError:"Error"},da:{noembedError:"Fejl"},sk:{noembedError:"Chyba"},fr:{noembedError:"Erreur"},cs:{noembedError:"Chyba"},ru:{noembedError:"Ошибка"},ja:{noembedError:"エラー"},tr:{noembedError:"Hata"},zh_tw:{noembed:"插入影片",noembedError:"錯誤"}},plugins:{noembed:{init:function(o){o.o.plugins.noembed=e.extend(!0,{},r,o.o.plugins.noembed||{});var n={fn:function(){var r=o.openModalInsert(o.lang.noembed,{url:{label:"URL",required:!0}},function(n){e.ajax({url:o.o.plugins.noembed.proxy,type:"GET",data:n,cache:!1,dataType:"json",success:o.o.plugins.noembed.success||function(n){n.html?(o.execCmd("insertHTML",n.html),setTimeout(function(){o.closeModal()},250)):o.addErrorOnModalField(e("input[type=text]",r),n.error)},error:o.o.plugins.noembed.error||function(){o.addErrorOnModalField(e("input[type=text]",r),o.lang.noembedError)}})})}};o.addBtnDef("noembed",n)}}}})}(jQuery);
+!function(e){"use strict";var r={proxy:"https://noembed.com/embed?nowrap=on",urlFiled:"url",data:[],success:void 0,error:void 0};e.extend(!0,e.trumbowyg,{langs:{en:{noembed:"Noembed",noembedError:"Error"},da:{noembedError:"Fejl"},sk:{noembedError:"Chyba"},fr:{noembedError:"Erreur"},cs:{noembedError:"Chyba"},ru:{noembedError:"Ошибка"},ja:{noembedError:"エラー"},tr:{noembedError:"Hata"},zh_tw:{noembed:"插入影片",noembedError:"錯誤"},pt_br:{noembed:"Incorporar",noembedError:"Erro"},ko:{noembed:"oEmbed 넣기",noembedError:"에러"}},plugins:{noembed:{init:function(o){o.o.plugins.noembed=e.extend(!0,{},r,o.o.plugins.noembed||{});var n={fn:function(){var r=o.openModalInsert(o.lang.noembed,{url:{label:"URL",required:!0}},function(n){e.ajax({url:o.o.plugins.noembed.proxy,type:"GET",data:n,cache:!1,dataType:"json",success:o.o.plugins.noembed.success||function(n){n.html?(o.execCmd("insertHTML",n.html),setTimeout(function(){o.closeModal()},250)):o.addErrorOnModalField(e("input[type=text]",r),n.error)},error:o.o.plugins.noembed.error||function(){o.addErrorOnModalField(e("input[type=text]",r),o.lang.noembedError)}})})}};o.addBtnDef("noembed",n)}}}})}(jQuery);

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

@@ -18,6 +18,7 @@
                     trumbowyg.pasteHandlers.push(function (pasteEvent) {
                         try {
                             var items = (pasteEvent.originalEvent || pasteEvent).clipboardData.items,
+                                mustPreventDefault = false,
                                 reader;
 
                             for (var i = items.length - 1; i >= 0; i -= 1) {
@@ -25,12 +26,19 @@
                                     reader = new FileReader();
                                     /* jshint -W083 */
                                     reader.onloadend = function (event) {
-                                        trumbowyg.execCmd('insertImage', event.target.result, undefined, true);
+                                        trumbowyg.execCmd('insertImage', event.target.result, false, true);
                                     };
                                     /* jshint +W083 */
                                     reader.readAsDataURL(items[i].getAsFile());
+
+                                    mustPreventDefault = true;
                                 }
                             }
+
+                            if (mustPreventDefault) {
+                                pasteEvent.stopPropagation();
+                                pasteEvent.preventDefault();
+                            }
                         } catch (c) {
                         }
                     });

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

@@ -1 +1 @@
-!function(e){"use strict";e.extend(!0,e.trumbowyg,{plugins:{pasteImage:{init:function(e){e.pasteHandlers.push(function(t){try{for(var a,n=(t.originalEvent||t).clipboardData.items,i=n.length-1;i>=0;i-=1)n[i].type.match(/^image\//)&&(a=new FileReader,a.onloadend=function(t){e.execCmd("insertImage",t.target.result,void 0,!0)},a.readAsDataURL(n[i].getAsFile()))}catch(r){}})}}}})}(jQuery);
+!function(e){"use strict";e.extend(!0,e.trumbowyg,{plugins:{pasteImage:{init:function(e){e.pasteHandlers.push(function(t){try{for(var a,n=(t.originalEvent||t).clipboardData.items,i=!1,r=n.length-1;r>=0;r-=1)n[r].type.match(/^image\//)&&(a=new FileReader,a.onloadend=function(t){e.execCmd("insertImage",t.target.result,!1,!0)},a.readAsDataURL(n[r].getAsFile()),i=!0);i&&(t.stopPropagation(),t.preventDefault())}catch(o){}})}}}})}(jQuery);

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

@@ -40,6 +40,12 @@
             zh_tw: {
                 preformatted: '代碼範例 <pre>'
             },
+            pt_br: {
+                preformatted: 'Exemple de código <pre>'
+            },
+            ko: {
+                preformatted: '코드 예제 <pre>'
+            },
         },
         // jshint camelcase:true
 

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

@@ -1 +1 @@
-!function(e){"use strict";function t(){var e,t=null;return window.getSelection?(e=window.getSelection(),e.rangeCount&&(t=e.getRangeAt(0).commonAncestorContainer,1!==t.nodeType&&(t=t.parentNode))):(e=document.selection)&&"Control"!==e.type&&(t=e.createRange().parentElement()),t}function n(e){var t=document.createElement("DIV");return t.innerHTML=e,t.textContent||t.innerText||""}function r(){var t=null;if(document.selection)t=document.selection.createRange().parentElement();else{var n=window.getSelection();n.rangeCount>0&&(t=n.getRangeAt(0).startContainer.parentNode)}var r=e(t).contents().closest("pre").length,o=e(t).contents().closest("code").length;r&&o?e(t).contents().unwrap("code").unwrap("pre"):r?e(t).contents().unwrap("pre"):o&&e(t).contents().unwrap("code")}e.extend(!0,e.trumbowyg,{langs:{en:{preformatted:"Code sample <pre>"},da:{preformatted:"Præformateret <pre>"},fr:{preformatted:"Exemple de code <pre>"},it:{preformatted:"Codice <pre>"},zh_cn:{preformatted:"代码示例 <pre>"},ru:{preformatted:"Пример кода <pre>"},ja:{preformatted:"コードサンプル <pre>"},tr:{preformatted:"Kod örneği <pre>"},zh_tw:{preformatted:"代碼範例 <pre>"}},plugins:{preformatted:{init:function(e){var o={fn:function(){e.saveRange();var o=e.getRangeText();if(""!==o.replace(/\s/g,""))try{var a=t().tagName.toLowerCase();if("code"===a||"pre"===a)return r();e.execCmd("insertHTML","<pre><code>"+n(o)+"</code></pre>")}catch(c){}},tag:"pre"};e.addBtnDef("preformatted",o)}}}})}(jQuery);
+!function(e){"use strict";function t(){var e,t=null;return window.getSelection?(e=window.getSelection(),e.rangeCount&&(t=e.getRangeAt(0).commonAncestorContainer,1!==t.nodeType&&(t=t.parentNode))):(e=document.selection)&&"Control"!==e.type&&(t=e.createRange().parentElement()),t}function r(e){var t=document.createElement("DIV");return t.innerHTML=e,t.textContent||t.innerText||""}function n(){var t=null;if(document.selection)t=document.selection.createRange().parentElement();else{var r=window.getSelection();r.rangeCount>0&&(t=r.getRangeAt(0).startContainer.parentNode)}var n=e(t).contents().closest("pre").length,o=e(t).contents().closest("code").length;n&&o?e(t).contents().unwrap("code").unwrap("pre"):n?e(t).contents().unwrap("pre"):o&&e(t).contents().unwrap("code")}e.extend(!0,e.trumbowyg,{langs:{en:{preformatted:"Code sample <pre>"},da:{preformatted:"Præformateret <pre>"},fr:{preformatted:"Exemple de code <pre>"},it:{preformatted:"Codice <pre>"},zh_cn:{preformatted:"代码示例 <pre>"},ru:{preformatted:"Пример кода <pre>"},ja:{preformatted:"コードサンプル <pre>"},tr:{preformatted:"Kod örneği <pre>"},zh_tw:{preformatted:"代碼範例 <pre>"},pt_br:{preformatted:"Exemple de código <pre>"},ko:{preformatted:"코드 예제 <pre>"}},plugins:{preformatted:{init:function(e){var o={fn:function(){e.saveRange();var o=e.getRangeText();if(""!==o.replace(/\s/g,""))try{var a=t().tagName.toLowerCase();if("code"===a||"pre"===a)return n();e.execCmd("insertHTML","<pre><code>"+r(o)+"</code></pre>")}catch(p){}},tag:"pre"};e.addBtnDef("preformatted",o)}}}})}(jQuery);

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/resizimg/resizable-resolveconflict.js

@@ -0,0 +1,20 @@
+(function (factory, define, require, module) {
+    'use strict';
+
+    if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(['jquery'], factory);
+    } else if (typeof module === 'object' && typeof module.exports === 'object') {
+        // CommonJS
+        module.exports = factory(require('jquery'));
+    } else {
+        // Global jQuery
+        factory(jQuery);
+    }
+}(function ($) {
+    'use strict';
+
+    // rename to avoid conflict with jquery-resizable
+    $.fn.uiresizable = $.fn.resizable;
+    delete $.fn.resizable;
+}));

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/resizimg/resizable-resolveconflict.min.js

@@ -0,0 +1 @@
+!function(e,t,o,r){"use strict";"function"==typeof t&&t.amd?t(["jquery"],e):"object"==typeof r&&"object"==typeof r.exports?r.exports=e(o("jquery")):e(jQuery)}(function(e){"use strict";e.fn.uiresizable=e.fn.resizable,delete e.fn.resizable});

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

@@ -1,4 +1,4 @@
-(function ($) {
+;(function ($) {
     'use strict';
 
     var defaultOptions = {
@@ -6,10 +6,206 @@
         step: 4
     };
 
-    var preventDefault = function (ev) {
-        return ev.preventDefault();
+    function preventDefault(e) {
+        e.stopPropagation();
+        e.preventDefault();
+    }
+
+    var ResizeWithCanvas = function () {
+        // variable to create canvas and save img in resize mode
+        this.resizeCanvas = document.createElement('canvas');
+        // to allow canvas to get focus
+        this.resizeCanvas.setAttribute('tabindex', '0');
+        this.resizeCanvas.id = 'trumbowyg-resizimg-' + (+new Date());
+        this.ctx = null;
+        this.resizeImg = null;
+
+        this.pressEscape = function (obj) {
+            obj.reset();
+        };
+        this.pressBackspaceOrDelete = function (obj) {
+            $(obj.resizeCanvas).replaceWith('');
+            obj.resizeImg = null;
+        };
+
+        // PRIVATE FUNCTION
+        var focusedNow = false;
+        var isCursorSeResize = false;
+
+        // calculate offset to change mouse over square in the canvas
+        var offsetX, offsetY;
+        var reOffset = function (canvas) {
+            var BB = canvas.getBoundingClientRect();
+            offsetX = BB.left;
+            offsetY = BB.top;
+        };
+
+        var drawRect = function (shapeData, ctx) {
+            // Inner
+            ctx.beginPath();
+            ctx.fillStyle = 'rgb(255, 255, 255)';
+            ctx.rect(shapeData.points.x, shapeData.points.y, shapeData.points.width, shapeData.points.height);
+            ctx.fill();
+            ctx.stroke();
+        };
+
+        var updateCanvas = function (canvas, ctx, img, canvasWidth, canvasHeight) {
+            ctx.translate(0.5, 0.5);
+            ctx.lineWidth = 1;
+
+            // image
+            ctx.drawImage(img, 5, 5, canvasWidth - 10, canvasHeight - 10);
+
+            // border
+            ctx.beginPath();
+            ctx.rect(5, 5, canvasWidth - 10, canvasHeight - 10);
+            ctx.stroke();
+
+            // square in the angle
+            ctx.beginPath();
+            ctx.fillStyle = 'rgb(255, 255, 255)';
+            ctx.rect(canvasWidth - 10, canvasHeight - 10, 9, 9);
+            ctx.fill();
+            ctx.stroke();
+
+            // get the offset to change the mouse cursor
+            reOffset(canvas);
+
+            return ctx;
+        };
+
+        // PUBLIC FUNCTION
+        // necessary to correctly print cursor over square. Called once for instance. Useless with trumbowyg.
+        this.init = function () {
+            var _this = this;
+            $(window).on('scroll resize', function () {
+                _this.reCalcOffset();
+            });
+        };
+
+        this.reCalcOffset = function () {
+            reOffset(this.resizeCanvas);
+        };
+
+        this.canvasId = function () {
+            return this.resizeCanvas.id;
+        };
+
+        this.isActive = function () {
+            return this.resizeImg !== null;
+        };
+
+        this.isFocusedNow = function () {
+            return focusedNow;
+        };
+
+        this.blurNow = function () {
+            focusedNow = false;
+        };
+
+        // restore image in the HTML of the editor
+        this.reset = function () {
+            if (this.resizeImg === null) {
+                return;
+            }
+
+            this.resizeImg.width = this.resizeCanvas.clientWidth - 10;
+            this.resizeImg.height = this.resizeCanvas.clientHeight - 10;
+            // clear style of image to avoid issue on resize because this attribute have priority over width and height attribute
+            this.resizeImg.removeAttribute('style');
+
+            $(this.resizeCanvas).replaceWith($(this.resizeImg));
+
+            // reset canvas style
+            this.resizeCanvas.removeAttribute('style');
+            this.resizeImg = null;
+        };
+
+        // setup canvas with points and border to allow the resizing operation
+        this.setup = function (img, resizableOptions) {
+            this.resizeImg = img;
+
+            if (!this.resizeCanvas.getContext) {
+                return false;
+            }
+
+            focusedNow = true;
+
+            // draw canvas
+            this.resizeCanvas.width = $(this.resizeImg).width() + 10;
+            this.resizeCanvas.height = $(this.resizeImg).height() + 10;
+            this.resizeCanvas.style.margin = '-5px';
+            this.ctx = this.resizeCanvas.getContext('2d');
+
+            // replace image with canvas
+            $(this.resizeImg).replaceWith($(this.resizeCanvas));
+
+            updateCanvas(this.resizeCanvas, this.ctx, this.resizeImg, this.resizeCanvas.width, this.resizeCanvas.height);
+
+            // enable resize
+            $(this.resizeCanvas).resizable(resizableOptions)
+                .on('mousedown', preventDefault);
+
+            var _this = this;
+            $(this.resizeCanvas)
+                .on('mousemove', function (e) {
+                    var mouseX = Math.round(e.clientX - offsetX);
+                    var mouseY = Math.round(e.clientY - offsetY);
+
+                    var wasCursorSeResize = isCursorSeResize;
+
+                    _this.ctx.rect(_this.resizeCanvas.width - 10, _this.resizeCanvas.height - 10, 9, 9);
+                    isCursorSeResize = _this.ctx.isPointInPath(mouseX, mouseY);
+                    if (wasCursorSeResize !== isCursorSeResize) {
+                        this.style.cursor = isCursorSeResize ? 'se-resize' : 'default';
+                    }
+                })
+                .on('keydown', function (e) {
+                    if (!_this.isActive()) {
+                        return;
+                    }
+
+                    var x = e.keyCode;
+                    if (x === 27) { // ESC
+                        _this.pressEscape(_this);
+                    } else if (x === 8 || x === 46) { // BACKSPACE or DELETE
+                        _this.pressBackspaceOrDelete(_this);
+                    }
+                })
+                .on('focus', preventDefault);
+
+            this.resizeCanvas.focus();
+
+            return true;
+        };
+
+        // update the canvas after the resizing
+        this.refresh = function () {
+            if (!this.resizeCanvas.getContext) {
+                return;
+            }
+
+            this.resizeCanvas.width = this.resizeCanvas.clientWidth;
+            this.resizeCanvas.height = this.resizeCanvas.clientHeight;
+            updateCanvas(this.resizeCanvas, this.ctx, this.resizeImg, this.resizeCanvas.width, this.resizeCanvas.height);
+        };
     };
 
+    // object to interact with canvas
+    var resizeWithCanvas = new ResizeWithCanvas();
+
+    function destroyResizable(trumbowyg) {
+        // clean html code
+        trumbowyg.$ed.find('canvas.resizable')
+            .resizable('destroy')
+            .off('mousedown', preventDefault)
+            .removeClass('resizable');
+
+        resizeWithCanvas.reset();
+
+        trumbowyg.syncCode();
+    }
+
     $.extend(true, $.trumbowyg, {
         plugins: {
             resizimg: {
@@ -38,30 +234,68 @@
                                     return false;
                                 },
                                 onDragEnd: function () {
-                                    trumbowyg.$c.trigger('tbwchange');
+                                    // resize update canvas information
+                                    resizeWithCanvas.refresh();
+                                    trumbowyg.syncCode();
                                 }
                             }
                         }
                     );
 
                     function initResizable() {
-                        trumbowyg.$ed.find('img:not(.resizable)')
-                            .resizable(trumbowyg.o.plugins.resizimg.resizable)
-                            .on('mousedown', preventDefault);
-                    }
+                        trumbowyg.$ed.find('img')
+                            .off('click')
+                            .on('click', function (e) {
+                                // if I'm already do a resize, reset it
+                                if (resizeWithCanvas.isActive()) {
+                                    resizeWithCanvas.reset();
+                                }
+                                // initialize resize of image
+                                resizeWithCanvas.setup(this, trumbowyg.o.plugins.resizimg.resizable);
 
-                    function destroyResizable() {
-                        trumbowyg.$ed.find('img.resizable')
-                            .resizable('destroy')
-                            .off('mousedown', preventDefault);
-                        trumbowyg.syncTextarea();
+                                preventDefault(e);
+                            });
                     }
 
-                    trumbowyg.$c.on('tbwinit', initResizable);
-                    trumbowyg.$c.on('tbwfocus', initResizable);
-                    trumbowyg.$c.on('tbwchange', initResizable);
-                    trumbowyg.$c.on('tbwblur', destroyResizable);
-                    trumbowyg.$c.on('tbwclose', destroyResizable);
+                    trumbowyg.$c.on('tbwinit', function () {
+                        initResizable();
+
+                        // disable resize when click on other items
+                        trumbowyg.$ed.on('click', function (e) {
+                            // check if I've clicked out of canvas or image to reset it
+                            if ($(e.target).is('img') || e.target.id === resizeWithCanvas.canvasId()) {
+                                return;
+                            }
+
+                            preventDefault(e);
+                            resizeWithCanvas.reset();
+
+                            // save changes
+                            trumbowyg.$c.trigger('tbwchange');
+                        });
+
+                        trumbowyg.$ed.on('scroll', function () {
+                            resizeWithCanvas.reCalcOffset();
+                        });
+                    });
+
+                    trumbowyg.$c.on('tbwfocus tbwchange', initResizable);
+                    trumbowyg.$c.on('tbwresize', function () {
+                        resizeWithCanvas.reCalcOffset();
+                    });
+
+                    // Destroy
+                    trumbowyg.$c.on('tbwblur', function () {
+                        // if I have already focused the canvas avoid destroy
+                        if (resizeWithCanvas.isFocusedNow()) {
+                            resizeWithCanvas.blurNow();
+                        } else {
+                            destroyResizable(trumbowyg);
+                        }
+                    });
+                },
+                destroy: function (trumbowyg) {
+                    destroyResizable(trumbowyg);
                 }
             }
         }