express_admin 1.7.15 → 1.7.16.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6ed0af9857afa0f710fa1fa671bf22f81d9cbb
-  data.tar.gz: 9e7ada3391993db3b2d4e09efcc87332be788f5d
+  metadata.gz: 3b75a30705f4e1af5085556962116363b122832a
+  data.tar.gz: cae1e2ff26f127059781f83e37632bc8a2c74498
 SHA512:
-  metadata.gz: 3511a91fd34b37f26c896c7a89a5316df6ff9f296662528fa54c423d39ce1b1ae00db525579bad650ca202d74ab8d6da5afbaec65dab149f58f74f56cadc100b
-  data.tar.gz: 59f7ba38d01ad326a940948e1e4107c164d6f1146b67a2428562e7eacacd1b016e2d9fc967484d4adf7e8c45380a1e87ece5e73447452421a1f0381d384a1faf
+  metadata.gz: 5050cfe2080920527da524a0ff7b3c0f6660efe3aa4be4c25e909fd9ab2a3a0b17b1520cc4834cc319d0728aaca1a6da421bd8ded5fd46cb1b7f3b04e55fddab
+  data.tar.gz: 00f54955f2164c9d52c19fab52ce3a4799744c71ef12c27b4e4347f1f2254c5f9694599130bbfa0372055666bc9b564bc977f84474f625ef5ff250e43b16b066

data/app/assets/javascripts/express_admin.js

@@ -2,7 +2,6 @@
 //= require jquery_ujs
 //= require jquery-ui
 //= require jquery.loadingdotdotdot
-//= require tinymce-jquery
 //= require select2
 //= require dropzone
 //= require ace/ace

data/app/helpers/express_admin/admin_helper.rb

@@ -74,6 +74,7 @@ module ExpressAdmin
       current_module_path = current_module.to_s.underscore
       admin_path ||= current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
       a = []
+      a << cdnjs_include_tag
       a << stylesheet_link_tag("#{admin_path}")
       a << javascript_include_tag("express_admin", 'data-turbolinks-track' => true)
       a << javascript_include_tag("#{admin_path}", 'data-turbolinks-track' => true)

data/app/views/layouts/express_admin/external.html.et

@@ -4,6 +4,7 @@ html(lang: 'en') {
     meta content: 'width=device-width, initial-scale=1.0', name: 'viewport'
     title { yield(:title) }
     stylesheet_link_tag 'express_admin/application'
+    cdnjs_include_tag
     javascript_include_tag :modernizr
     javascript_include_tag 'express_admin/application'
     csrf_meta_tags

data/config/initializers/cdnjs.rb

@@ -0,0 +1,3 @@
+Rails.application.config.cdnjs = [
+  { :cdnjs => 'tinymce/4.3.1/tinymce.min.js', :localpath => 'tinymce.min.js', :windowVar => 'tinyMCE' }
+]

data/lib/express_admin/engine.rb

@@ -37,6 +37,7 @@ module ExpressAdmin
       Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf|png|jpg|jpeg|gif)$/
       Rails.application.config.assets.precompile << /\.(?:mp4|webm|mp3)$/
       Rails.application.config.assets.precompile += all_assets
+      Rails.application.config.assets.precompile += %w(tinymce.min.js)
     end
 
     def all_rails_engines

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.15"
+  VERSION = "1.7.16.pre1"
 end