2.4.4

arqball · Feb 15, 2017 · 5e2b5c7 · 5e2b5c7
1 parent 5a09a67
commit 5e2b5c7
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 81 deletions.
diff --git a/dist/plugins/colors/Gulpfile.js b/dist/plugins/colors/Gulpfile.js
diff --git a/dist/plugins/colors/Gulpfile.min.js b/dist/plugins/colors/Gulpfile.min.js
diff --git a/dist/plugins/colors/trumbowyg.colors.js b/dist/plugins/colors/trumbowyg.colors.js
@@ -1,5 +1,5 @@
 /* ===========================================================
- * trumbowyg.colors.js v1.1
+ * trumbowyg.colors.js v1.2
  * Colors picker plugin for Trumbowyg
  * https://alex-d.github.com/Trumbowyg
  * ===========================================================
@@ -98,7 +98,7 @@
         plugins: {
             color: {
                 init: function (trumbowyg) {
-                    trumbowyg.o.plugins.colors = $.extend(true, {}, defaultOptions, trumbowyg.o.plugins.colors || {});
+                    trumbowyg.o.plugins.colors = trumbowyg.o.plugins.colors || defaultOptions;
                     var foreColorBtnDef = {
                             dropdown: buildDropdown('foreColor', trumbowyg)
                         },

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.4.3 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.4 - A lightweight WYSIWYG editor
  * Colors plugin stylesheet for Trumbowyg editor
  * ------------------------
  * @link https://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.4.3 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.4 - A lightweight WYSIWYG editor
  * Colors plugin stylesheet for Trumbowyg editor
  * ------------------------
  * @link https://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/trumbowyg.js b/dist/trumbowyg.js
@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.4.3 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.4 - A lightweight WYSIWYG editor
  * Trumbowyg core file
  * ------------------------
  * @link https://alex-d.github.io/Trumbowyg

diff --git a/dist/trumbowyg.min.js b/dist/trumbowyg.min.js
diff --git a/dist/ui/sass/trumbowyg.scss b/dist/ui/sass/trumbowyg.scss
@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.4.3 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.4 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor
  * ------------------------
  * @link https://alex-d.github.io/Trumbowyg

diff --git a/dist/ui/trumbowyg.css b/dist/ui/trumbowyg.css
@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.4.3 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.4 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor
  * ------------------------
  * @link https://alex-d.github.io/Trumbowyg