caboose-cms 0.4.23 → 0.4.24

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZGEwMWNmOGQ5MmU3ZjE2MWY0ZjgxODBkZDg3Mjk2MzhjMGIzYWQ4Mg==
4
+ YjZiMjY1MDUwZThiMTU0NjFjMzMwZjdhYWQzZTYwM2NiMzY4MzM4Zg==
5
5
  data.tar.gz: !binary |-
6
- MTJiYmM1NjQ2ZWJmMGYzODdlZTYxYTM3ODE5YTI4NWM5ZmM5MWM3OA==
6
+ NzJjMzk0YjNhOTg2ZWYxMjQ1MDk2OGVkNzA5M2Y2YWExYmM2ZWM5OQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- ZGEyYWQ0NDBkOTFjZGU0NGI0N2NjYjM0ZDdlYWQ1OTNmNGM0MGJhZmZkNGM2
10
- MGMyMjYxZTZlZTY3ZGI2MTNiYjZkOWNlNWQ5YmQ1NGUzYjAyZjVhMzkzMDRi
11
- Y2M0YjJiMTc1MGVmNmFhN2QxMGJkZjFhMDRiMmMyNzQyNGE1NGY=
9
+ ODQ2ZDg3MjJkY2JmZjA2NDk1MGYwZmU5NjhlZTc4Mzg0ZjcxYzA1NzBhNTI4
10
+ ZDc4ZmMzZmIxYmM4NzZjMjZlNWQzMTFmMDcxZjRlNmVmMTc0MWMzNDk4NmFi
11
+ Y2ZmNjE2MzRkNzZlYzRlYjY1MGZmZjE5ZGU0YzBlMmZlZDA4YmQ=
12
12
  data.tar.gz: !binary |-
13
- OWE2N2EzMzA3ODdlODU2MWJjYzllMmE3NGY2ZWM2ZjlkNjRmZmE2MWZhMDNm
14
- MmRiMzQ5MmNjNjg4ZmE5ZmM5MWM0NTc5YjZiNTY3YjMwMGYxNDgwOTFjMjU2
15
- NDFhYmU3MTFiZGQzODU5MWFhMDFhZTcwOTYyNDk1YzIyODc5YWU=
13
+ NWNjNjNhZTZlNjVlYTNkMzk4ZGMxMDY3OWI1YTIyMmE2MDEzMzlmNjc0OGUy
14
+ ZmQ2ODc1NDRmYTAxY2FlYTc3YmFjMWY1NWNjZTMyYTc4NDQ4NGZjODZlNzNm
15
+ NTAxMjQ1ODFiY2Y5NTQzMjg4ZGZkYjMxMmEzMDU1ZDMwYTU1ZTg=
@@ -135,10 +135,10 @@ module Caboose
135
135
  @block.create_children
136
136
  @modal = true
137
137
 
138
+ Caboose.log(Rails.application.config.action_controller)
138
139
  @cdn_domain = Rails.application.config.action_controller.asset_host
139
140
  if @cdn_domain.starts_with?('//')
140
- protocol = request.protocol.gsub('//', '')
141
- @cdn_domain = "#{protocol}#{Rails.application.config.action_controller.asset_host}"
141
+ @cdn_domain = @cdn_domain.gsub('//', '')
142
142
  end
143
143
 
144
144
  #render "caboose/blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/modal'
