From 7245e0a7fcf2a518879d8334ee9f706642544235 Mon Sep 17 00:00:00 2001 From: Sid Yadav Date: Mon, 2 Mar 2015 17:21:14 -0500 Subject: [PATCH] Change filepicker uploading to pickAndStore, fix services defaults --- angular-redactor-filepicker.js | 18 +++++++++++++----- bower.json | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/angular-redactor-filepicker.js b/angular-redactor-filepicker.js index 6f95dd4..ebf0099 100644 --- a/angular-redactor-filepicker.js +++ b/angular-redactor-filepicker.js @@ -265,21 +265,29 @@ RedactorPlugins.filepicker = function() { this.button.setAwesome('filepicker', 'fa-image'); }, show: function() { - filepicker.pick(this.filepicker.insert, { + filepicker.pickAndStore({ mimetype: 'image/*', container: 'modal', + multiple: false, + debug: false, + maxSize: 2000 * 1024 * 1024, + folders: false, services: [ "COMPUTER", "IMAGE_SEARCH", "URL", - "FTP" + "DROPBOX", + "GOOGLE_DRIVE", ] - }); + }, { + location:'S3', + path:'/', + access: 'public' + }, this.filepicker.insert); }, insert: function(object) { - html = "" - + html = "" this.insert.html(html); this.code.sync(); diff --git a/bower.json b/bower.json index a274152..c1904c7 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "angular-redactor-filepicker", "main": "angular-redactor-filepicker.js", - "version": "2.2.0", + "version": "2.3.0", "homepage": "https://github.com/UseFedora/angular-redactor", "authors": [ "Tyler Garlick ",