Properly extend tinyMCE config. Fixes #31

Friendly-Pixel · May 27, 2016 · 714a70a · 714a70a
1 parent 892b661
commit 714a70a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/dist/grideditor.css b/dist/grideditor.css
@@ -18,7 +18,7 @@
 }
 .ge-mainControls .ge-addRowGroup .btn.btn-primary {
   background: #f4f4f4;
-  color: #666666;
+  color: #666;
   border-color: #999;
 }
 .ge-mainControls .ge-addRowGroup .ge-row-icon {
@@ -109,7 +109,7 @@
 }
 .ge-canvas.ge-editing .column {
   background-color: rgba(47, 164, 231, 0.15);
-  border: 1px solid #2fa4e7;
+  border: 1px solid #2FA4E7;
   padding: 0 5px 5px;
 }
 .ge-canvas.ge-editing .column > .ge-tools-drawer {
@@ -119,7 +119,7 @@
   color: #178acc;
 }
 .ge-canvas.ge-editing .column > .ge-tools-drawer > a.ge-add-row {
-  color: #666666;
+  color: #666;
 }
 .ge-canvas.ge-editing .ge-content-type-tinymce.active {
   outline: 1px dotted #333;

diff --git a/dist/jquery.grideditor.js b/dist/jquery.grideditor.js
@@ -29,8 +29,8 @@ $.fn.gridEditor = function( options ) {
         // Wrap content if it is non-bootstrap
         if (baseElem.children().length && !baseElem.find('div.row').length) {
             var children = baseElem.children();
-            var row = $('<div class="row"><div class="col-md-12"/></div>').appendTo(baseElem);
-            row.find('.col-md-12').append(children);
+            var newRow = $('<div class="row"><div class="col-md-12"/></div>').appendTo(baseElem);
+            newRow.find('.col-md-12').append(children);
         }
 
         var settings = $.extend({
@@ -77,18 +77,18 @@ $.fn.gridEditor = function( options ) {
             /* Setup canvas */
             canvas = baseElem.addClass('ge-canvas');
 
-            if(settings.source_textarea) {
+            if (settings.source_textarea) {
                 var sourceEl = $(settings.source_textarea);
 
                 sourceEl.addClass('ge-html-output');
                     htmlTextArea = sourceEl;
 
-                if(sourceEl.val()) {
+                if (sourceEl.val()) {
                     self.html(sourceEl.val());
                 }
             }
 
-            if(typeof htmlTextArea === 'undefined' || !htmlTextArea.length) {
+            if (typeof htmlTextArea === 'undefined' || !htmlTextArea.length) {
                 htmlTextArea = $('<textarea class="ge-html-output"/>').insertBefore(canvas);
             }
 
@@ -465,7 +465,7 @@ $.fn.gridEditor = function( options ) {
 
         function createColumn(size) {
             return $('<div/>')
-                .addClass(colClasses.map(function(c) { return c += size }).join(' '))
+                .addClass(colClasses.map(function(c) { return c + size; }).join(' '))
                 .append(createDefaultContentWrapper().html(
                     getRTE(settings.content_types[0]).initialContent)
                 )
@@ -689,15 +689,18 @@ $.fn.gridEditor.RTEs = {};
                     }
                     contentArea.addClass('active');
                     var configuration = $.extend(
+                        {},
                         (settings.tinymce && settings.tinymce.config ? settings.tinymce.config : {}),
                         {
                             inline: true,
                             oninit: function(editor) {
-                                try {
-                                    settings.tinymce.config.oninit(editor);
-                                } catch(e) {}
                                 // Bring focus to text field
                                 $('#' + editor.settings.id).focus();
+
+                                // Call original oninit function, if one was passed in the config
+                                if (settings.tinymce.config.oninit && typeof settings.tinymce.config.oninit == 'function') {
+                                    settings.tinymce.config.oninit(editor);
+                                }
                             }
                         }
                     );