@@ -101,7 +101,7 @@ $(document).ready(function() {
101
101
  <% if @block.block_type.field_type == 'richtext' %>
102
102
  <%= tinymce_assets %>
103
103
  <script type='textjavascript'>
104
- document.domain = "<%= raw @cdn_domain %>";
104
+ //document.domain = "<%= raw @cdn_domain %>";
105
105
  </script>
106
106
  <%= tinymce :caboose, width: '800px', height:'300px' %>
107
107
  <% end %>
@@ -92,20 +92,72 @@ module Caboose
92
92
  'caboose/model/bound_checkbox.js',
93
93
  'caboose/model/bound_control.js',
94
94
  'caboose/model/bound_image.js',
95
+ 'caboose/model/bound_file.js',
95
96
  'caboose/model/bound_richtext.js',
96
- 'caboose/model/bound_select.js',
97
+ 'caboose/model/bound_s3_image.js',
98
+ 'caboose/model/bound_select.js',
97
99
  'caboose/model/bound_text.js',
98
100
  'caboose/model/bound_textarea.js',
99
101
  'caboose/model/class.js',
100
102
  'caboose/model/model_binder.js',
101
103
  'caboose/model/model.js',
104
+ 'caboose/model/s3.js',
102
105
  'caboose/model.form.page.js',
103
106
  'caboose/model.form.user.js',
104
107
  'caboose/placeholder.js',
105
108
  'caboose/shortcut.js',
106
- 'caboose/station.js',
107
- 'caboose/tinymce/plugins/caboose/plugin.js',
108
- # CSS
109
+ 'caboose/station.js',
110
+ 'caboose/tinymce/plugins/caboose/plugin.js',
111
+ 'caboose/messages/error.js',
112
+ 'caboose/jquery.placeholder.js',
113
+ 'caboose/jquery.detect.js',
114
+ 'caboose/jquery.placeholder.js',
115
+ 'caboose/jquery.detect.js',
116
+ 'caboose/model/s3.js',
117
+ 'caboose/model/bound_s3_image.js',
118
+ 'caboose/model/bound_file.js',
119
+ 'jquery.js',
120
+ 'jquery_ujs.js',
121
+ 'colorbox-rails/jquery.colorbox-min.js',
122
+ 'colorbox-rails.js',
123
+ 'colorbox-rails/colorbox-links.js',
124
+
125
+ 'tinymce/preinit.js',
126
+ 'tinymce/plugins/caboose/plugin.js',
127
+ 'tinymce/themes/modern/theme.js',
128
+ 'tinymce/plugins/advlist/plugin.js',
129
+ 'tinymce/plugins/lists/plugin.js',
130
+ 'tinymce/plugins/autolink/plugin.js',
131
+ 'tinymce/plugins/link/plugin.js',
132
+ 'tinymce/plugins/image/plugin.js',
133
+ 'tinymce/plugins/charmap/plugin.js',
134
+ 'tinymce/plugins/print/plugin.js',
135
+ 'tinymce/plugins/preview/plugin.js',
136
+ 'tinymce/plugins/hr/plugin.js',
137
+ 'tinymce/plugins/anchor/plugin.js',
138
+ 'tinymce/plugins/searchreplace/plugin.js',
139
+ 'tinymce/plugins/pagebreak/plugin.js',
140
+ 'tinymce/plugins/wordcount/plugin.js',
141
+ 'tinymce/plugins/visualblocks/plugin.js',
142
+ 'tinymce/plugins/visualchars/plugin.js',
143
+ 'tinymce/plugins/code/plugin.js',
144
+ 'tinymce/plugins/fullscreen/plugin.js',
145
+ 'tinymce/plugins/insertdatetime/plugin.js',
146
+ 'tinymce/plugins/media/plugin.js',
147
+ 'tinymce/plugins/nonbreaking/plugin.js',
148
+ 'tinymce/plugins/table/plugin.js',
149
+ 'tinymce/plugins/contextmenu/plugin.js',
150
+ 'tinymce/plugins/directionality/plugin.js',
151
+ 'tinymce/plugins/emoticons/plugin.js',
152
+ 'tinymce/plugins/paste/plugin.js',
153
+ 'tinymce/plugins/template/plugin.js',
154
+ 'tinymce/plugins/textcolor/plugin.js',
155
+ 'tinymce/plugins/caboose/plugin.js',
156
+
157
+ # CSS
158
+ 'colorbox-rails.css',
159
+ 'caboose/model_binder.css',
160
+ 'colorbox-rails/colorbox-rails.css',
109
161
  'caboose/admin_page_edit_content.css',
110
162
  'caboose/admin.css',
111
163
  'caboose/application.css',
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.4.23'
2
+ VERSION = '0.4.24'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.23
4
+ version: 0.4.24
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry