effective_assets 1.11.0 → 1.11.1

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
  SHA256:
3
- metadata.gz: 259da306cae2ad7cb0016c97ede0590b1bb1cbd612cfd1e22785d9c67c106309
4
- data.tar.gz: b91cc52f732ef79aae08033a4036128075c116bb24c8ce919815d01f47f1db0f
3
+ metadata.gz: c8765de009c8ebb04045ffde722a75536aeba50b882a1005a3e4d6da97f15f69
4
+ data.tar.gz: a16d85d054bb1833d9e032f83191d2078dbd7e0803dc4f77b81ba84d8aa4af9c
5
5
  SHA512:
6
- metadata.gz: e3ea04ae3523163153546607ddbf184d2b6897b620f09d115fae21b519858d4ca4ac2bd0d436ac63ebf71af7fe5319af59fce05f6095b776fc9dd24bb5979d60
7
- data.tar.gz: 2b58a23dc835673c47f110ffa675689c4330cae7899d78d4713deea01141e0bc71db0028d6ee0db93b85333e7e8f006cc0cb474f5a2786c5cfb29119a049d0ae
6
+ metadata.gz: 408efa39a45fb213960b936f93847f9f7cb3cf49f931f9d266e8157460e692c20449cf7457e20618ebb5bddb1b241a1cff54a417f5c9fbceebbf581de4a6cede
7
+ data.tar.gz: c87ba9c1a8f883a153042eb834fcc4ead52ee5db72ad3a452d29f611c1c02c27d13f30e6c996eda6f8229fe5cb102559ee3e47eabd6b0718899b38c12e13a05f
@@ -11,7 +11,7 @@ CKEDITOR.dialog.add 'effective_asset', (editor) ->
11
11
  {
12
12
  id: 'iframe-insert',
13
13
  type: 'html',
14
- html: "<div><p id='iframe-insert-loading' style='text-align: center;'><br><br><br><br><br><br><img src='<%= asset_path('effective_assets/spinner.gif') %>' /><br><br>&nbsp;&nbsp;&nbsp;Loading...</p><iframe class='effective_assets_iframe' style='width: 100%; height: 100%; min-height: 500px;' src='/effective/assets?only=nonimages'></iframe></div>"
14
+ html: "<div><p id='iframe-insert-loading' style='text-align: center;'><br><br><br><br><br><br><br><br>&nbsp;&nbsp;&nbsp;Loading...</p><iframe class='effective_assets_iframe' style='width: 100%; height: 100%; min-height: 500px;' src='/effective/assets?only=nonimages'></iframe></div>"
15
15
  onLoad: (evt) ->
16
16
  dialog = evt.sender # This is the CKEditor.dialog
17
17
  iframe = $('#' + dialog.getContentElement('upload', 'iframe-insert').domId).children('iframe').first()
@@ -8,8 +8,7 @@ module Effective
8
8
  def index # This is the IFRAME modal dialog that is read by CKEDITOR
9
9
  EffectiveAssets.authorized?(self, :index, Effective::Asset.new(:user_id => current_user.try(:id)))
10
10
 
11
- effective_iframe_uploads = Effective::Attachment.where(box: EffectiveAssets::IFRAME_UPLOADS).pluck(:asset_id)
12
- @assets = Effective::Asset.where(id: effective_iframe_uploads)
11
+ @assets = Effective::Asset.where(user_id: current_user.id)
13
12
 
14
13
  if params[:only] == 'images'
15
14
  @assets = @assets.images
@@ -22,7 +21,6 @@ module Effective
22
21
  end
23
22
 
24
23
  @user_uploads = IframeUpload.new(@assets)
25
- @user_uploads.add_to_asset_box(:uploads, @assets)
26
24
 
27
25
  render :file => 'effective/assets/iframe'
28
26
  end
@@ -24,7 +24,7 @@ if defined?(EffectiveRegions)
24
24
  end
25
25
 
26
26
  def is_private?
27
- private_url == true
27
+ [true, 'true', '1'].include?(private_url)
28
28
  end
29
29
 
30
30
  def aws_private?
@@ -1,3 +1,3 @@
1
1
  module EffectiveAssets
2
- VERSION = '1.11.0'.freeze
2
+ VERSION = '1.11.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_assets
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.11.0
4
+ version: 1.11.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-08-06 00:00:00.000000000 Z
11
+ date: 2019-08-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -142,7 +142,7 @@ files:
142
142
  - app/assets/images/mime-types/video.png
143
143
  - app/assets/images/mime-types/word.jpg
144
144
  - app/assets/images/mime-types/zip.png
145
- - app/assets/javascripts/effective/snippets/effective_asset.js.coffee.erb
145
+ - app/assets/javascripts/effective/snippets/effective_asset.js.coffee
146
146
  - app/assets/javascripts/effective_assets.js
147
147
  - app/assets/javascripts/effective_assets/asset_box.js.coffee
148
148
  - app/assets/javascripts/effective_assets/asset_box_dialog.js.coffee