2.4.3

arqball · Feb 15, 2017 · d01ecee · d01ecee
1 parent df4c556
commit d01ecee
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 29 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "trumbowyg",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "homepage": "https://github.com/Alex-D/Trumbowyg",
   "authors": [
     {

diff --git a/dist/langs/fi.min.js b/dist/langs/fi.min.js
diff --git a/dist/langs/fr.min.js b/dist/langs/fr.min.js
diff --git a/dist/langs/ru.min.js b/dist/langs/ru.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.2 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.3 - 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.2 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.3 - 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/plugins/upload/trumbowyg.upload.js b/dist/plugins/upload/trumbowyg.upload.js
@@ -17,13 +17,13 @@
     var defaultOptions = {
         serverPath: './src/plugins/upload/trumbowyg.upload.php',
         fileFieldName: 'fileToUpload',
-        data: [],
-        headers: {},
-        xhrFields: {},
-        urlPropertyName: 'file',
-        statusPropertyName: 'success',
-        success: undefined,
-        error: undefined
+        data: [],                       // Additional data for ajax [{name: 'key', value: 'value'}]
+        headers: {},                    // Additional headers
+        xhrFields: {},                  // Additional fields
+        urlPropertyName: 'file',        // How to get url from the json response (for instance 'url' for {url: ....})
+        statusPropertyName: 'success',  // How to get status from the json response 
+        success: undefined,             // Success callback: function (data, trumbowyg, $modal, values) {}
+        error: undefined                // Error callback: function () {}
     };
 
     function getDeep(object, propertyParts) {

diff --git a/dist/trumbowyg.js b/dist/trumbowyg.js
@@ -1,5 +1,5 @@
 /**
- * Trumbowyg v2.4.2 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.3 - A lightweight WYSIWYG editor
  * Trumbowyg core file
  * ------------------------
  * @link https://alex-d.github.io/Trumbowyg
@@ -70,7 +70,9 @@ jQuery.trumbowyg = {
     plugins: {},
 
     // SVG Path globally
-    svgPath: null
+    svgPath: null,
+
+    hideButtonTexts: null
 };
 
 
@@ -159,6 +161,8 @@ jQuery.trumbowyg = {
             t.lang = $.trumbowyg.langs.en;
         }
 
+        t.hideButtonTexts = $.trumbowyg.hideButtonTexts != null ? $.trumbowyg.hideButtonTexts : options.hideButtonTexts;
+
         // SVG path
         var svgPathOption = $.trumbowyg.svgPath != null ? $.trumbowyg.svgPath : options.svgPath;
         t.hasSvg = svgPathOption !== false;
@@ -583,6 +587,8 @@ jQuery.trumbowyg = {
                     } else if (!ctrl && e.which !== 17 && !composition) {
                         t.semanticCode(false, e.which === 13);
                         t.$c.trigger('tbwchange');
+                    } else if (typeof e.which === 'undefined'　&& composition) {
+                        t.semanticCode(false, false, true);
                     }
 
                     setTimeout(function () {
@@ -708,7 +714,9 @@ jQuery.trumbowyg = {
                 $btn = $('<button/>', {
                     type: 'button',
                     class: prefix + btnName + '-button ' + (btn.class || '') + (!hasIcon ? ' ' + prefix + 'textual-button' : ''),
-                    html: t.hasSvg && hasIcon ? '<svg><use xlink:href="' + t.svgPath + '#' + prefix + (btn.ico || btnName).replace(/([A-Z]+)/g, '-$1').toLowerCase() + '"/></svg>' : (btn.text || btn.title || t.lang[btnName] || btnName),
+                    html: t.hasSvg && hasIcon ?
+                      '<svg><use xlink:href="' + t.svgPath + '#' + prefix + (btn.ico || btnName).replace(/([A-Z]+)/g, '-$1').toLowerCase() + '"/></svg>' :
+                      t.hideButtonTexts ? '' : (btn.text || btn.title || t.lang[btnName] || btnName),
                     title: (btn.title || btn.text || textDef) + ((btn.key) ? ' (Ctrl + ' + btn.key + ')' : ''),
                     tabindex: -1,
                     mousedown: function () {
@@ -974,10 +982,12 @@ jQuery.trumbowyg = {
 
                 $(window).trigger('scroll');
 
-                $('body', d).on('mousedown.'+t.eventNamespace, function () {
-                    $('.' + prefix + 'dropdown', d).hide();
-                    $('.' + prefix + 'active', d).removeClass(prefix + 'active');
-                    $('body', d).off('mousedown.'+t.eventNamespace);
+                $('body', d).on('mousedown.'+t.eventNamespace, function (e) {
+                    if (!$dropdown.is(e.target)) {
+                        $('.' + prefix + 'dropdown', d).hide();
+                        $('.' + prefix + 'active', d).removeClass(prefix + 'active');
+                        $('body', d).off('mousedown.'+t.eventNamespace);
+                    }
                 });
             }
         },
@@ -1017,7 +1027,8 @@ jQuery.trumbowyg = {
         // Analyse and update to semantic code
         // @param force : force to sync code from textarea
         // @param full  : wrap text nodes in <p>
-        semanticCode: function (force, full) {
+        // @param keepRange  : leave selection range as it is
+        semanticCode: function (force, full, keepRange) {
             var t = this;
             t.saveRange();
             t.syncCode(force);
@@ -1066,7 +1077,9 @@ jQuery.trumbowyg = {
                     t.$ed.find('p:empty').remove();
                 }
 
-                t.restoreRange();
+                if (!keepRange) {
+                    t.restoreRange();
+                }
 
                 t.syncTextarea();
             }

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.2 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.3 - 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.2 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.4.3 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor
  * ------------------------
  * @link https://alex-d.github.io/Trumbowyg