build: v2.0.0

Alex-D · Apr 10, 2016 · 308117e · 308117e
1 parent b8d39f4
commit 308117e
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 48 deletions.
diff --git a/dist/langs/fr.min.js b/dist/langs/fr.min.js
diff --git a/dist/plugins/colors/trumbowyg.colors.js b/dist/plugins/colors/trumbowyg.colors.js
@@ -137,8 +137,8 @@
         // add free color btn
         var freeColorButtonName = fn + 'Free',
             freeColorBtnDef = {
-                fn: function (params, tbw) {
-                    tbw.openModalInsert(tbw.lang[fn],
+                fn: function () {
+                    trumbowyg.openModalInsert(trumbowyg.lang[fn],
                         {
                             color: {
                                 label: fn,
@@ -147,7 +147,7 @@
                         },
                         // callback
                         function (values) {
-                            tbw.execCmd(fn, values.color);
+                            trumbowyg.execCmd(fn, values.color);
                             return true;
                         }
                     );

diff --git a/dist/plugins/colors/trumbowyg.colors.min.js b/dist/plugins/colors/trumbowyg.colors.min.js
diff --git a/dist/plugins/colors/ui/sass/trumbowyg.colors.scss b/dist/plugins/colors/ui/sass/trumbowyg.colors.scss
@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.0.0-beta.8 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.0.0 - A lightweight WYSIWYG editor
  * Colors plugin stylesheet for Trumbowyg editor
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg

diff --git a/dist/plugins/colors/ui/trumbowyg.colors.css b/dist/plugins/colors/ui/trumbowyg.colors.css
@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.0.0-beta.8 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.0.0 - A lightweight WYSIWYG editor
  * Colors plugin stylesheet for Trumbowyg editor
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg

diff --git a/dist/plugins/colors/ui/trumbowyg.colors.min.css b/dist/plugins/colors/ui/trumbowyg.colors.min.css
diff --git a/dist/plugins/noembed/trumbowyg.noembed.js b/dist/plugins/noembed/trumbowyg.noembed.js
@@ -85,8 +85,7 @@
                                     });
                                 }
                             );
-                        },
-                        ico: 'insertImage'
+                        }
                     };
 
                     trumbowyg.addBtnDef('noembed', btnDef);

diff --git a/dist/plugins/noembed/trumbowyg.noembed.min.js b/dist/plugins/noembed/trumbowyg.noembed.min.js
diff --git a/dist/trumbowyg.js b/dist/trumbowyg.js
@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.0.0-beta.8 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.0.0 - A lightweight WYSIWYG editor
  * Trumbowyg core file
  * ------------------------
  * @link http://alex-d.github.io/Trumbowyg
@@ -14,6 +14,9 @@ jQuery.trumbowyg = {
         en: {
             viewHTML: 'View HTML',
 
+            undo: 'Undo',
+            redo: 'Redo',
+
             formatting: 'Formatting',
             p: 'Paragraph',
             blockquote: 'Quote',
@@ -190,12 +193,24 @@ jQuery.trumbowyg = {
              *          title: this.lang.foo
              *      }
          */
-        var h = t.lang.header; // Header translation
+        var h = t.lang.header, // Header translation
+            isBlinkFunction = function () {
+                return (window.chrome || (window.Intl && Intl.v8BreakIterator)) && 'CSS' in window;
+            };
         t.btnsDef = {
             viewHTML: {
                 fn: 'toggle'
             },
 
+            undo: {
+                isSupported: isBlinkFunction,
+                key: 'Z'
+            },
+            redo: {
+                isSupported: isBlinkFunction,
+                key: 'Y'
+            },
+
             p: {
                 fn: 'formatBlock'
             },
@@ -331,6 +346,7 @@ jQuery.trumbowyg = {
             },
             btns: [
                 ['viewHTML'],
+                ['undo', 'redo'],
                 ['formatting'],
                 'btnGrp-semantic',
                 ['superscript', 'subscript'],
@@ -426,7 +442,9 @@ jQuery.trumbowyg = {
 
             t.buildOverlay();
 
-            t.$c.trigger('tbwinit');
+            setTimeout(function () {
+                t.$c.trigger('tbwinit');
+            });
         },
 
         addBtnDef: function (btnName, btnDef) {
@@ -732,7 +750,7 @@ jQuery.trumbowyg = {
         // Check if button is supported
         isSupportedBtn: function (b) {
             try {
-                return this.o.btnsDef[b].isSupported();
+                return this.btnsDef[b].isSupported();
             } catch (c) {
             }
             return true;
@@ -1144,7 +1162,7 @@ jQuery.trumbowyg = {
                     cmd(param);
                 } catch (e2) {
                     if (cmd === 'insertHorizontalRule') {
-                        param = null;
+                        param = undefined;
                     } else if (cmd === 'formatBlock' && (navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') !== -1)) {
                         param = '<' + param + '>';
                     }

diff --git a/dist/trumbowyg.min.js b/dist/trumbowyg.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,8 +85,7 @@ @@
                                         });
                                     }
                                 );
-                            },
-                            ico: 'insertImage'
+                            }
                         };
                         trumbowyg.addBtnDef('noembed', btnDef);
@@ Expand Down @@