push_type_admin 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f76d34eb1c86d812216610a8bdf0c3b92680286
-  data.tar.gz: 7a3ae2b951f40228918b93e73adb75b8fdad1a6c
+  metadata.gz: aab192fb83e5823a6673eb6c22367bc3d6a583ed
+  data.tar.gz: 0a2e276c324790186b8081b9e57b1a0c7f902f26
 SHA512:
-  metadata.gz: 32952155ea63e3d194b19ed775ef5095b1c1366229e7a785a1428db55387938f4388c0fc511ae2132b86818b73d313efbcfca404bf576d5853bf4d959c1fd437
-  data.tar.gz: 39d161d62149b8f310123e1031e13587ba1ab869b66ffaf70465e6b586a52dc77bc2cba7f681d016ed203df4d0b820e2502bdb9e370c45a269cc1fdedee39339
+  metadata.gz: 108142567c344791e182563092139fd138b63c29ea27f02ddd70cae04eb3592f48f608177f831c54d8141eba9d745be376cf4e5c91356c906cbf1f2abc45e32e
+  data.tar.gz: 5e5cd3dffdbf79536ec5e685e1e220263b8302160c12d96f4a7cf5cf80ca5173686c2e18223a8ef8555b4d8d55afea61c06462ad876e57d7dfcd9d6e40b32c50

data/app/assets/javascripts/push_type/webpack/admin.bundle.js

@@ -48694,6 +48694,7 @@
 
 	    var options = {};
 	    _lodash2.default.extend(options, defaults, opts[this.params.froalaToolbar], {
+	      fileUploadURL: this.params.uploadPath,
 	      imageUploadURL: this.params.uploadPath
 	    });
 

data/app/assets/javascripts/push_type/wysiwyg_setup.js.erb

@@ -13,6 +13,8 @@
 
 $.extend($.FroalaEditor.DEFAULTS, {
   key: '<%= PushType::WysiwygField::FROALA_KEY %>',
+  fileUploadParam: 'asset[file]',
+  fileUploadParams: { froala: true },
   imageDefaultWidth: 0,
   imageMediaStyles: [ 'original', <%= PushType.config.media_styles.map { |style, _| "'#{ style }'" }.join(', ') %> ],
   imageUploadParam: 'asset[file]',

data/app/webpack/javascripts/directives/froala.es6

@@ -49,6 +49,7 @@ export default Vue.directive('froala', {
 
     let options = {};
     _.extend(options, defaults, opts[this.params.froalaToolbar], {
+      fileUploadURL: this.params.uploadPath,
       imageUploadURL: this.params.uploadPath
     })
 

data/test/dummy/config/initializers/push_type.rb

@@ -45,6 +45,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '652782af5572b84e2f69be6b82fd0a6e822c2ffe51933428cddf11853de15a34'
+  # config.dragonfly_secret = 'e752be1081e5051e80e1753c457dc23e67ded635a3642be26878621cb99c39a8'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: b8b257403284d0d91b1e54a0ff122b9cffa5c72d942e27ffc7fd998119e34e2c8cf529b83d89e70ae6ed6f041a277eb4b586da73aabd650ffa937623d19be1f1
+  secret_key_base: 9d384af54dec4810a5cc60136cb22efcca2068beeeddbf3bf89bd2e2728ed3ad6fa895aeb9d41cfc7865a12ce7fbc5f09a754b8ab2cbf8aa67c515c2fab3ee55
 
 test:
-  secret_key_base: a4896127f09bba2e463540cd5d4b6b6874218615487a026c5514e46163d1ed6f690595f3ec37d5cbbccd5fb08d01769ed2c6bb49c812299fd2ec642dec2f933f
+  secret_key_base: 4ba527b3ef5b9d98b6639d62cc07b69efee6865e8f6875a3345e326c782807169d21e6ec4589c40478f68b5f6afec7f6fb983f8665f68393ada8135ac63d4809
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160808143043) do
+ActiveRecord::Schema.define(version: 20161016144113) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"