express_admin 1.7.15 → 1.7.16.pre1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0f6ed0af9857afa0f710fa1fa671bf22f81d9cbb
4
- data.tar.gz: 9e7ada3391993db3b2d4e09efcc87332be788f5d
3
+ metadata.gz: 3b75a30705f4e1af5085556962116363b122832a
4
+ data.tar.gz: cae1e2ff26f127059781f83e37632bc8a2c74498
5
5
  SHA512:
6
- metadata.gz: 3511a91fd34b37f26c896c7a89a5316df6ff9f296662528fa54c423d39ce1b1ae00db525579bad650ca202d74ab8d6da5afbaec65dab149f58f74f56cadc100b
7
- data.tar.gz: 59f7ba38d01ad326a940948e1e4107c164d6f1146b67a2428562e7eacacd1b016e2d9fc967484d4adf7e8c45380a1e87ece5e73447452421a1f0381d384a1faf
6
+ metadata.gz: 5050cfe2080920527da524a0ff7b3c0f6660efe3aa4be4c25e909fd9ab2a3a0b17b1520cc4834cc319d0728aaca1a6da421bd8ded5fd46cb1b7f3b04e55fddab
7
+ data.tar.gz: 00f54955f2164c9d52c19fab52ce3a4799744c71ef12c27b4e4347f1f2254c5f9694599130bbfa0372055666bc9b564bc977f84474f625ef5ff250e43b16b066
@@ -2,7 +2,6 @@
2
2
  //= require jquery_ujs
3
3
  //= require jquery-ui
4
4
  //= require jquery.loadingdotdotdot
5
- //= require tinymce-jquery
6
5
  //= require select2
7
6
  //= require dropzone
8
7
  //= require ace/ace
@@ -74,6 +74,7 @@ module ExpressAdmin
74
74
  current_module_path = current_module.to_s.underscore
75
75
  admin_path ||= current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
76
76
  a = []
77
+ a << cdnjs_include_tag
77
78
  a << stylesheet_link_tag("#{admin_path}")
78
79
  a << javascript_include_tag("express_admin", 'data-turbolinks-track' => true)
79
80
  a << javascript_include_tag("#{admin_path}", 'data-turbolinks-track' => true)
@@ -4,6 +4,7 @@ html(lang: 'en') {
4
4
  meta content: 'width=device-width, initial-scale=1.0', name: 'viewport'
5
5
  title { yield(:title) }
6
6
  stylesheet_link_tag 'express_admin/application'
7
+ cdnjs_include_tag
7
8
  javascript_include_tag :modernizr
8
9
  javascript_include_tag 'express_admin/application'
9
10
  csrf_meta_tags
@@ -0,0 +1,3 @@
1
+ Rails.application.config.cdnjs = [
2
+ { :cdnjs => 'tinymce/4.3.1/tinymce.min.js', :localpath => 'tinymce.min.js', :windowVar => 'tinyMCE' }
3
+ ]
@@ -37,6 +37,7 @@ module ExpressAdmin
37
37
  Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf|png|jpg|jpeg|gif)$/
38
38
  Rails.application.config.assets.precompile << /\.(?:mp4|webm|mp3)$/
39
39
  Rails.application.config.assets.precompile += all_assets
40
+ Rails.application.config.assets.precompile += %w(tinymce.min.js)
40
41
  end
41
42
 
42
43
  def all_rails_engines
@@ -1,3 +1,3 @@
1
1
  module ExpressAdmin
2
- VERSION = "1.7.15"
2
+ VERSION = "1.7.16.pre1"
3
3
  end