tb_core 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d872d85445d4c25392456def398ec02e4103b2d200272849c105063c75699e7
-  data.tar.gz: a4fa137374414a058fce80a9169518b3978587e968c7a9b21d0a8982db1b86f0
+  metadata.gz: b601ae30b70478a2a908e9d8bc6dbf9b5ba8641edfd1768687f5472c5fd0b641
+  data.tar.gz: 0102a18e4e539fbe985e32c87eb38df5f6a68e9397316ff578d6bf9f86bd908b
 SHA512:
-  metadata.gz: f7b229ce4e43d1012672432e6641005cc944926eef3a77fe5044cfc26ed591d0d572729ddbd7fb6a7c0ca27e9c559fe8aa05941815abcb2d29281af35637a9d0
-  data.tar.gz: 1939d6ab1f5e361a89b0dc79f3dea4c023413cad9bb870a4f711241cdcb7dd6b8c0474b2a49321e686de3bf64ee86571c6ffb706bf0d736991dd1713de76d4d9
+  metadata.gz: bd894b75ba13119b6be69e1ce826d729333fd08f74f60ddd6393a666edc9fc7953449a58e6fce6b05e312625bc34e74afa8feac528932436d0f1488170184379
+  data.tar.gz: e4493e6a565cb75c8c0730bd220e4702ee7a19ab22bc371295cc84629ecab0a4012b4a6d81837ebaa5a8df63dfc46d3e6b8a0a7a18abcfdae24e419c760f779d

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

@@ -12,7 +12,9 @@ window.spud = { admin: window.tb };
 
 document.addEventListener('DOMContentLoaded', function() {
 
-  tb.editor.init();
+  if (typeof tinymce != "undefined") {
+    tb.editor.init();
+  }
 
   $("#modal_window .modal-footer .form-submit").bind('click', function() {
     $("#modal_window .modal-body form").submit();

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

@@ -14,62 +14,28 @@ tb.editor = {};
     'undo', 'redo', '|',
     'bold','italic','underline','strikethrough','|',
     'formatselect','|',
-    'cut','copy','paste', 'pasteword','pastetext','|',
+    'cut','copy','paste', '|',
     'bullist','numlist','outdent','indent','|',
     'link','unlink','image', '|', 'code', '|'
   ];
 
-  var validElements = "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|" +
-    "onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|" +
-    "onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|" +
-    "name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u," +
-    "#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|" +
-    "src|border|alt=|title|hspace|vspace|width|height|align|hidpi_src],-sub,-sup," +
-    "-blockquote,-table[border=0|cellspacing|cellpadding|width|frame|rules|" +
-    "height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|" +
-    "height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot," +
-    "#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor" +
-    "|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div," +
-    "-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face" +
-    "|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite]," +
-    "object[classid|width|height|codebase|*],param[name|value|_value],embed[type|width" +
-    "|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo," +
-    "button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|" +
-    "valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method]," +
-    "input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value]," +
-    "kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value]," +
-    "q[cite],samp,select[disabled|multiple|name|size],small," +
-    "textarea[cols|rows|disabled|name|readonly],tt,var,big";
-
   var extendedValidElements = [
     "iframe[src|width|height|name|align|frameborder|allowfullscreen]"
   ];
 
   editor.init = function(options) {
     editor.unload();
-    editor.checkAndCallTinyMce(options);
-  };
 
-  editor.initMCEWithOptions = function(element, options){
-    var theme = options.theme || 'modern';
-    var height = options.height || 400;
-    var width = options.width || $(element).width();
-    var buttons = options.buttons || registeredButtons;
-    var plugins = options.plugins || registeredPlugins;
+    options = options || { selector: 'textarea.tinymce' };
 
-    $(element).tinymce({
-      theme: theme,
-      language: 'en',
+    tinymce.init({
+      selector: options.selector,
+      height: 400,
       menubar: false,
-      plugins: plugins.join(' '),
-      toolbar: buttons.join(' '),
-      convert_urls: false,
-      valid_elements: validElements,
-      media_strict: false,
-      extended_valid_elements: extendedValidElements.join(","),
-      width: width,
-      height: height
-    });
+      toolbar: registeredButtons.join(' '),
+      plugins: registeredPlugins.join(' '),
+      extended_valid_elements: extendedValidElements.join(",")
+    })
   };
 
   editor.unload = function() {
@@ -111,32 +77,4 @@ tb.editor = {};
     }
   };
 
-  var loadScript = null;
-
-  editor.checkAndCallTinyMce = function(options){
-    options = options || {};
-    var selector = options.selector || 'textarea.tinymce';
-    var $elements = $(selector);
-
-    if($elements.length === 0){
-      return;
-    }
-
-    if(loadScript === null){
-      loadScript = $.when(
-        $.ajax({url: '//cdn.tinymce.com/4.3/tinymce.min.js', dataType: 'script', cache: true}),
-        $.ajax({url: '//cdn.tinymce.com/4.3/jquery.tinymce.min.js', dataType: 'script', cache: true})
-      ).done(function(){
-        $('body').trigger("tb:tinymce-loaded");
-        editor.tinymce.loaded = true;
-      });
-    }
-
-    loadScript.done(function(){
-      $elements.each(function(){
-        editor.initMCEWithOptions(this, options);
-      });
-    });
-  };
-
 })();

data/app/views/layouts/admin/application.html.erb

@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
   <title><%= TbCore.config.site_name %> Admin</title>
+  <%= tinymce_assets unless ENV['TB_SKIP_TINYMCE'] %>
   <%= stylesheet_link_tag *TbCore.config.admin_stylesheets %>
   <%= javascript_include_tag *TbCore.config.admin_javascripts %>
   <%= csrf_meta_tags %>

data/lib/tb_core/engine.rb

@@ -7,6 +7,7 @@ require 'will_paginate-bootstrap'
 require 'breadcrumbs_on_rails'
 require 'rails-ujs'
 require 'sortable_by'
+require 'tinymce-rails'
 
 module Spud
 end

data/lib/tb_core/version.rb

@@ -1,3 +1,3 @@
 module TbCore
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Greg Woods
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tinymce-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement