trestle-tinymce 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c8229395feba7e14f844eb1d8ef444d352fe4f4
-  data.tar.gz: 93de07f3bb3060d6c061b3ba1d1b1634fd5e6362
+SHA256:
+  metadata.gz: c7dc11e201036590329d24dfbe078063d5046e95f33cee7d8e8cd81f137bb272
+  data.tar.gz: ee172f063b4b8dd9b3ed8387a23f8d634a906b1441e785ba1ff495c6042ad8d5
 SHA512:
-  metadata.gz: beffffc73ee1c4e351f8abdbda9f53ea243a7edd52c80a73e6f2bdef31011ea9dcb6d24b8c3b6a844f5482d3b2cbc4330097be3bcbb8ee803a7259c3bb4c19b6
-  data.tar.gz: a921c31124e557c137cc15f8f835a30d1d806723ef93f393c6a83e158a28d18a20cccdf47cb007d5b1129390d9077f5fe1c465ae24f7fc2b999be78b480e8730
+  metadata.gz: 86585721365012d2ddb9b1f80de687c9ae36d34334b67853689688003f27708e247681a37b04a40915db991e53f3ca33acffc47b3b2368d24abdb5799cfa27f7
+  data.tar.gz: fd6bac809c2428eadfb4031c1520376c4133972f1e5ab4e40429142d31d3fc825947e228d5e0bf770381832bed7d094ca522ec805fb628e8d92ed5526c3ef553

data/app/assets/javascripts/trestle/tinymce.js

@@ -1,13 +1,11 @@
 Trestle.TinyMCE = {};
 
-Trestle.ready(function() {
-  function init() {
-    if (typeof(tinyMCE) !== 'undefined') {
-      tinyMCE.init(Trestle.TinyMCE.default);
-    } else {
-      setTimeout(init, 50);
-    }
-  }
+Trestle.init(function(e, root) {
+  $(root).find('textarea.tinymce').each(function() {
+    var id = $(this).attr('id');
+    var editor = tinyMCE.get(id);
+    if (editor) { editor.remove(); }
+  });
 
-  init();
+  tinyMCE.init(Trestle.TinyMCE.default);
 });

data/config/initializers/trestle.rb

@@ -27,7 +27,7 @@ Trestle.configure do |config|
   end
 
   config.hook(:javascripts) do
-    config = TinyMCE::Rails::Configuration.new(Trestle.config.tinymce.default.options)
+    config = TinyMCE::Rails::Configuration.new(Trestle.config.tinymce.default.as_json.with_indifferent_access)
 
     tinymce_assets +
       javascript_include_tag("trestle/tinymce") +

data/lib/trestle/tinymce/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module TinyMCE
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/trestle-tinymce.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trestle",       "~> 0.8"
+  spec.add_dependency "trestle",       "~> 0.8", ">= 0.8.8"
   spec.add_dependency "tinymce-rails", "~> 4.6"
 
   spec.add_development_dependency "bundler", "~> 1.15"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-tinymce
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trestle
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: TinyMCE integration plugin for the Trestle admin framework