tb_core 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be83cc72ea702d72548da1c9bf4d25eb632e154169ef241e11bfa845d842a3f
-  data.tar.gz: 191e53b35d46f8f5b91acef66b14015cfb69fc6dd6cd57ae68db1ac9d8e6540e
+  metadata.gz: 685a39f5f0708976182b94ca4eba53159105aae179377c82506808ac3c0140aa
+  data.tar.gz: 8281b2db3cd5ec6ff3c68b564ebc2b30d5fb4e90b1e1fd2d5966ad18b967ab49
 SHA512:
-  metadata.gz: 3eb99e7178bd58e87539f5ffec183614fccd1a1aa801a7c531d962d0a4a8408228736007b62172f04bd344f402bbed45c7771b768eb1278b14218fa9a3d46b4a
-  data.tar.gz: 04016da2d6563e8857c02c924b08878ecf238da9f63a871dd991498fc6f4765792a16c965b2053eb4add1ab75a71287af73d01475b52afa4596655ac2f8ee0d6
+  metadata.gz: 30658044ef646b5daffa80b31eaf80b6408d9336189e01671ab523a89d85edf86da366bf09d6b8ac0842a6c787718e5570452c461f98505ce79616ddc0e81efd
+  data.tar.gz: 78b94c0636177d2e71249dceaf11b153c1680f39597360393aa1b8b98defccae365f1509ae19295295e6db3aa58e5fe172125aeada933bfd98ef2f50efa5398f

data/app/assets/javascripts/admin/core/editor.js

@@ -4,7 +4,13 @@ tb.editor = {};
 
   var editor = tb.editor;
 
-  editor.tinymce = {loaded:false};
+  /*
+  * Use tb.editor.overrides to set custom configs in your application
+  *
+  * tb.editor.overrides = { menubar: true }
+  *
+  */
+  editor.overrides = {};
 
   var registeredPlugins = [
     'autolink','lists','image','link','media','paste', 'code'
@@ -23,19 +29,22 @@ tb.editor = {};
     "iframe[src|width|height|name|align|frameborder|allowfullscreen]"
   ];
 
-  editor.init = function(options) {
+  editor.init = function(args) {
     editor.unload();
 
-    options = options || { selector: 'textarea.tinymce' };
+    var selector = args ? args.selector : 'textarea.tinymce';
 
-    tinymce.init({
-      selector: options.selector,
+    var options = Object.assign({
+      selector: selector,
       height: 400,
       menubar: false,
       toolbar: registeredButtons.join(' '),
       plugins: registeredPlugins.join(' '),
-      extended_valid_elements: extendedValidElements.join(",")
-    })
+      extended_valid_elements: extendedValidElements.join(","),
+      convert_urls: false
+    }, editor.overrides);
+
+    tinymce.init(options)
   };
 
   editor.unload = function() {

data/lib/tb_core/version.rb

@@ -1,3 +1,3 @@
 module TbCore
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Greg Woods
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic